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

Commit 78502aac 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: Change bitrate layer ID default value" into msm-4.9

parents 18f92cc6 5115b467

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

+2 −2
Original line number Diff line number Diff line
@@ -1229,7 +1229,7 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
	{

		property_id = HAL_CONFIG_VENC_TARGET_BITRATE;

		bitrate.bit_rate = ctrl->val;

		bitrate.layer_id = 0;

		bitrate.layer_id = MSM_VIDC_ALL_LAYER_ID;

		pdata = &bitrate;

		inst->clk_data.bitrate = ctrl->val;

		break;
@@ -1253,7 +1253,7 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 


		property_id = HAL_CONFIG_VENC_MAX_BITRATE;

		bitrate.bit_rate = ctrl->val;

		bitrate.layer_id = 0;

		bitrate.layer_id = MSM_VIDC_ALL_LAYER_ID;

		pdata = &bitrate;

		break;

	}