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

lavfi/atempo: fix tempo range limit inconsistency 

yae_set_tempo was overlooked when max tempo limit was raised to 100.

tested with:
./ffmpeg_g -i Delerium/SemanticSpaces/Gateway.mp3 \
-af asendcmd=f=asendcmd.cfg,atempo=1.0 -y /tmp/asendcmd-atempo.wav

where asendcmd.cfg was:
15.0-45.0 [enter] atempo tempo 2.0,
          [leave] atempo tempo 0.5;

60.0-300.0 [enter] atempo tempo 4.0,
           [leave] atempo tempo 1.0;
This commit is contained in:
Pavel Koshevoy 2018-10-03 22:59:31 -06:00
parent d39fae0886
commit 03123e4053
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavfilter/af_atempo.c
View File

@ -149,11 +149,16 @@ typedef struct ATempoContext {
uint64_t nsamples_out; uint64_t nsamples_out;
} ATempoContext; } ATempoContext;
#define YAE_ATEMPO_MIN 0.5
#define YAE_ATEMPO_MAX 100.0
#define OFFSET(x) offsetof(ATempoContext, x) #define OFFSET(x) offsetof(ATempoContext, x)
static const AVOption atempo_options[] = { static const AVOption atempo_options[] = {
{ "tempo", "set tempo scale factor", { "tempo", "set tempo scale factor",
OFFSET(tempo), AV_OPT_TYPE_DOUBLE, { .dbl = 1.0 }, 0.5, 100.0, OFFSET(tempo), AV_OPT_TYPE_DOUBLE, { .dbl = 1.0 },
YAE_ATEMPO_MIN,
YAE_ATEMPO_MAX,
AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_FILTERING_PARAM }, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_FILTERING_PARAM },
{ NULL } { NULL }
}; };
@ -331,9 +336,9 @@ static int yae_set_tempo(AVFilterContext *ctx, const char *arg_tempo)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (tempo < 0.5 || tempo > 2.0) { if (tempo < YAE_ATEMPO_MIN || tempo > YAE_ATEMPO_MAX) {
av_log(ctx, AV_LOG_ERROR, "Tempo value %f exceeds [0.5, 2.0] range\n", av_log(ctx, AV_LOG_ERROR, "Tempo value %f exceeds [%f, %f] range\n",
tempo); tempo, YAE_ATEMPO_MIN, YAE_ATEMPO_MAX);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }