* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
-#include <vlc/decoder.h>
+#include <vlc_codec.h>
+#include <vlc_aout.h>
#ifdef HAVE_FLAC_STREAM_DECODER_H
# include <FLAC/stream_decoder.h>
# define USE_LIBFLAC
#endif
-#include "vlc_block_helper.h"
-#include "vlc_bits.h"
+#include <vlc_block_helper.h>
+#include <vlc_bits.h>
#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
*****************************************************************************/
STATE_SEND_DATA
};
-static int pi_channels_maps[6] =
+static int pi_channels_maps[7] =
{
0,
AOUT_CHAN_CENTER,
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
};
/*****************************************************************************
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACODEC );
+ add_shortcut( "flac" );
#ifdef USE_LIBFLAC
set_description( _("Flac audio decoder") );
set_capability( "packetizer", 100 );
set_callbacks( OpenPacketizer, CloseDecoder );
- add_shortcut( "flac" );
vlc_module_end();
/*****************************************************************************
(decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
{
msg_Err( p_dec, "out of memory" );
- return VLC_EGENERIC;
+ return VLC_ENOMEM;
}
/* Misc init */
p_sys->i_state = STATE_NOSYNC;
p_sys->b_stream_info = VLC_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 */
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,
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 */
#ifdef USE_LIBFLAC
p_dec->pf_decode_audio = DecodeBlock;
#endif
- p_dec->pf_packetize = PacketizeBlock;
return VLC_SUCCESS;
}
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;
}
}
/*****************************************************************************
- * ProcessHeader: processe Flac header.
+ * ProcessHeader: process Flac header.
*****************************************************************************/
static void ProcessHeader( decoder_t *p_dec )
{
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. */
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 )
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;
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;
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 */
FLAC__StreamDecoderErrorStatus status,
void *client_data )
{
+ VLC_UNUSED(decoder);
decoder_t *p_dec = (decoder_t *)client_data;
switch( status )
case FLAC__STREAM_DECODER_END_OF_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_Warn( p_dec, "the decoder was aborted by the read callback." );
break;
+#ifndef USE_NEW_FLAC_API
case FLAC__STREAM_DECODER_UNPARSEABLE_STREAM:
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 "
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;
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,
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;
}
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 );
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;