drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6c537e53: Merge "Properly handle start code in H264/AVC encoder output" into kraken

Browse Source
This commit is contained in:
James Dong
2010-05-24 10:55:28 -07:00
committed by Android Git Automerger
parent 1586f7133e 6c537e53ce
commit f09cab8cb0
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/libmediaplayerservice/StagefrightRecorder.cpp
View File

@ -701,6 +701,7 @@ status_t StagefrightRecorder::reset() {
mSampleRate = 8000; mSampleRate = 8000;
mAudioChannels = 1; mAudioChannels = 1;
mAudioBitRate = 12200; mAudioBitRate = 12200;
mInterleaveDurationUs = 0;
mOutputFd = -1; mOutputFd = -1;
mFlags = 0; mFlags = 0;

4
media/libstagefright/MPEG4Writer.cpp
View File

@ -334,8 +334,6 @@ static void StripStartcode(MediaBuffer *buffer) {
} }
off_t MPEG4Writer::addLengthPrefixedSample_l(MediaBuffer *buffer) { off_t MPEG4Writer::addLengthPrefixedSample_l(MediaBuffer *buffer) {
StripStartcode(buffer);
off_t old_offset = mOffset; off_t old_offset = mOffset;
size_t length = buffer->range_length(); size_t length = buffer->range_length();
@ -827,6 +825,8 @@ void MPEG4Writer::Track::threadEntry() {
continue; continue;
} }
if (is_avc) StripStartcode(buffer);
SampleInfo info; SampleInfo info;
info.size = is_avc info.size = is_avc
#if USE_NALLEN_FOUR #if USE_NALLEN_FOUR