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

Commit c88445d6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Add NV12_512 support for encoder"

parents b38ee758 6e3804fe

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

+7 −0
Original line number Diff line number Diff line
@@ -1347,6 +1347,13 @@ static struct msm_vidc_format venc_formats[] = { 
		.get_frame_size = get_frame_size_p010,

		.type = OUTPUT_PORT,

	},

	{

		.name = "YCbCr Semiplanar 4:2:0 512 aligned",

		.description = "Y/CbCr 4:2:0 512 aligned",

		.fourcc = V4L2_PIX_FMT_NV12_512,

		.get_frame_size = get_frame_size_nv12_512,

		.type = OUTPUT_PORT,

	},

};



static int msm_venc_set_csc(struct msm_vidc_inst *inst,

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

+4 −0
Original line number Diff line number Diff line
@@ -6238,6 +6238,10 @@ u32 get_frame_size_p010(int plane, u32 height, u32 width) 
	return VENUS_BUFFER_SIZE(COLOR_FMT_P010, width, height);

}



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

{

	return VENUS_BUFFER_SIZE(COLOR_FMT_NV12_512, width, height);

}



void print_vidc_buffer(u32 tag, const char *str, struct msm_vidc_inst *inst,

		struct msm_vidc_buffer *mbuf)

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

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ int msm_comm_session_continue(void *instance); 
int msm_vidc_send_pending_eos_buffers(struct msm_vidc_inst *inst);

enum hal_uncompressed_format msm_comm_get_hal_uncompressed(int fourcc);

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

u32 get_frame_size_nv12_512(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);

include/uapi/linux/videodev2.h

+3 −0
Original line number Diff line number Diff line
@@ -535,6 +535,9 @@ struct v4l2_pix_format { 
#define V4L2_PIX_FMT_NV24    v4l2_fourcc('N', 'V', '2', '4') /* 24  Y/CbCr 4:4:4  */

#define V4L2_PIX_FMT_NV42    v4l2_fourcc('N', 'V', '4', '2') /* 24  Y/CrCb 4:4:4  */



/* NV12_512 8-bit Y/CbCr 4:2:0  */

#define V4L2_PIX_FMT_NV12_512         v4l2_fourcc('Q', '5', '1', '2')



/* UBWC 8-bit Y/CbCr 4:2:0  */

#define V4L2_PIX_FMT_NV12_UBWC        v4l2_fourcc('Q', '1', '2', '8')

/* UBWC 10-bit Y/CbCr 4:2:0 */