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

Commit 5ddd9a28 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Increase minimum input buffer count for VP9 decode"

parents a38d4046 4535a343

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

+12 −0
Original line number Diff line number Diff line
@@ -23,6 +23,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
@@ -1460,6 +1461,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);