Merge "vidc_3x: Fix qbuf error in gralloc buffers encoding" (fee8073a) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/media/platform/msm/vidc_3x/msm_vdec.c

+22 −17

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2020, 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
		@@ -2023,24 +2023,29 @@ static int try_get_ctrl(struct msm_vidc_inst inst, struct v4l2_ctrl ctrl)
		ctrl->val = inst->capability.secure_output2_threshold.max;
		break;
		case V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE:
		if (inst->fmts[OUTPUT_PORT].fourcc == V4L2_PIX_FMT_H264) {
		rc = msm_comm_try_get_prop(inst,
		HAL_CONFIG_VDEC_ENTROPY, &hprop);
		if (rc) {
		dprintk(VIDC_ERR, "%s: Failed getting entropy type: %d",
		dprintk(VIDC_ERR,
		"%s: Failed getting entropy type: %d",
		__func__, rc);
		break;
		}
		switch (hprop.h264_entropy) {
		case HAL_H264_ENTROPY_CAVLC:
		ctrl->val = V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CAVLC;
		ctrl->val =
		V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CAVLC;
		break;
		case HAL_H264_ENTROPY_CABAC:
		ctrl->val = V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC;
		ctrl->val =
		V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC;
		break;
		case HAL_UNUSED_ENTROPY:
		rc = -ENOTSUPP;
		break;
		}
		}
		break;
		default:
		/* Other controls aren't really volatile, shouldn't need to

+1 −3

Original line number	Diff line number	Diff line
		@@ -971,9 +971,7 @@ int msm_vidc_qbuf(void instance, struct v4l2_buffer b)
		&binfo->device_addr[i]);
		}

		rc = qbuf_cache_operations(inst, binfo);
		if (rc)
		return rc;
		qbuf_cache_operations(inst, binfo);

		if (inst->session_type == MSM_VIDC_DECODER)
		return msm_vdec_qbuf(instance, b);