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

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

Merge "msm: vidc: Add support of level 6.1 to VP9 decoder"

parents 349732b1 bc60bd65

msm/vidc/msm_vidc_common.c

+0 −4
Original line number Diff line number Diff line
@@ -1455,10 +1455,6 @@ static void msm_vidc_comm_update_ctrl_limits(struct msm_vidc_inst *inst) 
		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDEO_B_FRAMES,

				&inst->capability.cap[CAP_BFRAME]);

	} else if (inst->session_type == MSM_VIDC_DECODER) {

		msm_vidc_comm_update_ctrl(inst,

			V4L2_CID_MPEG_VIDC_VIDEO_VP9_LEVEL,

			&inst->capability.cap[CAP_VP9_LEVEL]);

	}

	msm_vidc_comm_update_ctrl(inst,

			V4L2_CID_MPEG_VIDEO_H264_LEVEL,

msm/vidc/msm_vidc_platform.c

+0 −9
Original line number Diff line number Diff line
@@ -263,9 +263,6 @@ static struct msm_vidc_codec_capability lito_capabilities_v0[] = { 
	{CAP_HEVC_LEVEL, DEC, HEVC, V4L2_MPEG_VIDEO_HEVC_LEVEL_1,

	                            V4L2_MPEG_VIDEO_HEVC_LEVEL_6_1, 1,

	                            V4L2_MPEG_VIDEO_HEVC_LEVEL_5},

	{CAP_VP9_LEVEL, DEC, VP9, V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_UNUSED,

	                            V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_6, 1,

	                            V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_6},

};



static struct msm_vidc_codec_capability lito_capabilities_v1[] = {
@@ -356,9 +353,6 @@ static struct msm_vidc_codec_capability lito_capabilities_v1[] = { 
	{CAP_HEVC_LEVEL, DEC, HEVC, V4L2_MPEG_VIDEO_HEVC_LEVEL_1,

	                            V4L2_MPEG_VIDEO_HEVC_LEVEL_6_1, 1,

	                            V4L2_MPEG_VIDEO_HEVC_LEVEL_5},

	{CAP_VP9_LEVEL, DEC, VP9, V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_UNUSED,

	                            V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_6, 1,

	                            V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_6},

};



static struct msm_vidc_codec_capability bengal_capabilities[] = {
@@ -490,9 +484,6 @@ static struct msm_vidc_codec_capability kona_capabilities[] = { 
	{CAP_HEVC_LEVEL, DEC, HEVC, V4L2_MPEG_VIDEO_HEVC_LEVEL_1,

	                            V4L2_MPEG_VIDEO_HEVC_LEVEL_6_1, 1,

	                            V4L2_MPEG_VIDEO_HEVC_LEVEL_5},

	{CAP_VP9_LEVEL, DEC, VP9, V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_UNUSED,

	                            V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_6, 1,

	                            V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_6},

};



/*

msm/vidc/vidc_hfi_api.h

+0 −1
Original line number Diff line number Diff line
@@ -288,7 +288,6 @@ enum hal_capability { 
	CAP_HEIC_IMAGE_FRAME_HEIGHT,

	CAP_H264_LEVEL,

	CAP_HEVC_LEVEL,

	CAP_VP9_LEVEL,

	CAP_MAX,

};