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

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

Merge "msm: vidc: extend AVC level query support upto 6.2"

parents ad08a656 c1f00cec

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

+4 −2
Original line number Diff line number Diff line
@@ -213,9 +213,11 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
		.id = V4L2_CID_MPEG_VIDEO_H264_LEVEL,

		.name = "H264 Level",

		.type = V4L2_CTRL_TYPE_MENU,

		.maximum = V4L2_MPEG_VIDEO_H264_LEVEL_5_2,

		.maximum = V4L2_MPEG_VIDEO_H264_LEVEL_6_2,

		.default_value = V4L2_MPEG_VIDEO_H264_LEVEL_1_0,

		.menu_skip_mask = 0,

		.menu_skip_mask = (

		(1 << V4L2_MPEG_VIDEO_H264_LEVEL_UNKNOWN)

		),

		.flags = V4L2_CTRL_FLAG_VOLATILE,

		.qmenu = NULL,

	},

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

+12 −0
Original line number Diff line number Diff line
@@ -163,6 +163,12 @@ int msm_comm_hal_to_v4l2(int id, int value) 
			return V4L2_MPEG_VIDEO_H264_LEVEL_5_1;

		case HAL_H264_LEVEL_52:

			return V4L2_MPEG_VIDEO_H264_LEVEL_5_2;

		case HAL_H264_LEVEL_6:

			return V4L2_MPEG_VIDEO_H264_LEVEL_6_0;

		case HAL_H264_LEVEL_61:

			return V4L2_MPEG_VIDEO_H264_LEVEL_6_1;

		case HAL_H264_LEVEL_62:

			return V4L2_MPEG_VIDEO_H264_LEVEL_6_2;

		default:

			goto unknown_value;

		}
@@ -386,6 +392,12 @@ int msm_comm_v4l2_to_hal(int id, int value) 
			return HAL_H264_LEVEL_51;

		case V4L2_MPEG_VIDEO_H264_LEVEL_5_2:

			return HAL_H264_LEVEL_52;

		case V4L2_MPEG_VIDEO_H264_LEVEL_6_0:

			return HAL_H264_LEVEL_6;

		case V4L2_MPEG_VIDEO_H264_LEVEL_6_1:

			return HAL_H264_LEVEL_61;

		case V4L2_MPEG_VIDEO_H264_LEVEL_6_2:

			return HAL_H264_LEVEL_62;

		case V4L2_MPEG_VIDEO_H264_LEVEL_UNKNOWN:

			return HAL_H264_LEVEL_UNKNOWN;

		default:

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

+2 −0
Original line number Diff line number Diff line
@@ -315,6 +315,8 @@ enum hal_h264_level { 
	HAL_H264_LEVEL_51 = 0x00008000,

	HAL_H264_LEVEL_52 = 0x00010000,

	HAL_H264_LEVEL_6  = 0x00020000,

	HAL_H264_LEVEL_61 = 0x00040000,

	HAL_H264_LEVEL_62 = 0x00080000,

};



enum hal_hevc_profile {

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

+3 −0
Original line number Diff line number Diff line
@@ -114,6 +114,9 @@ 
#define HFI_H264_LEVEL_5					0x00004000

#define HFI_H264_LEVEL_51					0x00008000

#define HFI_H264_LEVEL_52					0x00010000

#define HFI_H264_LEVEL_6					0x00020000

#define HFI_H264_LEVEL_61					0x00040000

#define HFI_H264_LEVEL_62					0x00080000



#define HFI_MPEG2_PROFILE_SIMPLE			0x00000001

#define HFI_MPEG2_PROFILE_MAIN				0x00000002

include/uapi/linux/v4l2-controls.h

+6 −0
Original line number Diff line number Diff line
@@ -452,6 +452,12 @@ enum v4l2_mpeg_video_h264_level { 
	V4L2_MPEG_VIDEO_H264_LEVEL_5_2	= 16,

	V4L2_MPEG_VIDEO_H264_LEVEL_6_0	= 17,

	V4L2_MPEG_VIDEO_H264_LEVEL_UNKNOWN = 18,

#define V4L2_MPEG_VIDEO_H264_LEVEL_6_1 \

			V4L2_MPEG_VIDEO_H264_LEVEL_6_1

	V4L2_MPEG_VIDEO_H264_LEVEL_6_1	= 19,

#define V4L2_MPEG_VIDEO_H264_LEVEL_6_2 \

			V4L2_MPEG_VIDEO_H264_LEVEL_6_2

	V4L2_MPEG_VIDEO_H264_LEVEL_6_2	= 20,

};

#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA	(V4L2_CID_MPEG_BASE+360)

#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA	(V4L2_CID_MPEG_BASE+361)