Merge pull request #1290 from aballier/swresample

[ffmpeg] Convert from av_audio_convert API to the swresample one.

2 files changed, 65 insertions, 43 deletions

diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h
index 7805d342fa..752d36a4f2 100644
--- a/lib/DllAvCodec.h
+++ b/lib/DllAvCodec.h
@@ -58,20 +58,8 @@ extern "C" {
       #include <ffmpeg/avformat.h>
     #endif
   #endif
-
-  /* From non-public audioconvert.h */
-  struct AVAudioConvert;
-  typedef struct AVAudioConvert AVAudioConvert;
-  AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels,
-                                         enum AVSampleFormat in_fmt, int in_channels,
-                                         const float *matrix, int flags);
-  void av_audio_convert_free(AVAudioConvert *ctx);
-  int av_audio_convert(AVAudioConvert *ctx,
-                             void * const out[6], const int out_stride[6],
-                       const void * const  in[6], const int  in_stride[6], int len);
 #else
   #include "libavcodec/avcodec.h"
-  #include "libavcodec/audioconvert.h"
 #endif
 }
 
@@ -115,13 +103,6 @@ public:
   virtual int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic)=0;
   virtual void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic)=0;
   virtual AVCodec *av_codec_next(AVCodec *c)=0;
-  virtual AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels,
-                                                 enum AVSampleFormat in_fmt , int in_channels,
-                                                 const float *matrix        , int flags)=0;
-  virtual void av_audio_convert_free(AVAudioConvert *ctx)=0;
-  virtual int av_audio_convert(AVAudioConvert *ctx,
-                                     void * const out[6], const int out_stride[6],
-                               const void * const  in[6], const int  in_stride[6], int len)=0;
   virtual int av_dup_packet(AVPacket *pkt)=0;
   virtual void av_init_packet(AVPacket *pkt)=0;
 };
@@ -189,17 +170,6 @@ public:
   virtual void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic) { ::avcodec_default_release_buffer(s, pic); }
   virtual enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat *fmt) { return ::avcodec_default_get_format(s, fmt); }
   virtual AVCodec *av_codec_next(AVCodec *c) { return ::av_codec_next(c); }
-  virtual AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels,
-                                                 enum AVSampleFormat in_fmt , int in_channels,
-                                                 const float *matrix        , int flags)
-          { return ::av_audio_convert_alloc(out_fmt, out_channels, in_fmt, in_channels, matrix, flags); }
-  virtual void av_audio_convert_free(AVAudioConvert *ctx)
-          { ::av_audio_convert_free(ctx); }
-
-  virtual int av_audio_convert(AVAudioConvert *ctx,
-                                     void * const out[6], const int out_stride[6],
-                               const void * const  in[6], const int  in_stride[6], int len)
-          { return ::av_audio_convert(ctx, out, out_stride, in, in_stride, len); }
 
   virtual int av_dup_packet(AVPacket *pkt) { return ::av_dup_packet(pkt); }
   virtual void av_init_packet(AVPacket *pkt) { return ::av_init_packet(pkt); }
@@ -251,13 +221,6 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface
   DEFINE_METHOD2(enum PixelFormat, avcodec_default_get_format, (struct AVCodecContext *p1, const enum PixelFormat *p2))
 
   DEFINE_METHOD1(AVCodec*, av_codec_next, (AVCodec *p1))
-  DEFINE_METHOD6(AVAudioConvert*, av_audio_convert_alloc, (enum AVSampleFormat p1, int p2,
-                                                           enum AVSampleFormat p3, int p4,
-                                                           const float *p5, int p6))
-  DEFINE_METHOD1(void, av_audio_convert_free, (AVAudioConvert *p1));
-  DEFINE_METHOD6(int,  av_audio_convert,      (AVAudioConvert *p1,
-                                                     void * const p2[6], const int p3[6],
-                                               const void * const p4[6], const int p5[6], int p6))
   BEGIN_METHOD_RESOLVE()
     RESOLVE_METHOD(avcodec_flush_buffers)
     RESOLVE_METHOD_RENAME(avcodec_open2,avcodec_open2_dont_call)
