media: amphion: Abort vpu parsing directly in seek
authorMing Qian <ming.qian@nxp.com>
Mon, 5 Feb 2024 08:17:58 +0000 (17:17 +0900)
committerHans Verkuil <hverkuil-cisco@xs4all.nl>
Fri, 16 Feb 2024 10:46:32 +0000 (11:46 +0100)
Driver abort vpu decoding when both output and capture queues are off,
but if seek in parsing the sequence header, driver may miss aborting the
parsing. so just abort the vpu parsing directly in seek.

Meanwhile if capture is off unexpectedly, we still need to abort the
decoding and return capture buffers.

Signed-off-by: Ming Qian <ming.qian@nxp.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
drivers/media/platform/amphion/vdec.c

index 133d77d1ea0c30ac389fa402826b4c6470ff8e5b..a57f9f4f3b87658caebda407053dcda2e6949fff 100644 (file)
@@ -1595,9 +1595,11 @@ static int vdec_stop_session(struct vpu_inst *inst, u32 type)
        if (V4L2_TYPE_IS_OUTPUT(type)) {
                vdec_update_state(inst, VPU_CODEC_STATE_SEEK, 0);
                vdec->drain = 0;
+               vdec_abort(inst);
        } else {
                if (inst->state != VPU_CODEC_STATE_DYAMIC_RESOLUTION_CHANGE) {
-                       vdec_abort(inst);
+                       if (vb2_is_streaming(v4l2_m2m_get_src_vq(inst->fh.m2m_ctx)))
+                               vdec_abort(inst);
                        vdec->eos_received = 0;
                }
                vdec_clear_slots(inst);