virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

fftools/ffmpeg: deprecate -adrift_threshold

Browse Source 
This option has had no effect since -async was removed in
3d86a13b47
This commit is contained in:
Anton Khirnov
2023-04-18 20:03:23 +02:00
parent 0ed1eeb744
commit 5a04aae821
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/ffmpeg.texi
View File

@@ -1749,12 +1749,6 @@ The default is -1.1. One possible usecase is to avoid framedrops in case
of noisy timestamps or to increase frame drop precision in case of exact of noisy timestamps or to increase frame drop precision in case of exact
timestamps. timestamps.
@item -adrift_threshold @var{time}
Set the minimum difference between timestamps and audio data (in seconds) to trigger
adding/dropping samples to make it match the timestamps. This option effectively is
a threshold to select between hard (add/drop) and soft (squeeze/stretch) compensation.
@code{-async} must be set to a positive value.
@item -apad @var{parameters} (@emph{output,per-stream}) @item -apad @var{parameters} (@emph{output,per-stream})
Pad the output audio stream(s). This is the same as applying @code{-af apad}. Pad the output audio stream(s). This is the same as applying @code{-af apad}.
Argument is a string of filter parameters composed the same as with the @code{apad} filter. Argument is a string of filter parameters composed the same as with the @code{apad} filter.

2
fftools/ffmpeg.h
View File

@@ -55,6 +55,7 @@
#define FFMPEG_OPT_MAP_SYNC 1 #define FFMPEG_OPT_MAP_SYNC 1
#define FFMPEG_ROTATION_METADATA 1 #define FFMPEG_ROTATION_METADATA 1
#define FFMPEG_OPT_QPHIST 1 #define FFMPEG_OPT_QPHIST 1
#define FFMPEG_OPT_ADRIFT_THRESHOLD 1
enum VideoSyncMethod { enum VideoSyncMethod {
VSYNC_AUTO = -1, VSYNC_AUTO = -1,
@@ -728,7 +729,6 @@ extern int nb_filtergraphs;
extern char *vstats_filename; extern char *vstats_filename;
extern char *sdp_filename; extern char *sdp_filename;
extern float audio_drift_threshold;
extern float dts_delta_threshold; extern float dts_delta_threshold;
extern float dts_error_threshold; extern float dts_error_threshold;

14
fftools/ffmpeg_opt.c
View File

@@ -1347,6 +1347,14 @@ static int opt_qphist(void *optctx, const char *opt, const char *arg)
} }
#endif #endif
#if FFMPEG_OPT_ADRIFT_THRESHOLD
static int opt_adrift_threshold(void *optctx, const char *opt, const char *arg)
{
av_log(NULL, AV_LOG_WARNING, "Option -%s is deprecated and has no effect\n", opt);
return 0;
}
#endif
#define OFFSET(x) offsetof(OptionsContext, x) #define OFFSET(x) offsetof(OptionsContext, x)
const OptionDef options[] = { const OptionDef options[] = {
/* main options */ /* main options */
@@ -1453,8 +1461,10 @@ const OptionDef options[] = {
"set video sync method globally; deprecated, use -fps_mode", "" }, "set video sync method globally; deprecated, use -fps_mode", "" },
{ "frame_drop_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, { &frame_drop_threshold }, { "frame_drop_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, { &frame_drop_threshold },
"frame drop threshold", "" }, "frame drop threshold", "" },
{ "adrift_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, { &audio_drift_threshold }, #if FFMPEG_OPT_ADRIFT_THRESHOLD
"audio drift threshold", "threshold" }, { "adrift_threshold", HAS_ARG | OPT_EXPERT, { .func_arg = opt_adrift_threshold },
"deprecated, does nothing", "threshold" },
#endif
{ "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 }, { "start_at_zero", OPT_BOOL | OPT_EXPERT, { &start_at_zero },