Merge "msm: vidc: Increase minimum input buffer count for VP9 decode" (442541dc) · Commits · e / devices / android_kernel_xiaomi_markw

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

+13 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2017, 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
		@@ -21,6 +21,7 @@

		#define MSM_VDEC_DVC_NAME "msm_vdec_8974"
		#define MIN_NUM_OUTPUT_BUFFERS 4
		#define MIN_NUM_OUTPUT_BUFFERS_VP9 6
		#define MIN_NUM_CAPTURE_BUFFERS 6
		#define MIN_NUM_THUMBNAIL_MODE_CAPTURE_BUFFERS 1
		#define MAX_NUM_OUTPUT_BUFFERS VB2_MAX_FRAME
		@@ -1483,6 +1484,17 @@ static int msm_vdec_queue_setup(struct vb2_queue *q,
		if (*num_buffers < MIN_NUM_OUTPUT_BUFFERS \|\|
		*num_buffers > MAX_NUM_OUTPUT_BUFFERS)
		*num_buffers = MIN_NUM_OUTPUT_BUFFERS;
		/*
		* Increase input buffer count to 6 as for some
		* vp9 clips which have superframes with more
		* than 4 subframes requires more than 4
		* reference frames to decode.
		*/
		if (inst->fmts[OUTPUT_PORT].fourcc ==
		V4L2_PIX_FMT_VP9 &&
		*num_buffers < MIN_NUM_OUTPUT_BUFFERS_VP9)
		*num_buffers = MIN_NUM_OUTPUT_BUFFERS_VP9;

		for (i = 0; i < *num_planes; i++) {
		sizes[i] = get_frame_size(inst,
		&inst->fmts[OUTPUT_PORT], q->type, i);