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

Commit c48c535a 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: Addition of enums for HLG and HDR10"

parents 1f9a2cde 98f28d03

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

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

/* Copyright (c) 2012-2018, 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
@@ -1394,7 +1394,7 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.name = "Set Color space transfer characterstics",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = MSM_VIDC_TRANSFER_BT709_5,

		.maximum = MSM_VIDC_TRANSFER_BT_2020_12,

		.maximum = MSM_VIDC_TRANSFER_HLG,

		.default_value = MSM_VIDC_TRANSFER_601_6_625,

		.step = 1,

		.qmenu = NULL,

include/uapi/media/msm_vidc.h

+9 −0
Original line number Diff line number Diff line
@@ -345,6 +345,15 @@ enum msm_vidc_h264_transfer_chars_values { 
	MSM_VIDC_TRANSFER_SRGB = 13,

	MSM_VIDC_TRANSFER_BT_2020_10 = 14,

	MSM_VIDC_TRANSFER_BT_2020_12 = 15,

#define MSM_VIDC_TRANSFER_SMPTE_ST2084 \

	MSM_VIDC_TRANSFER_SMPTE_ST2084

	MSM_VIDC_TRANSFER_SMPTE_ST2084 = 16,

#define MSM_VIDC_TRANSFER_SMPTE_ST428_1 \

	MSM_VIDC_TRANSFER_SMPTE_ST428_1

	MSM_VIDC_TRANSFER_SMPTE_ST428_1 = 17,

#define MSM_VIDC_TRANSFER_HLG \

	MSM_VIDC_TRANSFER_HLG

	MSM_VIDC_TRANSFER_HLG = 18,

};



enum msm_vidc_pixel_depth {