Merge "Remove obsolete hack for TI specific code" into jb-mr1-dev (42c5ef98) · Commits · e / os / android_frameworks_av

include/media/stagefright/OMXCodec.h

+2 −5

Original line number	Diff line number	Diff line
		@@ -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<MetaData> &meta);

		void restorePatchedDataPointer(BufferInfo *info);

		status_t applyRotation();
		status_t waitForBufferFilled_l();

media/libstagefright/OMXCodec.cpp

+9 −39

Original line number	Diff line number	Diff line
		@@ -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,20 +3063,6 @@ 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) {
		releaseBuffer = false;
		info->mMediaBuffer = srcBuffer;
		@@ -3103,7 +3082,6 @@ bool OMXCodec::drainInputBuffer(BufferInfo *info) {
		+ srcBuffer->range_offset(),
		srcBuffer->range_length());
		}
		}

		int64_t lastBufferTimeUs;
		CHECK(srcBuffer->meta_data()->findInt64(kKeyTime, &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[]) {