mirror
/
F5OEO-tstools
kopia lustrzana https://github.com/F5OEO/tstools
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix AC/3 "too short" messages 

The AC/3 descriptor block can legitimately stop short of sending all fields.
This fixes that
master
John Cox 2014-09-03 14:50:49 +01:00
rodzic 1265079d48
commit 77f94dff7e
1 zmienionych plików z 13 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

22
ts.c
Wyświetl plik

@ -2319,6 +2319,8 @@ static const char * const descriptor_names[] =
// From ATSC A/52B section A3.4 // From ATSC A/52B section A3.4
// N.B. Horizontal lines in the table represent valid stop points
static void print_ac3_audio_descriptor(const int is_msg, const byte * const buf, const int len) static void print_ac3_audio_descriptor(const int is_msg, const byte * const buf, const int len)
{ {
const byte * p = buf; const byte * p = buf;
@ -2361,20 +2363,20 @@ static void print_ac3_audio_descriptor(const int is_msg, const byte * const buf,
bsmod, num_channels_txt[nc], *p & 1); bsmod, num_channels_txt[nc], *p & 1);
if (++p >= eop) if (++p >= eop)
{ {
goto too_short; goto done;
} }
fprint_msg_or_err(is_msg, ", langcod: %d", *p); fprint_msg_or_err(is_msg, ", langcod: %d", *p);
if (nc == 0) if (nc == 0)
{ {
if (++p >= eop) if (++p >= eop)
{ {
goto too_short; goto done;
} }
fprint_msg_or_err(is_msg, ", langcod2: %d", *p); fprint_msg_or_err(is_msg, ", langcod2: %d", *p);
} }
if (++p >= eop) if (++p >= eop)
{ {
goto too_short; goto done;
} }
if (bsmod < 2) if (bsmod < 2)
{ {
@ -2390,7 +2392,7 @@ static void print_ac3_audio_descriptor(const int is_msg, const byte * const buf,
} }
if (++p >= eop) if (++p >= eop)
{ {
goto too_short; goto done;
} }
{ {
unsigned int textlen = *p >> 1; unsigned int textlen = *p >> 1;
@ -2419,11 +2421,9 @@ static void print_ac3_audio_descriptor(const int is_msg, const byte * const buf,
p += textlen; p += textlen;
} }
} }
// From here on doesn't seem to be optional in the standard but streams don't have it
if (++p >= eop) if (++p >= eop)
{ {
fprint_msg_or_err(is_msg, ", language: <missing>\n"); goto done;
return;
} }
{ {
const int language_flag = *p >> 7; const int language_flag = *p >> 7;
@ -2454,10 +2454,14 @@ static void print_ac3_audio_descriptor(const int is_msg, const byte * const buf,
} }
} }
if (++p < eop) if (++p >= eop)
{ {
print_data(is_msg, "additional_info: ", p, eop - p,100); goto done;
} }
print_data(is_msg, "additional_info: ", p, eop - p,100);
done:
fprint_msg_or_err(is_msg, "\n"); fprint_msg_or_err(is_msg, "\n");
return; return;