X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmux%2Fwav.c;h=f2f4091d78f7d7334659ed5d49875f33a214af03;hb=2c15069fc16c1965266f4cb789780057d3bcc70c;hp=8a97f284cb1ab5f1abb7ae8dede4955d7c9ef40c;hpb=a73d65a89f314dedec7961f4102eb6c797393f34;p=vlc diff --git a/modules/mux/wav.c b/modules/mux/wav.c index 8a97f284cb..f2f4091d78 100644 --- a/modules/mux/wav.c +++ b/modules/mux/wav.c @@ -1,7 +1,7 @@ /***************************************************************************** * wav.c: wav muxer module for vlc ***************************************************************************** - * Copyright (C) 2004 the VideoLAN team + * Copyright (C) 2004, 2006 the VideoLAN team * $Id$ * * Authors: Gildas Bazin @@ -18,19 +18,23 @@ * * 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. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "codecs.h" +#include +#include +#include +#include +#include +#include /***************************************************************************** * Module descriptor @@ -38,14 +42,14 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_description( _("WAV muxer") ); - set_capability( "sout mux", 5 ); - set_category( CAT_SOUT ); - set_subcategory( SUBCAT_SOUT_MUX ); - set_callbacks( Open, Close ); - add_shortcut( "wav" ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("WAV muxer") ) + set_capability( "sout mux", 5 ) + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_MUX ) + set_callbacks( Open, Close ) + add_shortcut( "wav" ) +vlc_module_end () /***************************************************************************** * Exported prototypes @@ -59,9 +63,9 @@ static int Mux ( sout_mux_t * ); struct sout_mux_sys_t { - vlc_bool_t b_used; - vlc_bool_t b_header; - vlc_bool_t b_ext; + bool b_used; + bool b_header; + bool b_ext; uint32_t i_data; @@ -71,7 +75,7 @@ struct sout_mux_sys_t uint32_t waveheader2[2]; uint32_t i_channel_mask; - vlc_bool_t b_chan_reorder; /* do we need channel reordering */ + bool b_chan_reorder; /* do we need channel reordering */ int pi_chan_table[AOUT_CHAN_MAX]; }; @@ -79,17 +83,18 @@ struct sout_mux_sys_t static const uint32_t pi_channels_src[] = { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, - AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, + AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_REARCENTER, AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 }; static const uint32_t pi_channels_in[] = { WAVE_SPEAKER_FRONT_LEFT, WAVE_SPEAKER_FRONT_RIGHT, WAVE_SPEAKER_SIDE_LEFT, WAVE_SPEAKER_SIDE_RIGHT, - WAVE_SPEAKER_BACK_LEFT, WAVE_SPEAKER_BACK_RIGHT, + WAVE_SPEAKER_BACK_LEFT, WAVE_SPEAKER_BACK_RIGHT, WAVE_SPEAKER_BACK_CENTER, WAVE_SPEAKER_FRONT_CENTER, WAVE_SPEAKER_LOW_FREQUENCY, 0 }; static const uint32_t pi_channels_out[] = { WAVE_SPEAKER_FRONT_LEFT, WAVE_SPEAKER_FRONT_RIGHT, WAVE_SPEAKER_FRONT_CENTER, WAVE_SPEAKER_LOW_FREQUENCY, WAVE_SPEAKER_BACK_LEFT, WAVE_SPEAKER_BACK_RIGHT, + WAVE_SPEAKER_BACK_CENTER, WAVE_SPEAKER_SIDE_LEFT, WAVE_SPEAKER_SIDE_RIGHT, 0 }; /***************************************************************************** @@ -106,8 +111,10 @@ static int Open( vlc_object_t *p_this ) p_mux->pf_mux = Mux; p_mux->p_sys = p_sys = malloc( sizeof( sout_mux_sys_t ) ); - p_sys->b_used = VLC_FALSE; - p_sys->b_header = VLC_TRUE; + if( !p_sys ) + return VLC_ENOMEM; + p_sys->b_used = false; + p_sys->b_header = true; p_sys->i_data = 0; p_sys->b_chan_reorder = 0; @@ -127,29 +134,30 @@ static void Close( vlc_object_t * p_this ) static int Control( sout_mux_t *p_mux, int i_query, va_list args ) { - vlc_bool_t *pb_bool; + VLC_UNUSED(p_mux); + bool *pb_bool; char **ppsz; - switch( i_query ) - { - case MUX_CAN_ADD_STREAM_WHILE_MUXING: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); - *pb_bool = VLC_FALSE; - return VLC_SUCCESS; + switch( i_query ) + { + case MUX_CAN_ADD_STREAM_WHILE_MUXING: + pb_bool = (bool*)va_arg( args, bool * ); + *pb_bool = false; + return VLC_SUCCESS; - case MUX_GET_ADD_STREAM_WAIT: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); - *pb_bool = VLC_TRUE; - return VLC_SUCCESS; + case MUX_GET_ADD_STREAM_WAIT: + pb_bool = (bool*)va_arg( args, bool * ); + *pb_bool = true; + return VLC_SUCCESS; - case MUX_GET_MIME: - ppsz = (char**)va_arg( args, char ** ); - *ppsz = strdup( "audio/wav" ); - return VLC_SUCCESS; + case MUX_GET_MIME: + ppsz = (char**)va_arg( args, char ** ); + *ppsz = strdup( "audio/wav" ); + return VLC_SUCCESS; default: return VLC_EGENERIC; - } + } } static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) { @@ -157,7 +165,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) sout_mux_sys_t *p_sys = p_mux->p_sys; WAVEFORMATEX *p_waveformat = &p_sys->waveformat.Format; int i_bytes_per_sample, i_format; - vlc_bool_t b_ext; + bool b_ext; if( p_input->p_fmt->i_cat != AUDIO_ES ) { @@ -171,7 +179,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) return VLC_EGENERIC; } - msg_Dbg( p_mux, "adding input %i channels, %iHz", + msg_Dbg( p_mux, "adding %i input channels, %iHz", p_input->p_fmt->audio.i_channels, p_input->p_fmt->audio.i_rate ); @@ -179,7 +187,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) if( p_input->p_fmt->audio.i_physical_channels ) { unsigned int i; - + for( i = 0; i < sizeof(pi_channels_in)/sizeof(uint32_t); i++ ) { if( p_input->p_fmt->audio.i_physical_channels & pi_channels_src[i]) @@ -196,7 +204,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) p_sys->i_channel_mask, (int)p_sys->b_chan_reorder ); } - i_format = p_input->p_fmt->i_codec == VLC_FOURCC('f', 'l', '3', '2') ? + i_format = p_input->p_fmt->i_codec == VLC_CODEC_FL32 ? WAVE_FORMAT_IEEE_FLOAT : WAVE_FORMAT_PCM; b_ext = p_sys->b_ext = p_input->p_fmt->audio.i_channels > 2; @@ -233,7 +241,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) p_sys->waveformat.SubFormat.Data1 = i_format; - p_sys->b_used = VLC_TRUE; + p_sys->b_used = true; return VLC_SUCCESS; } @@ -260,10 +268,11 @@ static block_t *GetHeader( sout_mux_t *p_mux ) static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input ) { + VLC_UNUSED(p_input); msg_Dbg( p_mux, "removing input" ); msg_Dbg( p_mux, "writing header data" ); - if( !sout_AccessOutSeek( p_mux->p_access, 0 ) ) + if( sout_AccessOutSeek( p_mux->p_access, 0 ) == VLC_SUCCESS ) { sout_AccessOutWrite( p_mux->p_access, GetHeader( p_mux ) ); } @@ -283,10 +292,10 @@ static int Mux( sout_mux_t *p_mux ) msg_Dbg( p_mux, "writing header data" ); sout_AccessOutWrite( p_mux->p_access, GetHeader( p_mux ) ); } - p_sys->b_header = VLC_FALSE; + p_sys->b_header = false; p_input = p_mux->pp_inputs[0]; - while( p_input->p_fifo->i_depth > 0 ) + while( block_FifoCount( p_input->p_fifo ) > 0 ) { block_t *p_block = block_FifoGet( p_input->p_fifo ); p_sys->i_data += p_block->i_buffer;