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

Commit 7265701f 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: Renaming the AU-Delimiter params/extens"

parents 0e3466e4 8f110bd5

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

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

/* Copyright (c) 2012-2017, 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
@@ -1832,10 +1832,10 @@ int create_pkt_cmd_session_set_property( 
		pkt->size += sizeof(u32) + sizeof(struct hfi_enable);

		break;

	}

	case HAL_PARAM_VENC_H264_GENERATE_AUDNAL:

	case HAL_PARAM_VENC_GENERATE_AUDNAL:

	{

		create_pkt_enable(pkt->rg_property_data,

				HFI_PROPERTY_PARAM_VENC_H264_GENERATE_AUDNAL,

				HFI_PROPERTY_PARAM_VENC_GENERATE_AUDNAL,

				((struct hal_enable *)pdata)->enable);

		pkt->size += sizeof(u32) + sizeof(struct hfi_enable);

		break;

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

+8 −8
Original line number Diff line number Diff line
@@ -861,14 +861,14 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.step = 1,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_H264_AU_DELIMITER,

		.id = V4L2_CID_MPEG_VIDC_VIDEO_AU_DELIMITER,

		.name = "H264 AU Delimiter",

		.type = V4L2_CTRL_TYPE_BOOLEAN,

		.minimum = V4L2_MPEG_VIDC_VIDEO_H264_AU_DELIMITER_DISABLED,

		.maximum = V4L2_MPEG_VIDC_VIDEO_H264_AU_DELIMITER_ENABLED,

		.minimum = V4L2_MPEG_VIDC_VIDEO_AU_DELIMITER_DISABLED,

		.maximum = V4L2_MPEG_VIDC_VIDEO_AU_DELIMITER_ENABLED,

		.step = 1,

		.default_value =

			V4L2_MPEG_VIDC_VIDEO_H264_AU_DELIMITER_DISABLED,

			V4L2_MPEG_VIDC_VIDEO_AU_DELIMITER_DISABLED,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_SET_PERF_LEVEL,
@@ -3293,14 +3293,14 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		pdata = &vui_timing_info;

		break;

	}

	case V4L2_CID_MPEG_VIDC_VIDEO_H264_AU_DELIMITER:

		property_id = HAL_PARAM_VENC_H264_GENERATE_AUDNAL;

	case V4L2_CID_MPEG_VIDC_VIDEO_AU_DELIMITER:

		property_id = HAL_PARAM_VENC_GENERATE_AUDNAL;



		switch (ctrl->val) {

		case V4L2_MPEG_VIDC_VIDEO_H264_AU_DELIMITER_DISABLED:

		case V4L2_MPEG_VIDC_VIDEO_AU_DELIMITER_DISABLED:

			enable.enable = 0;

			break;

		case V4L2_MPEG_VIDC_VIDEO_H264_AU_DELIMITER_ENABLED:

		case V4L2_MPEG_VIDC_VIDEO_AU_DELIMITER_ENABLED:

			enable.enable = 1;

			break;

		default:

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

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

/* Copyright (c) 2012-2017, 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
@@ -201,7 +201,7 @@ enum hal_property { 
	HAL_PARAM_VENC_H264_ENTROPY_CABAC_MODEL,

	HAL_CONFIG_VENC_MAX_BITRATE,

	HAL_PARAM_VENC_H264_VUI_TIMING_INFO,

	HAL_PARAM_VENC_H264_GENERATE_AUDNAL,

	HAL_PARAM_VENC_GENERATE_AUDNAL,

	HAL_PARAM_VENC_MAX_NUM_B_FRAMES,

	HAL_PARAM_BUFFER_ALLOC_MODE,

	HAL_PARAM_VDEC_FRAME_ASSEMBLY,

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

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

/* Copyright (c) 2012-2017, 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
@@ -340,7 +340,7 @@ struct hfi_buffer_info { 
	(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x014)

#define  HFI_PROPERTY_PARAM_VENC_H264_PPS_ID               \

	(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x015)

#define HFI_PROPERTY_PARAM_VENC_H264_GENERATE_AUDNAL	\

#define HFI_PROPERTY_PARAM_VENC_GENERATE_AUDNAL	\

	(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x016)

#define HFI_PROPERTY_PARAM_VENC_ASPECT_RATIO			\

	(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x017)

include/uapi/linux/v4l2-controls.h

+7 −0
Original line number Diff line number Diff line
@@ -1216,6 +1216,13 @@ enum v4l2_mpeg_vidc_video_venc_iframesize_type { 
#define V4L2_CID_MPEG_VIDC_VIDEO_B_FRAME_QP \

		(V4L2_CID_MPEG_MSM_VIDC_BASE + 103)



#define V4L2_CID_MPEG_VIDC_VIDEO_AU_DELIMITER \

		(V4L2_CID_MPEG_MSM_VIDC_BASE + 104)

enum v4l2_mpeg_vidc_video_au_delimiter {

	V4L2_MPEG_VIDC_VIDEO_AU_DELIMITER_DISABLED = 0,

	V4L2_MPEG_VIDC_VIDEO_AU_DELIMITER_ENABLED = 1

};





/*  Camera class control IDs */