highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffmpeg: shift start time correction to ffmpeg_opt

Browse Source 
In preparation for applying start time correction that accounts for all
factors such as copyts, input_ts_offset ..etc
This commit is contained in:
Gyan Doshi
2022-10-21 18:37:37 +05:30
parent 5661c8715c
commit 93faba449c
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
fftools/ffmpeg.c
View File

@@ -3192,28 +3192,6 @@ static int transcode_init(void)
input_streams[j + ifile->ist_index]->start = av_gettime_relative(); input_streams[j + ifile->ist_index]->start = av_gettime_relative();
} }
// Correct starttime based on the enabled streams
for (i = 0; i < nb_input_files; i++) {
InputFile *ifile = input_files[i];
AVFormatContext *is = ifile->ctx;
int64_t new_start_time = INT64_MAX;
if (is->start_time == AV_NOPTS_VALUE ||
!(is->iformat->flags & AVFMT_TS_DISCONT))
continue;
for (int j = 0; j < is->nb_streams; j++) {
AVStream *st = is->streams[j];
if(st->discard == AVDISCARD_ALL || st->start_time == AV_NOPTS_VALUE)
continue;
new_start_time = FFMIN(new_start_time, av_rescale_q(st->start_time, st->time_base, AV_TIME_BASE_Q));
}
if (new_start_time > is->start_time) {
av_log(is, AV_LOG_VERBOSE, "Correcting start time by %"PRId64"\n", new_start_time - is->start_time);
ifile->ts_offset = -new_start_time;
}
}
/* init input streams */ /* init input streams */
for (i = 0; i < nb_input_streams; i++) for (i = 0; i < nb_input_streams; i++)
if ((ret = init_input_stream(i, error, sizeof(error))) < 0) if ((ret = init_input_stream(i, error, sizeof(error))) < 0)

27
fftools/ffmpeg_opt.c
View File

@@ -202,6 +202,31 @@ int parse_and_set_vsync(const char *arg, int *vsync_var, int file_idx, int st_id
return 0; return 0;
} }
static void correct_input_start_times(void)
{
// Correct starttime based on the enabled streams
for (int i = 0; i < nb_input_files; i++) {
InputFile *ifile = input_files[i];
AVFormatContext *is = ifile->ctx;
int64_t new_start_time = INT64_MAX;
if (is->start_time == AV_NOPTS_VALUE ||
!(is->iformat->flags & AVFMT_TS_DISCONT))
continue;
for (int j = 0; j < is->nb_streams; j++) {
AVStream *st = is->streams[j];
if(st->discard == AVDISCARD_ALL || st->start_time == AV_NOPTS_VALUE)
continue;
new_start_time = FFMIN(new_start_time, av_rescale_q(st->start_time, st->time_base, AV_TIME_BASE_Q));
}
if (new_start_time > is->start_time) {
av_log(is, AV_LOG_VERBOSE, "Correcting start time by %"PRId64"\n", new_start_time - is->start_time);
ifile->ts_offset = -new_start_time;
}
}
}
static int apply_sync_offsets(void) static int apply_sync_offsets(void)
{ {
for (int i = 0; i < nb_input_files; i++) { for (int i = 0; i < nb_input_files; i++) {
@@ -1268,6 +1293,8 @@ int ffmpeg_parse_options(int argc, char **argv)
goto fail; goto fail;
} }
correct_input_start_times();
check_filter_outputs(); check_filter_outputs();
fail: fail: