Prechádzať zdrojové kódy

video: driver: Enable HDR10/10+ encoder metadata

Modify control database to allow hdr10/10+ metadata
controls for encoder.

Change-Id: I594bae02c9f768307422b20ef0d5fe18b5597056
Signed-off-by: Mihir Ganu <[email protected]>
Mihir Ganu 4 rokov pred
rodič
commit
261f173680

+ 3 - 3
driver/platform/waipio/src/msm_vidc_waipio.c

@@ -1141,19 +1141,19 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
 		V4L2_CID_MPEG_VIDC_METADATA_HISTOGRAM_INFO,
 		HFI_PROP_HISTOGRAM_INFO},
 
-	{META_SEI_MASTERING_DISP, DEC, CODECS_ALL,
+	{META_SEI_MASTERING_DISP, DEC | ENC, HEVC,
 		V4L2_MPEG_MSM_VIDC_DISABLE, V4L2_MPEG_MSM_VIDC_ENABLE,
 		1, V4L2_MPEG_MSM_VIDC_DISABLE,
 		V4L2_CID_MPEG_VIDC_METADATA_SEI_MASTERING_DISPLAY_COLOUR,
 		HFI_PROP_SEI_MASTERING_DISPLAY_COLOUR},
 
-	{META_SEI_CLL, DEC, CODECS_ALL,
+	{META_SEI_CLL, DEC | ENC, HEVC,
 		V4L2_MPEG_MSM_VIDC_DISABLE, V4L2_MPEG_MSM_VIDC_ENABLE,
 		1, V4L2_MPEG_MSM_VIDC_DISABLE,
 		V4L2_CID_MPEG_VIDC_METADATA_SEI_CONTENT_LIGHT_LEVEL,
 		HFI_PROP_SEI_CONTENT_LIGHT_LEVEL},
 
-	{META_HDR10PLUS, DEC, CODECS_ALL,
+	{META_HDR10PLUS, DEC | ENC, HEVC,
 		V4L2_MPEG_MSM_VIDC_DISABLE, V4L2_MPEG_MSM_VIDC_ENABLE,
 		1, V4L2_MPEG_MSM_VIDC_DISABLE,
 		V4L2_CID_MPEG_VIDC_METADATA_HDR10PLUS,

+ 1 - 1
driver/vidc/src/msm_vdec.c

@@ -210,7 +210,7 @@ static int msm_vdec_set_bit_depth(struct msm_vidc_inst *inst,
 
 	inst->subcr_params[port].bit_depth = bitdepth;
 	msm_vidc_update_cap_value(inst, BIT_DEPTH, bitdepth, __func__);
-	i_vpr_h(inst, "%s: bit depth: %d", __func__, bitdepth);
+	i_vpr_h(inst, "%s: bit depth: %#x", __func__, bitdepth);
 	rc = venus_hfi_session_property(inst,
 			HFI_PROP_LUMA_CHROMA_BIT_DEPTH,
 			HFI_HOST_FLAGS_NONE,

+ 1 - 1
driver/vidc/src/venus_hfi_response.c

@@ -26,7 +26,7 @@ void print_psc_properties(const char *str, struct msm_vidc_inst *inst,
 		return;
 
 	i_vpr_h(inst,
-		"%s: resolution %#x, crop offsets[0] %#x, crop offsets[1] %#x, bit depth %d, coded frames %d "
+		"%s: resolution %#x, crop offsets[0] %#x, crop offsets[1] %#x, bit depth %#x, coded frames %d "
 		"fw min count %d, poc %d, color info %d, profile %d, level %d, tier %d ",
 		str, subsc_params.bitstream_resolution,
 		subsc_params.crop_offsets[0], subsc_params.crop_offsets[1],