Merge remote-tracking branch 'qatar/master'

* qatar/master:
  os_support: Choose between direct.h and io.h using a configure check
  os_support: Include io.h instead of direct.h on mingw32ce
  x86: ac3dsp: Only refer to the ac3_downmix_sse symbol if it has been declared
  swscale: Remove two bogus asserts
  ac3: move ac3_downmix() from dsputil to ac3dsp
  lavr/audio_mix_matrix: acknowledge the existence of LFE2.
  mlp_parser: avoid mapping multiple disctinct TrueHD channels to the same Libav channel.
  lavu/audioconvert: add a second low frequency channel.

Conflicts:
	doc/APIchanges
	libavcodec/ac3dsp.c
	libavcodec/ac3dsp.h
	libavcodec/mlp_parser.c
	libavutil/audioconvert.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2 files changed, 121 insertions, 111 deletions

diff --git a/libavcodec/x86/ac3dsp_init.c b/libavcodec/x86/ac3dsp_init.c
index 516a6adb19..b1e8cfb2dd 100644
--- a/libavcodec/x86/ac3dsp_init.c
+++ b/libavcodec/x86/ac3dsp_init.c
@@ -19,9 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
 #include "dsputil_mmx.h"
+#include "libavcodec/ac3.h"
 #include "libavcodec/ac3dsp.h"
 
 extern void ff_ac3_exponent_min_mmx   (uint8_t *exp, int num_reuse_blocks, int nb_coefs);
@@ -49,6 +51,119 @@ extern void ff_ac3_extract_exponents_3dnow(uint8_t *exp, int32_t *coef, int nb_c
 extern void ff_ac3_extract_exponents_sse2 (uint8_t *exp, int32_t *coef, int nb_coefs);
 extern void ff_ac3_extract_exponents_ssse3(uint8_t *exp, int32_t *coef, int nb_coefs);
 
+#if HAVE_SSE_INLINE
+
+#define IF1(x) x
+#define IF0(x)
+
+#define MIX5(mono, stereo)                                      \
+    __asm__ volatile (                                          \
+        "movss           0(%2), %%xmm5          \n"             \
+        "movss           8(%2), %%xmm6          \n"             \
+        "movss          24(%2), %%xmm7          \n"             \
+        "shufps     $0, %%xmm5, %%xmm5          \n"             \
+        "shufps     $0, %%xmm6, %%xmm6          \n"             \
+        "shufps     $0, %%xmm7, %%xmm7          \n"             \
+        "1:                                     \n"             \
+        "movaps       (%0, %1), %%xmm0          \n"             \
+        "movaps  0x400(%0, %1), %%xmm1          \n"             \
+        "movaps  0x800(%0, %1), %%xmm2          \n"             \
+        "movaps  0xc00(%0, %1), %%xmm3          \n"             \
+        "movaps 0x1000(%0, %1), %%xmm4          \n"             \
+        "mulps          %%xmm5, %%xmm0          \n"             \
+        "mulps          %%xmm6, %%xmm1          \n"             \
+        "mulps          %%xmm5, %%xmm2          \n"             \
+        "mulps          %%xmm7, %%xmm3          \n"             \
+        "mulps          %%xmm7, %%xmm4          \n"             \
+ stereo("addps          %%xmm1, %%xmm0          \n")            \
+        "addps          %%xmm1, %%xmm2          \n"             \
+        "addps          %%xmm3, %%xmm0          \n"             \
+        "addps          %%xmm4, %%xmm2          \n"             \
+   mono("addps          %%xmm2, %%xmm0          \n")            \
+        "movaps         %%xmm0, (%0, %1)        \n"             \
+ stereo("movaps         %%xmm2, 0x400(%0, %1)   \n")            \
+        "add               $16, %0              \n"             \
+        "jl                 1b                  \n"             \
+        : "+&r"(i)                                              \
+        : "r"(samples[0] + len), "r"(matrix)                    \
+        : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",      \
+                      "%xmm4", "%xmm5", "%xmm6", "%xmm7",)      \
+         "memory"                                               \
+    );
+
+#define MIX_MISC(stereo)                                        \
+    __asm__ volatile (                                          \
+        "1:                                 \n"                 \
+        "movaps     (%3, %0), %%xmm0        \n"                 \
+ stereo("movaps       %%xmm0, %%xmm1        \n")                \
+        "mulps        %%xmm4, %%xmm0        \n"                 \
+ stereo("mulps        %%xmm5, %%xmm1        \n")                \
+        "lea    1024(%3, %0), %1            \n"                 \
+        "mov              %5, %2            \n"                 \
+        "2:                                 \n"                 \
+        "movaps         (%1), %%xmm2        \n"                 \
+ stereo("movaps       %%xmm2, %%xmm3        \n")                \
+        "mulps      (%4, %2), %%xmm2        \n"                 \
+ stereo("mulps    16(%4, %2), %%xmm3        \n")                \
+        "addps        %%xmm2, %%xmm0        \n"                 \
+ stereo("addps        %%xmm3, %%xmm1        \n")                \
+        "add           $1024, %1            \n"                 \
+        "add             $32, %2            \n"                 \
+        "jl               2b                \n"                 \
+        "movaps       %%xmm0,     (%3, %0)  \n"                 \
+ stereo("movaps       %%xmm1, 1024(%3, %0)  \n")                \
+        "add             $16, %0            \n"                 \
+        "jl               1b                \n"                 \
+        : "+&r"(i), "=&r"(j), "=&r"(k)                          \
+        : "r"(samples[0] + len), "r"(matrix_simd + in_ch),      \
+          "g"((intptr_t) - 32 * (in_ch - 1))                    \
+        : "memory"                                              \
+    );
+
+static void ac3_downmix_sse(float (*samples)[256], float (*matrix)[2],
+                            int out_ch, int in_ch, int len)
+{
+    int (*matrix_cmp)[2] = (int(*)[2])matrix;
+    intptr_t i, j, k;
+
+    i = -len * sizeof(float);
+    if (in_ch == 5 && out_ch == 2 &&
+        !(matrix_cmp[0][1] | matrix_cmp[2][0]   |
+          matrix_cmp[3][1] | matrix_cmp[4][0]   |
+          (matrix_cmp[1][0] ^ matrix_cmp[1][1]) |
+          (matrix_cmp[0][0] ^ matrix_cmp[2][1]))) {
+        MIX5(IF0, IF1);
+    } else if (in_ch == 5 && out_ch == 1 &&
+               matrix_cmp[0][0] == matrix_cmp[2][0] &&
+               matrix_cmp[3][0] == matrix_cmp[4][0]) {
+        MIX5(IF1, IF0);
+    } else {
+        DECLARE_ALIGNED(16, float, matrix_simd)[AC3_MAX_CHANNELS][2][4];
+        j = 2 * in_ch * sizeof(float);
+        __asm__ volatile (
+            "1:                                 \n"
+            "sub             $8, %0             \n"
+            "movss     (%2, %0), %%xmm4         \n"
+            "movss    4(%2, %0), %%xmm5         \n"
+            "shufps          $0, %%xmm4, %%xmm4 \n"
+            "shufps          $0, %%xmm5, %%xmm5 \n"
+            "movaps      %%xmm4,   (%1, %0, 4)  \n"
+            "movaps      %%xmm5, 16(%1, %0, 4)  \n"
+            "jg              1b                 \n"
+            : "+&r"(j)
+            : "r"(matrix_simd), "r"(matrix)
+            : "memory"
+        );
+        if (out_ch == 2) {
+            MIX_MISC(IF1);
+        } else {
+            MIX_MISC(IF0);
+        }
+    }
+}
+
+#endif /* HAVE_SSE_INLINE */
+
 av_cold void ff_ac3dsp_init_x86(AC3DSPContext *c, int bit_exact)
 {
     int mm_flags = av_get_cpu_flags();
@@ -89,4 +204,10 @@ av_cold void ff_ac3dsp_init_x86(AC3DSPContext *c, int bit_exact)
             c->extract_exponents = ff_ac3_extract_exponents_ssse3;
         }
     }
+
+#if HAVE_SSE_INLINE
+    if (INLINE_SSE(mm_flags)) {
+        c->downmix = ac3_downmix_sse;
+    }
+#endif
 }
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index 3109c70fb5..567d8be057 100644
--- a/libavcodec/x86/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
@@ -28,7 +28,6 @@
 #include "libavcodec/h264dsp.h"
 #include "libavcodec/mpegvideo.h"
 #include "libavcodec/simple_idct.h"
