X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fdvb%2Fteletext.cpp;h=4fa0a8a6dbad867615304beadcf4a817dcccf33a;hb=4dfa43611e65709b6cdb570868055bd19382cf6a;hp=0515913a1066aa81dc0ebdb1b4a19b7f9ce13002;hpb=3ecd3b8d7f2d52fd7b5956c1fe08f926cc2a2858;p=vuplus_dvbapp diff --git a/lib/dvb/teletext.cpp b/lib/dvb/teletext.cpp index 0515913..4fa0a8a 100644 --- a/lib/dvb/teletext.cpp +++ b/lib/dvb/teletext.cpp @@ -3,14 +3,65 @@ #include #include -/* - This is a very simple en300 706 telext decoder. - - It can only decode a single page at a time, thus it's only used - for subtitles. - - */ +// G0 and G2 national option table +// see table 33 in ETSI EN 300 706 +// use it with (triplet 1 bits 14-11)*(ctrl bits C12-14) + +unsigned char NationalOptionSubsetsLookup[16*8] = +{ + 1, 4, 11, 5, 3, 8, 0, 1, + 7, 4, 11, 5, 3, 1, 0, 1, + 1, 4, 11, 5, 3, 8, 12, 1, + 1, 1, 1, 1, 1, 10, 1, 9, + 1, 4, 2, 6, 1, 1, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 1, // reserved + 1, 1, 1, 1, 1, 1, 12, 1, + 1, 1, 1, 1, 1, 1, 1, 1, // reserved + 1, 1, 1, 1, 3, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, // reserved + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, // reserved + 1, 1, 1, 1, 1, 1, 1, 1, // reserved + 1, 1, 1, 1, 1, 1, 1, 1, // reserved + 1, 1, 1, 1, 1, 1, 1, 1, // reserved + 1, 1, 1, 1, 1, 1, 1, 1 // reserved +}; + +unsigned char NationalReplaceMap[128] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 6, 7, 8, + 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 11, 12, 13, 0 +}; + +// national option subsets (UTF8) +// see table 36 in ETSI EN 300 706 + +unsigned int NationalOptionSubsets[13*14] = { + 0, 0x0023, 0xc5af, 0xc48d, 0xc5a3, 0xc5be, 0xc3bd, 0xc3ad, 0xc599, 0xc3a9, 0xc3a1, 0xc49b, 0xc3ba, 0xc5a1, // Slovak/Czech + 0, 0xc2a3, 0x0024, 0x0040, 0xe28690, 0xc2bd, 0xe28692, 0xe28691, 0x0023, 0x002d, 0xc2bc, 0xc781, 0xc2be, 0xc3b7, // English + 0, 0x0023, 0xc3b5, 0xc5A0, 0xc384, 0xc396, 0xc5bd, 0xc39c, 0xc395, 0xc5a1, 0xc3a4, 0xc3b6, 0xc5be, 0xc3bc, // Estonian + 0, 0xc3a9, 0xc3af, 0xc3a0, 0xc3ab, 0xc3aa, 0xc3b9, 0xc3ae, 0x0023, 0xc3a8, 0xc3a2, 0xc3b4, 0xc3bb, 0xc3a7, // French + 0, 0x0023, 0x0024, 0xc2a7, 0xc384, 0xc396, 0xc39c, 0x005e, 0x005f, 0xcb9a, 0xc3a4, 0xc3b6, 0xc3bc, 0xc39f, // German + 0, 0xc2a3, 0x0024, 0xc3a9, 0xcb9a, 0xc3a7, 0xe28692, 0xe28691, 0x0023, 0xc3b9, 0xc3a0, 0xc3b2, 0xc3a8, 0xc3ac, // Italian + 0, 0x0023, 0x0024, 0xc5a0, 0xc497, 0xc8a9, 0xc5bd, 0xc48d, 0xc5ab, 0xc5a1, 0xc485, 0xc5b3, 0xc5be, 0xc4af/*FIXMEE*/, // Lithuanian/Lettish + 0, 0x0023, 0xc584, 0xc485, 0xc6b5, 0xc59a, 0xc581, 0xc487, 0xc3b3, 0xc499, 0xc5bc, 0xc59b, 0xc582, 0xc5ba, // Polish + 0, 0xc3a7, 0x0024, 0xc2a1, 0xc3a1, 0xc3a9, 0xc3ad, 0xc3b3, 0xc3ba, 0xc2bf, 0xc3bc, 0xc3b1, 0xc3a8, 0xc3a0, // Spanish/Portuguese + 0, 0x0023, 0xc2a4, 0xc5a2, 0xc382, 0xc59e, 0xc78d, 0xc38e, 0xc4b1, 0xc5a3, 0xc3a2, 0xc59f, 0xc78e, 0xc3ae, // Rumanian + 0, 0x0023, 0xc38b, 0xc48c, 0xc486, 0xc5bd, 0xc490, 0xc5a0, 0xc3ab, 0xc48d, 0xc487, 0xc5be, 0xc491, 0xc5a1, // Slovenian/Serbian/Croation + 0, 0x0023, 0xc2a4, 0xc389, 0xc384, 0xc396, 0xc385, 0xc39c, 0x005f, 0xc3a9, 0xc3a4, 0xc3b6, 0xc3a5, 0xc3bc, // Finnish/Hungarian/Swedish + 0, 0xee8080/*FIXME*/, 0xc7a7, 0xc4b0, 0xc59e, 0xc396, 0xc387, 0xc39c, 0xc7a6, 0xc4b1, 0xc59f, 0xc3b6, 0xc3a7, 0xc3bc // Turkish +}; +// This is a very simple en300 706 telext decoder. +// It can only decode a single page at a time, thus it's only used +// for subtitles. + DEFINE_REF(eDVBTeletextParser); /* we asumme error free transmission! */ @@ -70,7 +121,7 @@ eDVBTeletextParser::eDVBTeletextParser(iDVBDemux *demux) { setStreamID(0xBD); /* as per en 300 472 */ - setPage(-1); + setPageAndMagazine(0,0); if (demux->createPESReader(eApp, m_pes_reader)) eDebug("failed to create teletext subtitle PES reader!"); @@ -118,6 +169,12 @@ void eDVBTeletextParser::processPESPacket(__u8 *pkt, int len) break; } +// if (data_unit_id != 0x03) +// { +// /* eDebug("non subtitle data unit id %d", data_unit_id); */ +// break; +// } + unsigned char line_offset = *p++; len--; unsigned char framing_code = *p++; len--; @@ -128,7 +185,7 @@ void eDVBTeletextParser::processPESPacket(__u8 *pkt, int len) if (framing_code != 0xe4) /* no teletxt data */ continue; - + m_M = magazine_and_packet_address & 7; m_Y = magazine_and_packet_address >> 3; @@ -157,7 +214,7 @@ void eDVBTeletextParser::processPESPacket(__u8 *pkt, int len) int serial_mode = m_C & (1<<11); /* page on the same magazine? end current page. */ - if ((serial_mode || (m_M == m_page_M)) && (m_page_open)) + if ((serial_mode || m_M == m_page_M) && m_page_open) { handlePageEnd(have_pts, pts); m_page_open = 0; @@ -166,21 +223,33 @@ void eDVBTeletextParser::processPESPacket(__u8 *pkt, int len) m_X = decode_hamming_84(data+1) * 0x10 + decode_hamming_84(data); if ((m_C & (1<<6)) && (m_X != 0xFF)) /* scan for pages with subtitle bit set */ - m_found_subtitle_pages.insert((m_M << 8) | m_X); - + { + eDVBServicePMTHandler::subtitleStream s; + s.pid = m_pid; + s.subtitling_type = 0x01; // ebu teletext subtitle + s.teletext_page_number = m_X & 0xFF; + s.teletext_magazine_number = m_M & 7; + m_found_subtitle_pages.insert(s); + } + /* correct page on correct magazine? open page. */ - if ((m_M == m_page_M) && (m_X == m_page_X)) + if (m_M == m_page_M && m_X == m_page_X) { handlePageStart(); m_page_open = 1; handleLine(data + 8, 32); } - } else + } else if (m_Y < 26) // directly displayable packet { - /* data for the selected page? */ - if ((m_M == m_page_M) && m_page_open) + /* data for the selected page ? */ + if (m_M == m_page_M && m_page_open) handleLine(data, 40); } +/* else + { + if (m_M == m_page_M && m_page_open) + eDebug("ignore packet %d, disgnation code %d", m_Y, decode_hamming_84(data)); + }*/ } } @@ -189,7 +258,10 @@ int eDVBTeletextParser::start(int pid) m_page_open = 0; if (m_pes_reader) + { + m_pid = pid; return m_pes_reader->start(pid); + } else return -1; } @@ -269,15 +341,18 @@ void eDVBTeletextParser::handlePageEnd(int have_pts, const pts_t &pts) m_subtitle_page.m_have_pts = have_pts; m_subtitle_page.m_pts = pts; m_subtitle_page.m_timeout = 90000 * 20; /* 20s */ - if (m_page_number != -1) + if (m_page_X != 0) sendSubtitlePage(); /* send assembled subtitle page to display */ } -void eDVBTeletextParser::setPage(int page) +void eDVBTeletextParser::setPageAndMagazine(int page, int magazine) { - m_page_number = page; - m_page_M = (page >> 8) & 7; /* magazine to look for */ - m_page_X = page & 0xFF; /* page number */ + if (page > 0) + eDebug("enable teletext subtitle page %x%02x", magazine, page); + else + eDebug("disable teletext subtitles"); + m_page_M = magazine&7; /* magazine to look for */ + m_page_X = page&0xFF; /* page number */ } void eDVBTeletextParser::connectNewPage(const Slot1 &slot, ePtr &connection) @@ -288,18 +363,53 @@ void eDVBTeletextParser::connectNewPage(const Slot1= 0x20) + { + unsigned char offs = NationalReplaceMap[c]; + if (offs) + { + unsigned int utf8_code = + NationalOptionSubsets[nat_subset*14+offs]; + if (utf8_code > 0xFFFFFF) + out[outidx++]=(utf8_code&0xFF000000)>>24; + if (utf8_code > 0xFFFF) + out[outidx++]=(utf8_code&0xFF0000)>>16; + if (utf8_code > 0xFF) + out[outidx++]=(utf8_code&0xFF00)>>8; + out[outidx++]=utf8_code&0xFF; + } + else + out[outidx++] = c; + } + ++idx; + } + // eDebug("color %d, m_subtitle_color %d", color, m_subtitle_color); gRGB rgbcol((color & 1) ? 255 : 128, (color & 2) ? 255 : 128, (color & 4) ? 255 : 128); - if ((color != m_subtitle_color || force_cell) && !m_subtitle_text.empty() && ((color == -2) || !string.empty())) + if ((color != m_subtitle_color || force_cell) && !m_subtitle_text.empty() && ((color == -2) || outidx)) { // eDebug("add text |%s|: %d != %d || %d", m_subtitle_text.c_str(), color, m_subtitle_color, force_cell); m_subtitle_page.m_elements.push_back(eDVBTeletextSubtitlePageElement(rgbcol, m_subtitle_text)); @@ -307,11 +417,11 @@ void eDVBTeletextParser::addSubtitleString(int color, std::string string) } else if (!m_subtitle_text.empty() && m_subtitle_text[m_subtitle_text.size()-1] != ' ') m_subtitle_text += " "; - if (!string.empty()) + if (outidx) { // eDebug("set %d as new color", color); m_subtitle_color = color; - m_subtitle_text += string; + m_subtitle_text += std::string((const char*)out, outidx); } }