diff options
author | James Dong <jdong@google.com> | 2010-08-20 11:39:29 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-20 11:39:29 -0700 |
commit | 3eb2ff224a12b5670f4f62f07a47ffb2fde01548 (patch) | |
tree | efb325e8e2f182dda3f8f6f40d01e19f8e49642c /media | |
parent | 817afcfe5679ab1251576c478c137488592cf7c2 (diff) | |
parent | 76c6e8f97cd6030454ebf60db06818e05d449f06 (diff) | |
download | frameworks_av-3eb2ff224a12b5670f4f62f07a47ffb2fde01548.zip frameworks_av-3eb2ff224a12b5670f4f62f07a47ffb2fde01548.tar.gz frameworks_av-3eb2ff224a12b5670f4f62f07a47ffb2fde01548.tar.bz2 |
Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/codecs/avc/enc/AVCEncoder.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp b/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp index 389180c..52a391f 100644 --- a/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp +++ b/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp @@ -338,10 +338,15 @@ status_t AVCEncoder::read( MediaBuffer *outputBuffer; CHECK_EQ(OK, mGroup->acquire_buffer(&outputBuffer)); - - // Add 4 bytes for the start code 0x00000001 - uint8_t *outPtr = (uint8_t *) outputBuffer->data() + 4; - uint32_t dataLength = outputBuffer->size() - 4; + uint8_t *outPtr = (uint8_t *) outputBuffer->data(); + uint32_t dataLength = outputBuffer->size(); + + if (!mSpsPpsHeaderReceived && mNumInputFrames < 0) { + // 4 bytes are reserved for holding the start code 0x00000001 + // of the sequence parameter set at the beginning. + outPtr += 4; + dataLength -= 4; + } int32_t type; AVCEnc_Status encoderStatus = AVCENC_SUCCESS; @@ -358,7 +363,7 @@ status_t AVCEncoder::read( switch (type) { case AVC_NALTYPE_SPS: ++mNumInputFrames; - memcpy(outputBuffer->data(), "\x00\x00\x00\x01", 4); + memcpy((uint8_t *)outputBuffer->data(), "\x00\x00\x00\x01", 4); outputBuffer->set_range(0, dataLength + 4); outPtr += (dataLength + 4); // 4 bytes for next start code dataLength = outputBuffer->size() - |