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

Commit 3d262b7f 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: Update limits of session specific ctrls only" into msm-4.9

parents 1f2e9105 468c267e

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

+64 −47
Original line number Original line Diff line number Diff line
@@ -1167,6 +1167,7 @@ static int msm_vidc_comm_update_ctrl(struct msm_vidc_inst *inst, 




static void msm_vidc_comm_update_ctrl_limits(struct msm_vidc_inst *inst)

static void msm_vidc_comm_update_ctrl_limits(struct msm_vidc_inst *inst)

{

{

	if (inst->session_type == MSM_VIDC_ENCODER) {

		msm_vidc_comm_update_ctrl(inst,

		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDC_VIDEO_HYBRID_HIERP_MODE,

				V4L2_CID_MPEG_VIDC_VIDEO_HYBRID_HIERP_MODE,

				&inst->capability.hier_p_hybrid);

				&inst->capability.hier_p_hybrid);
@@ -1181,40 +1182,56 @@ static void msm_vidc_comm_update_ctrl_limits(struct msm_vidc_inst *inst) 
		msm_vidc_comm_update_ctrl(inst,

		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDC_VENC_PARAM_LAYER_BITRATE,

				V4L2_CID_MPEG_VIDC_VENC_PARAM_LAYER_BITRATE,

				&inst->capability.bitrate);

				&inst->capability.bitrate);

	msm_vidc_comm_update_ctrl(inst, V4L2_CID_MPEG_VIDEO_BITRATE_PEAK,

		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDEO_BITRATE_PEAK,

				&inst->capability.peakbitrate);

				&inst->capability.peakbitrate);

	msm_vidc_comm_update_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP,

		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP,

				&inst->capability.i_qp);

				&inst->capability.i_qp);

	msm_vidc_comm_update_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_P_FRAME_QP,

		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDC_VIDEO_P_FRAME_QP,

				&inst->capability.p_qp);

				&inst->capability.p_qp);

	msm_vidc_comm_update_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_B_FRAME_QP,

		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDC_VIDEO_B_FRAME_QP,

				&inst->capability.b_qp);

				&inst->capability.b_qp);

	msm_vidc_comm_update_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP_MIN,

		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP_MIN,

				&inst->capability.i_qp);

				&inst->capability.i_qp);

	msm_vidc_comm_update_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_P_FRAME_QP_MIN,

		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDC_VIDEO_P_FRAME_QP_MIN,

				&inst->capability.p_qp);

				&inst->capability.p_qp);

	msm_vidc_comm_update_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_B_FRAME_QP_MIN,

		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDC_VIDEO_B_FRAME_QP_MIN,

				&inst->capability.b_qp);

				&inst->capability.b_qp);

	msm_vidc_comm_update_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP_MAX,

		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP_MAX,

				&inst->capability.i_qp);

				&inst->capability.i_qp);

	msm_vidc_comm_update_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_P_FRAME_QP_MAX,

		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDC_VIDEO_P_FRAME_QP_MAX,

				&inst->capability.p_qp);

				&inst->capability.p_qp);

	msm_vidc_comm_update_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_B_FRAME_QP_MAX,

		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDC_VIDEO_B_FRAME_QP_MAX,

				&inst->capability.b_qp);

				&inst->capability.b_qp);

	msm_vidc_comm_update_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_BLUR_WIDTH,

		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDC_VIDEO_BLUR_WIDTH,

				&inst->capability.blur_width);

				&inst->capability.blur_width);

	msm_vidc_comm_update_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_BLUR_HEIGHT,

		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDC_VIDEO_BLUR_HEIGHT,

				&inst->capability.blur_height);

				&inst->capability.blur_height);

		msm_vidc_comm_update_ctrl(inst,

		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES,

				V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES,

				&inst->capability.slice_bytes);

				&inst->capability.slice_bytes);

	msm_vidc_comm_update_ctrl(inst, V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB,

		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB,

				&inst->capability.slice_mbs);

				&inst->capability.slice_mbs);

	msm_vidc_comm_update_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_LTRCOUNT,

		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDC_VIDEO_LTRCOUNT,

				&inst->capability.ltr_count);

				&inst->capability.ltr_count);

	msm_vidc_comm_update_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_NUM_B_FRAMES,

		msm_vidc_comm_update_ctrl(inst,

				V4L2_CID_MPEG_VIDC_VIDEO_NUM_B_FRAMES,

				&inst->capability.bframe);

				&inst->capability.bframe);

	}

	}

}





static void handle_session_init_done(enum hal_command_response cmd, void *data)

static void handle_session_init_done(enum hal_command_response cmd, void *data)

{

{