RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

af_lavrresample: use native libavresample function for output size 

This also drops the unused get_drain_samples() function.
This commit is contained in:
wm4 2015-06-02 22:20:04 +02:00
parent 5a97ae2715
commit e40b663da3
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
audio/filter/af_lavrresample.c
View File

@ -99,9 +99,9 @@ static void drop_all_output(struct af_resample *s)
{ {
while (avresample_read(s->avrctx, NULL, 1000) > 0) {} while (avresample_read(s->avrctx, NULL, 1000) > 0) {}
} }
static int get_drain_samples(struct af_resample *s) static int get_out_samples(struct af_resample *s, int in_samples)
{ {
return avresample_get_out_samples(s->avrctx, 0); return avresample_get_out_samples(s->avrctx, in_samples);
} }
#else #else
static int get_delay(struct af_resample *s) static int get_delay(struct af_resample *s)
@ -112,9 +112,10 @@ static void drop_all_output(struct af_resample *s)
{ {
while (swr_drop_output(s->avrctx, 1000) > 0) {} while (swr_drop_output(s->avrctx, 1000) > 0) {}
} }
static int get_drain_samples(struct af_resample *s) static int get_out_samples(struct af_resample *s, int in_samples)
{ {
return 4096; // libswscale does not have this return av_rescale_rnd(get_delay(s) + in_samples,
s->ctx.out_rate, s->ctx.in_rate, AV_ROUND_UP);
} }
#endif #endif
@ -405,9 +406,7 @@ static int filter(struct af_instance *af, struct mp_audio *in)
{ {
struct af_resample *s = af->priv; struct af_resample *s = af->priv;
int samples = avresample_available(s->avrctx) + int samples = get_out_samples(s, in ? in->samples : 0);
av_rescale_rnd(get_delay(s) + (in ? in->samples : 0),
s->ctx.out_rate, s->ctx.in_rate, AV_ROUND_UP);
struct mp_audio out_format = s->avrctx_fmt; struct mp_audio out_format = s->avrctx_fmt;
struct mp_audio *out = mp_audio_pool_get(af->out_pool, &out_format, samples); struct mp_audio *out = mp_audio_pool_get(af->out_pool, &out_format, samples);