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,
{
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!");
while (len > 2)
{
- unsigned char data_unit_id = *p++;
+ /*unsigned char data_unit_id = */*p++;
unsigned char data_unit_length = *p++;
len -= 2;
// 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--;
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 if (m_Y < 26) // directly displayable packet
+ } 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
+ else if (m_page_open)
{
- if (m_M == m_page_M && m_page_open)
- eDebug("ignore packet %d, disgnation code %d", m_Y, decode_hamming_84(data));
- }*/
+ 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));
+ }
}
}
for (int i=0; i<len; ++i)
eDebugNoNewLine("%02x ", decode_odd_parity(data + i));
eDebug(""); */
- if (!m_Y) /* first line is page header, we don't need that. */
+ if (!m_subtitle_page.m_Y) /* first line is page header, we don't need that. */
{
m_double_height = -1;
return;
}
- if (m_double_height == m_Y)
+ if (m_double_height == m_subtitle_page.m_Y)
{
m_double_height = -1;
return;
}
- int last_was_white = 1, color = 7; /* start with whitespace. start with color=white. (that's unrelated.) */
-
- std::string text;
-
+ int last_was_white = 1, color = 1; /* start with whitespace. start with color=white. (that's unrelated.) */
+
+ static unsigned char out[128];
+
+ int outidx = 0,
+ Gtriplet = 0,
+ nat_opts = (m_subtitle_page.m_C & (1<<14) ? 1 : 0) |
+ (m_subtitle_page.m_C & (1<<13) ? 2 : 0) |
+ (m_subtitle_page.m_C & (1<<12) ? 4 : 0),
+ nat_subset = NationalOptionSubsetsLookup[Gtriplet*8+nat_opts];
+/* eDebug("nat_opts = %d, nat_subset = %d, C121314 = %d%d%d, m_C %08x",
+ nat_opts, nat_subset,
+ (m_subtitle_page.m_C & (1<<12))?1:0,
+ (m_subtitle_page.m_C & (1<<13))?1:0,
+ (m_subtitle_page.m_C & (1<<14))?1:0,
+ m_subtitle_page.m_C); */
+
// eDebug("handle subtitle line: %d len", len);
for (int i=0; i<len; ++i)
{
{
if (b != color) /* new color is split into a new string */
{
- addSubtitleString(color, text);
- text = "";
+ addSubtitleString(color, std::string((const char*)out, outidx));
+ outidx = 0;
color = b;
}
- } else if (b == 0xd)
- {
- m_double_height = m_Y + 1;
- } else if (b != 0xa && b != 0xb) /* box */
+ }
+ else if (b == 0xd)
+ m_double_height = m_subtitle_page.m_Y + 1;
+ else if (b == 0xa) // close box
+ m_box_open=0;
+ else if (b == 0xb) // open box
+ ++m_box_open;
+ else
eDebug("[ignore %x]", b);
/* ignore other attributes */
- } else
+ } else if (m_box_open>1)
{
//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)
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<void, const eDVBTeletextSubtitlePage&> &slot, ePtr<eConnection> &connection)
void eDVBTeletextParser::addSubtitleString(int color, std::string string)
{
// eDebug("add subtitle string: %s, col %d", string.c_str(), color);
- static unsigned char out[512];
int force_cell = 0;
if (string.substr(0, 2) == "- ")
force_cell = 1;
}
- int len = string.length(),
- idx = 0,
- outidx = 0,
- Gtriplet = 0,
- nat_opts = (m_C >> 11) & 0x7,
- nat_subset = NationalOptionSubsetsLookup[Gtriplet*8+nat_opts];
- while (idx < len)
- {
- unsigned char c = string[idx];
- if (c >= 0x20)
- {
- if (NationalReplaceMap[c])
- {
- unsigned int utf8_code =
- NationalOptionSubsets[nat_subset*14+c];
- 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) || outidx))
+ if ((color != m_subtitle_color || force_cell) && !m_subtitle_text.empty() && ((color == -2) || !string.empty()))
{
// 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));
} else if (!m_subtitle_text.empty() && m_subtitle_text[m_subtitle_text.size()-1] != ' ')
m_subtitle_text += " ";
- if (outidx)
+ if (!string.empty())
{
// eDebug("set %d as new color", color);
m_subtitle_color = color;
- m_subtitle_text += std::string((const char*)out, outidx);
+ m_subtitle_text += 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);
}