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

fftools/ffmpeg: reduce -re to -readrate 1 

They are exactly equivalent, so there is no point in maintaining a
separate flag for -re.
This commit is contained in:
Anton Khirnov 2023-05-02 15:27:24 +02:00
parent 007ec49db8
commit 0e00d23510
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fftools/ffmpeg.c
View File

@ -1564,7 +1564,7 @@ static int transcode_init(void)
/* init framerate emulation */ /* init framerate emulation */
for (int i = 0; i < nb_input_files; i++) { for (int i = 0; i < nb_input_files; i++) {
InputFile *ifile = input_files[i]; InputFile *ifile = input_files[i];
if (ifile->readrate || ifile->rate_emu) if (ifile->readrate)
for (int j = 0; j < ifile->nb_streams; j++) for (int j = 0; j < ifile->nb_streams; j++)
ifile->streams[j]->start = av_gettime_relative(); ifile->streams[j]->start = av_gettime_relative();
} }

1
fftools/ffmpeg.h
View File

@ -484,7 +484,6 @@ typedef struct InputFile {
InputStream **streams; InputStream **streams;
int nb_streams; int nb_streams;
int rate_emu;
float readrate; float readrate;
int accurate_seek; int accurate_seek;

16
fftools/ffmpeg_demux.c
View File

@ -450,13 +450,12 @@ int ifile_get_packet(InputFile *f, AVPacket **pkt)
return ret; return ret;
} }
if (f->readrate || f->rate_emu) { if (f->readrate) {
int i; int i;
int64_t file_start = copy_ts * ( int64_t file_start = copy_ts * (
(f->start_time_effective != AV_NOPTS_VALUE ? f->start_time_effective * !start_at_zero : 0) + (f->start_time_effective != AV_NOPTS_VALUE ? f->start_time_effective * !start_at_zero : 0) +
(f->start_time != AV_NOPTS_VALUE ? f->start_time : 0) (f->start_time != AV_NOPTS_VALUE ? f->start_time : 0)
); );
float scale = f->rate_emu ? 1.0 : f->readrate;
int64_t burst_until = AV_TIME_BASE * d->readrate_initial_burst; int64_t burst_until = AV_TIME_BASE * d->readrate_initial_burst;
for (i = 0; i < f->nb_streams; i++) { for (i = 0; i < f->nb_streams; i++) {
InputStream *ist = f->streams[i]; InputStream *ist = f->streams[i];
@ -464,7 +463,7 @@ int ifile_get_packet(InputFile *f, AVPacket **pkt)
if (!ist->nb_packets) continue; if (!ist->nb_packets) continue;
stream_ts_offset = FFMAX(ist->first_dts != AV_NOPTS_VALUE ? ist->first_dts : 0, file_start); stream_ts_offset = FFMAX(ist->first_dts != AV_NOPTS_VALUE ? ist->first_dts : 0, file_start);
pts = av_rescale(ist->dts, 1000000, AV_TIME_BASE); pts = av_rescale(ist->dts, 1000000, AV_TIME_BASE);
now = (av_gettime_relative() - ist->start) * scale + stream_ts_offset; now = (av_gettime_relative() - ist->start) * f->readrate + stream_ts_offset;
if (pts - burst_until > now) if (pts - burst_until > now)
return AVERROR(EAGAIN); return AVERROR(EAGAIN);
} }
@ -1223,7 +1222,6 @@ int ifile_open(const OptionsContext *o, const char *filename)
f->input_sync_ref = o->input_sync_ref; f->input_sync_ref = o->input_sync_ref;
f->input_ts_offset = o->input_ts_offset; f->input_ts_offset = o->input_ts_offset;
f->ts_offset = o->input_ts_offset - (copy_ts ? (start_at_zero && ic->start_time != AV_NOPTS_VALUE ? ic->start_time : 0) : timestamp); f->ts_offset = o->input_ts_offset - (copy_ts ? (start_at_zero && ic->start_time != AV_NOPTS_VALUE ? ic->start_time : 0) : timestamp);
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;
d->duration = 0; d->duration = 0;
@ -1234,12 +1232,14 @@ int ifile_open(const OptionsContext *o, const char *filename)
av_log(d, AV_LOG_ERROR, "Option -readrate is %0.3f; it must be non-negative.\n", f->readrate); av_log(d, AV_LOG_ERROR, "Option -readrate is %0.3f; it must be non-negative.\n", f->readrate);
exit_program(1); exit_program(1);
} }
if (f->readrate && f->rate_emu) { if (o->rate_emu) {
av_log(d, AV_LOG_WARNING, "Both -readrate and -re set. Using -readrate %0.3f.\n", f->readrate); if (f->readrate) {
f->rate_emu = 0; av_log(d, AV_LOG_WARNING, "Both -readrate and -re set. Using -readrate %0.3f.\n", f->readrate);
} else
f->readrate = 1.0f;
} }
if (f->readrate || f->rate_emu) { if (f->readrate) {
d->readrate_initial_burst = o->readrate_initial_burst ? o->readrate_initial_burst : 0.5; d->readrate_initial_burst = o->readrate_initial_burst ? o->readrate_initial_burst : 0.5;
if (d->readrate_initial_burst < 0.0) { if (d->readrate_initial_burst < 0.0) {
av_log(d, AV_LOG_ERROR, av_log(d, AV_LOG_ERROR,