Merge "msm: vidc: Increase output port buffer size for VP9 decode" (b1210d36) · Commits · e / devices / android_kernel_sony_msm8998

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -615,6 +615,12 @@ 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)
		{
		return (max_mbs_per_frame * size_per_mb * 3 / 2);
		}

		static u32 get_frame_size_compressed(int plane,
		u32 max_mbs_per_frame, u32 size_per_mb)
		{
		@@ -791,7 +797,7 @@ struct msm_vidc_format vdec_formats[] = {
		.description = "VP9 compressed format",
		.fourcc = V4L2_PIX_FMT_VP9,
		.num_planes = 1,
		.get_frame_size = get_frame_size_compressed,
		.get_frame_size = get_frame_size_compressed_full_yuv,
		.type = OUTPUT_PORT,
		},
		{
		@@ -2835,4 +2841,3 @@ int msm_vdec_ctrl_init(struct msm_vidc_inst *inst)
		return msm_comm_ctrl_init(inst, msm_vdec_ctrls,
		ARRAY_SIZE(msm_vdec_ctrls), &msm_vdec_ctrl_ops);
		}