[FFmpeg-devel] [PATCH] fftools/ffmpeg: fix gracefully shutdown

[FFmpeg-devel] [PATCH] fftools/ffmpeg: fix gracefully shutdown

[Patrick Wang via ffmpeg-devel]

d119ae2fd82a494d9430ff4d4fc262961a68c598 removed the loop-breaking condition
received_sigterm.
Thus, signals no longer gracefully shutdown ffmpeg.

Fixes: #10834

Signed-off-by: Patrick Wang <mail6543210@gmail.com>
---
 fftools/ffmpeg.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index de607cac9..cd3894341 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -806,8 +806,6 @@ static int check_keyboard_interaction(int64_t cur_time)
 {
     int i, key;
     static int64_t last_time;
-    if (received_nb_signals)
-        return AVERROR_EXIT;
     /* read_key() returns 0 on EOF */
     if (cur_time - last_time >= 100000) {
         key =  read_key();
@@ -891,6 +889,9 @@ static int transcode(Scheduler *sch)
     while (!sch_wait(sch, stats_period, &transcode_ts)) {
         int64_t cur_time= av_gettime_relative();
 
+	if (received_nb_signals)
+	    break;
+
         /* if 'q' pressed, exits */
         if (stdin_interaction)
             if (check_keyboard_interaction(cur_time) < 0)
-- 
2.51.0

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org

[FFmpeg-devel] Re: [PATCH] fftools/ffmpeg: fix gracefully shutdown

[Michael Niedermayer via ffmpeg-devel]

[-- Attachment #1.1: Type: text/plain, Size: 1518 bytes --]

Hi Patrick

On Fri, Aug 29, 2025 at 02:58:16AM +0800, Patrick Wang via ffmpeg-devel wrote:
> d119ae2fd82a494d9430ff4d4fc262961a68c598 removed the loop-breaking condition
> received_sigterm.
> Thus, signals no longer gracefully shutdown ffmpeg.
> 
> Fixes: #10834
> 
> Signed-off-by: Patrick Wang <mail6543210@gmail.com>
> ---
>  fftools/ffmpeg.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
> index de607cac9..cd3894341 100644
> --- a/fftools/ffmpeg.c
> +++ b/fftools/ffmpeg.c
> @@ -806,8 +806,6 @@ static int check_keyboard_interaction(int64_t cur_time)
>  {
>      int i, key;
>      static int64_t last_time;
> -    if (received_nb_signals)
> -        return AVERROR_EXIT;
>      /* read_key() returns 0 on EOF */
>      if (cur_time - last_time >= 100000) {
>          key =  read_key();
> @@ -891,6 +889,9 @@ static int transcode(Scheduler *sch)
>      while (!sch_wait(sch, stats_period, &transcode_ts)) {
>          int64_t cur_time= av_gettime_relative();
>  
> +	if (received_nb_signals)
> +	    break;

will apply without the tabs

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Awnsering whenever a program halts or runs forever is
On a turing machine, in general impossible (turings halting problem).
On any real computer, always possible as a real computer has a finite number
of states N, and will either halt in less than N cycles or never halt.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 163 bytes --]

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org