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 1/2] examples/decode_filter_audio: Add loop for draining the filtergraph
@ 2024-03-27 10:51 Tobias Rapp
  2024-03-27 10:51 ` [FFmpeg-devel] [PATCH 2/2] examples/decode_filter_video: " Tobias Rapp
  2024-03-27 12:04 ` [FFmpeg-devel] [PATCH 1/2] examples/decode_filter_audio: " Stefano Sabatini
  0 siblings, 2 replies; 8+ messages in thread
From: Tobias Rapp @ 2024-03-27 10:51 UTC (permalink / raw)
  To: ffmpeg-devel

Depending on the filters used the filtergraph can produce trailing data
after feeding it the last input frame. Update the example to include the
necessary loop for draining the filtergrap.

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
---
 doc/examples/decode_filter_audio.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/examples/decode_filter_audio.c b/doc/examples/decode_filter_audio.c
index 2046419..196f080 100644
--- a/doc/examples/decode_filter_audio.c
+++ b/doc/examples/decode_filter_audio.c
@@ -279,6 +279,25 @@ int main(int argc, char **argv)
         }
         av_packet_unref(packet);
     }
+    if (ret == AVERROR_EOF) {
+        /* signal EOF to the filtergraph */
+        if (av_buffersrc_add_frame_flags(buffersrc_ctx, NULL, 0) < 0) {
+            av_log(NULL, AV_LOG_ERROR, "Error while closing the filtergraph\n");
+            goto end;
+        }
+
+        /* pull remaining frames from the filtergraph */
+        while (1) {
+            ret = av_buffersink_get_frame(buffersink_ctx, filt_frame);
+            if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
+                break;
+            if (ret < 0)
+                goto end;
+            print_frame(filt_frame);
+            av_frame_unref(filt_frame);
+        }
+    }
+
 end:
     avfilter_graph_free(&filter_graph);
     avcodec_free_context(&dec_ctx);
-- 
2.7.4

_______________________________________________
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] 8+ messages in thread

* [FFmpeg-devel] [PATCH 2/2] examples/decode_filter_video: Add loop for draining the filtergraph
  2024-03-27 10:51 [FFmpeg-devel] [PATCH 1/2] examples/decode_filter_audio: Add loop for draining the filtergraph Tobias Rapp
@ 2024-03-27 10:51 ` Tobias Rapp
  2024-03-27 12:06   ` Stefano Sabatini
  2024-03-27 12:04 ` [FFmpeg-devel] [PATCH 1/2] examples/decode_filter_audio: " Stefano Sabatini
  1 sibling, 1 reply; 8+ messages in thread
From: Tobias Rapp @ 2024-03-27 10:51 UTC (permalink / raw)
  To: ffmpeg-devel

Depending on the filters used the filtergraph can produce trailing data
after feeding it the last input frame. Update the example to include the
necessary loop for draining the filtergrap.

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
---
 doc/examples/decode_filter_video.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/examples/decode_filter_video.c b/doc/examples/decode_filter_video.c
index 454c192..a57e6df 100644
--- a/doc/examples/decode_filter_video.c
+++ b/doc/examples/decode_filter_video.c
@@ -276,6 +276,25 @@ int main(int argc, char **argv)
         }
         av_packet_unref(packet);
     }
+    if (ret == AVERROR_EOF) {
+        /* signal EOF to the filtergraph */
+        if (av_buffersrc_add_frame_flags(buffersrc_ctx, NULL, 0) < 0) {
+            av_log(NULL, AV_LOG_ERROR, "Error while closing the filtergraph\n");
+            goto end;
+        }
+
+        /* pull remaining frames from the filtergraph */
+        while (1) {
+            ret = av_buffersink_get_frame(buffersink_ctx, filt_frame);
+            if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
+                break;
+            if (ret < 0)
+                goto end;
+            display_frame(filt_frame, buffersink_ctx->inputs[0]->time_base);
+            av_frame_unref(filt_frame);
+        }
+    }
+
 end:
     avfilter_graph_free(&filter_graph);
     avcodec_free_context(&dec_ctx);
-- 
2.7.4

_______________________________________________
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] 8+ messages in thread

* Re: [FFmpeg-devel] [PATCH 1/2] examples/decode_filter_audio: Add loop for draining the filtergraph
  2024-03-27 10:51 [FFmpeg-devel] [PATCH 1/2] examples/decode_filter_audio: Add loop for draining the filtergraph Tobias Rapp
  2024-03-27 10:51 ` [FFmpeg-devel] [PATCH 2/2] examples/decode_filter_video: " Tobias Rapp
