Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH v1] fftools/ffmpeg_dec: Don't keep sending frame to filters in flushing
@ 2023-06-12  3:33 Fei Wang
  2023-06-25  6:20 ` Xiang, Haihao
  0 siblings, 1 reply; 4+ messages in thread
From: Fei Wang @ 2023-06-12  3:33 UTC (permalink / raw)
  To: ffmpeg-devel

Filter may has a limited frame pool size. Do not always send frame to
filters without reaping.

Fix the regression of commit 5fa00b38e6.

Example cmd:
$ ffmpeg -threads 20 -init_hw_device vaapi=hw:/dev/dri/renderD128   \
-hwaccel_output_format vaapi -hwaccel vaapi -i avc_1080P.mp4        \
-vf 'scale_vaapi=w=720:h=480' -f null -

Signed-off-by: Fei Wang <fei.w.wang@intel.com>
---
 fftools/ffmpeg_dec.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c
index 799be63215..d6b34402f8 100644
--- a/fftools/ffmpeg_dec.c
+++ b/fftools/ffmpeg_dec.c
@@ -531,6 +531,12 @@ int dec_packet(InputStream *ist, const AVPacket *pkt, int no_eof)
         av_frame_unref(frame);
         if (ret < 0)
             exit_program(1);
+
+        // During flushing, break out to reap filter once send a frame to filters to
+        // avoid drain out filter's output frame pool. Especially for HW filters which
+        // always have a limited frame pool size.
+        if (!pkt)
+            return 0;
     }
 }
 
-- 
2.25.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [FFmpeg-devel] [PATCH v1] fftools/ffmpeg_dec: Don't keep sending frame to filters in flushing
  2023-06-12  3:33 [FFmpeg-devel] [PATCH v1] fftools/ffmpeg_dec: Don't keep sending frame to filters in flushing Fei Wang
@ 2023-06-25  6:20 ` Xiang, Haihao
  2023-06-26  5:01   ` Xiang, Haihao
  0 siblings, 1 reply; 4+ messages in thread
From: Xiang, Haihao @ 2023-06-25  6:20 UTC (permalink / raw)
  To: ffmpeg-devel

On Ma, 2023-06-12 at 11:33 +0800, Fei Wang wrote:
> Filter may has a limited frame pool size. Do not always send frame to
> filters without reaping.
> 
> Fix the regression of commit 5fa00b38e6.
> 
> Example cmd:
> $ ffmpeg -threads 20 -init_hw_device vaapi=hw:/dev/dri/renderD128   \
> -hwaccel_output_format vaapi -hwaccel vaapi -i avc_1080P.mp4        \
> -vf 'scale_vaapi=w=720:h=480' -f null -
> 
> Signed-off-by: Fei Wang <fei.w.wang@intel.com>
> ---
>  fftools/ffmpeg_dec.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c
> index 799be63215..d6b34402f8 100644
> --- a/fftools/ffmpeg_dec.c
> +++ b/fftools/ffmpeg_dec.c
> @@ -531,6 +531,12 @@ int dec_packet(InputStream *ist, const AVPacket *pkt, int
> no_eof)
>          av_frame_unref(frame);
>          if (ret < 0)
>              exit_program(1);
> +
> +        // During flushing, break out to reap filter once send a frame to
> filters to
> +        // avoid drain out filter's output frame pool. Especially for HW
> filters which
> +        // always have a limited frame pool size.
> +        if (!pkt)
> +            return 0;

Looks good and it works well for me. I'm going to push it if no objection

Thanks
Haihao

>      }
>  }
>  

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [FFmpeg-devel] [PATCH v1] fftools/ffmpeg_dec: Don't keep sending frame to filters in flushing
  2023-06-25  6:20 ` Xiang, Haihao
@ 2023-06-26  5:01   ` Xiang, Haihao
  2023-06-26  7:26     ` Wang, Fei W
  0 siblings, 1 reply; 4+ messages in thread
From: Xiang, Haihao @ 2023-06-26  5:01 UTC (permalink / raw)
  To: ffmpeg-devel

