Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6295107a authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Fix color format for HW HEIC encode"

parents 1d6e3472 a763c96b

drivers/media/platform/msm/vidc/hfi_packetization.c

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ static int color_format[] = { 
			HFI_COLOR_FORMAT_YUV420_TP10_UBWC,

	/*P010 10bit format*/

	[ilog2(HAL_COLOR_FORMAT_P010)] =  HFI_COLOR_FORMAT_P010,

	[ilog2(HAL_COLOR_FORMAT_NV12_512)] = HFI_COLOR_FORMAT_NV12,

};



static int nal_type[] = {

drivers/media/platform/msm/vidc/msm_vidc.c

+5 −0
Original line number Diff line number Diff line
@@ -282,6 +282,9 @@ int msm_vidc_g_fmt(void *instance, struct v4l2_format *f) 
	case V4L2_PIX_FMT_NV12:

		color_format = COLOR_FMT_NV12;

		break;

	case V4L2_PIX_FMT_NV12_512:

		color_format = COLOR_FMT_NV12_512;

		break;

	case V4L2_PIX_FMT_NV12_UBWC:

		color_format = COLOR_FMT_NV12_UBWC;

		break;
@@ -303,6 +306,8 @@ int msm_vidc_g_fmt(void *instance, struct v4l2_format *f) 
			inst->prop.width[port]);

	f->fmt.pix_mp.plane_fmt[0].reserved[0] = VENUS_Y_SCANLINES(color_format,

			inst->prop.height[port]);

	f->fmt.pix_mp.plane_fmt[0].sizeimage = VENUS_BUFFER_SIZE(color_format,

			inst->prop.width[port], inst->prop.height[port]);



	dprintk(VIDC_DBG,

		"g_fmt: %x : type %d wxh %dx%d pixelfmt %#x num_planes %d size[0] %d size[1] %d in_reconfig %d\n",

drivers/media/platform/msm/vidc/msm_vidc_common.c

+3 −0
Original line number Diff line number Diff line
@@ -943,6 +943,9 @@ enum hal_uncompressed_format msm_comm_get_hal_uncompressed(int fourcc) 
	case V4L2_PIX_FMT_NV12:

		format = HAL_COLOR_FORMAT_NV12;

		break;

	case V4L2_PIX_FMT_NV12_512:

		format = HAL_COLOR_FORMAT_NV12_512;

		break;

	case V4L2_PIX_FMT_NV21:

		format = HAL_COLOR_FORMAT_NV21;

		break;

drivers/media/platform/msm/vidc/vidc_hfi_api.h

+1 −0
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ enum hal_uncompressed_format { 
	HAL_COLOR_FORMAT_RGBA8888       = 0x00008000,

	HAL_COLOR_FORMAT_RGBA8888_UBWC  = 0x00010000,

	HAL_COLOR_FORMAT_P010           = 0x00020000,

	HAL_COLOR_FORMAT_NV12_512       = 0x00040000,

	HAL_UNUSED_COLOR                = 0x10000000,

};