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

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

Merge "msm: vidc: Add level 6 and 6.1 for VP9"

parents 530bddd1 2cc5c06d

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

+4 −2
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ static const char *const vp9_level[] = { 
	"4.1",

	"5.0",

	"5.1",

	"6.0",

	"6.1",

};



static const char *const mpeg2_profile[] = {
@@ -248,8 +250,8 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
		.name = "VP9 Level",

		.type = V4L2_CTRL_TYPE_MENU,

		.minimum = V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_UNUSED,

		.maximum = V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_51,

		.default_value = V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_51,

		.maximum = V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_61,

		.default_value = V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_61,

		.menu_skip_mask = 0,

		.qmenu = vp9_level,

		.flags = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,

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

+4 −0
Original line number Diff line number Diff line
@@ -300,6 +300,10 @@ int msm_comm_hal_to_v4l2(int id, int value) 
			return V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_5;

		case HAL_VP9_LEVEL_51:

			return V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_51;

		case HAL_VP9_LEVEL_6:

			return V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_6;

		case HAL_VP9_LEVEL_61:

			return V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_61;

		case HAL_VP9_LEVEL_UNUSED:

			return V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_UNUSED;

		default:

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

+2 −0
Original line number Diff line number Diff line
@@ -406,6 +406,8 @@ enum hal_vp9_level { 
	HAL_VP9_LEVEL_41 = 0x00000080,

	HAL_VP9_LEVEL_5  = 0x00000100,

	HAL_VP9_LEVEL_51 = 0x00000200,

	HAL_VP9_LEVEL_6  = 0x00000400,

	HAL_VP9_LEVEL_61 = 0x00000800,

};



struct hal_frame_rate {

include/uapi/linux/v4l2-controls.h

+6 −0
Original line number Diff line number Diff line
@@ -941,6 +941,12 @@ enum v4l2_mpeg_vidc_video_vp9_level { 
	V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_41 = 8,

	V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_5 = 9,

	V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_51 = 10,

#define V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_6 \

	V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_6

	V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_6 = 11,

#define V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_61 \

	V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_61

	V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_61 = 12,

};



#define V4L2_CID_MPEG_VIDC_VIDEO_ADAPTIVE_B \