2020-01-24 20:54:37

by Maxime Jourdan

Subject: [PATCH] media: meson: vdec: don't resume instantly if not streaming capture

In case userspace configured the capture queue before the source change
event, do not resume decoding instantly if it wasn't streamed on yet.

Signed-off-by: Maxime Jourdan <[email protected]>
---

Note: this patch is based off Neil's series:
[v4,0/4] media: meson: vdec: Add compliant H264 support

drivers/staging/media/meson/vdec/vdec_helpers.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/media/meson/vdec/vdec_helpers.c b/drivers/staging/media/meson/vdec/vdec_helpers.c
index ff4333074197..a4970ec1bf2e 100644
--- a/drivers/staging/media/meson/vdec/vdec_helpers.c
+++ b/drivers/staging/media/meson/vdec/vdec_helpers.c
@@ -417,7 +417,8 @@ void amvdec_src_change(struct amvdec_session *sess, u32 width,
* Check if the capture queue is already configured well for our
* usecase. If so, keep decoding with it and do not send the event
*/
- if (sess->width == width &&
+ if (sess->streamon_cap &&
+ sess->width == width &&
sess->height == height &&
dpb_size <= sess->num_dst_bufs) {
sess->fmt_out->codec_ops->resume(sess);
--
2.20.1

2020-02-06 08:10:58

by Neil Armstrong

Subject: Re: [PATCH] media: meson: vdec: don't resume instantly if not streaming capture

On 24/01/2020 16:56, Maxime Jourdan wrote:
> In case userspace configured the capture queue before the source change
> event, do not resume decoding instantly if it wasn't streamed on yet.
>
> Signed-off-by: Maxime Jourdan <[email protected]>
> ---
>
> Note: this patch is based off Neil's series:
> [v4,0/4] media: meson: vdec: Add compliant H264 support
>
> drivers/staging/media/meson/vdec/vdec_helpers.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/media/meson/vdec/vdec_helpers.c b/drivers/staging/media/meson/vdec/vdec_helpers.c
> index ff4333074197..a4970ec1bf2e 100644
> --- a/drivers/staging/media/meson/vdec/vdec_helpers.c
> +++ b/drivers/staging/media/meson/vdec/vdec_helpers.c
> @@ -417,7 +417,8 @@ void amvdec_src_change(struct amvdec_session *sess, u32 width,
> * Check if the capture queue is already configured well for our
> * usecase. If so, keep decoding with it and do not send the event
> */
> - if (sess->width == width &&
> + if (sess->streamon_cap &&
> + sess->width == width &&
> sess->height == height &&
> dpb_size <= sess->num_dst_bufs) {
> sess->fmt_out->codec_ops->resume(sess);
> --
> 2.20.1
>

Will squash into v5 of "media: meson: vdec: Add compliant H264 support"

Thanks,
Neil