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

Commit 2a182c29 authored by Arun Menon's avatar Arun Menon
Browse files

msm: vidc: Do not release capture buffers during flush 



If capture buffers are freed before flush_done, then
VIDIOC_DQBUF will fail, since driver will not have the
capture buffers registered with the instance. This results
in video playback failing after port reconfig. This change
fixes the issue.

Change-Id: I5fe40c5dbd7977a8b78a1bb6480c00bb0c86e695
Signed-off-by: default avatarArun Menon <avmenon@codeaurora.org>
parent 84bfeac2

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

+7 −2
Original line number Diff line number Diff line
@@ -3126,8 +3126,6 @@ int msm_vidc_comm_cmd(void *instance, union msm_v4l2_cmd *cmd) 
		flags = dec->flags;

	}



	rc = msm_vidc_release_buffers(inst,

		V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);



	switch (which_cmd) {

	case V4L2_DEC_QCOM_CMD_FLUSH:
@@ -3146,6 +3144,13 @@ int msm_vidc_comm_cmd(void *instance, union msm_v4l2_cmd *cmd) 
		}

		break;

	case V4L2_ENC_CMD_STOP:

		/* V4L2_DEC_CMD_STOP has the same value as V4L2_ENC_CMD_STOP */

		rc = msm_vidc_release_buffers(inst,

				V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);

		if (rc)

			dprintk(VIDC_ERR,

				"Failed to release Capture buffers\n");



		if (core->state != VIDC_CORE_INVALID &&

				inst->state ==  MSM_VIDC_CORE_INVALID) {

			rc = msm_comm_kill_session(inst);