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

Commit 7121dd22 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: venc: configure max-B-frames only if B is enabled"

parents 105d1fdd 8329f19d

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

+11 −12
Original line number Diff line number Diff line
@@ -2198,6 +2198,7 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
	case V4L2_CID_MPEG_VIDC_VIDEO_NUM_P_FRAMES:

	{

		int num_p, num_b;

		u32 max_num_b_frames;



		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_NUM_B_FRAMES);

		num_b = temp_ctrl->val;
@@ -2210,8 +2211,7 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		else if (ctrl->id == V4L2_CID_MPEG_VIDC_VIDEO_NUM_B_FRAMES)

			num_b = ctrl->val;



		if (num_b) {

			u32 max_num_b_frames = MAX_NUM_B_FRAMES;

		max_num_b_frames = num_b ? MAX_NUM_B_FRAMES : 0;

		property_id = HAL_PARAM_VENC_MAX_NUM_B_FRAMES;

		pdata = &max_num_b_frames;

		rc = call_hfi_op(hdev, session_set_property,
@@ -2222,7 +2222,6 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
				rc);

			break;

		}

		}



		property_id = HAL_CONFIG_VENC_INTRA_PERIOD;

		intra_period.pframes = num_p;