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

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

Merge 6714091b on remote branch 

Change-Id: I5c0a14e8206551fa0fcde9ada0bac73599363621
parents 65f83fc4 6714091b

msm/vidc/msm_venc.c

+5 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

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

 */

#include <linux/slab.h>

#include "msm_venc.h"
@@ -1205,6 +1205,7 @@ int msm_venc_inst_init(struct msm_vidc_inst *inst) 
	inst->buff_req.buffer[13].buffer_type = HAL_BUFFER_INTERNAL_RECON;

	msm_vidc_init_buffer_size_calculators(inst);

	inst->static_rotation_flip_enabled = false;

	inst->hdr10_sei_enabled = false;

	return rc;

}
@@ -1699,6 +1700,7 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		u32 info_type = ((u32)ctrl->val >> 28) & 0xF;

		u32 val = (ctrl->val & 0xFFFFFFF);



		inst->hdr10_sei_enabled = true;

		s_vpr_h(sid, "Ctrl:%d, HDR Info with value %u (%#X)",

				info_type, val, ctrl->val);

		switch (info_type) {
@@ -4383,7 +4385,8 @@ int msm_venc_set_hdr_info(struct msm_vidc_inst *inst) 
	}

	hdev = inst->core->device;



	if (get_v4l2_codec(inst) != V4L2_PIX_FMT_HEVC)

	if (get_v4l2_codec(inst) != V4L2_PIX_FMT_HEVC ||

		!inst->hdr10_sei_enabled)

		return 0;



	profile = get_ctrl(inst, V4L2_CID_MPEG_VIDEO_HEVC_PROFILE);

msm/vidc/msm_vidc_common.c

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

/*

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

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

 */



#include <linux/jiffies.h>
@@ -6186,10 +6186,12 @@ int msm_vidc_check_session_supported(struct msm_vidc_inst *inst) 
				width_min, height_min);

			rc = -ENOTSUPP;

		}

		if (!rc && output_width > width_max) {

		if (!rc && (output_width > width_max ||

				output_height > height_max)) {

			s_vpr_e(sid,

				"Unsupported width = %u supported max width = %u\n",

				output_width, width_max);

				"Unsupported WxH (%u)x(%u), max supported is (%u)x(%u)\n",

				output_width, output_height,

				width_max, height_max);

				rc = -ENOTSUPP;

		}

msm/vidc/msm_vidc_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -551,6 +551,7 @@ struct msm_vidc_inst { 
	bool static_rotation_flip_enabled;

	struct internal_buf *dpb_extra_binfo;

	struct msm_vidc_codec_data *codec_data;

	bool hdr10_sei_enabled;

	struct hal_hdr10_pq_sei hdr10_sei_params;

	struct batch_mode batch;

	struct delayed_work batch_work;