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

Commit b76d5171 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Implement new vpx profile and level" into msm-4.9

parents bb085f02 7f1cc153

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

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ static int profile_table[] = { 
		HFI_H264_PROFILE_CONSTRAINED_BASE,

	[ilog2(HAL_H264_PROFILE_CONSTRAINED_HIGH)] =

		HFI_H264_PROFILE_CONSTRAINED_HIGH,

	[ilog2(HAL_VPX_PROFILE_VERSION_1)] = HFI_VPX_PROFILE_VERSION_1,

};



static int entropy_mode[] = {

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

+2 −6
Original line number Diff line number Diff line
@@ -219,13 +219,9 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
		.name = "VP8 Profile Level",

		.type = V4L2_CTRL_TYPE_MENU,

		.minimum = V4L2_MPEG_VIDC_VIDEO_VP8_UNUSED,

		.maximum = V4L2_MPEG_VIDC_VIDEO_VP8_VERSION_1,

		.maximum = V4L2_MPEG_VIDC_VIDEO_VP8_VERSION_3,

		.default_value = V4L2_MPEG_VIDC_VIDEO_VP8_VERSION_0,

		.menu_skip_mask = ~(

			(1 << V4L2_MPEG_VIDC_VIDEO_VP8_UNUSED) |

			(1 << V4L2_MPEG_VIDC_VIDEO_VP8_VERSION_0) |

			(1 << V4L2_MPEG_VIDC_VIDEO_VP8_VERSION_1)

		),

		.menu_skip_mask = 0,

		.qmenu = vp8_profile_level,

		.flags = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,

	},

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

+4 −8
Original line number Diff line number Diff line
@@ -432,13 +432,9 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.name = "VP8 Profile Level",

		.type = V4L2_CTRL_TYPE_MENU,

		.minimum = V4L2_MPEG_VIDC_VIDEO_VP8_UNUSED,

		.maximum = V4L2_MPEG_VIDC_VIDEO_VP8_VERSION_1,

		.maximum = V4L2_MPEG_VIDC_VIDEO_VP8_VERSION_3,

		.default_value = V4L2_MPEG_VIDC_VIDEO_VP8_VERSION_0,

		.menu_skip_mask = ~(

		(1 << V4L2_MPEG_VIDC_VIDEO_VP8_UNUSED) |

		(1 << V4L2_MPEG_VIDC_VIDEO_VP8_VERSION_0) |

		(1 << V4L2_MPEG_VIDC_VIDEO_VP8_VERSION_1)

		),

		.menu_skip_mask = 0,

		.qmenu = vp8_profile_level,

	},

	{
@@ -1308,10 +1304,10 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_VP8_PROFILE_LEVEL:

		property_id = HAL_PARAM_PROFILE_LEVEL_CURRENT;

		profile_level.profile = msm_comm_v4l2_to_hal(

		profile_level.profile = HAL_VPX_PROFILE_MAIN;

		profile_level.level = msm_comm_v4l2_to_hal(

				V4L2_CID_MPEG_VIDC_VIDEO_VP8_PROFILE_LEVEL,

				ctrl->val);

		profile_level.level = HAL_VPX_PROFILE_UNUSED;

		pdata = &profile_level;

		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_HEVC_PROFILE:

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

+1 −1
Original line number Diff line number Diff line
@@ -1888,13 +1888,13 @@ static int try_get_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
	switch (ctrl->id) {



	case V4L2_CID_MPEG_VIDEO_H264_PROFILE:

	case V4L2_CID_MPEG_VIDC_VIDEO_VP8_PROFILE_LEVEL:

	case V4L2_CID_MPEG_VIDC_VIDEO_MPEG2_PROFILE:

	case V4L2_CID_MPEG_VIDC_VIDEO_HEVC_PROFILE:

		ctrl->val = inst->profile;

		break;



	case V4L2_CID_MPEG_VIDEO_H264_LEVEL:

	case V4L2_CID_MPEG_VIDC_VIDEO_VP8_PROFILE_LEVEL:

	case V4L2_CID_MPEG_VIDC_VIDEO_MPEG2_LEVEL:

	case V4L2_CID_MPEG_VIDC_VIDEO_HEVC_TIER_LEVEL:

		ctrl->val = inst->level;

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

+5 −5
Original line number Diff line number Diff line
@@ -321,15 +321,15 @@ int msm_comm_v4l2_to_hal(int id, int value) 
	case V4L2_CID_MPEG_VIDC_VIDEO_VP8_PROFILE_LEVEL:

		switch (value) {

		case V4L2_MPEG_VIDC_VIDEO_VP8_VERSION_0:

			return HAL_VPX_PROFILE_VERSION_0;

			return HAL_VPX_LEVEL_VERSION_0;

		case V4L2_MPEG_VIDC_VIDEO_VP8_VERSION_1:

			return HAL_VPX_PROFILE_VERSION_1;

			return HAL_VPX_LEVEL_VERSION_1;

		case V4L2_MPEG_VIDC_VIDEO_VP8_VERSION_2:

			return HAL_VPX_PROFILE_VERSION_2;

			return HAL_VPX_LEVEL_VERSION_2;

		case V4L2_MPEG_VIDC_VIDEO_VP8_VERSION_3:

			return HAL_VPX_PROFILE_VERSION_3;

			return HAL_VPX_LEVEL_VERSION_3;

		case V4L2_MPEG_VIDC_VIDEO_VP8_UNUSED:

			return HAL_VPX_PROFILE_UNUSED;

			return HAL_VPX_LEVEL_UNUSED;

		default:

			goto unknown_value;

		}