Changeset 255b41ac05c5be955025636475c5c50398b76530

Timestamp:

11/11/02 20:16:21 (6 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1037042181 +0000

git-parent:

[bc061e8455fa11eec3167681d53f9df3974b13a5]

git-author:

Gildas Bazin <gbazin@videolan.org> 1037042181 +0000

Message:

* 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.

Files:

• modules/audio_filter/resampler/linear.c (modified) (2 diffs)
• modules/audio_output/file.c (modified) (9 diffs)

modules/audio_filter/resampler/linear.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-2 2002/11/10 13:24:35 sigmunau
+3 2002/11/11 19:16:21 gbazin
- *
- * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
@@ -46 +46 @@
-vlc_module_begin();
-    set_description( _("audio filter for linear interpolation resampling") );
-1
+
-    set_callbacks( Create, NULL );
-vlc_module_end();

modules/audio_output/file.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-3 2002/10/20 12:23:47 massiot
+4 2002/11/11 19:16:21 gbazin
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *          Gildas Bazin <gbazin@netcourrier.com>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -33 +34 @@
-
-#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 */
+};
-
-/*****************************************************************************
@@ -49 +82 @@
-#define FORMAT_TEXT N_("output format")
-#define FORMAT_LONGTEXT N_("one of \"u8\", \"s8\", \"u16\", \"s16\"," \
-
-
+
+
+
+
+
-
-static char *format_list[] = { "u8", "s8", "u16", "s16", "u16_le", "s16_le",
@@ -71 +107 @@
-vlc_module_begin();
-    add_category_hint( N_("Audio"), NULL );
-
+audiofile-
-                          FORMAT_TEXT, FORMAT_LONGTEXT );
-
-
+
+
+
+
-    set_capability( "audio output", 0 );
-    add_shortcut( "file" );
+    add_shortcut( "audiofile" );
-    set_callbacks( Open, Close );
-vlc_module_end();
@@ -86 +125 @@
-{
-    aout_instance_t * p_aout = (aout_instance_t *)p_this;
-
-
-
+
+
-    char ** ppsz_compare = format_list;
-    int i = 0;
-
-
-
-
+
+
+
+
+
+
+
+
+
-    free( psz_name );
-
+
+
+
+
+
-
-    p_aout->output.pf_play = Play;
@@ -113 +161 @@
-        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;
-    }
@@ -129 +179 @@
-        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;
-}
@@ -139 +238 @@
-    aout_instance_t * p_aout = (aout_instance_t *)p_this;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -152 +272 @@
-
-    if( fwrite( p_buffer->p_buffer, p_buffer->i_nb_bytes, 1,
-(FILE *)p_aout->output.p_sys
+p_aout->output.p_sys->p_file
-    {
-        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 );
-}
-