am 696cfefd: am 9578a90c: stagefright: add software renderer support to OMX_COLOR_YUV420SemiPlanar (ca509506) · Commits · e / os / android_frameworks_av

media/libstagefright/colorconversion/SoftwareRenderer.cpp

+5 −4

Original line number	Diff line number	Diff line
		@@ -104,6 +104,7 @@ void SoftwareRenderer::resetFormatIfChanged(const sp<AMessage> &format) {
		switch (mColorFormat) {
		case OMX_COLOR_FormatYUV420Planar:
		case OMX_TI_COLOR_FormatYUV420PackedSemiPlanar:
		case OMX_COLOR_FormatYUV420SemiPlanar:
		{
		if (!runningInEmulator()) {
		halFormat = HAL_PIXEL_FORMAT_YV12;
		@@ -209,7 +210,6 @@ void SoftwareRenderer::render(
		buf->stride, buf->height,
		0, 0, mCropWidth - 1, mCropHeight - 1);
		} else if (mColorFormat == OMX_COLOR_FormatYUV420Planar) {
		// YV12 really
		const uint8_t src_y = (const uint8_t )data;
		const uint8_t src_u = (const uint8_t )data + mWidth * mHeight;
		const uint8_t src_v = src_u + (mWidth / 2 mHeight / 2);
		@@ -237,9 +237,8 @@ void SoftwareRenderer::render(
		dst_u += dst_c_stride;
		dst_v += dst_c_stride;
		}
		} else {
		CHECK_EQ(mColorFormat, OMX_TI_COLOR_FormatYUV420PackedSemiPlanar);

		} else if (mColorFormat == OMX_TI_COLOR_FormatYUV420PackedSemiPlanar
		\|\| mColorFormat == OMX_COLOR_FormatYUV420SemiPlanar) {
		const uint8_t *src_y =
		(const uint8_t *)data;

		@@ -272,6 +271,8 @@ void SoftwareRenderer::render(
		dst_u += dst_c_stride;
		dst_v += dst_c_stride;
		}
		} else {
		LOG_ALWAYS_FATAL("bad color format %#x", mColorFormat);
		}

		CHECK_EQ(0, mapper.unlock(buf->handle));