RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-13 18:55:08 +00:00
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg_sched: signal the main thread when a task fails

Browse Source 
Avoids a useless -stats_period wait before exiting.

Reported-by: names_are_hard
This commit is contained in:
Anton Khirnov 2024-11-23 07:26:27 +01:00
parent 785ffe67c8
commit 433cf391f5
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fftools/ffmpeg_sched.c
View File

@ -285,6 +285,7 @@ struct Scheduler {
pthread_mutex_t mux_ready_lock; pthread_mutex_t mux_ready_lock;
unsigned nb_mux_done; unsigned nb_mux_done;
unsigned task_failed;
pthread_mutex_t finish_lock; pthread_mutex_t finish_lock;
pthread_cond_t finish_cond; pthread_cond_t finish_cond;
@ -306,7 +307,6 @@ struct Scheduler {
enum SchedulerState state; enum SchedulerState state;
atomic_int terminate; atomic_int terminate;
atomic_int task_failed;
pthread_mutex_t schedule_lock; pthread_mutex_t schedule_lock;
@ -1664,7 +1664,7 @@ fail:
int sch_wait(Scheduler *sch, uint64_t timeout_us, int64_t *transcode_ts) int sch_wait(Scheduler *sch, uint64_t timeout_us, int64_t *transcode_ts)
{ {
int ret, err; int ret;
// convert delay to absolute timestamp // convert delay to absolute timestamp
timeout_us += av_gettime(); timeout_us += av_gettime();
@ -1677,16 +1677,14 @@ int sch_wait(Scheduler *sch, uint64_t timeout_us, int64_t *transcode_ts)
pthread_cond_timedwait(&sch->finish_cond, &sch->finish_lock, &tv); pthread_cond_timedwait(&sch->finish_cond, &sch->finish_lock, &tv);
} }
ret = sch->nb_mux_done == sch->nb_mux; // abort transcoding if any task failed
ret = sch->nb_mux_done == sch->nb_mux || sch->task_failed;
pthread_mutex_unlock(&sch->finish_lock); pthread_mutex_unlock(&sch->finish_lock);
*transcode_ts = atomic_load(&sch->last_dts); *transcode_ts = atomic_load(&sch->last_dts);
// abort transcoding if any task failed return ret;
err = atomic_load(&sch->task_failed);
return ret || err;
} }
static int enc_open(Scheduler *sch, SchEnc *enc, const AVFrame *frame) static int enc_open(Scheduler *sch, SchEnc *enc, const AVFrame *frame)
@ -2552,8 +2550,12 @@ static void *task_wrapper(void *arg)
// EOF is considered normal termination // EOF is considered normal termination
if (ret == AVERROR_EOF) if (ret == AVERROR_EOF)
ret = 0; ret = 0;
if (ret < 0) if (ret < 0) {
atomic_store(&sch->task_failed, 1); pthread_mutex_lock(&sch->finish_lock);
sch->task_failed = 1;
pthread_cond_signal(&sch->finish_cond);
pthread_mutex_unlock(&sch->finish_lock);
}
av_log(task->func_arg, ret < 0 ? AV_LOG_ERROR : AV_LOG_VERBOSE, av_log(task->func_arg, ret < 0 ? AV_LOG_ERROR : AV_LOG_VERBOSE,
"Terminating thread with return code %d (%s)\n", ret, "Terminating thread with return code %d (%s)\n", ret,