On So, 2023-06-25 at 06:20 +0000, Xiang, Haihao wrote:
> On Ma, 2023-06-12 at 11:33 +0800, Fei Wang wrote:
> > Filter may has a limited frame pool size. Do not always send frame to
> > filters without reaping.
> > 
> > Fix the regression of commit 5fa00b38e6.
> > 
> > Example cmd:
> > $ ffmpeg -threads 20 -init_hw_device vaapi=hw:/dev/dri/renderD128   \
> > -hwaccel_output_format vaapi -hwaccel vaapi -i avc_1080P.mp4        \
> > -vf 'scale_vaapi=w=720:h=480' -f null -
> > 
> > Signed-off-by: Fei Wang <fei.w.wang@intel.com>
> > ---
> >  fftools/ffmpeg_dec.c | 6 ++++++
> >  1 file changed, 6 insertions(+)
> > 
> > diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c
> > index 799be63215..d6b34402f8 100644
> > --- a/fftools/ffmpeg_dec.c
> > +++ b/fftools/ffmpeg_dec.c
> > @@ -531,6 +531,12 @@ int dec_packet(InputStream *ist, const AVPacket *pkt,
> > int
> > no_eof)
> >          av_frame_unref(frame);
> >          if (ret < 0)
> >              exit_program(1);
> > +
> > +        // During flushing, break out to reap filter once send a frame to
> > filters to
> > +        // avoid drain out filter's output frame pool. Especially for HW
> > filters which
> > +        // always have a limited frame pool size.
> > +        if (!pkt)
> > +            return 0;
> 
> Looks good and it works well for me. I'm going to push it if no objection
> 

There is a conflict when applying your patch to the latest FFmpeg, could you
rebase the patch ? 

Thanks
Haihao

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [FFmpeg-devel] [PATCH v1] fftools/ffmpeg_dec: Don't keep sending frame to filters in flushing
  2023-06-26  5:01   ` Xiang, Haihao
@ 2023-06-26  7:26     ` Wang, Fei W
  0 siblings, 0 replies; 4+ messages in thread
From: Wang, Fei W @ 2023-06-26  7:26 UTC (permalink / raw)
  To: ffmpeg-devel

On Mon, 2023-06-26 at 05:01 +0000, Xiang, Haihao wrote:
> On So, 2023-06-25 at 06:20 +0000, Xiang, Haihao wrote:
> > On Ma, 2023-06-12 at 11:33 +0800, Fei Wang wrote:
> > > Filter may has a limited frame pool size. Do not always send
> > > frame to
> > > filters without reaping.
> > > 
> > > Fix the regression of commit 5fa00b38e6.
> > > 
> > > Example cmd:
> > > $ ffmpeg -threads 20 -init_hw_device
> > > vaapi=hw:/dev/dri/renderD128   \
> > > -hwaccel_output_format vaapi -hwaccel vaapi -i
> > > avc_1080P.mp4        \
> > > -vf 'scale_vaapi=w=720:h=480' -f null -
> > > 
> > > Signed-off-by: Fei Wang <fei.w.wang@intel.com>
> > > ---
> > >  fftools/ffmpeg_dec.c | 6 ++++++
> > >  1 file changed, 6 insertions(+)
> > > 
> > > diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c
> > > index 799be63215..d6b34402f8 100644
> > > --- a/fftools/ffmpeg_dec.c
> > > +++ b/fftools/ffmpeg_dec.c
> > > @@ -531,6 +531,12 @@ int dec_packet(InputStream *ist, const
> > > AVPacket *pkt,
> > > int
> > > no_eof)
> > >          av_frame_unref(frame);
> > >          if (ret < 0)
> > >              exit_program(1);
> > > +
> > > +        // During flushing, break out to reap filter once send a
> > > frame to
> > > filters to
> > > +        // avoid drain out filter's output frame pool.
> > > Especially for HW
> > > filters which
> > > +        // always have a limited frame pool size.
> > > +        if (!pkt)
> > > +            return 0;
> > 
> > Looks good and it works well for me. I'm going to push it if no
> > objection
> > 
> 
> There is a conflict when applying your patch to the latest FFmpeg,
> could you
> rebase the patch ? 

Rebased with V2.

Thanks
Fei
> 
> Thanks
> Haihao
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-06-26  7:27 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-12  3:33 [FFmpeg-devel] [PATCH v1] fftools/ffmpeg_dec: Don't keep sending frame to filters in flushing Fei Wang
2023-06-25  6:20 ` Xiang, Haihao
2023-06-26  5:01   ` Xiang, Haihao
2023-06-26  7:26     ` Wang, Fei W

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git