X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fflac.c;h=f41fd6636561676966977086c97772600f474498;hb=2d22d0e2f33e7e617a49417418102e3105c038c1;hp=fa497544944f20486e128591301b38025ca8df47;hpb=85b29bdc288a1573d43bd524908be5748a9b3640;p=vlc diff --git a/modules/codec/flac.c b/modules/codec/flac.c index fa49754494..f41fd66365 100644 --- a/modules/codec/flac.c +++ b/modules/codec/flac.c @@ -1,11 +1,11 @@ /***************************************************************************** * flac.c: flac decoder/packetizer/encoder module making use of libflac ***************************************************************************** - * Copyright (C) 1999-2001 VideoLAN (Centrale Réseaux) and its contributors + * Copyright (C) 1999-2001 the VideoLAN team * $Id$ * * Authors: Gildas Bazin - * Sigmund Augdal + * Sigmund Augdal Helberg * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,15 +19,20 @@ * * 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 *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include +#include +#include #ifdef HAVE_FLAC_STREAM_DECODER_H # include @@ -35,11 +40,15 @@ # define USE_LIBFLAC #endif -#include "vlc_block_helper.h" -#include "vlc_bits.h" +#include +#include #define MAX_FLAC_HEADER_SIZE 16 +#if defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT >= 8 +# define USE_NEW_FLAC_API +#endif + /***************************************************************************** * decoder_sys_t : FLAC decoder descriptor *****************************************************************************/ @@ -97,7 +106,7 @@ enum { STATE_SEND_DATA }; -static int pi_channels_maps[6] = +static int pi_channels_maps[7] = { 0, AOUT_CHAN_CENTER, @@ -106,7 +115,9 @@ static int pi_channels_maps[6] = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT, AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER - | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT + | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT, + AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER + | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE }; /***************************************************************************** @@ -126,7 +137,8 @@ static aout_buffer_t *DecodeBlock( decoder_t *, block_t ** ); #endif static block_t *PacketizeBlock( decoder_t *, block_t ** ); -static int SyncInfo( decoder_t *, uint8_t *, int *, int *, int *,int * ); +static int SyncInfo( decoder_t *, uint8_t *, unsigned int *, unsigned int *, + unsigned int *,int * ); #ifdef USE_LIBFLAC @@ -165,6 +177,7 @@ vlc_module_begin(); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACODEC ); + add_shortcut( "flac" ); #ifdef USE_LIBFLAC set_description( _("Flac audio decoder") ); @@ -182,7 +195,6 @@ vlc_module_begin(); set_capability( "packetizer", 100 ); set_callbacks( OpenPacketizer, CloseDecoder ); - add_shortcut( "flac" ); vlc_module_end(); /***************************************************************************** @@ -203,15 +215,15 @@ static int OpenDecoder( vlc_object_t *p_this ) (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_state = STATE_NOSYNC; p_sys->b_stream_info = VLC_FALSE; - - p_sys->bytestream = block_BytestreamInit( p_dec ); + p_sys->p_block=NULL; + p_sys->bytestream = block_BytestreamInit(); #ifdef USE_LIBFLAC /* Take care of flac init */ @@ -222,6 +234,25 @@ static int OpenDecoder( vlc_object_t *p_this ) return VLC_EGENERIC; } +#ifdef USE_NEW_FLAC_API + if( FLAC__stream_decoder_init_stream( p_sys->p_flac, + DecoderReadCallback, + NULL, + NULL, + NULL, + NULL, + DecoderWriteCallback, + DecoderMetadataCallback, + DecoderErrorCallback, + p_dec ) + != FLAC__STREAM_DECODER_INIT_STATUS_OK ) + { + msg_Err( p_dec, "FLAC__stream_decoder_init_stream() failed" ); + FLAC__stream_decoder_delete( p_sys->p_flac ); + free( p_sys ); + return VLC_EGENERIC; + } +#else FLAC__stream_decoder_set_read_callback( p_sys->p_flac, DecoderReadCallback ); FLAC__stream_decoder_set_write_callback( p_sys->p_flac, @@ -233,6 +264,7 @@ static int OpenDecoder( vlc_object_t *p_this ) FLAC__stream_decoder_set_client_data( p_sys->p_flac, p_dec ); FLAC__stream_decoder_init( p_sys->p_flac ); +#endif #endif /* Set output properties */ @@ -243,7 +275,6 @@ static int OpenDecoder( vlc_object_t *p_this ) #ifdef USE_LIBFLAC p_dec->pf_decode_audio = DecodeBlock; #endif - p_dec->pf_packetize = PacketizeBlock; return VLC_SUCCESS; } @@ -251,18 +282,24 @@ static int OpenDecoder( vlc_object_t *p_this ) static int OpenPacketizer( vlc_object_t *p_this ) { decoder_t *p_dec = (decoder_t*)p_this; + es_format_t es_save = p_dec->fmt_out; int i_ret; - /* Hmmm, mem leak ?*/ + /* */ es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in ); i_ret = OpenDecoder( p_this ); + p_dec->pf_decode_audio = NULL; + p_dec->pf_packetize = PacketizeBlock; /* Set output properties */ p_dec->fmt_out.i_codec = VLC_FOURCC('f','l','a','c'); - if( i_ret != VLC_SUCCESS ) return i_ret; - + if( i_ret != VLC_SUCCESS ) + { + es_format_Clean( &p_dec->fmt_out ); + p_dec->fmt_out = es_save; + } return i_ret; } @@ -279,12 +316,12 @@ static void CloseDecoder( vlc_object_t *p_this ) FLAC__stream_decoder_delete( p_sys->p_flac ); #endif - if( p_sys->p_block ) free( p_sys->p_block ); + free( p_sys->p_block ); free( p_sys ); } /***************************************************************************** - * ProcessHeader: processe Flac header. + * ProcessHeader: process Flac header. *****************************************************************************/ static void ProcessHeader( decoder_t *p_dec ) { @@ -344,8 +381,26 @@ static block_t *PacketizeBlock( decoder_t *p_dec, block_t **pp_block ) if( !pp_block || !*pp_block ) return NULL; + if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) + { + if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED ) + { + p_sys->i_state = STATE_NOSYNC; + block_BytestreamFlush( &p_sys->bytestream ); + } +// aout_DateSet( &p_sys->end_date, 0 ); + block_Release( *pp_block ); + return NULL; + } + if( !p_sys->b_stream_info ) ProcessHeader( p_dec ); + if( p_sys->stream_info.channels > 6 ) + { + msg_Err( p_dec, "This stream uses too many audio channels" ); + return NULL; + } + if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts ) { /* We've just started the stream, wait for the first PTS. */ @@ -358,11 +413,6 @@ static block_t *PacketizeBlock( decoder_t *p_dec, block_t **pp_block ) aout_DateSet( &p_sys->end_date, (*pp_block)->i_pts ); } - if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) - { - p_sys->i_state = STATE_NOSYNC; - } - block_BytestreamPush( &p_sys->bytestream, *pp_block ); while( 1 ) @@ -536,6 +586,7 @@ static FLAC__StreamDecoderReadStatus DecoderReadCallback( const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data ) { + VLC_UNUSED(decoder); decoder_t *p_dec = (decoder_t *)client_data; decoder_sys_t *p_sys = p_dec->p_sys; @@ -563,6 +614,7 @@ DecoderWriteCallback( const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 *const buffer[], void *client_data ) { + VLC_UNUSED(decoder); decoder_t *p_dec = (decoder_t *)client_data; decoder_sys_t *p_sys = p_dec->p_sys; @@ -598,22 +650,26 @@ static void DecoderMetadataCallback( const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data ) { + VLC_UNUSED(decoder); decoder_t *p_dec = (decoder_t *)client_data; decoder_sys_t *p_sys = p_dec->p_sys; - switch( metadata->data.stream_info.bits_per_sample ) + if( p_dec->pf_decode_audio ) { - case 8: - p_dec->fmt_out.i_codec = VLC_FOURCC('s','8',' ',' '); - break; - case 16: - p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE; - break; - default: - msg_Dbg( p_dec, "strange bit/sample value: %d", - metadata->data.stream_info.bits_per_sample ); - p_dec->fmt_out.i_codec = VLC_FOURCC('f','i','3','2'); - break; + switch( metadata->data.stream_info.bits_per_sample ) + { + case 8: + p_dec->fmt_out.i_codec = VLC_FOURCC('s','8',' ',' '); + break; + case 16: + p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE; + break; + default: + msg_Dbg( p_dec, "strange bit/sample value: %d", + metadata->data.stream_info.bits_per_sample ); + p_dec->fmt_out.i_codec = VLC_FOURCC('f','i','3','2'); + break; + } } /* Setup the format */ @@ -644,12 +700,13 @@ static void DecoderErrorCallback( const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data ) { + VLC_UNUSED(decoder); decoder_t *p_dec = (decoder_t *)client_data; switch( status ) { case FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC: - msg_Err( p_dec, "an error in the stream caused the decoder to " + msg_Warn( p_dec, "an error in the stream caused the decoder to " "lose synchronization." ); break; case FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER: @@ -704,33 +761,44 @@ static void decoder_state_error( decoder_t *p_dec, switch ( state ) { case FLAC__STREAM_DECODER_SEARCH_FOR_METADATA: - msg_Err( p_dec, "the decoder is ready to search for metadata." ); + msg_Dbg( p_dec, "the decoder is ready to search for metadata." ); break; case FLAC__STREAM_DECODER_READ_METADATA: - msg_Err( p_dec, "the decoder is ready to or is in the process of " + msg_Dbg( p_dec, "the decoder is ready to or is in the process of " "reading metadata." ); break; case FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC: - msg_Err( p_dec, "the decoder is ready to or is in the process of " + msg_Dbg( p_dec, "the decoder is ready to or is in the process of " "searching for the frame sync code." ); break; case FLAC__STREAM_DECODER_READ_FRAME: - msg_Err( p_dec, "the decoder is ready to or is in the process of " + msg_Dbg( p_dec, "the decoder is ready to or is in the process of " "reading a frame." ); break; case FLAC__STREAM_DECODER_END_OF_STREAM: - msg_Err( p_dec, "the decoder has reached the end of the stream." ); + msg_Dbg( p_dec, "the decoder has reached the end of the stream." ); + break; +#ifdef USE_NEW_FLAC_API + case FLAC__STREAM_DECODER_OGG_ERROR: + msg_Err( p_dec, "error occurred in the Ogg layer." ); break; + case FLAC__STREAM_DECODER_SEEK_ERROR: + msg_Err( p_dec, "error occurred while seeking." ); + break; +#endif case FLAC__STREAM_DECODER_ABORTED: - msg_Err( p_dec, "the decoder was aborted by the read callback." ); + msg_Warn( p_dec, "the decoder was aborted by the read callback." ); break; +#ifndef USE_NEW_FLAC_API case FLAC__STREAM_DECODER_UNPARSEABLE_STREAM: - msg_Err( p_dec, "the decoder encountered reserved fields in use " + msg_Warn( p_dec, "the decoder encountered reserved fields in use " "in the stream." ); break; +#endif case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR: msg_Err( p_dec, "error when allocating memory." ); break; +#ifndef USE_NEW_FLAC_API case FLAC__STREAM_DECODER_ALREADY_INITIALIZED: msg_Err( p_dec, "FLAC__stream_decoder_init() was called when the " "decoder was already initialized, usually because " @@ -740,11 +808,12 @@ static void decoder_state_error( decoder_t *p_dec, msg_Err( p_dec, "FLAC__stream_decoder_init() was called without " "all callbacks being set." ); break; +#endif case FLAC__STREAM_DECODER_UNINITIALIZED: msg_Err( p_dec, "decoder in uninitialized state." ); break; default: - msg_Err(p_dec, "unknown error" ); + msg_Warn(p_dec, "unknown error" ); } } #endif @@ -753,8 +822,10 @@ static void decoder_state_error( decoder_t *p_dec, * SyncInfo: parse FLAC sync info *****************************************************************************/ static int SyncInfo( decoder_t *p_dec, uint8_t *p_buf, - int * pi_channels, int * pi_channels_conf, - int * pi_sample_rate, int * pi_bits_per_sample ) + unsigned int * pi_channels, + unsigned int * pi_channels_conf, + unsigned int * pi_sample_rate, + int * pi_bits_per_sample ) { decoder_sys_t *p_sys = p_dec->p_sys; int i_header, i_temp, i_read; @@ -1112,7 +1183,7 @@ struct encoder_sys_t int i_channels; FLAC__int32 *p_buffer; - int i_buffer; + unsigned int i_buffer; block_t *p_chain; @@ -1172,7 +1243,12 @@ static int OpenEncoder( vlc_object_t *p_this ) p_sys->i_samples_delay = 0; /* Create flac encoder */ - p_sys->p_flac = FLAC__stream_encoder_new(); + if( !(p_sys->p_flac = FLAC__stream_encoder_new()) ) + { + msg_Err( p_enc, "FLAC__stream_encoder_new() failed" ); + free( p_sys ); + return VLC_EGENERIC; + } FLAC__stream_encoder_set_streamable_subset( p_sys->p_flac, 1 ); FLAC__stream_encoder_set_channels( p_sys->p_flac, @@ -1182,15 +1258,32 @@ static int OpenEncoder( vlc_object_t *p_this ) FLAC__stream_encoder_set_bits_per_sample( p_sys->p_flac, 16 ); p_enc->fmt_in.i_codec = AOUT_FMT_S16_NE; + /* Get and store the STREAMINFO metadata block as a p_extra */ + p_sys->p_chain = 0; + +#ifdef USE_NEW_FLAC_API + if( FLAC__stream_encoder_init_stream( p_sys->p_flac, + EncoderWriteCallback, + NULL, + NULL, + EncoderMetadataCallback, + p_enc ) + != FLAC__STREAM_ENCODER_INIT_STATUS_OK ) + { + msg_Err( p_enc, "FLAC__stream_encoder_init_stream() failed" ); + FLAC__stream_encoder_delete( p_sys->p_flac ); + free( p_sys ); + return VLC_EGENERIC; + } +#else FLAC__stream_encoder_set_write_callback( p_sys->p_flac, EncoderWriteCallback ); FLAC__stream_encoder_set_metadata_callback( p_sys->p_flac, EncoderMetadataCallback ); FLAC__stream_encoder_set_client_data( p_sys->p_flac, p_enc ); - /* Get and store the STREAMINFO metadata block as a p_extra */ - p_sys->p_chain = 0; FLAC__stream_encoder_init( p_sys->p_flac ); +#endif return VLC_SUCCESS; } @@ -1204,7 +1297,7 @@ static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf ) { encoder_sys_t *p_sys = p_enc->p_sys; block_t *p_chain; - int i; + unsigned int i; p_sys->i_pts = p_aout_buf->start_date - (mtime_t)1000000 * (mtime_t)p_sys->i_samples_delay / @@ -1244,7 +1337,7 @@ static void CloseEncoder( vlc_object_t *p_this ) FLAC__stream_encoder_delete( p_sys->p_flac ); - if( p_sys->p_buffer ) free( p_sys->p_buffer ); + free( p_sys->p_buffer ); free( p_sys ); } @@ -1255,6 +1348,7 @@ static void EncoderMetadataCallback( const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data ) { + VLC_UNUSED(encoder); encoder_t *p_enc = (encoder_t *)client_data; msg_Err( p_enc, "MetadataCallback: %i", metadata->type ); @@ -1270,6 +1364,7 @@ EncoderWriteCallback( const FLAC__StreamEncoder *encoder, unsigned bytes, unsigned samples, unsigned current_frame, void *client_data ) { + VLC_UNUSED(encoder); VLC_UNUSED(current_frame); encoder_t *p_enc = (encoder_t *)client_data; encoder_sys_t *p_sys = p_enc->p_sys; block_t *p_block;