summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-06-06 21:34:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-06 21:34:32 +0000
commit22e4b319da44a86bbda41a2e68eb55f01729b23c (patch)
tree68dd5b3ed1d2e79c0d8e4b0a574987d2ab694c02 /media
parent1fffa73d5c8f8dec9ea237159ae21a624722eb18 (diff)
parent66830855846db5c211c2da6c055ca9b4167e8974 (diff)
downloadframeworks_av-22e4b319da44a86bbda41a2e68eb55f01729b23c.zip
frameworks_av-22e4b319da44a86bbda41a2e68eb55f01729b23c.tar.gz
frameworks_av-22e4b319da44a86bbda41a2e68eb55f01729b23c.tar.bz2
Merge "do not drop TS packet on discontinuity at payload start"
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/mpeg2ts/ATSParser.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/mpeg2ts/ATSParser.cpp b/media/libstagefright/mpeg2ts/ATSParser.cpp
index d1afd8b..338e899 100644
--- a/media/libstagefright/mpeg2ts/ATSParser.cpp
+++ b/media/libstagefright/mpeg2ts/ATSParser.cpp
@@ -555,7 +555,9 @@ status_t ATSParser::Stream::parse(
}
#endif
- return OK;
+ if (!payload_unit_start_indicator) {
+ return OK;
+ }
}
mExpectedContinuityCounter = (continuity_counter + 1) & 0x0f;