Merge "msm: vidc: Add support for TP10 color format" (f42bec50) · Commits · e / devices / android_kernel_xiaomi_markw

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -622,6 +622,11 @@ 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)
		@@ -721,6 +726,14 @@ struct msm_vidc_format vdec_formats[] = {
		.get_frame_size = get_frame_size_nv12_ubwc,
		.type = CAPTURE_PORT,
		},
		{
		.name = "UBWC YCbCr Semiplanar 4:2:0 10bit",
		.description = "UBWC Y/CbCr 4:2:0 10bit",
		.fourcc = V4L2_PIX_FMT_NV12_TP10_UBWC,
		.num_planes = 2,
		.get_frame_size = get_frame_size_nv12_ubwc_10bit,
		.type = CAPTURE_PORT,
		},
		{
		.name = "Mpeg4",
		.description = "Mpeg4 compressed format",

+5 −1

Original line number	Diff line number	Diff line
		@@ -486,10 +486,14 @@ enum vdec_interlaced_format {
		VDEC_InterlaceInterleaveFrameBottomFieldFirst = 0x4
		};

		#define VDEC_YUV_FORMAT_NV12_TP10_UBWC \
		VDEC_YUV_FORMAT_NV12_TP10_UBWC

		enum vdec_output_fromat {
		VDEC_YUV_FORMAT_NV12 = 0x1,
		VDEC_YUV_FORMAT_TILE_4x2 = 0x2,
		VDEC_YUV_FORMAT_NV12_UBWC = 0x3
		VDEC_YUV_FORMAT_NV12_UBWC = 0x3,
		VDEC_YUV_FORMAT_NV12_TP10_UBWC = 0x4
		};

		enum vdec_output_order {