diff options
| author | Andreas Huber <andih@google.com> | 2013-11-13 10:11:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 10:11:52 -0800 |
| commit | 5274e21ea6d9e8009c13817d75f9423735964700 (patch) | |
| tree | 83d70c58f374bff99d5a4b6f7aaad3eeeced9d49 /media/libstagefright | |
| parent | 728549e39be9b8fcc701ef0f4623bc50d8726bd7 (diff) | |
| parent | 26c8f714361bfb6403a7c457adfb8b55c89a634a (diff) | |
| download | frameworks_av-5274e21ea6d9e8009c13817d75f9423735964700.zip frameworks_av-5274e21ea6d9e8009c13817d75f9423735964700.tar.gz frameworks_av-5274e21ea6d9e8009c13817d75f9423735964700.tar.bz2 | |
am 26c8f714: Merge "Ignore transport stream packets with the "transport_error_indicator" bit set" into klp-dev
* commit '26c8f714361bfb6403a7c457adfb8b55c89a634a':
Ignore transport stream packets with the "transport_error_indicator" bit set
Diffstat (limited to 'media/libstagefright')
| -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 9850a46..175a263 100644 --- a/media/libstagefright/mpeg2ts/ATSParser.cpp +++ b/media/libstagefright/mpeg2ts/ATSParser.cpp @@ -1193,7 +1193,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); |