diff options
| author | Andreas Huber <andih@google.com> | 2013-11-13 10:16:53 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 10:16:53 -0800 |
| commit | 28786252886f6cd1d89bf4e6c2deeca1788ad5c3 (patch) | |
| tree | acbd6cd339347c1e7bdb04f42265fe0818c307b0 /media/libstagefright/mpeg2ts | |
| parent | 7000c85348a69e37193230c8ccf493c8cb2708f8 (diff) | |
| parent | 5274e21ea6d9e8009c13817d75f9423735964700 (diff) | |
| download | frameworks_av-28786252886f6cd1d89bf4e6c2deeca1788ad5c3.zip frameworks_av-28786252886f6cd1d89bf4e6c2deeca1788ad5c3.tar.gz frameworks_av-28786252886f6cd1d89bf4e6c2deeca1788ad5c3.tar.bz2 | |
am 5274e21e: am 26c8f714: Merge "Ignore transport stream packets with the "transport_error_indicator" bit set" into klp-dev
* commit '5274e21ea6d9e8009c13817d75f9423735964700':
Ignore transport stream packets with the "transport_error_indicator" bit set
Diffstat (limited to 'media/libstagefright/mpeg2ts')
| -rw-r--r-- | media/libstagefright/mpeg2ts/ATSParser.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/mpeg2ts/ATSParser.cpp b/media/libstagefright/mpeg2ts/ATSParser.cpp index f87b9da..cb57a2f 100644 --- a/media/libstagefright/mpeg2ts/ATSParser.cpp +++ b/media/libstagefright/mpeg2ts/ATSParser.cpp @@ -1199,7 +1199,10 @@ status_t ATSParser::parseTS(ABitReader *br) { unsigned sync_byte = br->getBits(8); CHECK_EQ(sync_byte, 0x47u); - MY_LOGV("transport_error_indicator = %u", br->getBits(1)); + if (br->getBits(1)) { // transport_error_indicator + // silently ignore. + return OK; + } unsigned payload_unit_start_indicator = br->getBits(1); ALOGV("payload_unit_start_indicator = %u", payload_unit_start_indicator); |