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

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

Merge "msm: vidc: Amend multislice capabilities"

parents b1aeae31 159ad46f

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

+7 −3
Original line number Diff line number Diff line
@@ -2735,7 +2735,7 @@ int msm_venc_set_slice_control_mode(struct msm_vidc_inst *inst) 
	struct v4l2_ctrl *ctrl_t;

	struct hfi_multi_slice_control multi_slice_control;

	int temp = 0;

	u32 mb_per_frame, fps, mbps, bitrate;

	u32 mb_per_frame, fps, mbps, bitrate, max_slices;

	u32 slice_val, slice_mode, max_avg_slicesize;

	u32 rc_mode, output_width, output_height;

	struct v4l2_ctrl *rc_enable;
@@ -2796,13 +2796,17 @@ int msm_venc_set_slice_control_mode(struct msm_vidc_inst *inst) 
		if (output_width <= 4096 || output_height <= 4096 ||

			mb_per_frame <= NUM_MBS_PER_FRAME(4096, 2160) ||

			mbps <= NUM_MBS_PER_SEC(4096, 2160, 60)) {

			slice_val = max(slice_val, mb_per_frame / 10);

			max_slices = inst->capability.cap[CAP_SLICE_MB].max ?

				inst->capability.cap[CAP_SLICE_MB].max : 1;

			slice_val = max(slice_val, mb_per_frame / max_slices);

		}

	} else {

		if (output_width <= 1920 || output_height <= 1920 ||

			mb_per_frame <= NUM_MBS_PER_FRAME(1088, 1920) ||

			mbps <= NUM_MBS_PER_SEC(1088, 1920, 60)) {

			max_avg_slicesize = ((bitrate / fps) / 8) / 10;

			max_slices = inst->capability.cap[CAP_SLICE_BYTE].max ?

				inst->capability.cap[CAP_SLICE_BYTE].max : 1;

			max_avg_slicesize = ((bitrate / fps) / 8) / max_slices;

			slice_val = max(slice_val, max_avg_slicesize);

		}

	}

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

+3 −4
Original line number Diff line number Diff line
@@ -168,10 +168,9 @@ static struct msm_vidc_codec_capability kona_capabilities[] = { 
	{CAP_I_FRAME_QP, ENC, VP8|VP9, 0, 127, 1, 20},

	{CAP_P_FRAME_QP, ENC, VP8|VP9, 0, 127, 1, 40},

	{CAP_B_FRAME_QP, ENC, VP8|VP9, 0, 127, 1, 40},

	/* (CAP_BITRATE / 8) / 10 slices */

	{CAP_SLICE_BYTE, ENC, H264|HEVC, 0, 2750000, 1, 2750000},

	/* CAP_MBS_PER_FRAME / 10 slices */

	{CAP_SLICE_MB, ENC, H264|HEVC, 0, 13824, 1, 13824},

	/* 10 slices */

	{CAP_SLICE_BYTE, ENC, H264|HEVC, 1, 10, 1, 10},

	{CAP_SLICE_MB, ENC, H264|HEVC, 1, 10, 1, 10},

	{CAP_MAX_VIDEOCORES, DOMAINS_ALL, CODECS_ALL, 0, 1, 1, 1},



	/* VP8 specific */