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

Commit f2995f8c authored by Umesh Pandey's avatar Umesh Pandey
Browse files

msm: vidc: TP10 colorformat for encoder 



Addition of TP10 colorformat on the OUTPUT port of encoder to
enable 10bit encoding. Also, calculation of YUV sizes for both
decoder and encoder is removed from individual files and moved
to a common file.

CRs-Fixed: 2016190
Change-Id: I502c4f70033b9979e49d35c78368c088d4dc82bb
Signed-off-by: default avatarUmesh Pandey <umeshp@codeaurora.org>
parent c6d522c5

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

+1 −17
Original line number Diff line number Diff line
@@ -368,17 +368,6 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 


#define NUM_CTRLS ARRAY_SIZE(msm_vdec_ctrls)



static u32 get_frame_size_nv12(int plane,

					u32 height, u32 width)

{

	return VENUS_BUFFER_SIZE(COLOR_FMT_NV12, width, height);

}



static u32 get_frame_size_nv12_ubwc(int plane, u32 height, u32 width)

{

	return VENUS_BUFFER_SIZE(COLOR_FMT_NV12_UBWC, width, height);

}



static u32 get_frame_size_compressed_full_yuv(int plane,

					u32 max_mbs_per_frame, u32 size_per_mb)

{
@@ -391,11 +380,6 @@ static u32 get_frame_size_compressed(int plane, 
	return (max_mbs_per_frame * size_per_mb * 3/2)/2;

}



static u32 get_frame_size_nv12_ubwc_10bit(int plane, u32 height, u32 width)

{

	return VENUS_BUFFER_SIZE(COLOR_FMT_NV12_BPP10_UBWC, width, height);

}



static u32 get_frame_size(struct msm_vidc_inst *inst,

					const struct msm_vidc_format *fmt,

					int fmt_type, int plane)
@@ -446,7 +430,7 @@ struct msm_vidc_format vdec_formats[] = { 
		.name = "UBWC YCbCr Semiplanar 4:2:0 10bit",

		.description = "UBWC Y/CbCr 4:2:0 10bit",

		.fourcc = V4L2_PIX_FMT_NV12_TP10_UBWC,

		.get_frame_size = get_frame_size_nv12_ubwc_10bit,

		.get_frame_size = get_frame_size_tp10_ubwc,

		.type = CAPTURE_PORT,

	},

	{

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

+7 −20
Original line number Diff line number Diff line
@@ -994,26 +994,6 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 


#define NUM_CTRLS ARRAY_SIZE(msm_venc_ctrls)



static u32 get_frame_size_nv12(int plane, u32 height, u32 width)

{

	return VENUS_BUFFER_SIZE(COLOR_FMT_NV12, width, height);

}



static u32 get_frame_size_nv12_ubwc(int plane, u32 height, u32 width)

{

	return VENUS_BUFFER_SIZE(COLOR_FMT_NV12_UBWC, width, height);

}



static u32 get_frame_size_rgba(int plane, u32 height, u32 width)

{

	return VENUS_BUFFER_SIZE(COLOR_FMT_RGBA8888, width, height);

}



static u32 get_frame_size_nv21(int plane, u32 height, u32 width)

{

	return VENUS_BUFFER_SIZE(COLOR_FMT_NV21, width, height);

}



static u32 get_frame_size_compressed(int plane, u32 height, u32 width)

{

	int sz = ALIGN(height, 32) * ALIGN(width, 32) * 3 / 2;
@@ -1071,6 +1051,13 @@ static struct msm_vidc_format venc_formats[] = { 
		.get_frame_size = get_frame_size_nv21,

		.type = OUTPUT_PORT,

	},

	{

		.name = "TP10 UBWC 4:2:0",

		.description = "TP10 UBWC 4:2:0",

		.fourcc = V4L2_PIX_FMT_NV12_TP10_UBWC,

		.get_frame_size = get_frame_size_tp10_ubwc,

		.type = OUTPUT_PORT,

	},

};



static int msm_venc_set_csc(struct msm_vidc_inst *inst);

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

+25 −0
Original line number Diff line number Diff line
@@ -5520,3 +5520,28 @@ int msm_comm_session_continue(void *instance) 
	mutex_unlock(&inst->lock);

	return rc;

}



u32 get_frame_size_nv12(int plane, u32 height, u32 width)

{

	return VENUS_BUFFER_SIZE(COLOR_FMT_NV12, width, height);

}



u32 get_frame_size_nv12_ubwc(int plane, u32 height, u32 width)

{

	return VENUS_BUFFER_SIZE(COLOR_FMT_NV12_UBWC, width, height);

}



u32 get_frame_size_rgba(int plane, u32 height, u32 width)

{

	return VENUS_BUFFER_SIZE(COLOR_FMT_RGBA8888, width, height);

}



u32 get_frame_size_nv21(int plane, u32 height, u32 width)

{

	return VENUS_BUFFER_SIZE(COLOR_FMT_NV21, width, height);

}



u32 get_frame_size_tp10_ubwc(int plane, u32 height, u32 width)

{

	return VENUS_BUFFER_SIZE(COLOR_FMT_NV12_BPP10_UBWC, width, height);

}

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

+5 −0
Original line number Diff line number Diff line
@@ -98,4 +98,9 @@ void msm_comm_print_inst_info(struct msm_vidc_inst *inst); 
int msm_comm_v4l2_to_hal(int id, int value);

int msm_comm_hal_to_v4l2(int id, int value);

int msm_comm_session_continue(void *instance);

u32 get_frame_size_nv12(int plane, u32 height, u32 width);

u32 get_frame_size_nv12_ubwc(int plane, u32 height, u32 width);

u32 get_frame_size_rgba(int plane, u32 height, u32 width);

u32 get_frame_size_nv21(int plane, u32 height, u32 width);

u32 get_frame_size_tp10_ubwc(int plane, u32 height, u32 width);

#endif