* modules/audio_output/file.c: will write a WAV header by default. Can be

   disabled with --no-audiofile-wav.
* modules/audio_filter/resampler/linear.c: disabled for now, until I actually
   manage to make it work without a problem.

diff --git a/modules/audio_filter/resampler/linear.c b/modules/audio_filter/resampler/linear.c
index 122e7e1b8ed6b7f41bfc281f19e1ccfdcc14081d..c32c6d5d2cc7e815ba2f7962c713b970063dc381 100644 (file)
--- a/modules/audio_filter/resampler/linear.c
+++ b/modules/audio_filter/resampler/linear.c
@@ -2,7 +2,7 @@
  * ugly.c : linear interpolation resampler
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: linear.c,v 1.2 2002/11/10 13:24:35 sigmunau Exp $
+ * $Id: linear.c,v 1.3 2002/11/11 19:16:21 gbazin Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *
@@ -45,7 +45,7 @@ static void DoWork    ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
  *****************************************************************************/
 vlc_module_begin();
     set_description( _("audio filter for linear interpolation resampling") );
-    set_capability( "audio filter", 10 );
+    set_capability( "audio filter", 0 );
     set_callbacks( Create, NULL );
 vlc_module_end();
 

diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index 83e362871dcb128e6ef690b13a85304a234f46c7..d09753acc5e2b4df0957df9738b41aa313982b41 100644 (file)
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -2,9 +2,10 @@
  * file.c : audio output which writes the samples to a file
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: file.c,v 1.13 2002/10/20 12:23:47 massiot Exp $
+ * $Id: file.c,v 1.14 2002/11/11 19:16:21 gbazin Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *          Gildas Bazin <gbazin@netcourrier.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,10 +33,42 @@
 #include <vlc/aout.h>
 
 #include "aout_internal.h"
+#include "codecs.h"
 
 #define FRAME_SIZE 2048
 #define A52_FRAME_NB 1536
 
+typedef struct WAVEHEADER
+{
+    uint32_t MainChunkID;                      // it will be 'RIFF'
+    uint32_t Length;
+    uint32_t ChunkTypeID;                      // it will be 'WAVE'
+    uint32_t SubChunkID;                       // it will be 'fmt '
+    uint32_t SubChunkLength;
+    uint16_t Format;
+    uint16_t Modus;
+    uint32_t SampleFreq;
+    uint32_t BytesPerSec;
+    uint16_t BytesPerSample;
+    uint16_t BitsPerSample;
+    uint32_t DataChunkID;                      // it will be 'data'
+    uint32_t DataLength;
+} WAVEHEADER;
+
+/*****************************************************************************
+ * aout_sys_t: audio output method descriptor
+ *****************************************************************************
+ * This structure is part of the audio output thread descriptor.
+ * It describes the direct sound specific properties of an audio device.
+ *****************************************************************************/
+struct aout_sys_t
+{
+    FILE     * p_file;
+    vlc_bool_t b_add_wav_header;
+
+    WAVEHEADER waveh;                      /* Wave header of the output file */
+};
+
 /*****************************************************************************
  * Local prototypes.
  *****************************************************************************/
@@ -48,8 +81,11 @@ static void    Play        ( aout_instance_t * );
  *****************************************************************************/
 #define FORMAT_TEXT N_("output format")
 #define FORMAT_LONGTEXT N_("one of \"u8\", \"s8\", \"u16\", \"s16\"," \
