Remove unneeded msg_Error about memory failure.

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

diff --git a/modules/audio_filter/converter/dtstospdif.c b/modules/audio_filter/converter/dtstospdif.c
index ac1e6475048e744c7d6265de6d2c6a57985301a0..cfe4260aabf5c0947b29350c2eda1946a34321de 100644 (file)
--- a/modules/audio_filter/converter/dtstospdif.c
+++ b/modules/audio_filter/converter/dtstospdif.c
@@ -24,7 +24,12 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 
 
 #ifdef HAVE_UNISTD_H
@@ -64,7 +69,7 @@ static void DoWork    ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
 vlc_module_begin();
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_MISC );
-    set_description( _("Audio filter for DTS->S/PDIF encapsulation") );
+    set_description( N_("Audio filter for DTS->S/PDIF encapsulation") );
     set_capability( "audio filter", 10 );
     set_callbacks( Create, Close );
 vlc_module_end();
@@ -86,10 +91,7 @@ static int Create( vlc_object_t *p_this )
     /* Allocate the memory needed to store the module's structure */
     p_filter->p_sys = malloc( sizeof(struct aout_filter_sys_t) );
     if( p_filter->p_sys == NULL )
-    {
-        msg_Err( p_filter, "out of memory" );
         return VLC_ENOMEM;
-    }
     memset( p_filter->p_sys, 0, sizeof(struct aout_filter_sys_t) );
     p_filter->p_sys->p_buf = 0;
 
@@ -134,9 +136,9 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     }
 
     /* Backup frame */
-    p_filter->p_libvlc->pf_memcpy( p_filter->p_sys->p_buf + p_in_buf->i_nb_bytes *
-                                p_filter->p_sys->i_frames, p_in_buf->p_buffer,
-                                p_in_buf->i_nb_bytes );
+    vlc_memcpy( p_filter->p_sys->p_buf + p_in_buf->i_nb_bytes *
+                  p_filter->p_sys->i_frames,
+                p_in_buf->p_buffer, p_in_buf->i_nb_bytes );
 
     p_filter->p_sys->i_frames++;
 
@@ -156,8 +158,9 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
 
     for( i_frame = 0; i_frame < 3; i_frame++ )
     {
-        byte_t * p_out = p_out_buf->p_buffer + (i_frame * i_fz);
-        byte_t * p_in = p_filter->p_sys->p_buf + (i_frame * i_length);
+        uint16_t i_length_padded = i_length;
+        uint8_t * p_out = p_out_buf->p_buffer + (i_frame * i_fz);
+        uint8_t * p_in = p_filter->p_sys->p_buf + (i_frame * i_length);
 
         switch( p_in_buf->i_nb_samples )
         {
@@ -169,14 +172,14 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
         /* 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[5] = i_ac5_spdif_type;
             p_out[6] = (( i_length ) >> 5 ) & 0xFF;
             p_out[7] = ( i_length << 3 ) & 0xFF;
         }
         else
         {
-            p_filter->p_libvlc->pf_memcpy( p_out, p_sync_le, 6 );
+            vlc_memcpy( p_out, p_sync_le, 6 );
             p_out[4] = i_ac5_spdif_type;
             p_out[6] = ( i_length << 3 ) & 0xFF;
             p_out[7] = (( i_length ) >> 5 ) & 0xFF;
@@ -192,7 +195,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
             swab( p_in, p_out + 8, i_length );
 #else
             uint16_t i;
-            byte_t * p_tmp, tmp;
+            uint8_t * p_tmp, tmp;
             p_tmp = p_out + 8;
             for( i = i_length / 2 ; i-- ; )
             {
@@ -202,16 +205,23 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
                 p_tmp += 2; p_in += 2;
             }
 #endif
+            /* If i_length is odd, we have to adjust swapping a bit.. */
+            if( i_length & 1 )
+            {
+                p_out[8+i_length-1] = 0;
+                p_out[8+i_length] = p_in[i_length-1];
+                i_length_padded++;
+            }
         }
         else
         {
-            p_filter->p_libvlc->pf_memcpy( p_out + 8, p_in, i_length );
+            vlc_memcpy( p_out + 8, p_in, i_length );
         }
 
         if( i_fz > i_length + 8 )
         {
-            p_filter->p_libvlc->pf_memset( p_out + 8 + i_length, 0,
-                                        i_fz - i_length - 8 );
+            vlc_memset( p_out + 8 + i_length_padded, 0,
+                        i_fz - i_length_padded - 8 );
         }
     }