summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MPEG4Writer.cpp
diff options
context:
space:
mode:
authorPradosh Das <prados@codeaurora.org>2015-10-25 00:47:12 +0530
committerSteve Kondik <steve@cyngn.com>2015-10-29 21:27:03 -0700
commit57583fd581d96e5b6497cb3f7839a5f0c0b33613 (patch)
tree181e344ef6b804ce890d7d09f3994f630d860cda /media/libstagefright/MPEG4Writer.cpp
parent7cda631948ca077855f76b20571784cbaf978ac9 (diff)
downloadframeworks_av-57583fd581d96e5b6497cb3f7839a5f0c0b33613.zip
frameworks_av-57583fd581d96e5b6497cb3f7839a5f0c0b33613.tar.gz
frameworks_av-57583fd581d96e5b6497cb3f7839a5f0c0b33613.tar.bz2
Revert "video: Avoid writing 0 sample count ctts entry"
This reverts commit 1c3512e861768125048e675966e3d8a7669bf4fa. Change-Id: I8a04c3035437f4aefa8c49ccdc2565c54a3831be
Diffstat (limited to 'media/libstagefright/MPEG4Writer.cpp')
-rw-r--r--media/libstagefright/MPEG4Writer.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 3614373..cb9df29 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -2401,11 +2401,7 @@ status_t MPEG4Writer::Track::threadEntry() {
cttsSampleCount = 0; // No sample in ctts box is pending
} else {
if (currCttsOffsetTimeTicks != lastCttsOffsetTimeTicks) {
- // cttsSampleCount is 0 after writing the initial ctts entry
- // Avoid writing entry with 0 sample count
- if (cttsSampleCount != 0) {
- addOneCttsTableEntry(cttsSampleCount, lastCttsOffsetTimeTicks);
- }
+ addOneCttsTableEntry(cttsSampleCount, lastCttsOffsetTimeTicks);
lastCttsOffsetTimeTicks = currCttsOffsetTimeTicks;
cttsSampleCount = 1; // One sample in ctts box is pending
} else {