X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fvorbis.c;h=b241bbf6bb36190b34670756fa9fdfda69ae95b4;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=3333b05a4ad41854edab0fa5a6dc9315ec2bd528;hpb=535be4f675ab04cb117aec179d91e273b9a156ad;p=vlc diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c index 3333b05a4a..b241bbf6bb 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 VideoLAN + * 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 @@ -18,16 +21,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 +#include +#include +#include +#include +#include +#include "../demux/xiph.h" #include @@ -35,15 +45,11 @@ #include #else -#include - -/* vorbis header */ -#ifdef HAVE_VORBIS_VORBISENC_H -# include -# ifndef OV_ECTL_RATEMANAGE_AVG -# define OV_ECTL_RATEMANAGE_AVG 0x0 -# endif -#endif +#include + +# ifndef OV_ECTL_RATEMANAGE_AVG +# define OV_ECTL_RATEMANAGE_AVG 0x0 +# endif #endif @@ -53,12 +59,9 @@ struct decoder_sys_t { /* Module mode */ - vlc_bool_t b_packetizer; + bool b_packetizer; - /* - * Input properties - */ - int i_headers; + bool b_has_headers; /* * Vorbis properties @@ -74,12 +77,16 @@ struct decoder_sys_t /* * Common properties */ - audio_date_t end_date; + date_t end_date; int i_last_block_size; + /* + ** Channel reordering + */ + int pi_chan_table[AOUT_CHAN_MAX]; }; -static int pi_channels_maps[7] = +static const int pi_channels_maps[9] = { 0, AOUT_CHAN_CENTER, @@ -90,9 +97,44 @@ 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_REARCENTER | AOUT_CHAN_MIDDLELEFT + | AOUT_CHAN_MIDDLERIGHT | 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_LFE, }; +/* +** channel order as defined in http://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-800004.3.9 +*/ + +/* recommended vorbis channel order for 8 channels */ +static const uint32_t pi_8channels_in[] = +{ AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT, + AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, + AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,AOUT_CHAN_LFE,0 }; + +/* recommended vorbis channel order for 7 channels */ +static const uint32_t pi_7channels_in[] = +{ AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT, + AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, + AOUT_CHAN_REARCENTER,AOUT_CHAN_LFE,0 }; + +/* 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_REARLEFT, AOUT_CHAN_REARRIGHT,AOUT_CHAN_LFE,0 }; + +/* recommended vorbis channel order for 4 channels */ +static const uint32_t pi_4channels_in[] = +{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 }; + +/* recommended vorbis channel order for 3 channels */ +static const uint32_t pi_3channels_in[] = +{ AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT, 0 }; + /**************************************************************************** * Local prototypes ****************************************************************************/ @@ -109,10 +151,12 @@ static block_t *SendPacket( decoder_t *, ogg_packet *, block_t * ); static void ParseVorbisComments( decoder_t * ); +static void ConfigureChannelOrder(int *, int, uint32_t, bool ); + #ifdef MODULE_NAME_IS_tremor -static void Interleave ( int32_t *, const int32_t **, int, int ); +static void Interleave ( int32_t *, const int32_t **, int, int, int * ); #else -static void Interleave ( float *, const float **, int, int ); +static void Interleave ( float *, const float **, int, int, int * ); #endif #ifndef MODULE_NAME_IS_tremor @@ -126,52 +170,58 @@ static block_t *Encode ( encoder_t *, aout_buffer_t * ); *****************************************************************************/ #define ENC_QUALITY_TEXT N_("Encoding quality") #define ENC_QUALITY_LONGTEXT N_( \ - "Allows you to specify a quality between 1 (low) and 10 (high), instead " \ + "Enforce a quality between 1 (low) and 10 (high), instead " \ "of specifying a particular bitrate. This will produce a VBR stream." ) #define ENC_MAXBR_TEXT N_("Maximum encoding bitrate") #define ENC_MAXBR_LONGTEXT N_( \ - "Allows you to specify a maximum bitrate in kbps. " \ - "Useful for streaming applications." ) + "Maximum bitrate in kbps. This is useful for streaming applications." ) #define ENC_MINBR_TEXT N_("Minimum encoding bitrate") #define ENC_MINBR_LONGTEXT N_( \ - "Allows you to specify a minimum bitrate in kbps. " \ - "Useful for encoding for a fixed-size channel." ) - -vlc_module_begin(); - - set_description( _("Vorbis audio decoder") ); + "Minimum bitrate in kbps. This is useful for encoding for a fixed-size channel." ) +#define ENC_CBR_TEXT N_("CBR encoding") +#define ENC_CBR_LONGTEXT N_( \ + "Force a constant bitrate encoding (CBR)." ) + +vlc_module_begin () + set_shortname( "Vorbis" ) + set_description( N_("Vorbis audio decoder") ) #ifdef MODULE_NAME_IS_tremor - set_capability( "decoder", 90 ); + set_capability( "decoder", 90 ) #else - set_capability( "decoder", 100 ); + set_capability( "decoder", 100 ) #endif - set_callbacks( OpenDecoder, CloseDecoder ); + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) + set_callbacks( OpenDecoder, CloseDecoder ) - add_submodule(); - set_description( _("Vorbis audio packetizer") ); - set_capability( "packetizer", 100 ); - set_callbacks( OpenPacketizer, CloseDecoder ); + add_submodule () + 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_capability( "encoder", 100 ); - set_callbacks( OpenEncoder, CloseEncoder ); + add_submodule () + set_description( N_("Vorbis audio encoder") ) + set_capability( "encoder", 130 ) + set_callbacks( OpenEncoder, CloseEncoder ) add_integer( ENC_CFG_PREFIX "quality", 0, NULL, ENC_QUALITY_TEXT, - ENC_QUALITY_LONGTEXT, VLC_FALSE ); + ENC_QUALITY_LONGTEXT, false ) + change_integer_range( 0, 10 ) 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", false, NULL, ENC_CBR_TEXT, + ENC_CBR_LONGTEXT, false ) #endif -vlc_module_end(); +vlc_module_end () #ifndef MODULE_NAME_IS_tremor -static const char *ppsz_enc_options[] = { - "quality", "max-bitrate", "min-bitrate", NULL +static const char *const ppsz_enc_options[] = { + "quality", "max-bitrate", "min-bitrate", "cbr", NULL }; #endif @@ -183,23 +233,20 @@ static int OpenDecoder( vlc_object_t *p_this ) decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; - if( p_dec->fmt_in.i_codec != VLC_FOURCC('v','o','r','b') ) + if( p_dec->fmt_in.i_codec != VLC_CODEC_VORBIS ) { return VLC_EGENERIC; } /* 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; - } + if( ( p_dec->p_sys = p_sys = malloc( sizeof(*p_sys) ) ) == NULL ) + return VLC_ENOMEM; /* Misc init */ - aout_DateSet( &p_sys->end_date, 0 ); - p_sys->b_packetizer = VLC_FALSE; - p_sys->i_headers = 0; + date_Set( &p_sys->end_date, 0 ); + p_sys->i_last_block_size = 0; + p_sys->b_packetizer = false; + p_sys->b_has_headers = false; /* Take care of vorbis init */ vorbis_info_init( &p_sys->vi ); @@ -208,9 +255,9 @@ static int OpenDecoder( vlc_object_t *p_this ) /* Set output properties */ p_dec->fmt_out.i_cat = AUDIO_ES; #ifdef MODULE_NAME_IS_tremor - p_dec->fmt_out.i_codec = VLC_FOURCC('f','i','3','2'); + p_dec->fmt_out.i_codec = VLC_CODEC_FI32; #else - p_dec->fmt_out.i_codec = VLC_FOURCC('f','l','3','2'); + p_dec->fmt_out.i_codec = VLC_CODEC_FL32; #endif /* Set callbacks */ @@ -230,8 +277,8 @@ static int OpenPacketizer( vlc_object_t *p_this ) if( i_ret == VLC_SUCCESS ) { - p_dec->p_sys->b_packetizer = VLC_TRUE; - p_dec->fmt_out.i_codec = VLC_FOURCC('v','o','r','b'); + p_dec->p_sys->b_packetizer = true; + p_dec->fmt_out.i_codec = VLC_CODEC_VORBIS; } return i_ret; @@ -270,41 +317,14 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) oggpacket.packetno = 0; /* Check for headers */ - if( p_sys->i_headers == 0 && p_dec->fmt_in.i_extra ) - { - /* Headers already available as extra data */ - p_sys->i_headers = 3; - } - else if( oggpacket.bytes && p_sys->i_headers < 3 ) + if( !p_sys->b_has_headers ) { - /* Backup headers as extra data */ - uint8_t *p_extra; - - p_dec->fmt_in.p_extra = - realloc( p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra + - oggpacket.bytes + 2 ); - p_extra = p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra; - *(p_extra++) = oggpacket.bytes >> 8; - *(p_extra++) = oggpacket.bytes & 0xFF; - - memcpy( p_extra, oggpacket.packet, oggpacket.bytes ); - p_dec->fmt_in.i_extra += oggpacket.bytes + 2; - - block_Release( *pp_block ); - p_sys->i_headers++; - return NULL; - } - - if( p_sys->i_headers == 3 ) - { - if( ProcessHeaders( p_dec ) != VLC_SUCCESS ) + if( ProcessHeaders( p_dec ) ) { - p_sys->i_headers = 0; - p_dec->fmt_in.i_extra = 0; block_Release( *pp_block ); return NULL; } - else p_sys->i_headers++; + p_sys->b_has_headers = true; } return ProcessPacket( p_dec, &oggpacket, pp_block ); @@ -317,83 +337,68 @@ static int ProcessHeaders( decoder_t *p_dec ) { decoder_sys_t *p_sys = p_dec->p_sys; ogg_packet oggpacket; - uint8_t *p_extra; - int i_extra; - if( !p_dec->fmt_in.i_extra ) return VLC_EGENERIC; + unsigned pi_size[XIPH_MAX_HEADER_COUNT]; + void *pp_data[XIPH_MAX_HEADER_COUNT]; + unsigned i_count; + if( xiph_SplitHeaders( pi_size, pp_data, &i_count, + p_dec->fmt_in.i_extra, p_dec->fmt_in.p_extra) ) + return VLC_EGENERIC; + if( i_count < 3 ) + goto error; oggpacket.granulepos = -1; - oggpacket.b_o_s = 1; /* yes this actually is a b_o_s packet :) */ oggpacket.e_o_s = 0; oggpacket.packetno = 0; - p_extra = p_dec->fmt_in.p_extra; - i_extra = p_dec->fmt_in.i_extra; /* Take care of the initial Vorbis header */ - oggpacket.bytes = *(p_extra++) << 8; - oggpacket.bytes |= (*(p_extra++) & 0xFF); - oggpacket.packet = p_extra; - p_extra += oggpacket.bytes; - i_extra -= (oggpacket.bytes + 2); - if( i_extra < 0 ) - { - msg_Err( p_dec, "header data corrupted"); - return VLC_EGENERIC; - } - + oggpacket.b_o_s = 1; /* yes this actually is a b_o_s packet :) */ + oggpacket.bytes = pi_size[0]; + oggpacket.packet = pp_data[0]; if( vorbis_synthesis_headerin( &p_sys->vi, &p_sys->vc, &oggpacket ) < 0 ) { msg_Err( p_dec, "this bitstream does not contain Vorbis audio data"); - return VLC_EGENERIC; + goto error; } /* Setup the format */ 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 > 9 ) + { + msg_Err( p_dec, "invalid number of channels (not between 1 and 9): %i", + p_dec->fmt_out.audio.i_channels ); + goto error; + } + p_dec->fmt_out.audio.i_physical_channels = p_dec->fmt_out.audio.i_original_channels = pi_channels_maps[p_sys->vi.channels]; 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 ); + date_Init( &p_sys->end_date, p_sys->vi.rate, 1 ); msg_Dbg( p_dec, "channels:%d samplerate:%ld bitrate:%ld", p_sys->vi.channels, p_sys->vi.rate, p_sys->vi.bitrate_nominal ); /* The next packet in order is the comments header */ - oggpacket.b_o_s = 0; - oggpacket.bytes = *(p_extra++) << 8; - oggpacket.bytes |= (*(p_extra++) & 0xFF); - oggpacket.packet = p_extra; - p_extra += oggpacket.bytes; - i_extra -= (oggpacket.bytes + 2); - if( i_extra < 0 ) - { - msg_Err( p_dec, "header data corrupted"); - return VLC_EGENERIC; - } - + oggpacket.b_o_s = 0; + oggpacket.bytes = pi_size[1]; + oggpacket.packet = pp_data[1]; if( vorbis_synthesis_headerin( &p_sys->vi, &p_sys->vc, &oggpacket ) < 0 ) { msg_Err( p_dec, "2nd Vorbis header is corrupted" ); - return VLC_EGENERIC; + goto error; } ParseVorbisComments( p_dec ); /* The next packet in order is the codebooks header * We need to watch out that this packet is not missing as a * missing or corrupted header is fatal. */ - oggpacket.bytes = *(p_extra++) << 8; - oggpacket.bytes |= (*(p_extra++) & 0xFF); - oggpacket.packet = p_extra; - i_extra -= (oggpacket.bytes + 2); - if( i_extra < 0 ) - { - msg_Err( p_dec, "header data corrupted"); - return VLC_EGENERIC; - } - + oggpacket.b_o_s = 0; + oggpacket.bytes = pi_size[2]; + oggpacket.packet = pp_data[2]; if( vorbis_synthesis_headerin( &p_sys->vi, &p_sys->vc, &oggpacket ) < 0 ) { msg_Err( p_dec, "3rd Vorbis header is corrupted" ); @@ -409,13 +414,23 @@ static int ProcessHeaders( decoder_t *p_dec ) else { p_dec->fmt_out.i_extra = p_dec->fmt_in.i_extra; - p_dec->fmt_out.p_extra = - realloc( p_dec->fmt_out.p_extra, p_dec->fmt_out.i_extra ); + p_dec->fmt_out.p_extra = xrealloc( p_dec->fmt_out.p_extra, + p_dec->fmt_out.i_extra ); memcpy( p_dec->fmt_out.p_extra, p_dec->fmt_in.p_extra, p_dec->fmt_out.i_extra ); } + ConfigureChannelOrder(p_sys->pi_chan_table, p_sys->vi.channels, + p_dec->fmt_out.audio.i_physical_channels, true); + + for( unsigned i = 0; i < i_count; i++ ) + free( pp_data[i] ); return VLC_SUCCESS; + +error: + for( unsigned i = 0; i < i_count; i++ ) + free( pp_data[i] ); + return VLC_EGENERIC; } /***************************************************************************** @@ -428,13 +443,13 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, block_t *p_block = *pp_block; /* Date management */ - if( p_block && p_block->i_pts > 0 && - p_block->i_pts != aout_DateGet( &p_sys->end_date ) ) + if( p_block && p_block->i_pts > VLC_TS_INVALID && + p_block->i_pts != date_Get( &p_sys->end_date ) ) { - aout_DateSet( &p_sys->end_date, p_block->i_pts ); + date_Set( &p_sys->end_date, p_block->i_pts ); } - if( !aout_DateGet( &p_sys->end_date ) ) + if( !date_Get( &p_sys->end_date ) ) { /* We've just started the stream, wait for the first PTS. */ if( p_block ) block_Release( p_block ); @@ -449,14 +464,9 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, } else { - aout_buffer_t *p_aout_buffer; - - if( p_sys->i_headers >= 3 ) - p_aout_buffer = DecodePacket( p_dec, p_oggpacket ); - else - p_aout_buffer = NULL; - - if( p_block ) block_Release( p_block ); + aout_buffer_t *p_aout_buffer = DecodePacket( p_dec, p_oggpacket ); + if( p_block ) + block_Release( p_block ); return p_aout_buffer; } } @@ -476,7 +486,11 @@ static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) #endif if( p_oggpacket->bytes && +#ifdef MODULE_NAME_IS_tremor + vorbis_synthesis( &p_sys->vb, p_oggpacket, 1 ) == 0 ) +#else vorbis_synthesis( &p_sys->vb, p_oggpacket ) == 0 ) +#endif vorbis_synthesis_blockin( &p_sys->vd, &p_sys->vb ); /* **pp_pcm is a multichannel float vector. In stereo, for @@ -490,26 +504,26 @@ static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) aout_buffer_t *p_aout_buffer; p_aout_buffer = - p_dec->pf_aout_buffer_new( p_dec, i_samples ); + decoder_NewAudioBuffer( p_dec, i_samples ); if( p_aout_buffer == NULL ) return NULL; /* Interleave the samples */ #ifdef MODULE_NAME_IS_tremor Interleave( (int32_t *)p_aout_buffer->p_buffer, - (const int32_t **)pp_pcm, p_sys->vi.channels, i_samples ); + (const int32_t **)pp_pcm, p_sys->vi.channels, i_samples, p_sys->pi_chan_table); #else Interleave( (float *)p_aout_buffer->p_buffer, - (const float **)pp_pcm, p_sys->vi.channels, i_samples ); + (const float **)pp_pcm, p_sys->vi.channels, i_samples, p_sys->pi_chan_table); #endif /* Tell libvorbis how many samples we actually consumed */ vorbis_synthesis_read( &p_sys->vd, i_samples ); /* Date management */ - p_aout_buffer->start_date = aout_DateGet( &p_sys->end_date ); - p_aout_buffer->end_date = aout_DateIncrement( &p_sys->end_date, - i_samples ); + p_aout_buffer->i_pts = date_Get( &p_sys->end_date ); + p_aout_buffer->i_length = date_Increment( &p_sys->end_date, + i_samples ) - p_aout_buffer->i_pts; return p_aout_buffer; } else @@ -533,44 +547,69 @@ static block_t *SendPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, p_sys->i_last_block_size = i_block_size; /* Date management */ - p_block->i_dts = p_block->i_pts = aout_DateGet( &p_sys->end_date ); + p_block->i_dts = p_block->i_pts = date_Get( &p_sys->end_date ); - if( p_sys->i_headers >= 3 ) - p_block->i_length = aout_DateIncrement( &p_sys->end_date, i_samples ) - - p_block->i_pts; - else - p_block->i_length = 0; + p_block->i_length = date_Increment( &p_sys->end_date, i_samples ) - p_block->i_pts; return p_block; } /***************************************************************************** - * ParseVorbisComments: FIXME should be done in demuxer + * ParseVorbisComments *****************************************************************************/ static void ParseVorbisComments( decoder_t *p_dec ) { - input_thread_t *p_input = (input_thread_t *)p_dec->p_parent; char *psz_name, *psz_value, *psz_comment; int i = 0; - if( p_input->i_object_type != VLC_OBJECT_INPUT ) return; - while( i < p_dec->p_sys->vc.comments ) { 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 ) { *psz_value = '\0'; psz_value++; - input_Control( p_input, INPUT_ADD_INFO, _("Vorbis comment"), - psz_name, psz_value ); + + if( !p_dec->p_description ) + p_dec->p_description = vlc_meta_New(); + if( p_dec->p_description ) + vlc_meta_AddExtra( p_dec->p_description, psz_name, psz_value ); + + 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] = true; + r->pf_gain[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value ); + } + else if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_PEAK" ) || + !strcasecmp( psz_name, "RG_PEAK" ) ) + { + audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain; + + 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" ) || + !strcasecmp( psz_name, "RG_AUDIOPHILE" ) ) + { + audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain; + + 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] = true; + r->pf_peak[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value ); + } } free( psz_comment ); i++; @@ -580,24 +619,74 @@ static void ParseVorbisComments( decoder_t *p_dec ) /***************************************************************************** * Interleave: helper function to interleave channels *****************************************************************************/ -static void Interleave( +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 ) + { + case 8: + pi_channels_in = pi_8channels_in; + break; + case 7: + pi_channels_in = pi_7channels_in; + break; + case 6: + case 5: + pi_channels_in = pi_6channels_in; + break; + case 4: + pi_channels_in = pi_4channels_in; + break; + case 3: + pi_channels_in = pi_3channels_in; + break; + default: + { + int i; + for( i = 0; i< i_channels; ++i ) + { + pi_chan_table[i] = i; + } + return; + } + } + + if( b_decode ) + aout_CheckChannelReorder( pi_channels_in, NULL, + i_channel_mask & AOUT_CHAN_PHYSMASK, + i_channels, + pi_chan_table ); + else + aout_CheckChannelReorder( NULL, pi_channels_in, + i_channel_mask & AOUT_CHAN_PHYSMASK, + i_channels, + pi_chan_table ); +} + +/***************************************************************************** + * Interleave: helper function to interleave channels + *****************************************************************************/ #ifdef MODULE_NAME_IS_tremor - int32_t *p_out, const int32_t **pp_in, +static void Interleave( int32_t *p_out, const int32_t **pp_in, + int i_nb_channels, int i_samples, int *pi_chan_table) +{ + int i, j; + + for ( j = 0; j < i_samples; j++ ) + for ( i = 0; i < i_nb_channels; i++ ) + p_out[j * i_nb_channels + pi_chan_table[i]] = pp_in[i][j] * (FIXED32_ONE >> 24); +} #else - float *p_out, const float **pp_in, -#endif - int i_nb_channels, int i_samples ) +static void Interleave( float *p_out, const float **pp_in, + int i_nb_channels, int i_samples, int *pi_chan_table ) { int i, j; for ( j = 0; j < i_samples; j++ ) - { for ( i = 0; i < i_nb_channels; i++ ) - { - p_out[j * i_nb_channels + i] = pp_in[i][j]; - } - } + p_out[j * i_nb_channels + pi_chan_table[i]] = pp_in[i][j]; } +#endif /***************************************************************************** * CloseDecoder: vorbis decoder destruction @@ -607,7 +696,7 @@ static void CloseDecoder( vlc_object_t *p_this ) decoder_t *p_dec = (decoder_t *)p_this; decoder_sys_t *p_sys = p_dec->p_sys; - if( !p_sys->b_packetizer && p_sys->i_headers >= 3 ) + if( !p_sys->b_packetizer && p_sys->b_has_headers ) { vorbis_block_clear( &p_sys->vb ); vorbis_dsp_clear( &p_sys->vd ); @@ -619,7 +708,7 @@ static void CloseDecoder( vlc_object_t *p_this ) free( p_sys ); } -#if defined(HAVE_VORBIS_VORBISENC_H) && !defined(MODULE_NAME_IS_tremor) +#ifndef MODULE_NAME_IS_tremor /***************************************************************************** * encoder_sys_t : vorbis encoder descriptor @@ -642,9 +731,10 @@ struct encoder_sys_t int i_channels; /* - * Common properties - */ - mtime_t i_pts; + ** Channel reordering + */ + int pi_chan_table[AOUT_CHAN_MAX]; + }; /***************************************************************************** @@ -654,12 +744,10 @@ static int OpenEncoder( vlc_object_t *p_this ) { encoder_t *p_enc = (encoder_t *)p_this; encoder_sys_t *p_sys; - int i_quality, i_min_bitrate, i_max_bitrate, i; + int i_quality, i_min_bitrate, i_max_bitrate; ogg_packet header[3]; - vlc_value_t val; - uint8_t *p_extra; - if( p_enc->fmt_out.i_codec != VLC_FOURCC('v','o','r','b') && + if( p_enc->fmt_out.i_codec != VLC_CODEC_VORBIS && !p_enc->b_force ) { return VLC_EGENERIC; @@ -667,26 +755,22 @@ 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; - p_enc->fmt_in.i_codec = AUDIO_FMT_S16_NE; - p_enc->fmt_out.i_codec = VLC_FOURCC('v','o','r','b'); + p_enc->fmt_in.i_codec = VLC_CODEC_FL32; + p_enc->fmt_out.i_codec = VLC_CODEC_VORBIS; - sout_CfgParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg ); + config_ChainParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg ); - var_Get( p_enc, ENC_CFG_PREFIX "quality", &val ); - i_quality = val.i_int; + i_quality = var_GetInteger( p_enc, ENC_CFG_PREFIX "quality" ); if( i_quality > 10 ) i_quality = 10; if( i_quality < 0 ) i_quality = 0; - var_Get( p_enc, ENC_CFG_PREFIX "max-bitrate", &val ); - i_max_bitrate = val.i_int; - var_Get( p_enc, ENC_CFG_PREFIX "min-bitrate", &val ); - i_min_bitrate = val.i_int; + + if( var_GetBool( p_enc, ENC_CFG_PREFIX "cbr" ) ) i_quality = 0; + i_max_bitrate = var_GetInteger( p_enc, ENC_CFG_PREFIX "max-bitrate" ); + i_min_bitrate = var_GetInteger( p_enc, ENC_CFG_PREFIX "min-bitrate" ); /* Initialize vorbis encoder */ vorbis_info_init( &p_sys->vi ); @@ -751,21 +835,22 @@ static int OpenEncoder( vlc_object_t *p_this ) /* Create and store headers */ vorbis_analysis_headerout( &p_sys->vd, &p_sys->vc, &header[0], &header[1], &header[2]); - p_enc->fmt_out.i_extra = 3 * 2 + header[0].bytes + - header[1].bytes + header[2].bytes; - p_extra = p_enc->fmt_out.p_extra = malloc( p_enc->fmt_out.i_extra ); - for( i = 0; i < 3; i++ ) + for( int i = 0; i < 3; i++ ) { - *(p_extra++) = header[i].bytes >> 8; - *(p_extra++) = header[i].bytes & 0xFF; - memcpy( p_extra, header[i].packet, header[i].bytes ); - p_extra += header[i].bytes; + if( xiph_AppendHeaders( &p_enc->fmt_out.i_extra, &p_enc->fmt_out.p_extra, + header[i].bytes, header[i].packet ) ) + { + p_enc->fmt_out.i_extra = 0; + p_enc->fmt_out.p_extra = NULL; + } } p_sys->i_channels = p_enc->fmt_in.audio.i_channels; p_sys->i_last_block_size = 0; p_sys->i_samples_delay = 0; - p_sys->i_pts = 0; + + ConfigureChannelOrder(p_sys->pi_chan_table, p_sys->vi.channels, + p_enc->fmt_in.audio.i_physical_channels, true); return VLC_SUCCESS; } @@ -784,7 +869,7 @@ static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf ) int i; unsigned int j; - p_sys->i_pts = p_aout_buf->start_date - + mtime_t i_pts = p_aout_buf->i_pts - (mtime_t)1000000 * (mtime_t)p_sys->i_samples_delay / (mtime_t)p_enc->fmt_in.audio.i_rate; @@ -797,8 +882,8 @@ static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf ) { for( j = 0 ; j < p_aout_buf->i_nb_samples ; j++ ) { - buffer[i][j]= ((float)( ((int16_t *)p_aout_buf->p_buffer ) - [j * p_sys->i_channels + i ] )) / 32768.f; + buffer[i][j]= ((float *)p_aout_buf->p_buffer) + [j * p_sys->i_channels + p_sys->pi_chan_table[i]]; } } @@ -826,12 +911,12 @@ static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf ) p_block->i_length = (mtime_t)1000000 * (mtime_t)i_samples / (mtime_t)p_enc->fmt_in.audio.i_rate; - p_block->i_dts = p_block->i_pts = p_sys->i_pts; + p_block->i_dts = p_block->i_pts = i_pts; p_sys->i_samples_delay -= i_samples; /* Update pts */ - p_sys->i_pts += p_block->i_length; + i_pts += p_block->i_length; block_ChainAppend( &p_chain, p_block ); } }