-#include "libavcodec/ac3dec.h"
 #include "dsputil_mmx.h"
 #include "idct_xvid.h"
 #include "diracdsp_mmx.h"
@@ -2375,115 +2374,6 @@ static void vorbis_inverse_coupling_sse(float *mag, float *ang, int blocksize)
     }
 }
 
-#define IF1(x) x
-#define IF0(x)
-
-#define MIX5(mono, stereo)                                      \
-    __asm__ volatile (                                          \
-        "movss           0(%2), %%xmm5          \n"             \
-        "movss           8(%2), %%xmm6          \n"             \
-        "movss          24(%2), %%xmm7          \n"             \
-        "shufps     $0, %%xmm5, %%xmm5          \n"             \
-        "shufps     $0, %%xmm6, %%xmm6          \n"             \
-        "shufps     $0, %%xmm7, %%xmm7          \n"             \
-        "1:                                     \n"             \
-        "movaps       (%0, %1), %%xmm0          \n"             \
-        "movaps  0x400(%0, %1), %%xmm1          \n"             \
-        "movaps  0x800(%0, %1), %%xmm2          \n"             \
-        "movaps  0xc00(%0, %1), %%xmm3          \n"             \
-        "movaps 0x1000(%0, %1), %%xmm4          \n"             \
-        "mulps          %%xmm5, %%xmm0          \n"             \
-        "mulps          %%xmm6, %%xmm1          \n"             \
-        "mulps          %%xmm5, %%xmm2          \n"             \
-        "mulps          %%xmm7, %%xmm3          \n"             \
-        "mulps          %%xmm7, %%xmm4          \n"             \
- stereo("addps          %%xmm1, %%xmm0          \n")            \
-        "addps          %%xmm1, %%xmm2          \n"             \
-        "addps          %%xmm3, %%xmm0          \n"             \
-        "addps          %%xmm4, %%xmm2          \n"             \
-   mono("addps          %%xmm2, %%xmm0          \n")            \
-        "movaps         %%xmm0, (%0, %1)        \n"             \
- stereo("movaps         %%xmm2, 0x400(%0, %1)   \n")            \
-        "add               $16, %0              \n"             \
-        "jl                 1b                  \n"             \
-        : "+&r"(i)                                              \
-        : "r"(samples[0] + len), "r"(matrix)                    \
-        : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",      \
-                      "%xmm4", "%xmm5", "%xmm6", "%xmm7",)      \
-         "memory"                                               \
-    );
-
-#define MIX_MISC(stereo)                                        \
-    __asm__ volatile (                                          \
-        "1:                                 \n"                 \
-        "movaps     (%3, %0), %%xmm0        \n"                 \
- stereo("movaps       %%xmm0, %%xmm1        \n")                \
-        "mulps        %%xmm4, %%xmm0        \n"                 \
- stereo("mulps        %%xmm5, %%xmm1        \n")                \
-        "lea    1024(%3, %0), %1            \n"                 \
-        "mov              %5, %2            \n"                 \
-        "2:                                 \n"                 \
-        "movaps         (%1), %%xmm2        \n"                 \
- stereo("movaps       %%xmm2, %%xmm3        \n")                \
-        "mulps      (%4, %2), %%xmm2        \n"                 \
- stereo("mulps    16(%4, %2), %%xmm3        \n")                \
-        "addps        %%xmm2, %%xmm0        \n"                 \
- stereo("addps        %%xmm3, %%xmm1        \n")                \
-        "add           $1024, %1            \n"                 \
-        "add             $32, %2            \n"                 \
-        "jl               2b                \n"                 \
-        "movaps       %%xmm0,     (%3, %0)  \n"                 \
- stereo("movaps       %%xmm1, 1024(%3, %0)  \n")                \
-        "add             $16, %0            \n"                 \
-        "jl               1b                \n"                 \
-        : "+&r"(i), "=&r"(j), "=&r"(k)                          \
-        : "r"(samples[0] + len), "r"(matrix_simd + in_ch),      \
-          "g"((intptr_t) - 32 * (in_ch - 1))                    \
-        : "memory"                                              \
-    );
-
-static void ac3_downmix_sse(float (*samples)[256], float (*matrix)[2],
-                            int out_ch, int in_ch, int len)
-{
-    int (*matrix_cmp)[2] = (int(*)[2])matrix;
-    intptr_t i, j, k;
-
-    i = -len * sizeof(float);
-    if (in_ch == 5 && out_ch == 2 &&
-        !(matrix_cmp[0][1] | matrix_cmp[2][0]   |
-          matrix_cmp[3][1] | matrix_cmp[4][0]   |
-          (matrix_cmp[1][0] ^ matrix_cmp[1][1]) |
-          (matrix_cmp[0][0] ^ matrix_cmp[2][1]))) {
-        MIX5(IF0, IF1);
-    } else if (in_ch == 5 && out_ch == 1 &&
-               matrix_cmp[0][0] == matrix_cmp[2][0] &&
-               matrix_cmp[3][0] == matrix_cmp[4][0]) {
-        MIX5(IF1, IF0);
-    } else {
-        DECLARE_ALIGNED(16, float, matrix_simd)[AC3_MAX_CHANNELS][2][4];
-        j = 2 * in_ch * sizeof(float);
-        __asm__ volatile (
-            "1:                                 \n"
-            "sub             $8, %0             \n"
-            "movss     (%2, %0), %%xmm4         \n"
-            "movss    4(%2, %0), %%xmm5         \n"
-            "shufps          $0, %%xmm4, %%xmm4 \n"
-            "shufps          $0, %%xmm5, %%xmm5 \n"
-            "movaps      %%xmm4,   (%1, %0, 4)  \n"
-            "movaps      %%xmm5, 16(%1, %0, 4)  \n"
-            "jg              1b                 \n"
-            : "+&r"(j)
-            : "r"(matrix_simd), "r"(matrix)
-            : "memory"
-        );
-        if (out_ch == 2) {
-            MIX_MISC(IF1);
-        } else {
-            MIX_MISC(IF0);
-        }
-    }
-}
-
 #if HAVE_6REGS
 static void vector_fmul_window_3dnowext(float *dst, const float *src0,
                                         const float *src1, const float *win,
@@ -2958,7 +2848,6 @@ static void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx, int mm_flags)
     }
 
     c->vorbis_inverse_coupling = vorbis_inverse_coupling_sse;
-    c->ac3_downmix             = ac3_downmix_sse;
 
 #if HAVE_6REGS
     c->vector_fmul_window = vector_fmul_window_sse;