commit 1cb8fa1e670786bf83ccde7571c5ac1fc087d4f1
author James Dong <jdong@google.com> Mon May 24 10:54:25 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 24 10:54:25 2010 -0700
tree 49e178290bd3b59a7487e72b691640ac9298fc04
parent 3d8055ac96170de7a8c49b9ffbe83ed447ccddce
parent e136c3bb38e88315bf8797a464ebf2c788296b22

Merge "Properly handle start code in H264/AVC encoder output" into kraken

media/libmediaplayerservice/StagefrightRecorder.cpp

diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index de64714..572389f 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -701,6 +701,7 @@
     mSampleRate    = 8000;
     mAudioChannels = 1;
     mAudioBitRate  = 12200;
+    mInterleaveDurationUs = 0;
 
     mOutputFd = -1;
     mFlags = 0;

media/libstagefright/MPEG4Writer.cpp

diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 094059d..e0f8f9e 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -334,8 +334,6 @@
 }
 
 off_t MPEG4Writer::addLengthPrefixedSample_l(MediaBuffer *buffer) {
-    StripStartcode(buffer);
-
     off_t old_offset = mOffset;
 
     size_t length = buffer->range_length();
@@ -827,6 +825,8 @@
             continue;
         }
 
+        if (is_avc) StripStartcode(buffer);
+
         SampleInfo info;
         info.size = is_avc
 #if USE_NALLEN_FOUR