* all: new sout scheme. Now a chain of module are created that can

[vlc] / modules / packetizer / mpegaudio.c

diff --git a/modules/packetizer/mpegaudio.c b/modules/packetizer/mpegaudio.c
index faaa19163fdc2222398daf8888839b2a53ee42e9..ee95286a4079c9d0c6004c6301215d2548987390 100644 (file)
--- a/modules/packetizer/mpegaudio.c
+++ b/modules/packetizer/mpegaudio.c
@@ -2,7 +2,7 @@
  * mpegaudio.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: mpegaudio.c,v 1.5 2003/03/31 03:46:11 fenrir Exp $
+ * $Id: mpegaudio.c,v 1.6 2003/04/13 20:00:21 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
@@ -45,7 +45,7 @@ typedef struct packetizer_s
 
     /* Output properties */
     sout_packetizer_input_t *p_sout_input;
-    sout_packet_format_t    output_format;
+    sout_format_t           output_format;
 
     uint64_t                i_samplescount;
     uint32_t                i_samplespersecond;
@@ -180,8 +180,13 @@ static int InitThread( packetizer_t *p_pack )
 
     p_pack->output_format.i_cat = AUDIO_ES;
     p_pack->output_format.i_fourcc = p_pack->p_fifo->i_fourcc;
+    p_pack->output_format.i_sample_rate = 0;
+    p_pack->output_format.i_channels    = 0;
+    p_pack->output_format.i_block_align = 0;
+    p_pack->output_format.i_bitrate     = 0;
+    p_pack->output_format.i_extra_data  = 0;
+    p_pack->output_format.p_extra_data  = NULL;
 
-    p_pack->output_format.p_format = NULL;
 
     p_pack->p_sout_input = NULL;
 
@@ -301,18 +306,10 @@ static void PacketizeThread( packetizer_t *p_pack )
     if( !p_pack->p_sout_input )
     {
         /* add a input for the stream ouput */
-        WAVEFORMATEX    *p_wf;
-
-        p_wf = malloc( sizeof( WAVEFORMATEX ) );
-        p_pack->output_format.p_format = (void*)p_wf;
-
-        p_wf->wFormatTag        = WAVE_FORMAT_MPEG;
-        p_wf->nChannels         = i_channels;
-        p_wf->nSamplesPerSec    = i_samplerate;
-        p_wf->nAvgBytesPerSec   = 0;
-        p_wf->nBlockAlign       = 1;
-        p_wf->wBitsPerSample    = 0;
-        p_wf->cbSize            = 0; // FIXME there are more field for mpegaudio
+        p_pack->output_format.i_sample_rate = i_samplerate;
+        p_pack->output_format.i_channels    = i_channels;
+        p_pack->output_format.i_block_align = 1;
+        p_pack->output_format.i_bitrate     = 0;
 
         p_pack->p_sout_input =
             sout_InputNew( p_pack->p_fifo,