X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0e3e7773e5d8e7ff159316db3de7fcfad57bb9e8..6dff5d54702aa6ed8d2c8e3b8e1ddee19b38447d:/lib/dvb/teletext.cpp diff --git a/lib/dvb/teletext.cpp b/lib/dvb/teletext.cpp index 7128000d..cafd8910 100644 --- a/lib/dvb/teletext.cpp +++ b/lib/dvb/teletext.cpp @@ -3,16 +3,13 @@ #include #include -// Try to map teletext characters into ISO-8859-1 charset -// Use similar looking or similar meaning characters when possible. - // 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 LatinNationalOptionSubsetsLookup[16*8] = +unsigned char NationalOptionSubsetsLookup[16*8] = { - 1, 4, 11, 5, 3, 8, 0, 1, + 1, 4, 11, 5, 3, 8, 0, 9, 7, 4, 11, 5, 3, 1, 0, 1, 1, 4, 11, 5, 3, 8, 12, 1, 1, 1, 1, 1, 1, 10, 1, 9, @@ -30,7 +27,7 @@ unsigned char LatinNationalOptionSubsetsLookup[16*8] = 1, 1, 1, 1, 1, 1, 1, 1 // reserved }; -unsigned char LatinNationalReplaceMap[128] = +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, @@ -42,36 +39,25 @@ unsigned char LatinNationalReplaceMap[128] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 11, 12, 13, 0 }; -// latin national option subsets +// national option subsets (UTF8) // see table 36 in ETSI EN 300 706 -unsigned char LatinNationalOptionSubsets[13*14] = { - 0, '#', 'u', 'c', 't', 'z', 'ý', 'í', 'r', 'é', 'á', 'e', 'ú', 's', // Slovak/Czech - 0, '£', '$', '@', '-', '½', '-', '|', '#', '-', '¼', '#', '¾', '÷', // English - 0, '#', 'õ', 'S', 'Ä', 'Ö', 'Z', 'Ü', 'Õ', 's', 'ä', 'ö', 'z', 'ü', // Estonian - 0, 'é', 'ï', 'à', 'ë', 'ê', 'ù', 'î', '#', 'è', 'â', 'ô', 'û', 'ç', // French - 0, '#', '$', '§', 'Ä', 'Ö', 'Ü', '^', '_', 'º', 'ä', 'ö', 'ü', 'ß', // German - 0, '£', '$', 'é', 'º', 'ç', '-', '|', '#', 'ù', 'à', 'ò', 'è', 'ì', // Italian - 0, '#', '$', 'S', 'e', 'e', 'Z', 'c', 'u', 's', 'a', 'u', 'z', 'i', // Lithuanian/Lettish - 0, '#', 'n', 'a', 'Z', 'S', 'L', 'c', 'ó', 'e', 'z', 's', 'l', 'z', // Polish - 0, 'ç', '$', 'i', 'á', 'é', 'í', 'ó', 'ú', '¿', 'ü', 'ñ', 'è', 'à', // Spanish/Portuguese - 0, '#', '¤', 'T', 'Â', 'S', 'A', 'Î', 'i', 't', 'â', 's', 'a', 'î', // Rumanian - 0, '#', 'Ë', 'C', 'C', 'Z', 'D', 'S', 'ë', 'c', 'c', 'z', 'd', 's', // Slovenian/Serbian/Croation - 0, '#', '¤', 'É', 'Ä', 'Ö', 'Å', 'Ü', '_', 'é', 'ä', 'ö', 'å', 'ü', // Finnish/Hungarian/Swedish - 0, 'T', 'g', 'I', 'S', 'Ö', 'Ç', 'Ü', 'G', 'i', 's', 'ö', 'ç', 'ü' // Turkish +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 }; -unsigned char MapTeletextG0Latin1Char(int Gtriplet, int NatOpts, unsigned char inchar) -{ - int num = LatinNationalOptionSubsetsLookup[(Gtriplet&0xf)*(NatOpts&0x7)]; - unsigned char c = inchar&0x7f; - unsigned char cc = LatinNationalReplaceMap[c]; - if(cc) - return LatinNationalOptionSubsets[num*cc]; - else - return c; -} - // 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. @@ -135,7 +121,7 @@ eDVBTeletextParser::eDVBTeletextParser(iDVBDemux *demux) { setStreamID(0xBD); /* as per en 300 472 */ - setPageAndMagazine(0,0); + setPageAndMagazine(-1, -1); if (demux->createPESReader(eApp, m_pes_reader)) eDebug("failed to create teletext subtitle PES reader!"); @@ -167,7 +153,7 @@ void eDVBTeletextParser::processPESPacket(__u8 *pkt, int len) while (len > 2) { - unsigned char data_unit_id = *p++; + /*unsigned char data_unit_id = */*p++; unsigned char data_unit_length = *p++; len -= 2; @@ -183,13 +169,13 @@ void eDVBTeletextParser::processPESPacket(__u8 *pkt, int len) break; } - if (data_unit_id != 0x03) - { - /* eDebug("non subtitle data unit id %d", data_unit_id); */ - 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 line_offset =*/ *p++; len--; unsigned char framing_code = *p++; len--; int magazine_and_packet_address = decode_hamming_84(p++); len--; @@ -199,65 +185,71 @@ 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; + int M = magazine_and_packet_address & 7, + Y = magazine_and_packet_address >> 3; // eDebug("line %d, framing code: %02x, M=%02x, Y=%02x", line_offset, framing_code, m_M, m_Y); - if (m_Y == 0) /* page header */ + if (Y == 0) /* page header */ { - m_C = 0; - - m_S1 = decode_hamming_84(data + 2); /* S1 */ - int S2C4 = decode_hamming_84(data + 3); - - m_S2 = S2C4 & 7; - m_C |= (S2C4 & 8) ? (1<<4) : 0; - - m_S3 = decode_hamming_84(data + 4); - - int S4C5C6 = decode_hamming_84(data + 5); - - m_S4 = S4C5C6 & 3; - m_C |= (S4C5C6 & 0xC) << 3; - - m_C |= decode_hamming_84(data + 6) << 7; - m_C |= decode_hamming_84(data + 7) << 11; - - int serial_mode = m_C & (1<<11); - + int X = decode_hamming_84(data + 1) * 0x10 + decode_hamming_84(data), +// S1 = decode_hamming_84(data + 2), + S2C4 = decode_hamming_84(data + 3), +// S2 = S2C4 & 7, +// S3 = decode_hamming_84(data + 4), + S4C5C6 = decode_hamming_84(data + 5), +// S4 = S4C5C6 & 3, + C = ((S2C4 & 8) ? (1<<4) : 0) | + ((S4C5C6 & 0xC) << 3) | + (decode_hamming_84(data + 6) << 7) | + (decode_hamming_84(data + 7) << 11), + serial_mode = 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_page_M) && m_page_open) { handlePageEnd(have_pts, pts); m_page_open = 0; } - - 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 */ + + if ((C & (1<<6)) && (X != 0xFF) && !(C & (1<<5))) /* scan for pages with subtitle bit set */ { 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; + s.teletext_page_number = X & 0xFF; + s.teletext_magazine_number = 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_page_M && X == m_page_X) { handlePageStart(); + m_subtitle_page.m_C = C; + m_subtitle_page.m_Y = Y; m_page_open = 1; + m_box_open = 0; handleLine(data + 8, 32); } - } else + } else if (Y < 26) // directly displayable packet { /* data for the selected page ? */ - if (m_M == m_page_M && m_page_open) + if (M == m_page_M && m_page_open) + { + m_subtitle_page.m_Y = Y; + m_box_open = 0; handleLine(data, 40); + } + } else if (Y > 29) + { + } + else if (m_page_open) + { + if (M == m_page_M) + eDebug("ignore packet X/%d/%d", Y, decode_hamming_84(data)); + else + eDebug("ignore packet M/%d/%d", Y, decode_hamming_84(data)); } } } @@ -290,22 +282,35 @@ void eDVBTeletextParser::handleLine(unsigned char *data, int len) for (int i=0; i1) { //eDebugNoNewLine("%c", b); /* no more than one whitespace, only printable chars */ if (((!last_was_white) || (b != ' ')) && (b >= 0x20)) { - text += b; + unsigned char offs = NationalReplaceMap[b]; + 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++] = b; last_was_white = b == ' '; } } } //eDebug(""); - addSubtitleString(color, text); + addSubtitleString(color, std::string((const char*)out, outidx)); } void eDVBTeletextParser::handlePageEnd(int have_pts, const pts_t &pts) @@ -357,11 +380,15 @@ void eDVBTeletextParser::handlePageEnd(int have_pts, const pts_t &pts) void eDVBTeletextParser::setPageAndMagazine(int page, int magazine) { if (page > 0) - eDebug("enable teletext subtitle page %d", page); + 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 */ + m_page_M = magazine; /* magazine to look for */ + if (magazine != -1) + m_page_M &= 7; + m_page_X = page; /* page number */ + if (page != -1) + m_page_X &= 0xFF; } void eDVBTeletextParser::connectNewPage(const Slot1 &slot, ePtr &connection) @@ -372,7 +399,6 @@ void eDVBTeletextParser::connectNewPage(const Slot1= 0x20) - string[idx] = MapTeletextG0Latin1Char(0, (m_C >> 11), string[idx]); - ++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())) @@ -412,7 +428,11 @@ void eDVBTeletextParser::addSubtitleString(int color, std::string string) void eDVBTeletextParser::sendSubtitlePage() { // eDebug("subtitle page:"); - //for (unsigned int i = 0; i < m_subtitle_page.m_elements.size(); ++i) - // eDebug("%s", m_subtitle_page.m_elements[i].m_text.c_str()); - m_new_subtitle_page(m_subtitle_page); + bool empty=true; + if (empty) + for (unsigned int i = 0; i < m_subtitle_page.m_elements.size(); ++i) + if (!m_subtitle_page.m_elements[i].m_text.empty()) + empty=false; + if (!empty) + m_new_subtitle_page(m_subtitle_page); }