C2AllocatorGralloc: support locking RGBA_1010102 as YUVA_1010102 (35d36cba) · Commits · e / os / android_frameworks_av

media/codec2/vndk/C2AllocatorGralloc.cpp

+139 −63

Original line number	Diff line number	Diff line
		@@ -366,88 +366,88 @@ c2_status_t C2AllocationGralloc::map(
		generation, igbp_id, igbp_slot);
		}

		// UGLY HACK: assume YCbCr 4:2:0 8-bit format (and lockable via lockYCbCr) if we don't
		// recognize the format
		PixelFormat format = mInfo.mapperInfo.format;
		if (format != PixelFormat::RGBA_8888 && format != PixelFormat::RGBX_8888) {
		format = PixelFormat::YCBCR_420_888;
		}

		switch (format) {
		case PixelFormat::YCBCR_420_888:
		case PixelFormat::YV12: {
		YCbCrLayout ycbcrLayout;
		mMapper->lockYCbCr(
		const_cast<native_handle_t *>(mBuffer), grallocUsage,
		switch (mInfo.mapperInfo.format) {
		case PixelFormat::RGBA_1010102: {
		// TRICKY: this is used for media as YUV444 in the case when it is queued directly to a
		// Surface. In all other cases it is RGBA. We don't know which case it is here, so
		// default to YUV for now.
		void *pointer = nullptr;
		mMapper->lock(
		const_cast<native_handle_t *>(mBuffer),
		grallocUsage,
		{ (int32_t)rect.left, (int32_t)rect.top, (int32_t)rect.width, (int32_t)rect.height },
		// TODO: fence
		hidl_handle(),
		[&err, &ycbcrLayout](const auto &maperr, const auto &mapLayout) {
		[&err, &pointer](const auto &maperr, const auto &mapPointer) {
		err = maperr2error(maperr);
		if (err == C2_OK) {
		ycbcrLayout = mapLayout;
		pointer = mapPointer;
		}
		});
		if (err != C2_OK) {
		ALOGD("lockYCbCr failed: %d", err);
		ALOGD("lock failed: %d", err);
		return err;
		}
		addr[C2PlanarLayout::PLANE_Y] = (uint8_t *)ycbcrLayout.y;
		addr[C2PlanarLayout::PLANE_U] = (uint8_t *)ycbcrLayout.cb;
		addr[C2PlanarLayout::PLANE_V] = (uint8_t *)ycbcrLayout.cr;
		layout->type = C2PlanarLayout::TYPE_YUV;
		layout->numPlanes = 3;
		layout->rootPlanes = 3;
		// treat as 32-bit values
		addr[C2PlanarLayout::PLANE_Y] = (uint8_t *)pointer;
		addr[C2PlanarLayout::PLANE_U] = (uint8_t *)pointer;
		addr[C2PlanarLayout::PLANE_V] = (uint8_t *)pointer;
		addr[C2PlanarLayout::PLANE_A] = (uint8_t *)pointer;
		layout->type = C2PlanarLayout::TYPE_YUVA;
		layout->numPlanes = 4;
		layout->rootPlanes = 1;
		layout->planes[C2PlanarLayout::PLANE_Y] = {
		C2PlaneInfo::CHANNEL_Y, // channel
		1, // colInc
		(int32_t)ycbcrLayout.yStride, // rowInc
		4, // colInc
		4 * (int32_t)mInfo.stride, // rowInc
		1, // mColSampling
		1, // mRowSampling
		8, // allocatedDepth
		8, // bitDepth
		0, // rightShift
		C2PlaneInfo::NATIVE, // endianness
		32, // allocatedDepth
		10, // bitDepth
		10, // rightShift
		C2PlaneInfo::LITTLE_END, // endianness
		C2PlanarLayout::PLANE_Y, // rootIx
		0, // offset
		};
		layout->planes[C2PlanarLayout::PLANE_U] = {
		C2PlaneInfo::CHANNEL_CB, // channel
		(int32_t)ycbcrLayout.chromaStep, // colInc
		(int32_t)ycbcrLayout.cStride, // rowInc
		2, // mColSampling
		2, // mRowSampling
		8, // allocatedDepth
		8, // bitDepth
		4, // colInc
		4 * (int32_t)mInfo.stride, // rowInc
		1, // mColSampling
		1, // mRowSampling
		32, // allocatedDepth
		10, // bitDepth
		0, // rightShift
		C2PlaneInfo::NATIVE, // endianness
		C2PlanarLayout::PLANE_U, // rootIx
		C2PlaneInfo::LITTLE_END, // endianness
		C2PlanarLayout::PLANE_Y, // rootIx
		0, // offset
		};
		layout->planes[C2PlanarLayout::PLANE_V] = {
		C2PlaneInfo::CHANNEL_CR, // channel
		(int32_t)ycbcrLayout.chromaStep, // colInc
		(int32_t)ycbcrLayout.cStride, // rowInc
		2, // mColSampling
		2, // mRowSampling
		8, // allocatedDepth
		8, // bitDepth
		0, // rightShift
		C2PlaneInfo::NATIVE, // endianness
		C2PlanarLayout::PLANE_V, // rootIx
		4, // colInc
		4 * (int32_t)mInfo.stride, // rowInc
		1, // mColSampling
		1, // mRowSampling
		32, // allocatedDepth
		10, // bitDepth
		20, // rightShift
		C2PlaneInfo::LITTLE_END, // endianness
		C2PlanarLayout::PLANE_Y, // rootIx
		0, // offset
		};
		layout->planes[C2PlanarLayout::PLANE_A] = {
		C2PlaneInfo::CHANNEL_A, // channel
		4, // colInc
		4 * (int32_t)mInfo.stride, // rowInc
		1, // mColSampling
		1, // mRowSampling
		32, // allocatedDepth
		2, // bitDepth
		30, // rightShift
		C2PlaneInfo::LITTLE_END, // endianness
		C2PlanarLayout::PLANE_Y, // rootIx
		0, // offset
		};
		// handle interleaved formats
		intptr_t uvOffset = addr[C2PlanarLayout::PLANE_V] - addr[C2PlanarLayout::PLANE_U];
		if (uvOffset > 0 && uvOffset < (intptr_t)ycbcrLayout.chromaStep) {
		layout->rootPlanes = 2;
		layout->planes[C2PlanarLayout::PLANE_V].rootIx = C2PlanarLayout::PLANE_U;
		layout->planes[C2PlanarLayout::PLANE_V].offset = uvOffset;
		} else if (uvOffset < 0 && uvOffset > -(intptr_t)ycbcrLayout.chromaStep) {
		layout->rootPlanes = 2;
		layout->planes[C2PlanarLayout::PLANE_U].rootIx = C2PlanarLayout::PLANE_V;
		layout->planes[C2PlanarLayout::PLANE_U].offset = -uvOffset;
		}
		break;
		}

		@@ -519,9 +519,85 @@ c2_status_t C2AllocationGralloc::map(
		};
		break;
		}

		case PixelFormat::YCBCR_420_888:
		// fall-through
		case PixelFormat::YV12:
		// fall-through
		default: {
		ALOGD("unsupported pixel format: %d", mInfo.mapperInfo.format);
		return C2_OMITTED;
		YCbCrLayout ycbcrLayout;
		mMapper->lockYCbCr(
		const_cast<native_handle_t *>(mBuffer), grallocUsage,
		{ (int32_t)rect.left, (int32_t)rect.top, (int32_t)rect.width, (int32_t)rect.height },
		// TODO: fence
		hidl_handle(),
		[&err, &ycbcrLayout](const auto &maperr, const auto &mapLayout) {
		err = maperr2error(maperr);
		if (err == C2_OK) {
		ycbcrLayout = mapLayout;
		}
		});
		if (err != C2_OK) {
		ALOGD("lockYCbCr failed: %d", err);
		return err;
		}
		addr[C2PlanarLayout::PLANE_Y] = (uint8_t *)ycbcrLayout.y;
		addr[C2PlanarLayout::PLANE_U] = (uint8_t *)ycbcrLayout.cb;
		addr[C2PlanarLayout::PLANE_V] = (uint8_t *)ycbcrLayout.cr;
		layout->type = C2PlanarLayout::TYPE_YUV;
		layout->numPlanes = 3;
		layout->rootPlanes = 3;
		layout->planes[C2PlanarLayout::PLANE_Y] = {
		C2PlaneInfo::CHANNEL_Y, // channel
		1, // colInc
		(int32_t)ycbcrLayout.yStride, // rowInc
		1, // mColSampling
		1, // mRowSampling
		8, // allocatedDepth
		8, // bitDepth
		0, // rightShift
		C2PlaneInfo::NATIVE, // endianness
		C2PlanarLayout::PLANE_Y, // rootIx
		0, // offset
		};
		layout->planes[C2PlanarLayout::PLANE_U] = {
		C2PlaneInfo::CHANNEL_CB, // channel
		(int32_t)ycbcrLayout.chromaStep, // colInc
		(int32_t)ycbcrLayout.cStride, // rowInc
		2, // mColSampling
		2, // mRowSampling
		8, // allocatedDepth
		8, // bitDepth
		0, // rightShift
		C2PlaneInfo::NATIVE, // endianness
		C2PlanarLayout::PLANE_U, // rootIx
		0, // offset
		};
		layout->planes[C2PlanarLayout::PLANE_V] = {
		C2PlaneInfo::CHANNEL_CR, // channel
		(int32_t)ycbcrLayout.chromaStep, // colInc
		(int32_t)ycbcrLayout.cStride, // rowInc
		2, // mColSampling
		2, // mRowSampling
		8, // allocatedDepth
		8, // bitDepth
		0, // rightShift
		C2PlaneInfo::NATIVE, // endianness
		C2PlanarLayout::PLANE_V, // rootIx
		0, // offset
		};
		// handle interleaved formats
		intptr_t uvOffset = addr[C2PlanarLayout::PLANE_V] - addr[C2PlanarLayout::PLANE_U];
		if (uvOffset > 0 && uvOffset < (intptr_t)ycbcrLayout.chromaStep) {
		layout->rootPlanes = 2;
		layout->planes[C2PlanarLayout::PLANE_V].rootIx = C2PlanarLayout::PLANE_U;
		layout->planes[C2PlanarLayout::PLANE_V].offset = uvOffset;
		} else if (uvOffset < 0 && uvOffset > -(intptr_t)ycbcrLayout.chromaStep) {
		layout->rootPlanes = 2;
		layout->planes[C2PlanarLayout::PLANE_U].rootIx = C2PlanarLayout::PLANE_V;
		layout->planes[C2PlanarLayout::PLANE_U].offset = -uvOffset;
		}
		break;
		}
		}
		mLocked = true;