virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

fftools/ffmpeg: update the reported timestamp at the end

Browse Source 
Reported-by: microchip
This commit is contained in:
Anton Khirnov 2023-12-13 20:10:38 +01:00
parent 98d706b818
commit 2305091a3a
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fftools/ffmpeg.c
View File

@ -941,7 +941,7 @@ static int transcode(Scheduler *sch)
print_report(0, timer_start, cur_time, transcode_ts); print_report(0, timer_start, cur_time, transcode_ts);
} }
ret = sch_stop(sch); ret = sch_stop(sch, &transcode_ts);
/* write the trailer if needed */ /* write the trailer if needed */
for (i = 0; i < nb_output_files; i++) { for (i = 0; i < nb_output_files; i++) {

13
fftools/ffmpeg_sched.c
View File

@ -423,7 +423,7 @@ static void task_init(Scheduler *sch, SchTask *task, enum SchedulerNodeType type
task->func_arg = func_arg; task->func_arg = func_arg;
} }
static int64_t trailing_dts(const Scheduler *sch) static int64_t trailing_dts(const Scheduler *sch, int count_finished)
{ {
int64_t min_dts = INT64_MAX; int64_t min_dts = INT64_MAX;
@ -433,7 +433,7 @@ static int64_t trailing_dts(const Scheduler *sch)
for (unsigned j = 0; j < mux->nb_streams; j++) { for (unsigned j = 0; j < mux->nb_streams; j++) {
const SchMuxStream *ms = &mux->streams[j]; const SchMuxStream *ms = &mux->streams[j];
if (ms->source_finished) if (ms->source_finished && !count_finished)
continue; continue;
if (ms->last_dts == AV_NOPTS_VALUE) if (ms->last_dts == AV_NOPTS_VALUE)
return AV_NOPTS_VALUE; return AV_NOPTS_VALUE;
@ -445,7 +445,7 @@ static int64_t trailing_dts(const Scheduler *sch)
return min_dts == INT64_MAX ? AV_NOPTS_VALUE : min_dts; return min_dts == INT64_MAX ? AV_NOPTS_VALUE : min_dts;
} }
int sch_stop(Scheduler *sch) int sch_stop(Scheduler *sch, int64_t *finish_ts)
{ {
int ret = 0, err; int ret = 0, err;
@ -492,6 +492,9 @@ int sch_stop(Scheduler *sch)
ret = err_merge(ret, err); ret = err_merge(ret, err);
} }
if (finish_ts)
*finish_ts = trailing_dts(sch, 1);
return ret; return ret;
} }
@ -502,7 +505,7 @@ void sch_free(Scheduler **psch)
if (!sch) if (!sch)
return; return;
sch_stop(sch); sch_stop(sch, NULL);
for (unsigned i = 0; i < sch->nb_demux; i++) { for (unsigned i = 0; i < sch->nb_demux; i++) {
SchDemux *d = &sch->demux[i]; SchDemux *d = &sch->demux[i];
@ -1200,7 +1203,7 @@ static void schedule_update_locked(Scheduler *sch)
if (atomic_load(&sch->terminate)) if (atomic_load(&sch->terminate))
return; return;
dts = trailing_dts(sch); dts = trailing_dts(sch, 0);
atomic_store(&sch->last_dts, dts); atomic_store(&sch->last_dts, dts);

2
fftools/ffmpeg_sched.h
View File

@ -127,7 +127,7 @@ Scheduler *sch_alloc(void);
void sch_free(Scheduler **sch); void sch_free(Scheduler **sch);
int sch_start(Scheduler *sch); int sch_start(Scheduler *sch);
int sch_stop(Scheduler *sch); int sch_stop(Scheduler *sch, int64_t *finish_ts);
/** /**
* Wait until transcoding terminates or the specified timeout elapses. * Wait until transcoding terminates or the specified timeout elapses.