RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg: move duration/time_base from InputFile to Demuxer 

They are private to the demuxer and do not need to be visible outside of
it.
This commit is contained in:
Anton Khirnov 2022-10-17 12:49:51 +02:00
parent 5bc1f177d3
commit 541104f3a3
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fftools/ffmpeg.h
View File

@ -441,9 +441,6 @@ typedef struct InputFile {
int eof_reached; /* true if eof reached */ int eof_reached; /* true if eof reached */
int eagain; /* true if last read attempt returned EAGAIN */ int eagain; /* true if last read attempt returned EAGAIN */
int ist_index; /* index of first stream in input_streams */ int ist_index; /* index of first stream in input_streams */
int64_t duration; /* actual duration of the longest stream in a file
at the moment when looping happens */
AVRational time_base; /* time base of the duration */
int64_t input_ts_offset; int64_t input_ts_offset;
int input_sync_ref; int input_sync_ref;

30
fftools/ffmpeg_demux.c
View File

@ -57,6 +57,11 @@ typedef struct Demuxer {
/* number of times input stream should be looped */ /* number of times input stream should be looped */
int loop; int loop;
/* actual duration of the longest stream in a file at the moment when
* looping happens */
int64_t duration;
/* time base of the duration */
AVRational time_base;
AVThreadMessageQueue *in_thread_queue; AVThreadMessageQueue *in_thread_queue;
int thread_queue_size; int thread_queue_size;
@ -91,7 +96,7 @@ static void report_new_stream(InputFile *file, const AVPacket *pkt)
file->nb_streams_warn = pkt->stream_index + 1; file->nb_streams_warn = pkt->stream_index + 1;
} }
static void ifile_duration_update(InputFile *f, InputStream *ist, static void ifile_duration_update(Demuxer *d, InputStream *ist,
int64_t last_duration) int64_t last_duration)
{ {
/* the total duration of the stream, max_pts - min_pts is /* the total duration of the stream, max_pts - min_pts is
@ -100,11 +105,11 @@ static void ifile_duration_update(InputFile *f, InputStream *ist,
ist->max_pts - (uint64_t)ist->min_pts < INT64_MAX - last_duration) ist->max_pts - (uint64_t)ist->min_pts < INT64_MAX - last_duration)
last_duration += ist->max_pts - ist->min_pts; last_duration += ist->max_pts - ist->min_pts;
if (!f->duration || if (!d->duration ||
av_compare_ts(f->duration, f->time_base, av_compare_ts(d->duration, d->time_base,
last_duration, ist->st->time_base) < 0) { last_duration, ist->st->time_base) < 0) {
f->duration = last_duration; d->duration = last_duration;
f->time_base = ist->st->time_base; d->time_base = ist->st->time_base;
} }
} }
@ -133,7 +138,7 @@ static int seek_to_start(Demuxer *d)
got_durations++; got_durations++;
ist = input_streams[ifile->ist_index + dur.stream_idx]; ist = input_streams[ifile->ist_index + dur.stream_idx];
ifile_duration_update(ifile, ist, dur.duration); ifile_duration_update(d, ist, dur.duration);
} }
} else { } else {
for (int i = 0; i < ifile->nb_streams; i++) { for (int i = 0; i < ifile->nb_streams; i++) {
@ -148,7 +153,7 @@ static int seek_to_start(Demuxer *d)
duration = 1; duration = 1;
} }
ifile_duration_update(ifile, ist, duration); ifile_duration_update(d, ist, duration);
} }
} }
@ -158,8 +163,9 @@ static int seek_to_start(Demuxer *d)
return ret; return ret;
} }
static void ts_fixup(InputFile *ifile, AVPacket *pkt, int *repeat_pict) static void ts_fixup(Demuxer *d, AVPacket *pkt, int *repeat_pict)
{ {
InputFile *ifile = &d->f;
InputStream *ist = input_streams[ifile->ist_index + pkt->stream_index]; InputStream *ist = input_streams[ifile->ist_index + pkt->stream_index];
const int64_t start_time = ifile->ctx->start_time; const int64_t start_time = ifile->ctx->start_time;
int64_t duration; int64_t duration;
@ -202,7 +208,7 @@ static void ts_fixup(InputFile *ifile, AVPacket *pkt, int *repeat_pict)
if (pkt->dts != AV_NOPTS_VALUE) if (pkt->dts != AV_NOPTS_VALUE)
pkt->dts *= ist->ts_scale; pkt->dts *= ist->ts_scale;
duration = av_rescale_q(ifile->duration, ifile->time_base, ist->st->time_base); duration = av_rescale_q(d->duration, d->time_base, ist->st->time_base);
if (pkt->pts != AV_NOPTS_VALUE) { if (pkt->pts != AV_NOPTS_VALUE) {
pkt->pts += duration; pkt->pts += duration;
ist->max_pts = FFMAX(pkt->pts, ist->max_pts); ist->max_pts = FFMAX(pkt->pts, ist->max_pts);
@ -290,7 +296,7 @@ static void *input_thread(void *arg)
} }
} }
ts_fixup(f, pkt, &msg.repeat_pict); ts_fixup(d, pkt, &msg.repeat_pict);
msg.pkt = av_packet_alloc(); msg.pkt = av_packet_alloc();
if (!msg.pkt) { if (!msg.pkt) {
@ -1011,8 +1017,8 @@ int ifile_open(OptionsContext *o, const char *filename)
f->rate_emu = o->rate_emu; f->rate_emu = o->rate_emu;
f->accurate_seek = o->accurate_seek; f->accurate_seek = o->accurate_seek;
d->loop = o->loop; d->loop = o->loop;
f->duration = 0; d->duration = 0;
f->time_base = (AVRational){ 1, 1 }; d->time_base = (AVRational){ 1, 1 };
f->readrate = o->readrate ? o->readrate : 0.0; f->readrate = o->readrate ? o->readrate : 0.0;
if (f->readrate < 0.0f) { if (f->readrate < 0.0f) {