lavfi/afade: use av_rescale()

Should not make a difference, but its good idea.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-07-10 19:08:16 +00:00
parent 2ea60971dc
commit 1e89f74902

View File

@ -200,11 +200,10 @@ FADE(flt, float)
FADE(s16, int16_t) FADE(s16, int16_t)
FADE(s32, int32_t) FADE(s32, int32_t)
static int config_output(AVFilterLink *outlink) static int config_input(AVFilterLink *inlink)
{ {
AVFilterContext *ctx = outlink->src; AVFilterContext *ctx = inlink->dst;
AudioFadeContext *afade = ctx->priv; AudioFadeContext *afade = ctx->priv;
AVFilterLink *inlink = ctx->inputs[0];
switch (inlink->format) { switch (inlink->format) {
case AV_SAMPLE_FMT_DBL: afade->fade_samples = fade_samples_dbl; break; case AV_SAMPLE_FMT_DBL: afade->fade_samples = fade_samples_dbl; break;
@ -218,9 +217,9 @@ static int config_output(AVFilterLink *outlink)
} }
if (afade->duration) if (afade->duration)
afade->nb_samples = afade->duration * inlink->sample_rate / AV_TIME_BASE; afade->nb_samples = av_rescale(afade->duration, inlink->sample_rate, AV_TIME_BASE);
if (afade->start_time) if (afade->start_time)
afade->start_sample = afade->start_time * inlink->sample_rate / AV_TIME_BASE; afade->start_sample = av_rescale(afade->start_time, inlink->sample_rate, AV_TIME_BASE);
return 0; return 0;
} }
@ -275,6 +274,7 @@ static const AVFilterPad avfilter_af_afade_inputs[] = {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.filter_frame = filter_frame, .filter_frame = filter_frame,
.config_props = config_input,
}, },
{ NULL } { NULL }
}; };
@ -283,7 +283,6 @@ static const AVFilterPad avfilter_af_afade_outputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.config_props = config_output,
}, },
{ NULL } { NULL }
}; };