Merge svn changes up to r30301

2 files changed, 51 insertions, 39 deletions

diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c
index c7e87cd92e..5843a49ae8 100644
--- a/libmpcodecs/ad.c
+++ b/libmpcodecs/ad.c
@@ -49,8 +49,8 @@ const ad_functions_t * const mpcodecs_ad_drivers[] =
 #endif
 #ifdef CONFIG_LIBA52
   &mpcodecs_ad_liba52,
-  &mpcodecs_ad_hwac3,
 #endif
+  &mpcodecs_ad_hwac3,
   &mpcodecs_ad_hwmpa,
 #ifdef CONFIG_LIBAVCODEC
   &mpcodecs_ad_ffmpeg,
diff --git a/libmpcodecs/ad_hwac3.c b/libmpcodecs/ad_hwac3.c
index 4dadf1723f..e6c7446631 100644
--- a/libmpcodecs/ad_hwac3.c
+++ b/libmpcodecs/ad_hwac3.c
@@ -15,15 +15,11 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "mpbswap.h"
+#include "libavutil/common.h"
+#include "ffmpeg_files/intreadwrite.h"
 
 #include "ad_internal.h"
 
-#ifdef CONFIG_LIBA52_INTERNAL
-#include "liba52/a52.h"
-#else
-#include <a52dec/a52.h>
-#endif
-
 
 static int isdts = -1;
 
@@ -43,6 +39,44 @@ static int dts_syncinfo(uint8_t *indata_ptr, int *flags, int *sample_rate, int *
 static int decode_audio_dts(unsigned char *indata_ptr, int len, unsigned char *buf);
 
 
+static int a52_syncinfo (uint8_t *buf, int *sample_rate, int *bit_rate)
+{
+    static const uint16_t rate[] = { 32,  40,  48,  56,  64,  80,  96, 112,
+                                    128, 160, 192, 224, 256, 320, 384, 448,
+                                    512, 576, 640};
+    int frmsizecod;
+    int bitrate;
+    int half;
+
+    if (buf[0] != 0x0b || buf[1] != 0x77)    /* syncword */
+        return 0;
+
+    if (buf[5] >= 0x60)                      /* bsid >= 12 */
+        return 0;
+    half = buf[5] >> 3;
+    half = FFMAX(half - 8, 0);
+
+    frmsizecod = buf[4] & 63;
+    if (frmsizecod >= 38)
+        return 0;
+    bitrate = rate[frmsizecod >> 1];
+    *bit_rate = (bitrate * 1000) >> half;
+
+    switch (buf[4] & 0xc0) {
+    case 0:
+        *sample_rate = 48000 >> half;
+        return 4 * bitrate;
+    case 0x40:
+        *sample_rate = 44100 >> half;
+        return 2 * (320 * bitrate / 147 + (frmsizecod & 1));
+    case 0x80:
+        *sample_rate = 32000 >> half;
+        return 6 * bitrate;
+    default:
+        return 0;
+    }
+}
+
 static int ac3dts_fillbuff(sh_audio_t *sh_audio)
 {
   int length = 0;
@@ -79,7 +113,7 @@ static int ac3dts_fillbuff(sh_audio_t *sh_audio)
     }
     else
     {
-      length = a52_syncinfo(sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate);
+      length = a52_syncinfo(sh_audio->a_in_buffer, &sample_rate, &bit_rate);
       if(length >= 7 && length <= 3840)
       {
         if(isdts != 0)
@@ -101,12 +135,6 @@ static int ac3dts_fillbuff(sh_audio_t *sh_audio)
   demux_read_data(sh_audio->ds, sh_audio->a_in_buffer + 12, length - 12);
   sh_audio->a_in_buffer_len = length;
 
-  // TODO: is DTS also checksummed?
-#ifdef CONFIG_LIBA52_INTERNAL
-  if(isdts == 0 && crc16_block(sh_audio->a_in_buffer + 2, length - 2) != 0)
-    mp_msg(MSGT_DECAUDIO, MSGL_STATUS, "a52: CRC check failed!  \n");
-#endif
-
   return length;
 }
 
@@ -118,32 +146,26 @@ static int preinit(sh_audio_t *sh)
   sh->audio_in_minsize = 8192;
   sh->channels = 2;
   sh->samplesize = 2;
-  sh->sample_format = AF_FORMAT_AC3;
+  sh->sample_format = AF_FORMAT_AC3_BE;
+  // HACK for DTS where useless swapping can't easily be removed
+  if (sh->format == 0x2001)
+    sh->sample_format = AF_FORMAT_AC3_NE;
   return 1;
 }
 
 static int init(sh_audio_t *sh_audio)
 {
   /* Dolby AC3 passthrough:*/
-  a52_state_t *a52_state = a52_init(0);
-  if(a52_state == NULL)
-  {
-    mp_msg(MSGT_DECAUDIO, MSGL_ERR, "A52 init failed\n");
-    return 0;
-  }
   if(ac3dts_fillbuff(sh_audio) < 0)
   {
-    a52_free(a52_state);
     mp_msg(MSGT_DECAUDIO, MSGL_ERR, "AC3/DTS sync failed\n");
     return 0;
   }
-  sh_audio->context = a52_state;
   return 1;
 }
 
 static void uninit(sh_audio_t *sh)
 {
-  a52_free(sh->context);
 }
 
 static int control(sh_audio_t *sh,int cmd,void* arg, ...)
@@ -174,22 +196,12 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m
   }
   else if(isdts == 0)
   {
-    uint16_t *buf16 = (uint16_t *)buf;
-    buf16[0] = 0xF872;   // iec 61937 syncword 1
-    buf16[1] = 0x4E1F;   // iec 61937 syncword 2
-    buf16[2] = 0x0001;   // data-type ac3
-    buf16[2] |= (sh_audio->a_in_buffer[5] & 0x7) << 8; // bsmod
-    buf16[3] = len << 3; // number of bits in payload
-#if HAVE_BIGENDIAN
+    AV_WB16(buf,     0xF872);   // iec 61937 syncword 1
+    AV_WB16(buf + 2, 0x4E1F);   // iec 61937 syncword 2
+    buf[4] = sh_audio->a_in_buffer[5] & 0x7; // bsmod
+    buf[5] = 0x01;              // data-type ac3
+    AV_WB16(buf + 6, len << 3); // number of bits in payload
     memcpy(buf + 8, sh_audio->a_in_buffer, len);
-#else
-    swab(sh_audio->a_in_buffer, buf + 8, len);
-    if (len & 1) {
-      buf[8+len-1] = 0;
-      buf[8+len] = sh_audio->a_in_buffer[len-1];
-      len++;
-    }
-#endif
     memset(buf + 8 + len, 0, 6144 - 8 - len);
 
     return 6144;