* Re: [PATCH 5/8] media: cedrus: Detect first slice of a frame [not found] ` <20190830074806.78a2b8b4@collabora.com> @ 2019-08-30 17:19 ` Nicolas Dufresne 0 siblings, 0 replies; 2+ messages in thread From: Nicolas Dufresne @ 2019-08-30 17:19 UTC (permalink / raw) To: Boris Brezillon, Jernej Škrabec Cc: devel, acourbot, pawel, jonas, gregkh, wens, mripard, tfiga, paul.kocialkowski, kyungmin.park, linux-media, linux-arm-kernel, hverkuil-cisco, mchehab, ezequiel, linux-kernel, m.szyprowski [-- Attachment #1.1: Type: text/plain, Size: 3560 bytes --] Le vendredi 30 août 2019 à 07:48 +0200, Boris Brezillon a écrit : > On Thu, 29 Aug 2019 21:04:28 +0200 > Jernej Škrabec <jernej.skrabec@siol.net> wrote: > > > Dne ponedeljek, 26. avgust 2019 ob 20:28:31 CEST je Boris Brezillon > > napisal(a): > > > Hi Jernej, > > > > > > On Thu, 22 Aug 2019 21:44:57 +0200 > > > > > > Jernej Skrabec <jernej.skrabec@siol.net> wrote: > > > > When codec supports multiple slices in one frame, VPU has to know when > > > > first slice of each frame is being processed, presumably to correctly > > > > clear/set data in auxiliary buffers. > > > > > > > > Add first_slice field to cedrus_run structure and set it according to > > > > timestamps of capture and output buffers. If timestamps are different, > > > > it's first slice and viceversa. > > > > > > > > Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> > > > > --- > > > > > > > > drivers/staging/media/sunxi/cedrus/cedrus.h | 1 + > > > > drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 2 ++ > > > > 2 files changed, 3 insertions(+) > > > > > > > > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h > > > > b/drivers/staging/media/sunxi/cedrus/cedrus.h index > > > > 2f017a651848..32cb38e541c6 100644 > > > > --- a/drivers/staging/media/sunxi/cedrus/cedrus.h > > > > +++ b/drivers/staging/media/sunxi/cedrus/cedrus.h > > > > @@ -70,6 +70,7 @@ struct cedrus_mpeg2_run { > > > > > > > > struct cedrus_run { > > > > > > > > struct vb2_v4l2_buffer *src; > > > > struct vb2_v4l2_buffer *dst; > > > > > > > > + bool first_slice; > > > > > > > > union { > > > > > > > > struct cedrus_h264_run h264; > > > > > > > > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_dec.c > > > > b/drivers/staging/media/sunxi/cedrus/cedrus_dec.c index > > > > 56ca4c9ad01c..d7b54accfe83 100644 > > > > --- a/drivers/staging/media/sunxi/cedrus/cedrus_dec.c > > > > +++ b/drivers/staging/media/sunxi/cedrus/cedrus_dec.c > > > > @@ -31,6 +31,8 @@ void cedrus_device_run(void *priv) > > > > > > > > run.src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx); > > > > run.dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx); > > > > > > > > + run.first_slice = > > > > + run.src->vb2_buf.timestamp != run.dst- > > > vb2_buf.timestamp; > > > > > > Can't we use slice->first_mb_in_slice to determine if a slice is the > > > first? I'd expect ->first_mb_in_slice to be 0 (unless we decide to > > > support ASO). > > > > I looked in all VPU documentation available to me (which isn't much) and there > > is no indication if ASO is supported or not. Do you have any sample video with > > out-of-order slices? It's my understanding that this is uncommon. > > I'm not entirely sure, but my understanding was that it might be used > when streaming over network where some packets might be lost and > re-emitted later on. > > > If it's > > supported, I would leave code as-is. > > I remember seeing the ASO acronym mentioned in the hantro G1 spec, but > at the same time we're doing frame-based decoding, so I guess the HW > block expects slices to be ordered in that case. Honestly I don't know, > so let's keep the code as-is. We had an ASO interrupt when we tried to do slice decoding rather then frame. I believe on Hantro, the way to do ASO is to actually re-order in software. ASO is a feature of baseline profile use to reduce latency. As an example, VA-API does not support baseline profile (only constrained- baseline, which excludes ASO). Nicolas [-- Attachment #1.2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 195 bytes --] [-- Attachment #2: Type: text/plain, Size: 169 bytes --] _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 2+ messages in thread
[parent not found: <20190822194500.2071-8-jernej.skrabec@siol.net>]
[parent not found: <f105990c-e059-6bdd-433f-074388e3a2dc@xs4all.nl>]
* Re: [PATCH 7/8] media: cedrus: Add support for holding capture buffer [not found] ` <f105990c-e059-6bdd-433f-074388e3a2dc@xs4all.nl> @ 2019-09-04 23:14 ` Jernej Škrabec 0 siblings, 0 replies; 2+ messages in thread From: Jernej Škrabec @ 2019-09-04 23:14 UTC (permalink / raw) To: Hans Verkuil Cc: devel, acourbot, pawel, jonas, gregkh, wens, mripard, tfiga, paul.kocialkowski, kyungmin.park, linux-media, linux-arm-kernel, mchehab, ezequiel, linux-kernel, m.szyprowski Dne četrtek, 29. avgust 2019 ob 13:23:29 CEST je Hans Verkuil napisal(a): > On 8/22/19 9:44 PM, Jernej Skrabec wrote: > > When frame contains multiple slices and driver works in slice mode, it's > > more efficient to hold capture buffer in queue until all slices of a > > same frame are decoded. > > > > Add support for that to Cedrus driver by exposing and implementing > > V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF capability. > > > > Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> > > --- > > > > drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 9 +++++++++ > > drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 8 +++++--- > > drivers/staging/media/sunxi/cedrus/cedrus_video.c | 1 + > > 3 files changed, 15 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_dec.c > > b/drivers/staging/media/sunxi/cedrus/cedrus_dec.c index > > d7b54accfe83..68462b99750e 100644 > > --- a/drivers/staging/media/sunxi/cedrus/cedrus_dec.c > > +++ b/drivers/staging/media/sunxi/cedrus/cedrus_dec.c > > @@ -31,6 +31,14 @@ void cedrus_device_run(void *priv) > > > > run.src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx); > > run.dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx); > > > > + > > + if (v4l2_m2m_release_capture_buf(run.src, run.dst)) { > > + v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx); > > + v4l2_m2m_buf_done(run.dst, VB2_BUF_STATE_DONE); > > + run.dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx); > > + } > > + run.dst->is_held = run.src->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF; > > + > > > > run.first_slice = > > > > run.src->vb2_buf.timestamp != run.dst- >vb2_buf.timestamp; > > > > @@ -46,6 +54,7 @@ void cedrus_device_run(void *priv) > > > > V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS); > > > > run.mpeg2.quantization = cedrus_find_control_data(ctx, > > > > V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION); > > > > + run.dst->is_held = false; > > > > break; > > > > case V4L2_PIX_FMT_H264_SLICE: > > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c > > b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c index > > a942cd9bed57..99fedec80224 100644 > > --- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c > > +++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c > > @@ -122,7 +122,7 @@ static irqreturn_t cedrus_irq(int irq, void *data) > > > > dev->dec_ops[ctx->current_codec]->irq_clear(ctx); > > > > src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx); > > > > - dst_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx); > > + dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx); > > > > if (!src_buf || !dst_buf) { > > > > v4l2_err(&dev->v4l2_dev, > > > > @@ -136,8 +136,10 @@ static irqreturn_t cedrus_irq(int irq, void *data) > > > > state = VB2_BUF_STATE_DONE; > > > > v4l2_m2m_buf_done(src_buf, state); > > > > - v4l2_m2m_buf_done(dst_buf, state); > > - > > + if (!dst_buf->is_held) { > > + v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx); > > + v4l2_m2m_buf_done(dst_buf, state); > > + } > > > > v4l2_m2m_job_finish(ctx->dev->m2m_dev, ctx->fh.m2m_ctx); > > > > return IRQ_HANDLED; > > > > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_video.c > > b/drivers/staging/media/sunxi/cedrus/cedrus_video.c index > > eeee3efd247b..5153b2bba21e 100644 > > --- a/drivers/staging/media/sunxi/cedrus/cedrus_video.c > > +++ b/drivers/staging/media/sunxi/cedrus/cedrus_video.c > > @@ -515,6 +515,7 @@ int cedrus_queue_init(void *priv, struct vb2_queue > > *src_vq,> > > src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT; > > src_vq->io_modes = VB2_MMAP | VB2_DMABUF; > > src_vq->drv_priv = ctx; > > > > + src_vq->subsystem_flags = VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF; > > This isn't quite right: this flag should only be set for formats that > support slicing. So cedrus_s_fmt_vid_out() should set this for H264, but > clear it for MPEG2. > > Looking at the cedrus code it seems that it does not set an initial default > output format after opening the video device. This seems wrong to me. If it > did set a default output format, then src_vq->subsystem_flags should set > this flag corresponding to the default output format. Ok, I'll base v2 series on your "cedrus: v4l2-compliance fixes", because it has some useful changes for this case. Best regards, Jernej > > > src_vq->buf_struct_size = sizeof(struct cedrus_buffer); > > src_vq->min_buffers_needed = 1; > > src_vq->ops = &cedrus_qops; > > Regards, > > Hans _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-09-04 23:14 UTC | newest] Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <20190822194500.2071-1-jernej.skrabec@siol.net> [not found] ` <20190822194500.2071-6-jernej.skrabec@siol.net> [not found] ` <20190826202831.311c7c20@collabora.com> [not found] ` <3132748.mYbjOY1tKM@jernej-laptop> [not found] ` <20190830074806.78a2b8b4@collabora.com> 2019-08-30 17:19 ` [PATCH 5/8] media: cedrus: Detect first slice of a frame Nicolas Dufresne [not found] ` <20190822194500.2071-8-jernej.skrabec@siol.net> [not found] ` <f105990c-e059-6bdd-433f-074388e3a2dc@xs4all.nl> 2019-09-04 23:14 ` [PATCH 7/8] media: cedrus: Add support for holding capture buffer Jernej Škrabec
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).