diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-10 14:13:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-10 14:13:10 +0100 |
| commit | cfdd68eb5fb0ef8423e860103ad4e5510994f1da (patch) | |
| tree | 9ea43b250723775329741e59d5bc2dd861bcb7be /src/lib/resampler.cc | |
| parent | 1dcfb3a26085ebb3703f40e2f51e43ce3d98be50 (diff) | |
| parent | 5575a950f13dbed1e60d733aee71b316c3429ae0 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/resampler.cc')
| -rw-r--r-- | src/lib/resampler.cc | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc index 00121384d..9a81df499 100644 --- a/src/lib/resampler.cc +++ b/src/lib/resampler.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ extern "C" { #include "libavutil/channel_layout.h" +#include "libavutil/opt.h" } #include "resampler.h" #include "audio_buffers.h" @@ -37,24 +38,19 @@ Resampler::Resampler (int in, int out, int channels) , _out_rate (out) , _channels (channels) { - /* We will be using planar float data when we call the - resampler. As far as I can see, the audio channel - layout is not necessary for our purposes; it seems - only to be used get the number of channels and - decide if rematrixing is needed. It won't be, since - input and output layouts are the same. - */ - - _swr_context = swr_alloc_set_opts ( - 0, - av_get_default_channel_layout (_channels), - AV_SAMPLE_FMT_FLTP, - _out_rate, - av_get_default_channel_layout (_channels), - AV_SAMPLE_FMT_FLTP, - _in_rate, - 0, 0 - ); + _swr_context = swr_alloc (); + + /* Sample formats */ + av_opt_set_int (_swr_context, "isf", AV_SAMPLE_FMT_FLTP, 0); + av_opt_set_int (_swr_context, "osf", AV_SAMPLE_FMT_FLTP, 0); + + /* Channel counts */ + av_opt_set_int (_swr_context, "ich", _channels, 0); + av_opt_set_int (_swr_context, "och", _channels, 0); + + /* Sample rates */ + av_opt_set_int (_swr_context, "isr", _in_rate, 0); + av_opt_set_int (_swr_context, "osr", _out_rate, 0); swr_init (_swr_context); } |