Improvements to preferences

[vlc] / modules / audio_filter / converter / a52tospdif.c

diff --git a/modules/audio_filter/converter/a52tospdif.c b/modules/audio_filter/converter/a52tospdif.c
index 37c52e7c6dc92570a737fbc7c25bb5df02eee827..a1a676698891ccf4e1e8da7b7ed88e8fb43d5d1b 100644 (file)
--- a/modules/audio_filter/converter/a52tospdif.c
+++ b/modules/audio_filter/converter/a52tospdif.c
@@ -2,7 +2,7 @@
  * a52tospdif.c : encapsulates A/52 frames into S/PDIF packets
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: a52tospdif.c,v 1.12 2002/09/11 23:08:43 stef Exp $
+ * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -25,7 +25,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 
@@ -49,6 +48,8 @@ static void DoWork    ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
+    set_category( CAT_AUDIO );
+    set_subcategory( SUBCAT_AUDIO_MISC );
     set_description( _("audio filter for A/52->S/PDIF encapsulation") );
     set_capability( "audio filter", 10 );
     set_callbacks( Create, NULL );
@@ -61,8 +62,8 @@ static int Create( vlc_object_t *p_this )
 {
     aout_filter_t * p_filter = (aout_filter_t *)p_this;
 
-    if ( p_filter->input.i_format != AOUT_FMT_A52
-          || p_filter->output.i_format != AOUT_FMT_SPDIF )
+    if ( p_filter->input.i_format != VLC_FOURCC('a','5','2',' ')
+          || p_filter->output.i_format != VLC_FOURCC('s','p','d','i') )
     {
         return -1;
     }
@@ -79,42 +80,39 @@ static int Create( vlc_object_t *p_this )
 static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
                     aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
 {
-#ifdef WORDS_BIGENDIAN
-    static const u8 p_sync[6] = { 0xF8, 0x72, 0x4E, 0x1F, 0x00, 0x01 };
-#else
-    static const u8 p_sync[6] = { 0x72, 0xF8, 0x1F, 0x4E, 0x01, 0x00 };
-#   ifndef HAVE_SWAB
-    u16 i;
-#   endif
+    /* It is not entirely clear which endianness the AC3 stream should have.
+     * I have been told endianness does not matter, AC3 can be both endian.
+     * But then, I could not get it to work on Mac OS X and a JVC RX-6000R
+     * decoder without using little endian. So right now, I convert to little
+     * endian.
+     */
+
+    static const uint8_t p_sync[6] = { 0x72, 0xF8, 0x1F, 0x4E, 0x01, 0x00 };
+#ifndef HAVE_SWAB
+    byte_t * p_tmp;
+    uint16_t i;
 #endif
-    u16 i_length = p_in_buf->i_nb_bytes;
-    u16 * pi_length;
+    uint16_t i_length = p_in_buf->i_nb_bytes;
+    uint8_t * pi_length;
     byte_t * p_in = p_in_buf->p_buffer;
     byte_t * p_out = p_out_buf->p_buffer;
 
     /* Copy the S/PDIF headers. */
     memcpy( p_out, p_sync, 6 );
-    pi_length = (u16 *)(p_out + 6);
-    *pi_length = i_length * 8;
-
-    /* FIXME : if i_length is odd, the following code sucks. What should
-     * we do ? --Meuuh */
+    pi_length = (p_out + 6);
+    *pi_length = (i_length * 8) & 0xff;
+    *(pi_length + 1) = (i_length * 8) >> 8;
 
-#ifndef WORDS_BIGENDIAN
-#   ifdef HAVE_SWAB
+#ifdef HAVE_SWAB
     swab( p_in, p_out + 8, i_length );
-#   else
-    p_out += 8;
+#else
+    p_tmp = p_out + 8;
     for ( i = i_length / 2 ; i-- ; )
     {
-        p_out[0] = p_in[1];
-        p_out[1] = p_in[0];
-        p_out += 2; p_in += 2;
+        p_tmp[0] = p_in[1];
+        p_tmp[1] = p_in[0];
+        p_tmp += 2; p_in += 2;
     }
-#   endif
-
-#else
-    p_filter->p_vlc->pf_memcpy( p_out + 8, p_in, i_length );
 #endif
 
     p_filter->p_vlc->pf_memset( p_out + 8 + i_length, 0,