* configure.ac:

* src/Makefile.am:
* src/flump3dec.c:
* src/mp3-c-synth.c: (mp3_dewindow_output):
* src/mp3-c.c: (inv_mdct_l), (inv_mdct), (III_hybrid),
(mp3_c_init):
Drop liboil support.


git-svn-id: https://core.fluendo.com/gstreamer/svn/trunk/gst-fluendo-mp3@2602 2b0047a9-a6d8-0310-accf-f7200b2a168c

6 files changed, 12 insertions, 59 deletions

diff --git a/ChangeLog b/ChangeLog
index 666582f..dc784ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-04-02  Josep Torra  <josep@fluendo.com>
+
+	* configure.ac:
+	* src/Makefile.am:
+	* src/flump3dec.c:
+	* src/mp3-c-synth.c: (mp3_dewindow_output):
+	* src/mp3-c.c: (inv_mdct_l), (inv_mdct), (III_hybrid),
+	(mp3_c_init):
+	Drop liboil support.
+
 2014-02-24  Release Maker <nomail@fluendo.com>
 
 	* configure.ac: Back to TRUNK.
diff --git a/configure.ac b/configure.ac
index 6d97148..c7f32f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,27 +84,6 @@ fi
 dnl Setup for finding IPP libraries. Attempt to detect by default.
 AG_NEED_IPP("ippac ipps")
 
-HAVE_LIBOIL=false
-test_liboil=false
-
-AC_ARG_WITH(liboil,
-    AC_HELP_STRING([--with-liboil],
-        [Turn on/off use of Liboil (default=no)]),
-	[if test "x$withval" = "xyes"; then test_liboil=true; fi])
-
-dnl When building without IPP, we can use liboil
-if test "x$test_liboil" = "xtrue"; then
-  MIN_LIBOIL=0.3.7
-  PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= $MIN_LIBOIL, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
-  if test "x$HAVE_LIBOIL" = "xyes"; then
-    AC_DEFINE(USE_LIBOIL, TRUE, [Build liboil code paths])
-  fi
-else
-AC_MSG_CHECKING([for liboil-0.3])
-echo "check disabled"
-fi
-AM_CONDITIONAL(USE_LIBOIL, test "x$HAVE_LIBOIL" = "xtrue")
-
 dnl Now we're ready to ask for gstreamer libs and cflags
 dnl And we can also ask for the right version of gstreamer
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 5f1d08c..70838cc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,14 +48,13 @@ libgstflump3dec_la_CFLAGS = \
     $(GST_AUDIO_CFLAGS) \
     $(ERROR_CFLAGS) \
     $(CPU_TUNE_CFLAGS) \
-    $(DECODER_INCLUDES) \
-    $(LIBOIL_CFLAGS)
+    $(DECODER_INCLUDES)
 
 libgstflump3dec_la_LIBADD = \
     $(GST_LIBS) \
     $(GST_AUDIO_LIBS) \
     $(DECODER_LIBS) \
-    $(LIBOIL_LIBS) -lm
+    -lm
 
 libgstflump3dec_la_LDFLAGS = \
     $(GST_PLUGIN_LDFLAGS) \
diff --git a/src/flump3dec.c b/src/flump3dec.c
index 6414d83..590bf1f 100644
--- a/src/flump3dec.c
+++ b/src/flump3dec.c
@@ -15,12 +15,8 @@ GST_DEBUG_CATEGORY (flump3debug);
 #ifdef USE_IPP
 #define LONGNAME "Fluendo MP3 Decoder (IPP build)"
 #else
-#ifdef USE_LIBOIL
-#define LONGNAME "Fluendo MP3 Decoder (liboil build)"
-#else
 #define LONGNAME "Fluendo MP3 Decoder (C build)"
 #endif
-#endif
 
 /* static vars */
 
diff --git a/src/mp3-c-synth.c b/src/mp3-c-synth.c
index 8f0f699..aa7726e 100644
--- a/src/mp3-c-synth.c
+++ b/src/mp3-c-synth.c
@@ -12,10 +12,6 @@
 #include "table-dewindow.h"
 #include "mp3-cos-tables.h"
 
