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

Commit 22379a46 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: Add Override QP extradata support"

parents a59900af ce85012e

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

+3 −0
Original line number Diff line number Diff line
@@ -678,6 +678,9 @@ static int get_hfi_extradata_index(enum hal_extradata_id index) 
	case HAL_EXTRADATA_VPX_COLORSPACE:

		ret = HFI_PROPERTY_PARAM_VDEC_VPX_COLORSPACE_EXTRADATA;

		break;

	case HAL_EXTRADATA_PQ_INFO:

		ret = HFI_PROPERTY_PARAM_VENC_OVERRIDE_QP_EXTRADATA;

		break;

	default:

		dprintk(VIDC_WARN, "Extradata index not found: %d\n", index);

		break;

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

+4 −2
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.name = "Extradata Type",

		.type = V4L2_CTRL_TYPE_MENU,

		.minimum = V4L2_MPEG_VIDC_EXTRADATA_NONE,

		.maximum = V4L2_MPEG_VIDC_EXTRADATA_ROI_QP,

		.maximum = V4L2_MPEG_VIDC_EXTRADATA_PQ_INFO,

		.default_value = V4L2_MPEG_VIDC_EXTRADATA_NONE,

		.menu_skip_mask = ~(

			(1 << V4L2_MPEG_VIDC_EXTRADATA_NONE) |
@@ -766,7 +766,8 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
			(1 << V4L2_MPEG_VIDC_EXTRADATA_LTR) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_METADATA_MBI) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_YUV_STATS)|

			(1 << V4L2_MPEG_VIDC_EXTRADATA_ROI_QP)

			(1 << V4L2_MPEG_VIDC_EXTRADATA_ROI_QP) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_PQ_INFO)

			),

		.qmenu = mpeg_video_vidc_extradata,

	},
@@ -1590,6 +1591,7 @@ static int msm_venc_queue_setup(struct vb2_queue *q, 
			case V4L2_MPEG_VIDC_EXTRADATA_ASPECT_RATIO:

			case V4L2_MPEG_VIDC_EXTRADATA_YUV_STATS:

			case V4L2_MPEG_VIDC_EXTRADATA_ROI_QP:

			case V4L2_MPEG_VIDC_EXTRADATA_PQ_INFO:

				*num_planes = *num_planes + 1;

				break;

			default:

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

+4 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ const char *const mpeg_video_vidc_extradata[] = { 
	"Extradata light level SEI",

	"Extradata display VUI",

	"Extradata vpx color space",

	"Extradata PQ Info",

};



struct getprop_buf {
@@ -4672,6 +4673,9 @@ enum hal_extradata_id msm_comm_get_hal_extradata_index( 
	case V4L2_MPEG_VIDC_EXTRADATA_VPX_COLORSPACE:

		ret = HAL_EXTRADATA_VPX_COLORSPACE;

		break;

	case V4L2_MPEG_VIDC_EXTRADATA_PQ_INFO:

		ret = HAL_EXTRADATA_PQ_INFO;

		break;

	default:

		dprintk(VIDC_WARN, "Extradata not found: %d\n", index);

		break;

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

+2 −0
Original line number Diff line number Diff line
@@ -254,6 +254,8 @@ struct hfi_extradata_header { 
	(HFI_PROPERTY_PARAM_VENC_OX_START + 0x007)

#define  HFI_PROPERTY_PARAM_VENC_ROI_QP_EXTRADATA		\

	(HFI_PROPERTY_PARAM_VENC_OX_START + 0x008)

#define  HFI_PROPERTY_PARAM_VENC_OVERRIDE_QP_EXTRADATA		\

	(HFI_PROPERTY_PARAM_VENC_OX_START + 0x009)



#define HFI_PROPERTY_CONFIG_VENC_OX_START				\

	(HFI_DOMAIN_BASE_VENC + HFI_ARCH_OX_OFFSET + 0x6000)

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

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ enum hal_extradata_id { 
	HAL_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI,

	HAL_EXTRADATA_VUI_DISPLAY_INFO,

	HAL_EXTRADATA_VPX_COLORSPACE,

	HAL_EXTRADATA_PQ_INFO,

};



enum hal_property {