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

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

Merge "msm: vidc: add support to enable frame average QP"

parents 5c227589 cdaaddf5

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

+4 −1
Original line number Diff line number Diff line
@@ -552,9 +552,12 @@ static int get_hfi_extradata_index(enum hal_extradata_id index) 
	case HAL_EXTRADATA_STREAM_USERDATA:

		ret = HFI_PROPERTY_PARAM_VDEC_STREAM_USERDATA_EXTRADATA;

		break;

	case HAL_EXTRADATA_FRAME_QP:

	case HAL_EXTRADATA_DEC_FRAME_QP:

		ret = HFI_PROPERTY_PARAM_VDEC_FRAME_QP_EXTRADATA;

		break;

	case HAL_EXTRADATA_ENC_FRAME_QP:

		ret = HFI_PROPERTY_PARAM_VENC_FRAME_QP_EXTRADATA;

		break;

	case HAL_EXTRADATA_LTR_INFO:

		ret = HFI_PROPERTY_PARAM_VENC_LTR_INFO;

		break;

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

+5 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -677,7 +677,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_UBWC_CR_STATS_INFO,

		.maximum = V4L2_MPEG_VIDC_EXTRADATA_ENC_FRAME_QP,

		.default_value = V4L2_MPEG_VIDC_EXTRADATA_NONE,

		.menu_skip_mask = ~(

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

			(1 << V4L2_MPEG_VIDC_EXTRADATA_LTR) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_ROI_QP) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_HDR10PLUS_METADATA)

			(1 << V4L2_MPEG_VIDC_EXTRADATA_HDR10PLUS_METADATA) |

			(1ULL << V4L2_MPEG_VIDC_EXTRADATA_ENC_FRAME_QP)

			),

		.qmenu = mpeg_video_vidc_extradata,

	},
@@ -1808,6 +1809,7 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
			inst->bufq[OUTPUT_PORT].num_planes = 2;

			break;

		case V4L2_MPEG_VIDC_EXTRADATA_LTR:

		case V4L2_MPEG_VIDC_EXTRADATA_ENC_FRAME_QP:

			inst->bufq[CAPTURE_PORT].num_planes = 2;

			break;

		default:

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

+5 −1
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ const char *const mpeg_video_vidc_extradata[] = { 
	"Extradata display VUI",

	"Extradata vpx color space",

	"Extradata UBWC CR stats info",

	"Extradata enc frame QP",

};



static void handle_session_error(enum hal_command_response cmd, void *data);
@@ -5397,7 +5398,10 @@ enum hal_extradata_id msm_comm_get_hal_extradata_index( 
		ret = HAL_EXTRADATA_STREAM_USERDATA;

		break;

	case V4L2_MPEG_VIDC_EXTRADATA_FRAME_QP:

		ret = HAL_EXTRADATA_FRAME_QP;

		ret = HAL_EXTRADATA_DEC_FRAME_QP;

		break;

	case V4L2_MPEG_VIDC_EXTRADATA_ENC_FRAME_QP:

		ret = HAL_EXTRADATA_ENC_FRAME_QP;

		break;

	case V4L2_MPEG_VIDC_EXTRADATA_LTR:

		ret = HAL_EXTRADATA_LTR_INFO;

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

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ struct msm_vidc_ctrl { 
	s64 maximum;

	s64 default_value;

	u32 step;

	u32 menu_skip_mask;

	u64 menu_skip_mask;

	u32 flags;

	const char * const *qmenu;

};

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

+2 −1
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ enum hal_extradata_id { 
	HAL_EXTRADATA_ASPECT_RATIO,

	HAL_EXTRADATA_MPEG2_SEQDISP,

	HAL_EXTRADATA_STREAM_USERDATA,

	HAL_EXTRADATA_FRAME_QP,

	HAL_EXTRADATA_DEC_FRAME_QP,

	HAL_EXTRADATA_ENC_FRAME_QP,

	HAL_EXTRADATA_LTR_INFO,

	HAL_EXTRADATA_ROI_QP,

	HAL_EXTRADATA_OUTPUT_CROP,