Hi Ming Qian, Since the v1 has already been merged, this patch no longer applies. Can you make a v3 on top of https://git.linuxtv.org/media_stage.git/? The only change that a v3 has to do is the removal of V4L2_FMT_FLAG_DYN_RESOLUTION. Regards, Hans On 6/30/22 03:30, Ming Qian wrote: > For some formats, the amphion vpu requires startcode > before sequence and frame, such as vc1, vp8. > > But for V4L2_PIX_FMT_VC1_ANNEX_L, only the first sequence startcode > is needed, the extra startcode will cause decoding error. > So after seek, we don't need to insert the sequence startcode. > > In other words, for V4L2_PIX_FMT_VC1_ANNEX_L, > the vpu doesn't support dynamic resolution change. > > Fixes: 145e936380edb ("media: amphion: implement malone decoder rpc interface") > Signed-off-by: Ming Qian <ming.qian@xxxxxxx> > --- > v2 > - remove V4L2_FMT_FLAG_DYN_RESOLUTION from the format V4L2_PIX_FMT_VC1_ANNEX_L > drivers/media/platform/amphion/vdec.c | 2 +- > drivers/media/platform/amphion/vpu.h | 1 + > drivers/media/platform/amphion/vpu_malone.c | 2 ++ > drivers/media/platform/amphion/vpu_rpc.h | 7 ++++++- > 4 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/amphion/vdec.c b/drivers/media/platform/amphion/vdec.c > index 09d4f27970ec..6eab9e711cba 100644 > --- a/drivers/media/platform/amphion/vdec.c > +++ b/drivers/media/platform/amphion/vdec.c > @@ -104,7 +104,6 @@ static const struct vpu_format vdec_formats[] = { > .pixfmt = V4L2_PIX_FMT_VC1_ANNEX_L, > .num_planes = 1, > .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, > - .flags = V4L2_FMT_FLAG_DYN_RESOLUTION > }, > { > .pixfmt = V4L2_PIX_FMT_MPEG2, > @@ -731,6 +730,7 @@ static void vdec_stop_done(struct vpu_inst *inst) > vdec->eos_received = 0; > vdec->is_source_changed = false; > vdec->source_change = 0; > + inst->total_input_count = 0; > vpu_inst_unlock(inst); > } > > diff --git a/drivers/media/platform/amphion/vpu.h b/drivers/media/platform/amphion/vpu.h > index e56b96a7e5d3..f914de6ed81e 100644 > --- a/drivers/media/platform/amphion/vpu.h > +++ b/drivers/media/platform/amphion/vpu.h > @@ -258,6 +258,7 @@ struct vpu_inst { > struct vpu_format cap_format; > u32 min_buffer_cap; > u32 min_buffer_out; > + u32 total_input_count; > > struct v4l2_rect crop; > u32 colorspace; > diff --git a/drivers/media/platform/amphion/vpu_malone.c b/drivers/media/platform/amphion/vpu_malone.c > index c62b49e85060..f4a488bf9880 100644 > --- a/drivers/media/platform/amphion/vpu_malone.c > +++ b/drivers/media/platform/amphion/vpu_malone.c > @@ -1314,6 +1314,8 @@ static int vpu_malone_insert_scode_vc1_l_seq(struct malone_scode_t *scode) > int size = 0; > u8 rcv_seqhdr[MALONE_VC1_RCV_SEQ_HEADER_LEN]; > > + if (scode->inst->total_input_count) > + return 0; > scode->need_data = 0; > > ret = vpu_malone_insert_scode_seq(scode, MALONE_CODEC_ID_VC1_SIMPLE, sizeof(rcv_seqhdr)); > diff --git a/drivers/media/platform/amphion/vpu_rpc.h b/drivers/media/platform/amphion/vpu_rpc.h > index 25119e5e807e..7eb6f01e6ab5 100644 > --- a/drivers/media/platform/amphion/vpu_rpc.h > +++ b/drivers/media/platform/amphion/vpu_rpc.h > @@ -312,11 +312,16 @@ static inline int vpu_iface_input_frame(struct vpu_inst *inst, > struct vb2_buffer *vb) > { > struct vpu_iface_ops *ops = vpu_core_get_iface(inst->core); > + int ret; > > if (!ops || !ops->input_frame) > return -EINVAL; > > - return ops->input_frame(inst->core->iface, inst, vb); > + ret = ops->input_frame(inst->core->iface, inst, vb); > + if (ret < 0) > + return ret; > + inst->total_input_count++; > + return ret; > } > > static inline int vpu_iface_config_memory_resource(struct vpu_inst *inst,
