diff options
| author | Alexis Ballier <aballier@gentoo.org> | 2013-08-01 17:55:25 -0400 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-06 10:15:41 -0400 |
| commit | fb1bd7e4c4a723436d7e8e26862d90a0347a4d08 (patch) | |
| tree | df527cf8c93a7b03e382e9da96512e115d1f63b8 /lib | |
| parent | 758f3532d05be3989660b3c05d52eccae028e2b2 (diff) | |
DllSwResample: Clean up libavresample support that is broken anyway.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/DllSwResample.h | 43 |
1 files changed, 1 insertions, 42 deletions
diff --git a/lib/DllSwResample.h b/lib/DllSwResample.h index 57eeda133e..686aec6411 100644 --- a/lib/DllSwResample.h +++ b/lib/DllSwResample.h @@ -37,16 +37,7 @@ extern "C" { #pragma warning(disable:4244) #endif #if (defined USE_EXTERNAL_FFMPEG) - #if HAVE_LIBSWRESAMPLE_SWRESAMPLE_H - #include <libswresample/swresample.h> - #elif HAVE_LIBAVRESAMPLE_AVRESAMPLE_H - #include <libavresample/avresample.h> - #include <libavutil/opt.h> - #include <libavutil/samplefmt.h> - #define SwrContext AVAudioResampleContext - #else - #error "Either libswresample or libavresample is needed!" - #endif + #include <libswresample/swresample.h> #else #include "libswresample/swresample.h" #endif @@ -67,7 +58,6 @@ public: #if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) -#if HAVE_LIBSWRESAMPLE_SWRESAMPLE_H || (defined TARGET_DARWIN) // Use direct mapping class DllSwResample : public DllDynamic, DllSwResampleInterface { @@ -91,37 +81,6 @@ public: virtual int swr_set_channel_mapping (struct SwrContext *s, const int *channel_map) { return ::swr_set_channel_mapping(s, channel_map); } virtual int swr_set_matrix(struct SwrContext *s, const double *matrix, int stride) { return ::swr_set_matrix(s, matrix, stride); } }; -#else -// Wrap the same API through libavresample. -class DllSwResample : public DllDynamic, DllSwResampleInterface -{ -public: - virtual ~DllSwResample() {} - - // DLL faking. - virtual bool ResolveExports() { return true; } - virtual bool Load() { -#if !defined(TARGET_DARWIN) - CLog::Log(LOGDEBUG, "DllAvFormat: Using libavresample system library"); -#endif - return true; - } - virtual void Unload() {} - virtual struct SwrContext *swr_alloc_set_opts(struct SwrContext *s, int64_t out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate, int64_t in_ch_layout, enum AVSampleFormat in_sample_fmt, int in_sample_rate, int log_offset, void *log_ctx) { - AVAudioResampleContext *ret = ::avresample_alloc_context(); - av_opt_set_int(ret, "out_channel_layout", out_ch_layout , 0); - av_opt_set_int(ret, "out_sample_fmt" , out_sample_fmt , 0); - av_opt_set_int(ret, "out_sample_rate" , out_sample_rate, 0); - av_opt_set_int(ret, "in_channel_layout" , in_ch_layout , 0); - av_opt_set_int(ret, "in_sample_fmt" , in_sample_fmt , 0); - av_opt_set_int(ret, "in_sample_rate" , in_sample_rate , 0); - return ret; - } - virtual int swr_init(struct SwrContext *s) { return ::avresample_open(s); } - virtual void swr_free(struct SwrContext **s){ ::avresample_close(*s); *s = NULL; } - virtual int swr_convert(struct SwrContext *s, uint8_t **out, int out_count, const uint8_t **in , int in_count){ return ::avresample_convert(s, out, 0, out_count, (uint8_t**)in, 0,in_count); } -}; -#endif #else |