Added strnlen replacement (Untested)

[vlc] / modules / demux / wav.c

diff --git a/modules/demux/wav.c b/modules/demux/wav.c
index d83eebd7113ee91d43397a75b72e4ff8394d3e12..9d02add905028fbc8cb1263154937ae95d26c800 100644 (file)
--- a/modules/demux/wav.c
+++ b/modules/demux/wav.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * wav.c : wav file input module for vlc
  *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
+ * Copyright (C) 2001-2003 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -27,10 +27,9 @@
 #include <stdlib.h>                                      /* malloc(), free() */
 
 #include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/aout.h>
-
-#include <codecs.h>
+#include <vlc_demux.h>
+#include <vlc_aout.h>
+#include <vlc_codecs.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -40,6 +39,8 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("WAV demuxer") );
+    set_category( CAT_INPUT );
+    set_subcategory( SUBCAT_INPUT_DEMUX );
     set_capability( "demux2", 142 );
     set_callbacks( Open, Close );
 vlc_module_end();
@@ -70,7 +71,7 @@ struct demux_sys_t
 
 #define __EVEN( x ) ( ( (x)%2 != 0 ) ? ((x)+1) : (x) )
 
-static int ChunkFind( demux_t *, char *, unsigned int * );
+static int ChunkFind( demux_t *, const char *, unsigned int * );
 
 static void FrameInfo_IMA_ADPCM( demux_t *, unsigned int *, int * );
 static void FrameInfo_MS_ADPCM ( demux_t *, unsigned int *, int * );
@@ -102,18 +103,15 @@ static int Open( vlc_object_t * p_this )
 
     uint8_t     *p_peek;
     unsigned int i_size, i_extended;
-    char        *psz_name;
+    const char        *psz_name;
 
     WAVEFORMATEXTENSIBLE *p_wf_ext;
     WAVEFORMATEX         *p_wf;
 
     /* Is it a wav file ? */
-    if( stream_Peek( p_demux->s, &p_peek, 12 ) < 12 )
-    {
-        msg_Warn( p_demux, "WAV module discarded (cannot peek)" );
-        return VLC_EGENERIC;
-    }
-    if( strncmp( p_peek, "RIFF", 4 ) || strncmp( &p_peek[8], "WAVE", 4 ) )
+    if( stream_Peek( p_demux->s, &p_peek, 12 ) < 12 ) return VLC_EGENERIC;
+
+    if( memcmp( p_peek, "RIFF", 4 ) || memcmp( &p_peek[8], "WAVE", 4 ) )
     {
         return VLC_EGENERIC;
     }
@@ -164,13 +162,21 @@ static int Open( vlc_object_t * p_this )
     i_extended = 0;
 
     /* Handle new WAVE_FORMAT_EXTENSIBLE wav files */
+    /* see the following link for more information:
+     * http://www.microsoft.com/whdc/device/audio/multichaud.mspx#EFAA */
     if( GetWLE( &p_wf->wFormatTag ) == WAVE_FORMAT_EXTENSIBLE &&
         i_size >= sizeof( WAVEFORMATEXTENSIBLE ) )
     {
-        int i, i_channel_mask;
+        unsigned i, i_channel_mask;
+        GUID guid_subformat;
+
+        guid_subformat = p_wf_ext->SubFormat;
+        guid_subformat.Data1 = GetDWLE( &p_wf_ext->SubFormat.Data1 );
+        guid_subformat.Data2 = GetWLE( &p_wf_ext->SubFormat.Data2 );
+        guid_subformat.Data3 = GetWLE( &p_wf_ext->SubFormat.Data3 );
+
+        sf_tag_to_fourcc( &guid_subformat, &p_sys->fmt.i_codec, &psz_name );
 
-        wf_tag_to_fourcc( GetWLE( &p_wf_ext->SubFormat ),
-                          &p_sys->fmt.i_codec, &psz_name );
         i_extended = sizeof( WAVEFORMATEXTENSIBLE ) - sizeof( WAVEFORMATEX );
         p_sys->fmt.i_extra -= i_extended;
 
@@ -184,6 +190,7 @@ static int Open( vlc_object_t * p_this )
             }
 
             if( p_sys->fmt.i_codec == VLC_FOURCC('a','r','a','w') ||
+                p_sys->fmt.i_codec == VLC_FOURCC('p','c','m',' ') ||
                 p_sys->fmt.i_codec == VLC_FOURCC('a','f','l','t') )
 
             p_sys->b_chan_reorder =
@@ -223,6 +230,8 @@ static int Open( vlc_object_t * p_this )
     case VLC_FOURCC( 'a', 'f', 'l', 't' ):
     case VLC_FOURCC( 'u', 'l', 'a', 'w' ):
     case VLC_FOURCC( 'a', 'l', 'a', 'w' ):
+    case VLC_FOURCC( 'm', 'l', 'a', 'w' ):
+    case VLC_FOURCC( 'p', 'c', 'm', ' ' ):
         FrameInfo_PCM( p_demux, &p_sys->i_frame_size,
                        &p_sys->i_frame_samples );
         break;
@@ -356,7 +365,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 /*****************************************************************************
  * Local functions
  *****************************************************************************/
-static int ChunkFind( demux_t *p_demux, char *fcc, unsigned int *pi_size )
+static int ChunkFind( demux_t *p_demux, const char *fcc, unsigned int *pi_size )
 {
     uint8_t *p_peek;
 
@@ -372,9 +381,9 @@ static int ChunkFind( demux_t *p_demux, char *fcc, unsigned int *pi_size )
 
         i_size = GetDWLE( p_peek + 4 );
 
-        msg_Dbg( p_demux, "Chunk: fcc=`%4.4s` size=%d", p_peek, i_size );
+        msg_Dbg( p_demux, "chunk: fcc=`%4.4s` size=%d", p_peek, i_size );
 
-        if( !strncmp( p_peek, fcc, 4 ) )
+        if( !memcmp( p_peek, fcc, 4 ) )
         {
             if( pi_size )
             {