@ 2024-03-27 12:04 ` Stefano Sabatini
  1 sibling, 0 replies; 8+ messages in thread
From: Stefano Sabatini @ 2024-03-27 12:04 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

On date Wednesday 2024-03-27 11:51:30 +0100, Tobias Rapp wrote:
> Depending on the filters used the filtergraph can produce trailing data
> after feeding it the last input frame. Update the example to include the
> necessary loop for draining the filtergrap.
> 
> Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
> ---
>  doc/examples/decode_filter_audio.c | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
> 
> diff --git a/doc/examples/decode_filter_audio.c b/doc/examples/decode_filter_audio.c
> index 2046419..196f080 100644
> --- a/doc/examples/decode_filter_audio.c
> +++ b/doc/examples/decode_filter_audio.c
> @@ -279,6 +279,25 @@ int main(int argc, char **argv)
>          }
>          av_packet_unref(packet);
>      }
> +    if (ret == AVERROR_EOF) {
> +        /* signal EOF to the filtergraph */
> +        if (av_buffersrc_add_frame_flags(buffersrc_ctx, NULL, 0) < 0) {
> +            av_log(NULL, AV_LOG_ERROR, "Error while closing the filtergraph\n");
> +            goto end;
> +        }
> +
> +        /* pull remaining frames from the filtergraph */
> +        while (1) {
> +            ret = av_buffersink_get_frame(buffersink_ctx, filt_frame);
> +            if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
> +                break;
> +            if (ret < 0)
> +                goto end;
> +            print_frame(filt_frame);
> +            av_frame_unref(filt_frame);
> +        }
> +    }
> +
>  end:
>      avfilter_graph_free(&filter_graph);
>      avcodec_free_context(&dec_ctx);

Should be fine, thanks.
_______________________________________________
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] 8+ messages in thread

* Re: [FFmpeg-devel] [PATCH 2/2] examples/decode_filter_video: Add loop for draining the filtergraph
  2024-03-27 10:51 ` [FFmpeg-devel] [PATCH 2/2] examples/decode_filter_video: " Tobias Rapp
@ 2024-03-27 12:06   ` Stefano Sabatini
  2024-03-27 12:46     ` Tobias Rapp
  0 siblings, 1 reply; 8+ messages in thread
From: Stefano Sabatini @ 2024-03-27 12:06 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

On date Wednesday 2024-03-27 11:51:31 +0100, Tobias Rapp wrote:
> Depending on the filters used the filtergraph can produce trailing data
> after feeding it the last input frame. Update the example to include the
> necessary loop for draining the filtergrap.
> 
> Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
> ---
>  doc/examples/decode_filter_video.c | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
> 
> diff --git a/doc/examples/decode_filter_video.c b/doc/examples/decode_filter_video.c
> index 454c192..a57e6df 100644
> --- a/doc/examples/decode_filter_video.c
> +++ b/doc/examples/decode_filter_video.c
> @@ -276,6 +276,25 @@ int main(int argc, char **argv)
>          }
>          av_packet_unref(packet);
>      }

