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

Commit b5d9bb29 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Correct CBR limit checks"

parents 19f2de1b 0f919bdf

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

+2 −2
Original line number Diff line number Diff line
@@ -931,9 +931,9 @@ int msm_vidc_set_internal_config(struct msm_vidc_inst *inst) 
		 rc_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_CBR_VFR) &&

		(codec != V4L2_PIX_FMT_VP8)) {

		if ((rc_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_CBR &&

		    mbps < CBR_MB_LIMIT) ||

		    mbps <= CBR_MB_LIMIT) ||

		   (rc_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_CBR_VFR &&

		    mbps < CBR_VFR_MB_LIMIT))

		    mbps <= CBR_VFR_MB_LIMIT))

			hrd_buf_size.vbv_hdr_buf_size = 500;

		else

			hrd_buf_size.vbv_hdr_buf_size = 1000;

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

+2 −2
Original line number Diff line number Diff line
@@ -1204,9 +1204,9 @@ int msm_vidc_decide_work_route(struct msm_vidc_inst *inst) 
		if (slice_mode ==

			V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES ||

			(rc_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_CBR &&

			mbps < CBR_MB_LIMIT) ||

			mbps <= CBR_MB_LIMIT) ||

			(rc_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_CBR_VFR &&

			mbps < CBR_VFR_MB_LIMIT)) {

			mbps <= CBR_VFR_MB_LIMIT)) {

			pdata.video_work_route = 1;

			dprintk(VIDC_DBG, "Configured work route = 1");

		}