X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fflac.c;h=0f9620a986a836e7e9c460c31c8ff58861472082;hb=22dbf2bfad420b171fee86c1a97a433929e6fc1e;hp=e2d33a949d93e5b900db6802eaa4f66dc490768c;hpb=bfabd662d161182fc071096963d4d727662b73b1;p=vlc diff --git a/modules/codec/flac.c b/modules/codec/flac.c index e2d33a949d..0f9620a986 100644 --- a/modules/codec/flac.c +++ b/modules/codec/flac.c @@ -26,8 +26,14 @@ * Preamble *****************************************************************************/ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include #ifdef HAVE_FLAC_STREAM_DECODER_H # include @@ -35,11 +41,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 *****************************************************************************/ @@ -75,7 +85,7 @@ struct decoder_sys_t } stream_info; #endif - vlc_bool_t b_stream_info; + bool b_stream_info; /* * Common properties @@ -97,7 +107,7 @@ enum { STATE_SEND_DATA }; -static int pi_channels_maps[6] = +static int pi_channels_maps[7] = { 0, AOUT_CHAN_CENTER, @@ -106,7 +116,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 }; /***************************************************************************** @@ -166,24 +178,24 @@ vlc_module_begin(); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACODEC ); + add_shortcut( "flac" ); #ifdef USE_LIBFLAC - set_description( _("Flac audio decoder") ); + set_description( N_("Flac audio decoder") ); set_capability( "decoder", 100 ); set_callbacks( OpenDecoder, CloseDecoder ); add_submodule(); - set_description( _("Flac audio encoder") ); + set_description( N_("Flac audio encoder") ); set_capability( "encoder", 100 ); set_callbacks( OpenEncoder, CloseEncoder ); add_submodule(); #endif - set_description( _("Flac audio packetizer") ); + set_description( N_("Flac audio packetizer") ); set_capability( "packetizer", 100 ); set_callbacks( OpenPacketizer, CloseDecoder ); - add_shortcut( "flac" ); vlc_module_end(); /***************************************************************************** @@ -202,17 +214,14 @@ 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_state = STATE_NOSYNC; - p_sys->b_stream_info = VLC_FALSE; + p_sys->b_stream_info = false; p_sys->p_block=NULL; - p_sys->bytestream = block_BytestreamInit( p_dec ); + p_sys->bytestream = block_BytestreamInit(); #ifdef USE_LIBFLAC /* Take care of flac init */ @@ -223,6 +232,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, @@ -234,6 +262,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 */ @@ -244,7 +273,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; } @@ -252,18 +280,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; } @@ -280,12 +314,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 ) { @@ -345,8 +379,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. */ @@ -359,11 +411,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 ) @@ -537,6 +584,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; @@ -564,6 +612,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; @@ -599,22 +648,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 */ @@ -632,7 +685,7 @@ static void DecoderMetadataCallback( const FLAC__StreamDecoder *decoder, p_dec->fmt_out.audio.i_channels, p_dec->fmt_out.audio.i_rate, p_dec->fmt_out.audio.i_bitspersample ); - p_sys->b_stream_info = VLC_TRUE; + p_sys->b_stream_info = true; p_sys->stream_info = metadata->data.stream_info; return; @@ -645,12 +698,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: @@ -705,33 +759,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 " @@ -741,11 +806,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 @@ -764,9 +830,9 @@ static int SyncInfo( decoder_t *p_dec, uint8_t *p_buf, int i_blocksize = 0, i_blocksize_hint = 0, i_sample_rate_hint = 0; uint64_t i_sample_number = 0; - vlc_bool_t b_variable_blocksize = ( p_sys->b_stream_info && + bool b_variable_blocksize = ( p_sys->b_stream_info && p_sys->stream_info.min_blocksize != p_sys->stream_info.max_blocksize ); - vlc_bool_t b_fixed_blocksize = ( p_sys->b_stream_info && + bool b_fixed_blocksize = ( p_sys->b_stream_info && p_sys->stream_info.min_blocksize == p_sys->stream_info.max_blocksize ); /* Check syncword */ @@ -947,12 +1013,12 @@ static int SyncInfo( decoder_t *p_dec, uint8_t *p_buf, if( i_blocksize_hint && b_variable_blocksize ) { i_sample_number = read_utf8( &p_buf[i_header++], &i_read ); - if( i_sample_number == I64C(0xffffffffffffffff) ) return 0; + if( i_sample_number == INT64_C(0xffffffffffffffff) ) return 0; } else { i_sample_number = read_utf8( &p_buf[i_header++], &i_read ); - if( i_sample_number == I64C(0xffffffffffffffff) ) return 0; + if( i_sample_number == INT64_C(0xffffffffffffffff) ) return 0; if( p_sys->b_stream_info ) i_sample_number *= p_sys->stream_info.min_blocksize; @@ -1037,14 +1103,14 @@ static uint64_t read_utf8( const uint8_t *p_buf, int *pi_read ) i = 6; } else { - return I64C(0xffffffffffffffff); + return INT64_C(0xffffffffffffffff); } for( j = 1; j <= i; j++ ) { if( !(p_buf[j] & 0x80) || (p_buf[j] & 0x40) ) /* 10xxxxxx */ { - return I64C(0xffffffffffffffff); + return INT64_C(0xffffffffffffffff); } i_result <<= 6; i_result |= (p_buf[j] & 0x3F); @@ -1115,7 +1181,7 @@ struct encoder_sys_t int i_channels; FLAC__int32 *p_buffer; - int i_buffer; + unsigned int i_buffer; block_t *p_chain; @@ -1161,10 +1227,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; p_enc->fmt_out.i_codec = VLC_FOURCC('f','l','a','c'); @@ -1175,7 +1238,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, @@ -1185,15 +1253,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; } @@ -1207,7 +1292,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 / @@ -1247,7 +1332,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 ); } @@ -1258,6 +1343,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 ); @@ -1273,6 +1359,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;