> +    if (ret == AVERROR_EOF) {
> +        /* signal EOF to the filtergraph */
> +        if (av_buffersrc_add_frame_flags(buffersrc_ctx, NULL, 0) < 0) {
> +            av_log(NULL, AV_LOG_ERROR, "Error while closing the filtergraph\n");
> +            goto end;
> +        }
> +
> +        /* pull remaining frames from the filtergraph */
> +        while (1) {
> +            ret = av_buffersink_get_frame(buffersink_ctx, filt_frame);

> +            if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
> +                break;

how are we supposed to handle the EAGAIN case? Shouldn't this be a
sleep and retry?
_______________________________________________
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] 8+ messages in thread

* Re: [FFmpeg-devel] [PATCH 2/2] examples/decode_filter_video: Add loop for draining the filtergraph
  2024-03-27 12:06   ` Stefano Sabatini
@ 2024-03-27 12:46     ` Tobias Rapp
  2024-03-27 12:53       ` Anton Khirnov
  0 siblings, 1 reply; 8+ messages in thread
From: Tobias Rapp @ 2024-03-27 12:46 UTC (permalink / raw)
  To: ffmpeg-devel

On 27/03/2024 13:06, Stefano Sabatini wrote:

> On date Wednesday 2024-03-27 11:51:31 +0100, Tobias Rapp wrote:
>> Depending on the filters used the filtergraph can produce trailing data
>> after feeding it the last input frame. Update the example to include the
>> necessary loop for draining the filtergrap.
>>
>> Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
>> ---
>>   doc/examples/decode_filter_video.c | 19 +++++++++++++++++++
>>   1 file changed, 19 insertions(+)
>>
>> diff --git a/doc/examples/decode_filter_video.c b/doc/examples/decode_filter_video.c
>> index 454c192..a57e6df 100644
>> --- a/doc/examples/decode_filter_video.c
>> +++ b/doc/examples/decode_filter_video.c
>> @@ -276,6 +276,25 @@ int main(int argc, char **argv)
>>           }
>>           av_packet_unref(packet);
>>       }
>> +    if (ret == AVERROR_EOF) {
>> +        /* signal EOF to the filtergraph */
>> +        if (av_buffersrc_add_frame_flags(buffersrc_ctx, NULL, 0) < 0) {
>> +            av_log(NULL, AV_LOG_ERROR, "Error while closing the filtergraph\n");
>> +            goto end;
>> +        }
>> +
>> +        /* pull remaining frames from the filtergraph */
>> +        while (1) {
>> +            ret = av_buffersink_get_frame(buffersink_ctx, filt_frame);
>> +            if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
>> +                break;
> how are we supposed to handle the EAGAIN case? Shouldn't this be a
> sleep and retry?

Good suggestion. I could add something like usleep(100) upon EAGAIN.

Will post an updated patch.

_______________________________________________
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] 8+ messages in thread

* Re: [FFmpeg-devel] [PATCH 2/2] examples/decode_filter_video: Add loop for draining the filtergraph
  2024-03-27 12:46     ` Tobias Rapp
@ 2024-03-27 12:53       ` Anton Khirnov
  2024-03-27 13:04         ` Tobias Rapp
  0 siblings, 1 reply; 8+ messages in thread
From: Anton Khirnov @ 2024-03-27 12:53 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

Quoting Tobias Rapp (2024-03-27 13:46:40)
> On 27/03/2024 13:06, Stefano Sabatini wrote:
> 
> > On date Wednesday 2024-03-27 11:51:31 +0100, Tobias Rapp wrote:
> >> Depending on the filters used the filtergraph can produce trailing data
> >> after feeding it the last input frame. Update the example to include the
> >> necessary loop for draining the filtergrap.
> >>
> >> Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
> >> ---
> >>   doc/examples/decode_filter_video.c | 19 +++++++++++++++++++
> >>   1 file changed, 19 insertions(+)
> >>
> >> diff --git a/doc/examples/decode_filter_video.c b/doc/examples/decode_filter_video.c
> >> index 454c192..a57e6df 100644
> >> --- a/doc/examples/decode_filter_video.c
> >> +++ b/doc/examples/decode_filter_video.c
> >> @@ -276,6 +276,25 @@ int main(int argc, char **argv)
> >>           }
> >>           av_packet_unref(packet);
> >>       }
> >> +    if (ret == AVERROR_EOF) {
> >> +        /* signal EOF to the filtergraph */
> >> +        if (av_buffersrc_add_frame_flags(buffersrc_ctx, NULL, 0) < 0) {
> >> +            av_log(NULL, AV_LOG_ERROR, "Error while closing the filtergraph\n");
> >> +            goto end;
> >> +        }
> >> +
> >> +        /* pull remaining frames from the filtergraph */
> >> +        while (1) {
> >> +            ret = av_buffersink_get_frame(buffersink_ctx, filt_frame);
> >> +            if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
> >> +                break;
> > how are we supposed to handle the EAGAIN case? Shouldn't this be a
> > sleep and retry?
> 
> Good suggestion. I could add something like usleep(100) upon EAGAIN.

No, EAGAIN from a filter after EOF on all inputs is a bug.

-- 
Anton Khirnov
_______________________________________________
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] 8+ messages in thread

* Re: [FFmpeg-devel] [PATCH 2/2] examples/decode_filter_video: Add loop for draining the filtergraph
  2024-03-27 12:53       ` Anton Khirnov
@ 2024-03-27 13:04         ` Tobias Rapp
  2024-03-28 11:07           ` Tobias Rapp
  0 siblings, 1 reply; 8+ messages in thread
From: Tobias Rapp @ 2024-03-27 13:04 UTC (permalink / raw)
  To: ffmpeg-devel

On 27/03/2024 13:53, Anton Khirnov wrote:

> Quoting Tobias Rapp (2024-03-27 13:46:40)
>> On 27/03/2024 13:06, Stefano Sabatini wrote:
>>
>>> On date Wednesday 2024-03-27 11:51:31 +0100, Tobias Rapp wrote:
>>>> Depending on the filters used the filtergraph can produce trailing data
>>>> after feeding it the last input frame. Update the example to include the
>>>> necessary loop for draining the filtergrap.
>>>>
>>>> Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
>>>> ---
>>>>    doc/examples/decode_filter_video.c | 19 +++++++++++++++++++
>>>>    1 file changed, 19 insertions(+)
>>>>
>>>> diff --git a/doc/examples/decode_filter_video.c b/doc/examples/decode_filter_video.c
>>>> index 454c192..a57e6df 100644
>>>> --- a/doc/examples/decode_filter_video.c
>>>> +++ b/doc/examples/decode_filter_video.c
>>>> @@ -276,6 +276,25 @@ int main(int argc, char **argv)
>>>>            }
>>>>            av_packet_unref(packet);
>>>>        }
>>>> +    if (ret == AVERROR_EOF) {
>>>> +        /* signal EOF to the filtergraph */
>>>> +        if (av_buffersrc_add_frame_flags(buffersrc_ctx, NULL, 0) < 0) {
>>>> +            av_log(NULL, AV_LOG_ERROR, "Error while closing the filtergraph\n");
>>>> +            goto end;
>>>> +        }
>>>> +
>>>> +        /* pull remaining frames from the filtergraph */
>>>> +        while (1) {
>>>> +            ret = av_buffersink_get_frame(buffersink_ctx, filt_frame);
>>>> +            if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
>>>> +                break;
>>> how are we supposed to handle the EAGAIN case? Shouldn't this be a
>>> sleep and retry?
>> Good suggestion. I could add something like usleep(100) upon EAGAIN.
> No, EAGAIN from a filter after EOF on all inputs is a bug.

Ok. Also from a second look at the example all the other locations where 
EAGAIN is handled do not perform a retry. So adding that would be 
orthogonal to this patch, IMHO.

Regards, Tobias

_______________________________________________
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] 8+ messages in thread

* Re: [FFmpeg-devel] [PATCH 2/2] examples/decode_filter_video: Add loop for draining the filtergraph
  2024-03-27 13:04         ` Tobias Rapp
@ 2024-03-28 11:07           ` Tobias Rapp
  0 siblings, 0 replies; 8+ messages in thread
From: Tobias Rapp @ 2024-03-28 11:07 UTC (permalink / raw)
  To: ffmpeg-devel

On 27/03/2024 14:04, Tobias Rapp wrote:

> On 27/03/2024 13:53, Anton Khirnov wrote:
>
>> Quoting Tobias Rapp (2024-03-27 13:46:40)
>>> On 27/03/2024 13:06, Stefano Sabatini wrote:
>>>
>>>> On date Wednesday 2024-03-27 11:51:31 +0100, Tobias Rapp wrote:
>>>>> Depending on the filters used the filtergraph can produce trailing 
>>>>> data
>>>>> after feeding it the last input frame. Update the example to 
>>>>> include the
>>>>> necessary loop for draining the filtergrap.
>>>>>
>>>>> Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
>>>>> ---
>>>>>    doc/examples/decode_filter_video.c | 19 +++++++++++++++++++
>>>>>    1 file changed, 19 insertions(+)
>>>>>
>>>>> diff --git a/doc/examples/decode_filter_video.c 
>>>>> b/doc/examples/decode_filter_video.c
>>>>> index 454c192..a57e6df 100644
>>>>> --- a/doc/examples/decode_filter_video.c
>>>>> +++ b/doc/examples/decode_filter_video.c
>>>>> @@ -276,6 +276,25 @@ int main(int argc, char **argv)
>>>>>            }
>>>>>            av_packet_unref(packet);
>>>>>        }
>>>>> +    if (ret == AVERROR_EOF) {
>>>>> +        /* signal EOF to the filtergraph */
>>>>> +        if (av_buffersrc_add_frame_flags(buffersrc_ctx, NULL, 0) 
>>>>> < 0) {
>>>>> +            av_log(NULL, AV_LOG_ERROR, "Error while closing the 
>>>>> filtergraph\n");
>>>>> +            goto end;
>>>>> +        }
>>>>> +
>>>>> +        /* pull remaining frames from the filtergraph */
>>>>> +        while (1) {
>>>>> +            ret = av_buffersink_get_frame(buffersink_ctx, 
>>>>> filt_frame);
>>>>> +            if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
>>>>> +                break;
>>>> how are we supposed to handle the EAGAIN case? Shouldn't this be a
>>>> sleep and retry?
>>> Good suggestion. I could add something like usleep(100) upon EAGAIN.
>> No, EAGAIN from a filter after EOF on all inputs is a bug.
>
> Ok. Also from a second look at the example all the other locations 
> where EAGAIN is handled do not perform a retry. So adding that would 
> be orthogonal to this patch, IMHO.
>
Applied both patches. Thanks for the feedback!

Regards, Tobias

_______________________________________________
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] 8+ messages in thread

end of thread, other threads:[~2024-03-28 11:07 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-27 10:51 [FFmpeg-devel] [PATCH 1/2] examples/decode_filter_audio: Add loop for draining the filtergraph Tobias Rapp
2024-03-27 10:51 ` [FFmpeg-devel] [PATCH 2/2] examples/decode_filter_video: " Tobias Rapp
2024-03-27 12:06   ` Stefano Sabatini
2024-03-27 12:46     ` Tobias Rapp
2024-03-27 12:53       ` Anton Khirnov
2024-03-27 13:04         ` Tobias Rapp
2024-03-28 11:07           ` Tobias Rapp
2024-03-27 12:04 ` [FFmpeg-devel] [PATCH 1/2] examples/decode_filter_audio: " Stefano Sabatini

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