X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fvorbis.c;h=77e0a22c860166107ba0195827b254bc40fa3734;hb=03a8d035fc5caf6da4a072a0ab313e3c59de722e;hp=5dbdfb25895b2133823db3aed3e903e73de0bcc7;hpb=7e29d932257d0bf6dca42ffecf9b0dce523ca92e;p=vlc diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c index 5dbdfb2589..77e0a22c86 100644 --- a/modules/codec/vorbis.c +++ b/modules/codec/vorbis.c @@ -1,7 +1,10 @@ /***************************************************************************** - * vorbis.c: vorbis decoder/encoder/packetizer module making use of libvorbis. + * vorbis.c: vorbis decoder/encoder/packetizer module using of libvorbis. ***************************************************************************** * Copyright (C) 2001-2003 the VideoLAN team + * Copyright (C) 2007 Société des arts technologiques + * Copyright (C) 2007 Savoir-faire Linux + * * $Id$ * * Authors: Gildas Bazin @@ -24,10 +27,16 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include #include +#include #include #include @@ -54,7 +63,7 @@ struct decoder_sys_t { /* Module mode */ - vlc_bool_t b_packetizer; + bool b_packetizer; /* * Input properties @@ -86,7 +95,7 @@ struct decoder_sys_t int pi_chan_table[AOUT_CHAN_MAX]; }; -static int pi_channels_maps[7] = +static int pi_channels_maps[9] = { 0, AOUT_CHAN_CENTER, @@ -97,7 +106,13 @@ static int pi_channels_maps[7] = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT, AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER - | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE + | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE, + AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER + | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_MIDDLELEFT + | AOUT_CHAN_MIDDLERIGHT, + AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER | AOUT_CHAN_REARLEFT + | AOUT_CHAN_REARRIGHT | AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT + | AOUT_CHAN_LFE }; /* @@ -106,7 +121,7 @@ static int pi_channels_maps[7] = /* recommended vorbis channel order for 6 channels */ static const uint32_t pi_6channels_in[] = -{ AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT, +{ AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,AOUT_CHAN_LFE,0 }; /* recommended vorbis channel order for 4 channels */ @@ -138,7 +153,7 @@ static block_t *SendPacket( decoder_t *, ogg_packet *, block_t * ); static void ParseVorbisComments( decoder_t * ); -static void ConfigureChannelOrder(int *, int, uint32_t, vlc_bool_t ); +static void ConfigureChannelOrder(int *, int, uint32_t, bool ); #ifdef MODULE_NAME_IS_tremor static void Interleave ( int32_t *, const int32_t **, int, int, int * ); @@ -171,7 +186,7 @@ static block_t *Encode ( encoder_t *, aout_buffer_t * ); vlc_module_begin(); set_shortname( "Vorbis" ); - set_description( _("Vorbis audio decoder") ); + set_description( N_("Vorbis audio decoder") ); #ifdef MODULE_NAME_IS_tremor set_capability( "decoder", 90 ); #else @@ -182,33 +197,33 @@ vlc_module_begin(); set_callbacks( OpenDecoder, CloseDecoder ); add_submodule(); - set_description( _("Vorbis audio packetizer") ); + set_description( N_("Vorbis audio packetizer") ); set_capability( "packetizer", 100 ); set_callbacks( OpenPacketizer, CloseDecoder ); #ifndef MODULE_NAME_IS_tremor # define ENC_CFG_PREFIX "sout-vorbis-" add_submodule(); - set_description( _("Vorbis audio encoder") ); + set_description( N_("Vorbis audio encoder") ); set_capability( "encoder", 100 ); #if defined(HAVE_VORBIS_VORBISENC_H) - set_callbacks( OpenEncoder, CloseEncoder ); + set_callbacks( OpenEncoder, CloseEncoder ); #endif add_integer( ENC_CFG_PREFIX "quality", 0, NULL, ENC_QUALITY_TEXT, - ENC_QUALITY_LONGTEXT, VLC_FALSE ); + ENC_QUALITY_LONGTEXT, false ); add_integer( ENC_CFG_PREFIX "max-bitrate", 0, NULL, ENC_MAXBR_TEXT, - ENC_MAXBR_LONGTEXT, VLC_FALSE ); + ENC_MAXBR_LONGTEXT, false ); add_integer( ENC_CFG_PREFIX "min-bitrate", 0, NULL, ENC_MINBR_TEXT, - ENC_MINBR_LONGTEXT, VLC_FALSE ); + ENC_MINBR_LONGTEXT, false ); add_bool( ENC_CFG_PREFIX "cbr", 0, NULL, ENC_CBR_TEXT, - ENC_CBR_LONGTEXT, VLC_FALSE ); + ENC_CBR_LONGTEXT, false ); #endif vlc_module_end(); #ifndef MODULE_NAME_IS_tremor -static const char *ppsz_enc_options[] = { +static const char *const ppsz_enc_options[] = { "quality", "max-bitrate", "min-bitrate", "cbr", NULL }; #endif @@ -229,15 +244,12 @@ static int OpenDecoder( vlc_object_t *p_this ) /* Allocate the memory needed to store the decoder's structure */ if( ( p_dec->p_sys = p_sys = (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) - { - msg_Err( p_dec, "out of memory" ); - return VLC_EGENERIC; - } + return VLC_ENOMEM; /* Misc init */ aout_DateSet( &p_sys->end_date, 0 ); p_sys->i_last_block_size = 0; - p_sys->b_packetizer = VLC_FALSE; + p_sys->b_packetizer = false; p_sys->i_headers = 0; p_sys->i_input_rate = INPUT_RATE_DEFAULT; @@ -270,7 +282,7 @@ static int OpenPacketizer( vlc_object_t *p_this ) if( i_ret == VLC_SUCCESS ) { - p_dec->p_sys->b_packetizer = VLC_TRUE; + p_dec->p_sys->b_packetizer = true; p_dec->fmt_out.i_codec = VLC_FOURCC('v','o','r','b'); } @@ -395,10 +407,9 @@ static int ProcessHeaders( decoder_t *p_dec ) p_dec->fmt_out.audio.i_rate = p_sys->vi.rate; p_dec->fmt_out.audio.i_channels = p_sys->vi.channels; - if( p_dec->fmt_out.audio.i_channels < 0 || - p_dec->fmt_out.audio.i_channels > 6 ) + if( p_dec->fmt_out.audio.i_channels > 9 ) { - msg_Err( p_dec, "invalid number of channels (not between 1 and 6): %i", + msg_Err( p_dec, "invalid number of channels (not between 1 and 9): %i", p_dec->fmt_out.audio.i_channels ); return VLC_EGENERIC; } @@ -409,7 +420,6 @@ static int ProcessHeaders( decoder_t *p_dec ) p_dec->fmt_out.i_bitrate = p_sys->vi.bitrate_nominal; aout_DateInit( &p_sys->end_date, p_sys->vi.rate ); - aout_DateSet( &p_sys->end_date, 0 ); msg_Dbg( p_dec, "channels:%d samplerate:%ld bitrate:%ld", p_sys->vi.channels, p_sys->vi.rate, p_sys->vi.bitrate_nominal ); @@ -469,7 +479,7 @@ static int ProcessHeaders( decoder_t *p_dec ) } ConfigureChannelOrder(p_sys->pi_chan_table, p_sys->vi.channels, - p_dec->fmt_out.audio.i_physical_channels, VLC_TRUE); + p_dec->fmt_out.audio.i_physical_channels, true); return VLC_SUCCESS; } @@ -606,7 +616,7 @@ static block_t *SendPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, } /***************************************************************************** - * ParseVorbisComments: FIXME should be done in demuxer + * ParseVorbisComments *****************************************************************************/ static void ParseVorbisComments( decoder_t *p_dec ) { @@ -623,10 +633,7 @@ static void ParseVorbisComments( decoder_t *p_dec ) { psz_comment = strdup( p_dec->p_sys->vc.user_comments[i] ); if( !psz_comment ) - { - msg_Warn( p_dec, "out of memory" ); break; - } psz_name = psz_comment; psz_value = strchr( psz_comment, '=' ); if( psz_value ) @@ -635,49 +642,37 @@ static void ParseVorbisComments( decoder_t *p_dec ) psz_value++; input_Control( p_input, INPUT_ADD_INFO, _("Vorbis comment"), psz_name, "%s", psz_value ); - if( !strcasecmp( psz_name, "artist" ) ) - { - if( psz_value && ( *psz_value != '\0' ) ) - { - vlc_meta_SetArtist( p_item->p_meta, - psz_value ); - input_ItemAddInfo( p_item, - _(VLC_META_INFO_CAT), - _(VLC_META_ARTIST), - "%s", psz_value ); - } - } - else if( !strcasecmp( psz_name, "title" ) ) +/*TODO: dot he test at the beginning and save time !! */ +#ifndef HAVE_TAGLIB + if( psz_value && ( *psz_value != '\0' ) ) { - if( psz_value && ( *psz_value != '\0' ) ) + if( !strcasecmp( psz_name, "artist" ) ) + input_item_SetArtist( p_item, psz_value ); + else if( !strcasecmp( psz_name, "title" ) ) { - vlc_meta_SetTitle( p_item->p_meta, - psz_value ); + input_item_SetTitle( p_item, psz_value ); p_item->psz_name = strdup( psz_value ); } - } - else if( !strcasecmp( psz_name, "album" ) ) - { - if( psz_value && ( *psz_value != '\0' ) ) - { - vlc_meta_SetAlbum( p_item->p_meta, - psz_value ); - } - } - else if( !strcasecmp( psz_name, "musicbrainz_trackid" ) ) - { - if( psz_value && ( *psz_value != '\0' ) ) + else if( !strcasecmp( psz_name, "album" ) ) { - vlc_meta_SetTrackID( p_item->p_meta, - psz_value ); + input_item_SetAlbum( p_item, psz_value ); } + else if( !strcasecmp( psz_name, "musicbrainz_trackid" ) ) + input_item_SetTrackID( p_item, psz_value ); +#if 0 //not used + else if( !strcasecmp( psz_name, "musicbrainz_artistid" ) ) + vlc_meta_SetArtistID( p_item, psz_value ); + else if( !strcasecmp( psz_name, "musicbrainz_albumid" ) ) + input_item_SetAlbumID( p_item, psz_value ); +#endif } - else if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_GAIN" ) || +#endif + if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_GAIN" ) || !strcasecmp( psz_name, "RG_RADIO" ) ) { audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain; - r->pb_gain[AUDIO_REPLAY_GAIN_TRACK] = VLC_TRUE; + r->pb_gain[AUDIO_REPLAY_GAIN_TRACK] = true; r->pf_gain[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value ); } else if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_PEAK" ) || @@ -685,7 +680,7 @@ static void ParseVorbisComments( decoder_t *p_dec ) { audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain; - r->pb_peak[AUDIO_REPLAY_GAIN_TRACK] = VLC_TRUE; + r->pb_peak[AUDIO_REPLAY_GAIN_TRACK] = true; r->pf_peak[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value ); } else if( !strcasecmp( psz_name, "REPLAYGAIN_ALBUM_GAIN" ) || @@ -693,37 +688,19 @@ static void ParseVorbisComments( decoder_t *p_dec ) { audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain; - r->pb_gain[AUDIO_REPLAY_GAIN_ALBUM] = VLC_TRUE; + r->pb_gain[AUDIO_REPLAY_GAIN_ALBUM] = true; r->pf_gain[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value ); } else if( !strcasecmp( psz_name, "REPLAYGAIN_ALBUM_PEAK" ) ) { audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain; - r->pb_peak[AUDIO_REPLAY_GAIN_ALBUM] = VLC_TRUE; + r->pb_peak[AUDIO_REPLAY_GAIN_ALBUM] = true; r->pf_peak[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value ); } -#if 0 //not used - else if( !strcasecmp( psz_name, "musicbrainz_artistid" ) ) - { - if( psz_value && ( *psz_value != '\0' ) ) - { - vlc_meta_SetArtistID( p_item->p_meta, - psz_value ); - } - } - else if( !strcasecmp( psz_name, "musicbrainz_albumid" ) ) - { - if( psz_value && ( *psz_value != '\0' ) ) - { - vlc_meta_SetAlbumID( p_item->p_meta, - psz_value ); - } - } -#endif } - /* FIXME */ - var_SetInteger( p_input, "item-change", p_item->i_id ); + var_SetInteger( pl_Yield( p_input ), "item-change", p_item->i_id ); + pl_Release( p_input ); free( psz_comment ); i++; } @@ -732,7 +709,7 @@ static void ParseVorbisComments( decoder_t *p_dec ) /***************************************************************************** * Interleave: helper function to interleave channels *****************************************************************************/ -static void ConfigureChannelOrder(int *pi_chan_table, int i_channels, uint32_t i_channel_mask, vlc_bool_t b_decode) +static void ConfigureChannelOrder(int *pi_chan_table, int i_channels, uint32_t i_channel_mask, bool b_decode) { const uint32_t *pi_channels_in; switch( i_channels ) @@ -869,10 +846,7 @@ static int OpenEncoder( vlc_object_t *p_this ) /* Allocate the memory needed to store the decoder's structure */ if( ( p_sys = (encoder_sys_t *)malloc(sizeof(encoder_sys_t)) ) == NULL ) - { - msg_Err( p_enc, "out of memory" ); - return VLC_EGENERIC; - } + return VLC_ENOMEM; p_enc->p_sys = p_sys; p_enc->pf_encode_audio = Encode; @@ -972,7 +946,7 @@ static int OpenEncoder( vlc_object_t *p_this ) p_sys->i_pts = 0; ConfigureChannelOrder(p_sys->pi_chan_table, p_sys->vi.channels, - p_enc->fmt_in.audio.i_physical_channels, VLC_TRUE); + p_enc->fmt_in.audio.i_physical_channels, true); return VLC_SUCCESS; }