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

This commit is contained in:
Linux Build Service Account 2018-08-03 04:05:44 -07:00 committed by Gerrit - the friendly Code Review server
commit 066d4578b9

View file

@ -23,6 +23,7 @@
#define MSM_VDEC_DVC_NAME "msm_vdec_8974"
#define MIN_NUM_OUTPUT_BUFFERS 4
#define MIN_NUM_OUTPUT_BUFFERS_HEVC 5
#define MIN_NUM_CAPTURE_BUFFERS 6
#define MIN_NUM_THUMBNAIL_MODE_CAPTURE_BUFFERS 1
#define MAX_NUM_OUTPUT_BUFFERS VB2_MAX_FRAME
@ -1471,6 +1472,12 @@ 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;
if (inst->fmts[OUTPUT_PORT].fourcc ==
V4L2_PIX_FMT_HEVC &&
*num_buffers < MIN_NUM_OUTPUT_BUFFERS_HEVC)
*num_buffers = MIN_NUM_OUTPUT_BUFFERS_HEVC;
for (i = 0; i < *num_planes; i++) {
sizes[i] = get_frame_size(inst,
&inst->fmts[OUTPUT_PORT], q->type, i);