@@ -288,9 +251,6 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface
     RESOLVE_METHOD(avcodec_default_release_buffer)
     RESOLVE_METHOD(avcodec_default_get_format)
     RESOLVE_METHOD(av_codec_next)
-    RESOLVE_METHOD(av_audio_convert_alloc)
-    RESOLVE_METHOD(av_audio_convert_free)
-    RESOLVE_METHOD(av_audio_convert)
     RESOLVE_METHOD(av_dup_packet)
     RESOLVE_METHOD(av_init_packet)
   END_METHOD_RESOLVE()
diff --git a/lib/DllSwResample.h b/lib/DllSwResample.h
index 8a990720c3..05beab6a64 100644
--- a/lib/DllSwResample.h
+++ b/lib/DllSwResample.h
@@ -24,6 +24,7 @@
   #include "config.h"
 #endif
 #include "DynamicDll.h"
+#include "utils/log.h"
 
 extern "C" {
 #ifndef HAVE_MMX
@@ -36,17 +37,36 @@ extern "C" {
 #pragma warning(disable:4244)
 #endif
 #if (defined USE_EXTERNAL_FFMPEG)
-  #include <libswresample/swresample.h>
+  #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
 #else
   #include "libswresample/swresample.h"
 #endif
 }
 
+class DllSwResampleInterface
+{
+public:
+  virtual ~DllSwResampleInterface() {}
+  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)=0;
+  virtual int swr_init(struct SwrContext *s)=0;
+  virtual void swr_free(struct SwrContext **s)=0;
+  virtual int swr_convert(struct SwrContext *s, uint8_t **out, int out_count, const uint8_t **in , int in_count)=0;
+};
 
 #if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) 
 
+#if HAVE_LIBSWRESAMPLE_SWRESAMPLE_H || (defined TARGET_DARWIN)
 // Use direct mapping
-class DllSwResample : public DllDynamic
+class DllSwResample : public DllDynamic, DllSwResampleInterface
 {
 public:
   virtual ~DllSwResample() {}
@@ -58,17 +78,59 @@ public:
     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) { return ::swr_alloc_set_opts(s, out_ch_layout, out_sample_fmt, out_sample_rate, in_ch_layout, in_sample_fmt, in_sample_rate, log_offset, log_ctx); }
+  virtual int swr_init(struct SwrContext *s) { return ::swr_init(s); }
+  virtual void swr_free(struct SwrContext **s){ return ::swr_free(s); }
+  virtual int swr_convert(struct SwrContext *s, uint8_t **out, int out_count, const uint8_t **in , int in_count){ return ::swr_convert(s, out, out_count, in, in_count); }
+};
+#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() {
+    CLog::Log(LOGDEBUG, "DllAvFormat: Using libavresample system library");
+    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, (void**)out, 0, out_count, (void**)in, 0,in_count); }
 };
+#endif
 
 #else
 
-class DllSwResample : public DllDynamic
+class DllSwResample : public DllDynamic, DllSwResampleInterface
 {
   DECLARE_DLL_WRAPPER(DllSwResample, DLL_PATH_LIBSWRESAMPLE)
 
   LOAD_SYMBOLS()
 
+  DEFINE_METHOD9(SwrContext*, swr_alloc_set_opts, (struct SwrContext *p1, int64_t p2, enum AVSampleFormat p3, int p4, int64_t p5, enum AVSampleFormat p6, int p7, int p8, void * p9));
+  DEFINE_METHOD1(int, swr_init, (struct SwrContext *p1))
+  DEFINE_METHOD1(void, swr_free, (struct SwrContext **p1))
+  DEFINE_METHOD5(int, swr_convert, (struct SwrContext *p1, uint8_t **p2, int p3, const uint8_t **p4, int p5))
+
   BEGIN_METHOD_RESOLVE()
+    RESOLVE_METHOD(swr_alloc_set_opts)
+    RESOLVE_METHOD(swr_init)
+    RESOLVE_METHOD(swr_free)
+    RESOLVE_METHOD(swr_convert)
   END_METHOD_RESOLVE()
 
   /* dependencies of libavformat */