Merge "CCodec: fix image data update handling" (42f674ed) · Commits · e / os / android_frameworks_av

media/codec2/sfplugin/CCodecBufferChannel.cpp

+30 −0

Original line number	Diff line number	Diff line
		@@ -255,6 +255,34 @@ public:
		mSkipCutBuffer = scb;
		}

		void handleImageData(const sp<Codec2Buffer> &buffer) {
		sp<ABuffer> imageDataCandidate = buffer->getImageData();
		if (imageDataCandidate == nullptr) {
		return;
		}
		sp<ABuffer> imageData;
		if (!mFormat->findBuffer("image-data", &imageData)
		\|\| imageDataCandidate->size() != imageData->size()
		\|\| memcmp(imageDataCandidate->data(), imageData->data(), imageData->size()) != 0) {
		ALOGD("[%s] updating image-data", mName);
		sp<AMessage> newFormat = dupFormat();
		newFormat->setBuffer("image-data", imageDataCandidate);
		MediaImage2 img = (MediaImage2)imageDataCandidate->data();
		if (img->mNumPlanes > 0 && img->mType != img->MEDIA_IMAGE_TYPE_UNKNOWN) {
		int32_t stride = img->mPlane[0].mRowInc;
		newFormat->setInt32(KEY_STRIDE, stride);
		ALOGD("[%s] updating stride = %d", mName, stride);
		if (img->mNumPlanes > 1 && stride > 0) {
		int32_t vstride = (img->mPlane[1].mOffset - img->mPlane[0].mOffset) / stride;
		newFormat->setInt32(KEY_SLICE_HEIGHT, vstride);
		ALOGD("[%s] updating vstride = %d", mName, vstride);
		}
		}
		setFormat(newFormat);
		buffer->setFormat(newFormat);
		}
		}

		protected:
		sp<SkipCutBuffer> mSkipCutBuffer;

		@@ -1152,6 +1180,7 @@ public:
		return WOULD_BLOCK;
		}
		submit(c2Buffer);
		handleImageData(c2Buffer);
		*clientBuffer = c2Buffer;
		ALOGV("[%s] grabbed buffer %zu", mName, *index);
		return OK;
		@@ -1250,6 +1279,7 @@ public:
		}
		newBuffer->setFormat(mFormat);
		*index = mImpl.assignSlot(newBuffer);
		handleImageData(newBuffer);
		*clientBuffer = newBuffer;
		ALOGV("[%s] registered buffer %zu", mName, *index);
		return OK;

media/codec2/sfplugin/Codec2Buffer.cpp

+2 −15

Original line number	Diff line number	Diff line
		@@ -84,17 +84,7 @@ bool Codec2Buffer::copyLinear(const std::shared_ptr<C2Buffer> &buffer) {
		}

		void Codec2Buffer::setImageData(const sp<ABuffer> &imageData) {
		meta()->setBuffer("image-data", imageData);
		format()->setBuffer("image-data", imageData);
		MediaImage2 img = (MediaImage2)imageData->data();
		if (img->mNumPlanes > 0 && img->mType != img->MEDIA_IMAGE_TYPE_UNKNOWN) {
		int32_t stride = img->mPlane[0].mRowInc;
		format()->setInt32(KEY_STRIDE, stride);
		if (img->mNumPlanes > 1 && stride > 0) {
		int32_t vstride = (img->mPlane[1].mOffset - img->mPlane[0].mOffset) / stride;
		format()->setInt32(KEY_SLICE_HEIGHT, vstride);
		}
		}
		mImageData = imageData;
		}

		// LocalLinearBuffer
		@@ -546,7 +536,6 @@ GraphicBlockBuffer::GraphicBlockBuffer(
		: Codec2Buffer(format, buffer),
		mView(view),
		mBlock(block),
		mImageData(imageData),
		mWrapped(wrapped) {
		setImageData(imageData);
		}
		@@ -683,10 +672,8 @@ ConstGraphicBlockBuffer::ConstGraphicBlockBuffer(
		mView(std::move(view)),
		mBufferRef(buffer),
		mWrapped(wrapped) {
		if (imageData != nullptr) {
		setImageData(imageData);
		}
		}

		std::shared_ptr<C2Buffer> ConstGraphicBlockBuffer::asC2Buffer() {
		mView.reset();

media/codec2/sfplugin/Codec2Buffer.h

+5 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include <android/hardware/cas/native/1.0/types.h>
		#include <binder/IMemory.h>
		#include <media/hardware/VideoAPI.h>
		#include <media/stagefright/foundation/ABuffer.h>
		#include <media/MediaCodecBuffer.h>
		#include <media/ICrypto.h>

		@@ -85,6 +86,8 @@ public:
		return false;
		}

		sp<ABuffer> getImageData() const { return mImageData; }

		protected:
		/**
		* canCopy() implementation for linear buffers.
		@@ -100,6 +103,8 @@ protected:
		* sets MediaImage data for flexible graphic buffers
		*/
		void setImageData(const sp<ABuffer> &imageData);

		sp<ABuffer> mImageData;
		};

		/**
		@@ -239,7 +244,6 @@ private:

		C2GraphicView mView;
		std::shared_ptr<C2GraphicBlock> mBlock;
		sp<ABuffer> mImageData;
		const bool mWrapped;
		};