summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MPEG4Writer.cpp
diff options
context:
space:
mode:
authorSurajit Podder <spodder@codeaurora.org>2015-08-25 21:14:38 +0530
committerSteve Kondik <steve@cyngn.com>2015-10-29 21:27:02 -0700
commitb8d0cd79582e04079a5ce9ac3462d29e17d99835 (patch)
treef754dfbf39473667bcc6f331b6a78b40ffa40d77 /media/libstagefright/MPEG4Writer.cpp
parent94641325fe4dba33923740010806689dbd4620e2 (diff)
downloadframeworks_av-b8d0cd79582e04079a5ce9ac3462d29e17d99835.zip
frameworks_av-b8d0cd79582e04079a5ce9ac3462d29e17d99835.tar.gz
frameworks_av-b8d0cd79582e04079a5ce9ac3462d29e17d99835.tar.bz2
video: Avoid writing 0 sample count ctts entry
After the initial ctts entry is written, cttsSampleCount is set to 0, and the next ctts is written with 0 sample count. Add change to write ctts entry only for non-zero sample count. Change-Id: I457c3c9bdd402138338c340db4187f1d2b9bdbe6
Diffstat (limited to 'media/libstagefright/MPEG4Writer.cpp')
-rw-r--r--media/libstagefright/MPEG4Writer.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index cb9df29..3614373 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -2401,7 +2401,11 @@ status_t MPEG4Writer::Track::threadEntry() {
cttsSampleCount = 0; // No sample in ctts box is pending
} else {
if (currCttsOffsetTimeTicks != lastCttsOffsetTimeTicks) {
- addOneCttsTableEntry(cttsSampleCount, lastCttsOffsetTimeTicks);
+ // cttsSampleCount is 0 after writing the initial ctts entry
+ // Avoid writing entry with 0 sample count
+ if (cttsSampleCount != 0) {
+ addOneCttsTableEntry(cttsSampleCount, lastCttsOffsetTimeTicks);
+ }
lastCttsOffsetTimeTicks = currCttsOffsetTimeTicks;
cttsSampleCount = 1; // One sample in ctts box is pending
} else {