From a6ee7bc5f9524c220377e37f6525e2d46c69b75b Mon Sep 17 00:00:00 2001 From: James Dong Date: Mon, 6 Aug 2012 22:02:27 -0700 Subject: Remove obsolete hack for TI specific code o related-to-bug: 6566886 Change-Id: I39aad214cbf7b748a95a9d22db50cd8f421931e6 --- include/media/stagefright/OMXCodec.h | 7 ++---- media/libstagefright/OMXCodec.cpp | 48 +++++++----------------------------- 2 files changed, 11 insertions(+), 44 deletions(-) diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 81350ca..c57e2a5 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -98,9 +98,8 @@ struct OMXCodec : public MediaSource, kDecoderLiesAboutNumberOfChannels = 256, kInputBufferSizesAreBogus = 512, kSupportsMultipleFramesPerInputBuffer = 1024, - kAvoidMemcopyInputRecordingFrames = 2048, - kRequiresLargerEncoderOutputBuffer = 4096, - kOutputBuffersAreUnreadable = 8192, + kRequiresLargerEncoderOutputBuffer = 2048, + kOutputBuffersAreUnreadable = 4096, }; // for use by ACodec @@ -342,8 +341,6 @@ private: status_t configureCodec(const sp &meta); - void restorePatchedDataPointer(BufferInfo *info); - status_t applyRotation(); status_t waitForBufferFilled_l(); diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index dabb0e7..e8cb9d5 100755 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -2091,13 +2091,6 @@ void OMXCodec::on_message(const omx_message &msg) { // Buffer could not be released until empty buffer done is called. if (info->mMediaBuffer != NULL) { - if (mIsEncoder && - (mQuirks & kAvoidMemcopyInputRecordingFrames)) { - // If zero-copy mode is enabled this will send the - // input buffer back to the upstream source. - restorePatchedDataPointer(info); - } - info->mMediaBuffer->release(); info->mMediaBuffer = NULL; } @@ -3070,39 +3063,24 @@ bool OMXCodec::drainInputBuffer(BufferInfo *info) { } bool releaseBuffer = true; - if (mIsEncoder && (mQuirks & kAvoidMemcopyInputRecordingFrames)) { - CHECK(mOMXLivesLocally && offset == 0); - - OMX_BUFFERHEADERTYPE *header = - (OMX_BUFFERHEADERTYPE *)info->mBuffer; - - CHECK(header->pBuffer == info->mData); - - header->pBuffer = - (OMX_U8 *)srcBuffer->data() + srcBuffer->range_offset(); - - releaseBuffer = false; - info->mMediaBuffer = srcBuffer; - } else { - if (mFlags & kStoreMetaDataInVideoBuffers) { + if (mFlags & kStoreMetaDataInVideoBuffers) { releaseBuffer = false; info->mMediaBuffer = srcBuffer; - } + } - if (mFlags & kUseSecureInputBuffers) { + if (mFlags & kUseSecureInputBuffers) { // Data in "info" is already provided at this time. releaseBuffer = false; CHECK(info->mMediaBuffer == NULL); info->mMediaBuffer = srcBuffer; - } else { - CHECK(srcBuffer->data() != NULL) ; - memcpy((uint8_t *)info->mData + offset, - (const uint8_t *)srcBuffer->data() - + srcBuffer->range_offset(), - srcBuffer->range_length()); - } + } else { + CHECK(srcBuffer->data() != NULL) ; + memcpy((uint8_t *)info->mData + offset, + (const uint8_t *)srcBuffer->data() + + srcBuffer->range_offset(), + srcBuffer->range_length()); } int64_t lastBufferTimeUs; @@ -4608,14 +4586,6 @@ status_t QueryCodecs( return QueryCodecs(omx, mimeType, queryDecoders, false /*hwCodecOnly*/, results); } -void OMXCodec::restorePatchedDataPointer(BufferInfo *info) { - CHECK(mIsEncoder && (mQuirks & kAvoidMemcopyInputRecordingFrames)); - CHECK(mOMXLivesLocally); - - OMX_BUFFERHEADERTYPE *header = (OMX_BUFFERHEADERTYPE *)info->mBuffer; - header->pBuffer = (OMX_U8 *)info->mData; -} - // These are supposed be equivalent to the logic in // "audio_channel_out_mask_from_count". status_t getOMXChannelMapping(size_t numChannels, OMX_AUDIO_CHANNELTYPE map[]) { -- cgit v1.1