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

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

Merge "msm: vidc: add support to enable Enc DTS metadata"

parents 62efffad 5909974e

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

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

		ret = HFI_PROPERTY_PARAM_VENC_HDR10PLUS_METADATA_EXTRADATA;

		break;

	case HAL_EXTRADATA_ENC_DTS_METADATA:

		ret = HFI_PROPERTY_PARAM_VENC_DTS_INFO;

		break;

	default:

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

		break;

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

+2 −0
Original line number Diff line number Diff line
@@ -688,6 +688,7 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.menu_skip_mask = ~(

			(1 << V4L2_MPEG_VIDC_EXTRADATA_NONE) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_INTERLACE_VIDEO) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_ENC_DTS) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_TIMESTAMP) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_S3D_FRAME_PACKING) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_FRAME_RATE) |
@@ -1830,6 +1831,7 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
			break;

		case V4L2_MPEG_VIDC_EXTRADATA_LTR:

		case V4L2_MPEG_VIDC_EXTRADATA_ENC_FRAME_QP:

		case V4L2_MPEG_VIDC_EXTRADATA_ENC_DTS:

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

			break;

		default:

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

+4 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ const char *const mpeg_video_vidc_extradata[] = { 
	"Extradata none",

	"Extradata MB Quantization",

	"Extradata Interlace Video",

	"Reserved",

	"Extradata enc DTS",

	"Reserved",

	"Extradata timestamp",

	"Extradata S3D Frame Packing",
@@ -5433,6 +5433,9 @@ enum hal_extradata_id msm_comm_get_hal_extradata_index( 
	case V4L2_MPEG_VIDC_EXTRADATA_HDR10PLUS_METADATA:

		ret = HAL_EXTRADATA_HDR10PLUS_METADATA;

		break;

	case V4L2_MPEG_VIDC_EXTRADATA_ENC_DTS:

		ret = HAL_EXTRADATA_ENC_DTS_METADATA;

		break;

	default:

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

		break;

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

+3 −1
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
@@ -220,6 +220,8 @@ struct hfi_extradata_header { 
	(HFI_PROPERTY_PARAM_VENC_OX_START + 0x008)

#define HFI_PROPERTY_PARAM_VENC_HDR10PLUS_METADATA_EXTRADATA	\

	(HFI_PROPERTY_PARAM_VENC_OX_START + 0x00A)

#define HFI_PROPERTY_PARAM_VENC_DTS_INFO \

	(HFI_PROPERTY_PARAM_VENC_OX_START + 0x00C)



#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
@@ -119,6 +119,7 @@ enum hal_extradata_id { 
	HAL_EXTRADATA_VPX_COLORSPACE,

	HAL_EXTRADATA_UBWC_CR_STATS_INFO,

	HAL_EXTRADATA_HDR10PLUS_METADATA,

	HAL_EXTRADATA_ENC_DTS_METADATA,

};



enum hal_property {