Always use swab.

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

diff --git a/modules/audio_filter/converter/a52tospdif.c b/modules/audio_filter/converter/a52tospdif.c
index a0dcbb13b008c41abe486137a6231525418e7b55..f43855135934775fb62bfe36ae13ba7a1e202755 100644 (file)
--- a/modules/audio_filter/converter/a52tospdif.c
+++ b/modules/audio_filter/converter/a52tospdif.c
@@ -11,7 +11,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -26,16 +26,18 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
 
-#include "audio_output.h"
-#include "aout_internal.h"
+#include <vlc_aout.h>
 
 /*****************************************************************************
  * Local prototypes
@@ -47,13 +49,13 @@ 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 );
-vlc_module_end();
+vlc_module_begin ()
+    set_category( CAT_AUDIO )
+    set_subcategory( SUBCAT_AUDIO_MISC )
+    set_description( N_("Audio filter for A/52->S/PDIF encapsulation") )
+    set_capability( "audio filter", 10 )
+    set_callbacks( Create, NULL )
+vlc_module_end ()
 
 /*****************************************************************************
  * Create:
@@ -81,49 +83,36 @@ 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 )
 {
+    VLC_UNUSED(p_aout);
     /* AC3 is natively big endian. Most SPDIF devices have the native
      * endianness of the computer system.
      * On Mac OS X however, little endian devices are also common.
      */
     static const uint8_t p_sync_le[6] = { 0x72, 0xF8, 0x1F, 0x4E, 0x01, 0x00 };
     static const uint8_t p_sync_be[6] = { 0xF8, 0x72, 0x4E, 0x1F, 0x00, 0x01 };
-#ifndef HAVE_SWAB
-    byte_t * p_tmp;
-    uint16_t i;
-#endif
     uint16_t i_frame_size = p_in_buf->i_nb_bytes / 2;
-    byte_t * p_in = p_in_buf->p_buffer;
-    byte_t * p_out = p_out_buf->p_buffer;
+    uint8_t * p_in = p_in_buf->p_buffer;
+    uint8_t * p_out = p_out_buf->p_buffer;
 
     /* Copy the S/PDIF headers. */
     if( p_filter->output.i_format == VLC_FOURCC('s','p','d','b') )
     {
-        p_filter->p_libvlc->pf_memcpy( p_out, p_sync_be, 6 );
+        vlc_memcpy( p_out, p_sync_be, 6 );
         p_out[4] = p_in[5] & 0x7; /* bsmod */
         p_out[6] = (i_frame_size >> 4) & 0xff;
         p_out[7] = (i_frame_size << 4) & 0xff;
-        p_filter->p_libvlc->pf_memcpy( &p_out[8], p_in, i_frame_size * 2 );
+        vlc_memcpy( &p_out[8], p_in, i_frame_size * 2 );
     }
     else
     {
-        p_filter->p_libvlc->pf_memcpy( p_out, p_sync_le, 6 );
+        vlc_memcpy( p_out, p_sync_le, 6 );
         p_out[5] = p_in[5] & 0x7; /* bsmod */
         p_out[6] = (i_frame_size << 4) & 0xff;
         p_out[7] = (i_frame_size >> 4) & 0xff;
-#ifdef HAVE_SWAB
         swab( p_in, &p_out[8], i_frame_size * 2 );
-#else
-        p_tmp = &p_out[8];
-        for( i = i_frame_size; i-- ; )
-        {
-            p_tmp[0] = p_in[1];
-            p_tmp[1] = p_in[0];
-            p_tmp += 2; p_in += 2;
-        }
-#endif
     }
-    p_filter->p_libvlc->pf_memset( p_out + 8 + i_frame_size * 2, 0,
-                                AOUT_SPDIF_SIZE - i_frame_size * 2 - 8 );
+    vlc_memset( p_out + 8 + i_frame_size * 2, 0,
+                AOUT_SPDIF_SIZE - i_frame_size * 2 - 8 );
 
     p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
     p_out_buf->i_nb_bytes = AOUT_SPDIF_SIZE;