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

Commit 7b5d48ef authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 0c44b2d6 on remote branch 

Change-Id: Ie78ff3abc2dbf718760fc2de1f523cd331457832
parents b8619627 0c44b2d6

msm/vidc/msm_vdec.c

+1 −6
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

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

 */



#include <linux/slab.h>
@@ -1378,11 +1378,6 @@ int msm_vdec_set_extradata(struct msm_vidc_inst *inst) 
		HFI_PROPERTY_PARAM_VDEC_INTERLACE_VIDEO_EXTRADATA, 0x1);

	msm_comm_set_extradata(inst, display_info, 0x1);



	if (codec == V4L2_PIX_FMT_VP9 || codec == V4L2_PIX_FMT_HEVC) {

		msm_comm_set_extradata(inst,

			HFI_PROPERTY_PARAM_VDEC_HDR10_HIST_EXTRADATA, 0x1);

	}



	msm_comm_set_extradata(inst,

		HFI_PROPERTY_PARAM_VDEC_NUM_CONCEALED_MB, 0x1);

	if (codec == V4L2_PIX_FMT_HEVC) {