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

Commit e8aae45c 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 3b157650 26e12f8a

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

+10 −0
Original line number Diff line number Diff line
@@ -1500,6 +1500,16 @@ static int try_get_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
					HAL_BUFFER_INPUT);

			return -EINVAL;

		}



		if (inst->session_type == MSM_VIDC_DECODER &&

			!(inst->flags & VIDC_THUMBNAIL) &&

			inst->fmts[OUTPUT_PORT].fourcc ==

				V4L2_PIX_FMT_VP9 &&

			bufreq->buffer_count_min_host <

				MIN_NUM_OUTPUT_BUFFERS_VP9)

			bufreq->buffer_count_min_host =

				MIN_NUM_OUTPUT_BUFFERS_VP9;



		ctrl->val = bufreq->buffer_count_min_host;

		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_TME_PAYLOAD_VERSION:

drivers/media/platform/msm/vidc/msm_vidc_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#define MIN_SUPPORTED_HEIGHT 32

#define DEFAULT_FPS 15

#define MIN_NUM_OUTPUT_BUFFERS 1

#define MIN_NUM_OUTPUT_BUFFERS_VP9 6

#define MIN_NUM_CAPTURE_BUFFERS 1

#define MAX_NUM_OUTPUT_BUFFERS VIDEO_MAX_FRAME // same as VB2_MAX_FRAME

#define MAX_NUM_CAPTURE_BUFFERS VIDEO_MAX_FRAME // same as VB2_MAX_FRAME