-                           " \"u16_le\", \"s16_le\", \"u16_be\"," \
-                           " \"s16_be\", \"fixed32\", \"float32\" or \"spdif\"")
+                        " \"u16_le\", \"s16_le\", \"u16_be\"," \
+                        " \"s16_be\", \"fixed32\", \"float32\" or \"spdif\"")
+#define WAV_TEXT N_("add wave header")
+#define WAV_LONGTEXT N_("instead of writing a raw file, you can add a wav " \
+                        "header to the file")
 
 static char *format_list[] = { "u8", "s8", "u16", "s16", "u16_le", "s16_le",
                                "u16_be", "s16_be", "fixed32", "float32",
@@ -70,12 +106,15 @@ static int format_int[] = { VLC_FOURCC('u','8',' ',' '),
 
 vlc_module_begin();
     add_category_hint( N_("Audio"), NULL );
-    add_string_from_list( "format", "s16", format_list, NULL,
+    add_string_from_list( "audiofile-format", "s16", format_list, NULL,
                           FORMAT_TEXT, FORMAT_LONGTEXT );
-    add_string( "path", "samples.raw", NULL, PATH_TEXT, PATH_LONGTEXT );
-    set_description( _("file output module") );
+    add_string( "audiofile-path", "audiofile.wav", NULL, PATH_TEXT,
+                PATH_LONGTEXT );
+    add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT );
+    set_description( _("file audio output module") );
     set_capability( "audio output", 0 );
     add_shortcut( "file" );
+    add_shortcut( "audiofile" );
     set_callbacks( Open, Close );
 vlc_module_end();
 
@@ -85,17 +124,26 @@ vlc_module_end();
 static int Open( vlc_object_t * p_this )
 {
     aout_instance_t * p_aout = (aout_instance_t *)p_this;
-    FILE * p_file;
-    char * psz_name = config_GetPsz( p_this, "path" );
-    char * psz_format = config_GetPsz( p_aout, "format" );
+    char * psz_name = config_GetPsz( p_this, "audiofile-path" );
+    char * psz_format = config_GetPsz( p_aout, "audiofile-format" );
     char ** ppsz_compare = format_list;
     int i = 0;
 
+   /* Allocate structure */
+    p_aout->output.p_sys = malloc( sizeof( aout_sys_t ) );
+    if( p_aout->output.p_sys == NULL )
+    {
+        msg_Err( p_aout, "out of memory" );
+        return VLC_EGENERIC;
+    }
 
-    p_file = fopen( psz_name, "wb" );
-    p_aout->output.p_sys = (void *)p_file;
+    p_aout->output.p_sys->p_file = fopen( psz_name, "wb" );
     free( psz_name );
-    if ( p_file == NULL ) return -1;
+    if ( p_aout->output.p_sys->p_file == NULL )
+    {
+        free( p_aout->output.p_sys );
+        return -1;
+    }
 
     p_aout->output.pf_play = Play;
 
@@ -112,6 +160,8 @@ static int Open( vlc_object_t * p_this )
     {
         msg_Err( p_aout, "Cannot understand the format string (%s)",
                  psz_format );
+        fclose( p_aout->output.p_sys->p_file );
+        free( p_aout->output.p_sys );
         return -1;
     }
 
@@ -128,6 +178,55 @@ static int Open( vlc_object_t * p_this )
         p_aout->output.i_nb_samples = FRAME_SIZE;
         aout_VolumeSoftInit( p_aout );
     }
+
+    p_aout->output.p_sys->b_add_wav_header =
+        config_GetInt( p_this, "audiofile-wav" );
+
+    if( p_aout->output.p_sys->b_add_wav_header )
+    {
+        /* Write wave header */
+        WAVEHEADER *wh = &p_aout->output.p_sys->waveh;
+
+        memset( wh, 0, sizeof(wh) );
+
+        switch( p_aout->output.output.i_format )
+        {
+        case VLC_FOURCC('f','l','3','2'):
+            wh->Format     = WAVE_FORMAT_IEEE_FLOAT;
+            wh->BitsPerSample = sizeof(float) * 8;
+            break;
+        case VLC_FOURCC('u','8',' ',' '):
+            wh->Format     = WAVE_FORMAT_PCM;
+            wh->BitsPerSample = 8;
+            break;
+        case VLC_FOURCC('s','1','6','l'):
+        default:
+            wh->Format     = WAVE_FORMAT_PCM;
+            wh->BitsPerSample = 16;
+            break;
+        }
+
+        wh->MainChunkID = VLC_FOURCC('R', 'I', 'F', 'F');
+        wh->Length = 0;                    /* temp, to be filled in as we go */
+        wh->ChunkTypeID = VLC_FOURCC('W', 'A', 'V', 'E');
+        wh->SubChunkID = VLC_FOURCC('f', 'm', 't', ' ');
+        wh->SubChunkLength = 16;
+
+        wh->Modus = aout_FormatNbChannels( &p_aout->output.output );
+        wh->SampleFreq = p_aout->output.output.i_rate;
+        wh->BytesPerSample = wh->Modus * ( wh->BitsPerSample / 8 );
+        wh->BytesPerSec = wh->BytesPerSample * wh->SampleFreq;
+
+        wh->DataChunkID = VLC_FOURCC('d', 'a', 't', 'a');
+        wh->DataLength = 0;                /* temp, to be filled in as we go */
+
+        if( fwrite( wh, sizeof(WAVEHEADER), 1,
+                    p_aout->output.p_sys->p_file ) != 1 )
+        {
+            msg_Err( p_aout, "write error (%s)", strerror(errno) );
+        }
+    }
+
     return 0;
 }
 
@@ -138,7 +237,28 @@ static void Close( vlc_object_t * p_this )
 {
     aout_instance_t * p_aout = (aout_instance_t *)p_this;
 
-    fclose( (FILE *)p_aout->output.p_sys );
+    msg_Dbg( p_aout, "closing audio file" );
+
+    if( p_aout->output.p_sys->b_add_wav_header )
+    {
+        /* Update Wave Header */
+        p_aout->output.p_sys->waveh.Length =
+            p_aout->output.p_sys->waveh.DataLength + sizeof(WAVEHEADER) - 4;
+
+        /* Write Wave Header */
+        if( fseek( p_aout->output.p_sys->p_file, 0, SEEK_SET ) )
+        {
+            msg_Err( p_aout, "seek error (%s)", strerror(errno) );
+        }
+        if( fwrite( &p_aout->output.p_sys->waveh, sizeof(WAVEHEADER), 1,
+                    p_aout->output.p_sys->p_file ) != 1 )
+        {
+            msg_Err( p_aout, "write error (%s)", strerror(errno) );
+        }
+    }
+
+    fclose( p_aout->output.p_sys->p_file );
+    free( p_aout->output.p_sys );
 }
 
 /*****************************************************************************
@@ -151,11 +271,16 @@ static void Play( aout_instance_t * p_aout )
     p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo );
 
     if( fwrite( p_buffer->p_buffer, p_buffer->i_nb_bytes, 1,
-                (FILE *)p_aout->output.p_sys ) != 1 )
+                p_aout->output.p_sys->p_file ) != 1 )
     {
         msg_Err( p_aout, "write error (%s)", strerror(errno) );
     }
 
+    if( p_aout->output.p_sys->b_add_wav_header )
+    {
+        /* Update Wave Header */
+        p_aout->output.p_sys->waveh.DataLength += p_buffer->i_nb_bytes;
+    }
+
     aout_BufferFree( p_buffer );
 }
-