Commit 315f9e92 authored by Rodger Combs's avatar Rodger Combs Committed by Michael Niedermayer

ffmpeg_opt: Add -start_at_zero option.

This automatically shifts input timestamps to start at 0 instead of the file's
starting timestamp when using -copyts.
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 832b4c0a
...@@ -91,6 +91,7 @@ int do_benchmark_all = 0; ...@@ -91,6 +91,7 @@ int do_benchmark_all = 0;
int do_hex_dump = 0; int do_hex_dump = 0;
int do_pkt_dump = 0; int do_pkt_dump = 0;
int copy_ts = 0; int copy_ts = 0;
int start_at_zero = 0;
int copy_tb = -1; int copy_tb = -1;
int debug_ts = 0; int debug_ts = 0;
int exit_on_error = 0; int exit_on_error = 0;
...@@ -921,7 +922,7 @@ static int open_input_file(OptionsContext *o, const char *filename) ...@@ -921,7 +922,7 @@ static int open_input_file(OptionsContext *o, const char *filename)
f->start_time = o->start_time; f->start_time = o->start_time;
f->recording_time = o->recording_time; f->recording_time = o->recording_time;
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 ? 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->nb_streams = ic->nb_streams; f->nb_streams = ic->nb_streams;
f->rate_emu = o->rate_emu; f->rate_emu = o->rate_emu;
f->accurate_seek = o->accurate_seek; f->accurate_seek = o->accurate_seek;
...@@ -2840,6 +2841,8 @@ const OptionDef options[] = { ...@@ -2840,6 +2841,8 @@ const OptionDef options[] = {
"audio drift threshold", "threshold" }, "audio drift threshold", "threshold" },
{ "copyts", OPT_BOOL | OPT_EXPERT, { &copy_ts }, { "copyts", OPT_BOOL | OPT_EXPERT, { &copy_ts },
"copy timestamps" }, "copy timestamps" },
{ "start_at_zero", OPT_BOOL | OPT_EXPERT, { &start_at_zero },
"shift input timestamps to start at 0 when using copyts" },
{ "copytb", HAS_ARG | OPT_INT | OPT_EXPERT, { &copy_tb }, { "copytb", HAS_ARG | OPT_INT | OPT_EXPERT, { &copy_tb },
"copy input stream time base when stream copying", "mode" }, "copy input stream time base when stream copying", "mode" },
{ "shortest", OPT_BOOL | OPT_EXPERT | OPT_OFFSET | { "shortest", OPT_BOOL | OPT_EXPERT | OPT_OFFSET |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment