Merge "msm: camera: isp: Resetting init framedrop if source is active" (9092179a) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -493,14 +493,15 @@ void msm_isp_reset_framedrop(struct vfe_device *vfe_dev,
		* is taken into consideration But if skip frame has already
		* passed, burst count has to be updated accordingly
		*/
		if (vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id == 0)
		if (vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id == 0) {
		stream_info->runtime_burst_frame_count =
		stream_info->burst_frame_count;
		else
		} else {
		stream_info->runtime_burst_frame_count =
		stream_info->burst_frame_count -
		stream_info->runtime_init_frame_drop;

		stream_info->runtime_init_frame_drop = 0;
		}
		stream_info->runtime_num_burst_capture =
		stream_info->num_burst_capture;
		stream_info->runtime_framedrop_update = stream_info->framedrop_update;