-#ifdef USE_LIBOIL
-#include <liboil/liboil.h>
-#endif
-
 #define OPT_SYNTH
 
 void
@@ -435,21 +431,10 @@ mp3_dewindow_output (gfloat *u_vec, short *samples, gfloat* window)
   gfloat *u_vec0;
 
   /* dewindowing */
-#ifdef USE_LIBOIL
-  oil_multiply_f32 (u_vec, u_vec, window, HAN_SIZE);
-#else
   for (i = 0; i < HAN_SIZE; i++)
     u_vec[i] *= dewindow[i];
-#endif
 
   /* Now calculate 32 samples */
-#ifdef USE_LIBOIL
-  u_vec0 = u_vec + 32;
-  for (i = 0; i < 15; i++) {
-    oil_add_f32 (u_vec, u_vec, u_vec0, 32);
-    u_vec0 += 32;
-  }
-#else
   for (i = 0; i < 32; i++) {
     gfloat sum;
     u_vec0 = u_vec + i;
@@ -470,7 +455,6 @@ mp3_dewindow_output (gfloat *u_vec, short *samples, gfloat* window)
     sum += u_vec0[15 << 5];
     u_vec0[0] += sum;
   }
-#endif
 
   for (i = 0; i < 32; i++) {
     gfloat sample = u_vec[i];
diff --git a/src/mp3-c.c b/src/mp3-c.c
index c011c6f..a8371be 100644
--- a/src/mp3-c.c
+++ b/src/mp3-c.c
@@ -14,9 +14,6 @@
 #endif
 
 #include <gst/gst.h>
-#ifdef USE_LIBOIL
-#include <liboil/liboil.h>
-#endif
 
 #include "mp3tl-priv.h"
 #include "decode.h"
@@ -1246,8 +1243,6 @@ inv_mdct_l (gfloat invec[18], gfloat outvec[36])
 
 #if defined(USE_ARM_VFP) && defined(__VFP_FP__) && !defined(__SOFTFP__)
   calculate_H (H, invec);
-#elif defined(USE_LIBOIL)
-  oil_add_f32 (H, invec, invec + 1, 17);
 #else
   for (i = 0; i < 17; i++)
     H[i] = invec[i] + invec[i + 1];
@@ -1482,8 +1477,6 @@ inv_mdct (gfloat in[18], gfloat out[36], gint block_type)
     /* Window the imdct result */
 #if defined(USE_ARM_VFP) && defined(__VFP_FP__) && !defined(__SOFTFP__)
     dewindow_block_type_other (out, out, (gfloat *) win[block_type]);
-#elif defined(USE_LIBOIL)
-    oil_multiply_f32 (out, out, win[block_type], 36);
 #else
     for (i = 0; i < 36; i++)
       out[i] = out[i] * win[block_type][i];
@@ -1610,10 +1603,6 @@ III_hybrid (gfloat fsIn[SSLIMIT], gfloat tsOut[SSLIMIT], int sb, int ch,
   /* overlap addition */
 #if defined(USE_ARM_VFP) && defined(__VFP_FP__) && !defined(__SOFTFP__)
   overlap_addition (tsOut, rawout, (gfloat *) tl->c_impl.prevblck[ch][sb]);
-#elif defined(USE_LIBOIL)
-  oil_add_f32 (tsOut, rawout, (gfloat *) tl->c_impl.prevblck[ch][sb], SSLIMIT);
-  oil_memcpy (tl->c_impl.prevblck[ch][sb], rawout + 18,
-      SSLIMIT * sizeof (gfloat));
 #else
   for (i = 0; i < SSLIMIT; i++) {
     tsOut[i] = (gfloat) (rawout[i] + tl->c_impl.prevblck[ch][sb][i]);
@@ -1833,10 +1822,6 @@ c_decode_mp3 (mp3tl * tl)
 gboolean
 mp3_c_init (mp3tl * tl)
 {
-#ifdef USE_LIBOIL
-  oil_init ();
-#endif
-
   init_hybrid (&tl->c_impl);
   init_mdct ();