/*****************************************************************************
* flac.c: flac decoder/packetizer/encoder module making use of libflac
*****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
+ * Copyright (C) 1999-2001 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
- * Sigmund Augdal <sigmunau@idi.ntnu.no>
+ * Sigmund Augdal Helberg <dnumgis@videolan.org>
*
* 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
*
* 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 <vlc/vlc.h>
-#include <vlc/decoder.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <FLAC/stream_decoder.h>
-#include <FLAC/stream_encoder.h>
+#include <assert.h>
-#include "vlc_block_helper.h"
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_codec.h>
+#include <vlc_aout.h>
+#include <vlc_memory.h>
+
+#ifdef HAVE_FLAC_STREAM_DECODER_H
+# include <FLAC/stream_decoder.h>
+# include <FLAC/stream_encoder.h>
+# define USE_LIBFLAC
+#endif
+
+#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
*****************************************************************************/
/*
* FLAC properties
*/
+#ifdef USE_LIBFLAC
FLAC__StreamDecoder *p_flac;
-
- vlc_bool_t b_stream_info;
FLAC__StreamMetadata_StreamInfo stream_info;
+#else
+ struct
+ {
+ unsigned min_blocksize, max_blocksize;
+ unsigned min_framesize, max_framesize;
+ unsigned sample_rate;
+ unsigned channels;
+ unsigned bits_per_sample;
+
+ } stream_info;
+#endif
+ bool b_stream_info;
/*
* Common properties
*/
- audio_date_t end_date;
+ date_t end_date;
mtime_t i_pts;
int i_frame_size, i_frame_length, i_bits_per_sample;
STATE_SEND_DATA
};
-static int pi_channels_maps[6] =
+static const 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
};
/*****************************************************************************
static int OpenPacketizer( vlc_object_t * );
static void CloseDecoder ( vlc_object_t * );
+#ifdef USE_LIBFLAC
static int OpenEncoder ( vlc_object_t * );
static void CloseEncoder ( vlc_object_t * );
+#endif
+#ifdef USE_LIBFLAC
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
static FLAC__StreamDecoderReadStatus
DecoderReadCallback( const FLAC__StreamDecoder *decoder,
FLAC__byte buffer[], unsigned *bytes, void *client_data );
void *client_data);
static void Interleave32( int32_t *p_out, const int32_t * const *pp_in,
- int i_nb_channels, int i_samples );
+ const int *pi_order, int i_nb_channels, int i_samples );
+static void Interleave24( int8_t *p_out, const int32_t * const *pp_in,
+ const int *pi_order, int i_nb_channels, int i_samples );
static void Interleave16( int16_t *p_out, const int32_t * const *pp_in,
- int i_nb_channels, int i_samples );
+ const int *pi_order, int i_nb_channels, int i_samples );
static void decoder_state_error( decoder_t *p_dec,
FLAC__StreamDecoderState state );
+#endif
static uint64_t read_utf8( const uint8_t *p_buf, int *pi_read );
static uint8_t flac_crc8( const uint8_t *data, unsigned len );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-vlc_module_begin();
+vlc_module_begin ()
- set_description( _("Flac audio decoder") );
- set_capability( "decoder", 100 );
- set_callbacks( OpenDecoder, CloseDecoder );
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_ACODEC )
+ add_shortcut( "flac" )
- add_submodule();
- set_description( _("Flac audio packetizer") );
- set_capability( "packetizer", 100 );
- set_callbacks( OpenPacketizer, CloseDecoder );
+#ifdef USE_LIBFLAC
+ set_description( N_("Flac audio decoder") )
+ set_capability( "decoder", 100 )
+ set_callbacks( OpenDecoder, CloseDecoder )
- add_submodule();
- set_description( _("Flac audio encoder") );
- set_capability( "encoder", 100 );
- set_callbacks( OpenEncoder, CloseEncoder );
+ add_submodule ()
+ add_shortcut( "flac" )
+ set_description( N_("Flac audio encoder") )
+ set_capability( "encoder", 100 )
+ set_callbacks( OpenEncoder, CloseEncoder )
- add_shortcut( "flac" );
-vlc_module_end();
+ add_submodule ()
+ add_shortcut( "flac" )
+#endif
+ set_description( N_("Flac audio packetizer") )
+ set_capability( "packetizer", 100 )
+ set_callbacks( OpenPacketizer, CloseDecoder )
+
+vlc_module_end ()
/*****************************************************************************
* OpenDecoder: probe the decoder and return score
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys;
- if( p_dec->fmt_in.i_codec != VLC_FOURCC('f','l','a','c') )
+ if( p_dec->fmt_in.i_codec != VLC_CODEC_FLAC )
{
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 );
+ date_Set( &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->b_stream_info = false;
+ p_sys->p_block=NULL;
+ p_sys->bytestream = block_BytestreamInit();
+#ifdef USE_LIBFLAC
/* Take care of flac init */
if( !(p_sys->p_flac = FLAC__stream_decoder_new()) )
{
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 */
p_dec->fmt_out.i_cat = AUDIO_ES;
- p_dec->fmt_out.i_codec = VLC_FOURCC('f','l','3','2');
+ p_dec->fmt_out.i_codec = VLC_CODEC_FL32;
/* Set callbacks */
+#ifdef USE_LIBFLAC
p_dec->pf_decode_audio = DecodeBlock;
+#endif
+
+ 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;
+
+ /* */
+ 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_CODEC_FLAC;
+
+ if( i_ret != VLC_SUCCESS )
+ {
+ es_format_Clean( &p_dec->fmt_out );
+ p_dec->fmt_out = es_save;
+ }
+ return i_ret;
+}
+
+/*****************************************************************************
+ * CloseDecoder: flac decoder destruction
+ *****************************************************************************/
+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;
+
+#ifdef USE_LIBFLAC
+ FLAC__stream_decoder_finish( p_sys->p_flac );
+ FLAC__stream_decoder_delete( p_sys->p_flac );
+#endif
+
+ free( p_sys->p_block );
+ free( p_sys );
+}
+
+/*****************************************************************************
+ * ProcessHeader: process Flac header.
+ *****************************************************************************/
+static void ProcessHeader( decoder_t *p_dec )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+#ifdef USE_LIBFLAC
+ if( !p_dec->fmt_in.i_extra ) return;
+
/* Decode STREAMINFO */
msg_Dbg( p_dec, "decode STREAMINFO" );
p_sys->p_block = block_New( p_dec, p_dec->fmt_in.i_extra );
FLAC__stream_decoder_process_until_end_of_metadata( p_sys->p_flac );
msg_Dbg( p_dec, "STREAMINFO decoded" );
- return VLC_SUCCESS;
-}
+#else
+ bs_t bs;
-static int OpenPacketizer( vlc_object_t *p_this )
-{
- decoder_t *p_dec = (decoder_t*)p_this;
+ if( !p_dec->fmt_in.i_extra ) return;
- /* Hmmm, mem leak ?*/
- es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
+ bs_init( &bs, p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra );
- int i_ret = OpenDecoder( p_this );
+ p_sys->stream_info.min_blocksize = bs_read( &bs, 16 );
+ p_sys->stream_info.max_blocksize = bs_read( &bs, 16 );
- if( i_ret != VLC_SUCCESS ) return i_ret;
+ p_sys->stream_info.min_framesize = bs_read( &bs, 24 );
+ p_sys->stream_info.max_framesize = bs_read( &bs, 24 );
- return i_ret;
+ p_sys->stream_info.sample_rate = bs_read( &bs, 20 );
+ p_sys->stream_info.channels = bs_read( &bs, 3 ) + 1;
+ p_sys->stream_info.bits_per_sample = bs_read( &bs, 5 ) + 1;
+#endif
+
+ if( !p_sys->b_stream_info ) return;
+
+ if( p_dec->fmt_out.i_codec == VLC_CODEC_FLAC )
+ {
+ p_dec->fmt_out.i_extra = p_dec->fmt_in.i_extra;
+ p_dec->fmt_out.p_extra = realloc_or_free( p_dec->fmt_out.p_extra,
+ p_dec->fmt_out.i_extra );
+ assert( p_dec->fmt_out.p_extra );
+ memcpy( p_dec->fmt_out.p_extra,
+ p_dec->fmt_in.p_extra, p_dec->fmt_out.i_extra );
+ }
}
/****************************************************************************
if( !pp_block || !*pp_block ) return NULL;
- if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts )
+ if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
- /* We've just started the stream, wait for the first PTS. */
+ if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED )
+ {
+ p_sys->i_state = STATE_NOSYNC;
+ block_BytestreamEmpty( &p_sys->bytestream );
+ }
+ date_Set( &p_sys->end_date, 0 );
block_Release( *pp_block );
return NULL;
}
- else if( !aout_DateGet( &p_sys->end_date ) )
+
+ if( !p_sys->b_stream_info ) ProcessHeader( p_dec );
+
+ if( p_sys->stream_info.channels > 6 )
{
- /* The first PTS is as good as anything else. */
- aout_DateSet( &p_sys->end_date, (*pp_block)->i_pts );
+ msg_Err( p_dec, "This stream uses too many audio channels" );
+ return NULL;
}
- if( (*pp_block)->i_flags&BLOCK_FLAG_DISCONTINUITY )
+ if( !date_Get( &p_sys->end_date ) && !(*pp_block)->i_pts )
{
- p_sys->i_state = STATE_NOSYNC;
+ /* We've just started the stream, wait for the first PTS. */
+ block_Release( *pp_block );
+ return NULL;
+ }
+ else if( !date_Get( &p_sys->end_date ) )
+ {
+ /* The first PTS is as good as anything else. */
+ p_sys->i_rate = p_dec->fmt_out.audio.i_rate;
+ date_Init( &p_sys->end_date, p_sys->i_rate, 1 );
+ date_Set( &p_sys->end_date, (*pp_block)->i_pts );
}
block_BytestreamPush( &p_sys->bytestream, *pp_block );
/* New frame, set the Presentation Time Stamp */
p_sys->i_pts = p_sys->bytestream.p_block->i_pts;
if( p_sys->i_pts != 0 &&
- p_sys->i_pts != aout_DateGet( &p_sys->end_date ) )
+ p_sys->i_pts != date_Get( &p_sys->end_date ) )
{
- aout_DateSet( &p_sys->end_date, p_sys->i_pts );
+ date_Set( &p_sys->end_date, p_sys->i_pts );
}
p_sys->i_state = STATE_HEADER;
if( p_sys->i_rate != p_dec->fmt_out.audio.i_rate )
{
p_dec->fmt_out.audio.i_rate = p_sys->i_rate;
- aout_DateInit( &p_sys->end_date, p_sys->i_rate );
+ date_Init( &p_sys->end_date, p_sys->i_rate, 1 );
}
p_sys->i_state = STATE_NEXT_SYNC;
p_sys->i_frame_size = 1;
/* Date management */
p_sout_block->i_pts =
- p_sout_block->i_dts = aout_DateGet( &p_sys->end_date );
- aout_DateIncrement( &p_sys->end_date, p_sys->i_frame_length );
+ p_sout_block->i_dts = date_Get( &p_sys->end_date );
+ date_Increment( &p_sys->end_date, p_sys->i_frame_length );
p_sout_block->i_length =
- aout_DateGet( &p_sys->end_date ) - p_sout_block->i_pts;
+ date_Get( &p_sys->end_date ) - p_sout_block->i_pts;
return p_sout_block;
}
return NULL;
}
+#ifdef USE_LIBFLAC
/****************************************************************************
* DecodeBlock: the whole thing
****************************************************************************/
return p_sys->p_aout_buffer;
}
-/*****************************************************************************
- * CloseDecoder: flac decoder destruction
- *****************************************************************************/
-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;
-
- FLAC__stream_decoder_finish( p_sys->p_flac );
- FLAC__stream_decoder_delete( p_sys->p_flac );
- if( p_sys->p_block ) free( p_sys->p_block );
- free( p_sys );
-}
-
/*****************************************************************************
* DecoderReadCallback: called by libflac when it needs more data
*****************************************************************************/
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 )
{
+ /* XXX it supposes our internal format is WG4 */
+ static const int ppi_reorder[1+8][8] = {
+ {-1},
+ { 0, },
+ { 0, 1 },
+ { 0, 1, 2 },
+ { 0, 1, 2, 3 },
+ { 0, 1, 3, 4, 2 },
+ { 0, 1, 4, 5, 2, 3 },
+
+ { 0, 1, 6, 2, 3, 4, 5 }, /* 7.0 Unspecified by flac */
+ { 0, 1, 6, 7, 2, 3, 4, 5 }, /* 7.1 Unspecified by flac */
+ };
+
+ VLC_UNUSED(decoder);
decoder_t *p_dec = (decoder_t *)client_data;
decoder_sys_t *p_sys = p_dec->p_sys;
+ if( p_dec->fmt_out.audio.i_channels <= 0 ||
+ p_dec->fmt_out.audio.i_channels > 8 )
+ return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+ const int * const pi_reorder = ppi_reorder[p_dec->fmt_out.audio.i_channels];
+
p_sys->p_aout_buffer =
- p_dec->pf_aout_buffer_new( p_dec, frame->header.blocksize );
+ decoder_NewAudioBuffer( p_dec, frame->header.blocksize );
if( p_sys->p_aout_buffer == NULL )
return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
switch( frame->header.bits_per_sample )
{
case 16:
- Interleave16( (int16_t *)p_sys->p_aout_buffer->p_buffer, buffer,
+ Interleave16( (int16_t *)p_sys->p_aout_buffer->p_buffer, buffer, pi_reorder,
+ frame->header.channels, frame->header.blocksize );
+ break;
+ case 24:
+ Interleave24( (int8_t *)p_sys->p_aout_buffer->p_buffer, buffer, pi_reorder,
frame->header.channels, frame->header.blocksize );
break;
default:
- Interleave32( (int32_t *)p_sys->p_aout_buffer->p_buffer, buffer,
+ Interleave32( (int32_t *)p_sys->p_aout_buffer->p_buffer, buffer, pi_reorder,
frame->header.channels, frame->header.blocksize );
}
/* Date management (already done by packetizer) */
- p_sys->p_aout_buffer->start_date = p_sys->p_block->i_pts;
- p_sys->p_aout_buffer->end_date =
- p_sys->p_block->i_pts + p_sys->p_block->i_length;
+ p_sys->p_aout_buffer->i_pts = p_sys->p_block->i_pts;
+ p_sys->p_aout_buffer->i_length = p_sys->p_block->i_length;
return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
}
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_CODEC_S8;
+ break;
+ case 16:
+ p_dec->fmt_out.i_codec = VLC_CODEC_S16N;
+ break;
+ case 24:
+ p_dec->fmt_out.i_codec = VLC_CODEC_S24N;
+ 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_CODEC_FI32;
+ break;
+ }
}
/* Setup the format */
p_dec->fmt_out.audio.i_bitspersample =
metadata->data.stream_info.bits_per_sample;
- aout_DateInit( &p_sys->end_date, p_dec->fmt_out.audio.i_rate );
+ date_Init( &p_sys->end_date, p_dec->fmt_out.audio.i_rate, 1 );
msg_Dbg( p_dec, "channels:%d samplerate:%d bitspersamples:%d",
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;
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:
* Interleave: helper function to interleave channels
*****************************************************************************/
static void Interleave32( int32_t *p_out, const int32_t * const *pp_in,
+ const int pi_index[],
int i_nb_channels, int i_samples )
{
int i, 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 + i] = pp_in[pi_index[i]][j];
}
}
}
+
+static void Interleave24( int8_t *p_out, const int32_t * const *pp_in,
+ const int pi_index[],
+ int i_nb_channels, int i_samples )
+{
+ int i, j;
+ for ( j = 0; j < i_samples; j++ )
+ {
+ for ( i = 0; i < i_nb_channels; i++ )
+ {
+ const int i_index = pi_index[i];
+#ifdef WORDS_BIGENDIAN
+ p_out[3*(j * i_nb_channels + i)+0] = (pp_in[i_index][j] >> 16) & 0xff;
+ p_out[3*(j * i_nb_channels + i)+1] = (pp_in[i_index][j] >> 8 ) & 0xff;
+ p_out[3*(j * i_nb_channels + i)+2] = (pp_in[i_index][j] >> 0 ) & 0xff;
+#else
+ p_out[3*(j * i_nb_channels + i)+2] = (pp_in[i_index][j] >> 16) & 0xff;
+ p_out[3*(j * i_nb_channels + i)+1] = (pp_in[i_index][j] >> 8 ) & 0xff;
+ p_out[3*(j * i_nb_channels + i)+0] = (pp_in[i_index][j] >> 0 ) & 0xff;
+#endif
+ }
+ }
+}
+
static void Interleave16( int16_t *p_out, const int32_t * const *pp_in,
+ const int pi_index[],
int i_nb_channels, int i_samples )
{
int i, j;
{
for ( i = 0; i < i_nb_channels; i++ )
{
- p_out[j * i_nb_channels + i] = (int32_t)(pp_in[i][j]);
+ p_out[j * i_nb_channels + i] = (int32_t)(pp_in[pi_index[i]][j]);
}
}
}
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 "
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
/*****************************************************************************
* 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;
- int i_blocksize = 0, i_blocksize_hint = 0, i_sample_rate_hint = 0;
+ unsigned i_blocksize = 0;
+ int 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 */
i_temp = (unsigned)(p_buf[3] >> 4);
if( i_temp & 8 )
{
+#ifdef USE_LIBFLAC
int i_channel_assignment; /* ??? */
- *pi_channels = 2;
switch( i_temp & 7 )
{
case 0:
return 0;
break;
}
+#endif
+
+ *pi_channels = 2;
}
else
{
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;
return 0;
}
+ /* Sanity check using stream info header when possible */
+ if( p_sys->b_stream_info )
+ {
+ if( i_blocksize < p_sys->stream_info.min_blocksize ||
+ i_blocksize > p_sys->stream_info.max_blocksize )
+ return 0;
+ }
return i_blocksize;
}
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);
}
/* CRC-8, poly = x^8 + x^2 + x^1 + x^0, init = 0 */
-static uint8_t const flac_crc8_table[256] = {
+static const uint8_t flac_crc8_table[256] = {
0x00, 0x07, 0x0E, 0x09, 0x1C, 0x1B, 0x12, 0x15,
0x38, 0x3F, 0x36, 0x31, 0x24, 0x23, 0x2A, 0x2D,
0x70, 0x77, 0x7E, 0x79, 0x6C, 0x6B, 0x62, 0x65,
return crc;
}
+#ifdef USE_LIBFLAC
/*****************************************************************************
* encoder_sys_t : flac encoder descriptor
*****************************************************************************/
int i_channels;
FLAC__int32 *p_buffer;
- int i_buffer;
+ unsigned int i_buffer;
block_t *p_chain;
encoder_t *p_enc = (encoder_t *)p_this;
encoder_sys_t *p_sys;
- if( p_enc->fmt_out.i_codec != VLC_FOURCC('f','l','a','c') &&
+ if( p_enc->fmt_out.i_codec != VLC_CODEC_FLAC &&
!p_enc->b_force )
{
return VLC_EGENERIC;
/* 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');
+ p_enc->fmt_out.i_codec = VLC_CODEC_FLAC;
p_sys->i_headers = 0;
p_sys->p_buffer = 0;
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_sample_rate( p_sys->p_flac,
p_enc->fmt_in.audio.i_rate );
FLAC__stream_encoder_set_bits_per_sample( p_sys->p_flac, 16 );
- p_enc->fmt_in.i_codec = AOUT_FMT_S16_NE;
+ p_enc->fmt_in.i_codec = VLC_CODEC_S16N;
+ /* 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;
}
{
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 -
+ p_sys->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;
p_sys->i_samples_delay += p_aout_buf->i_nb_samples;
/* Convert samples to FLAC__int32 */
- if( p_sys->i_buffer < p_aout_buf->i_nb_bytes * 2 )
+ if( p_sys->i_buffer < p_aout_buf->i_buffer * 2 )
{
p_sys->p_buffer =
- realloc( p_sys->p_buffer, p_aout_buf->i_nb_bytes * 2 );
- p_sys->i_buffer = p_aout_buf->i_nb_bytes * 2;
+ realloc_or_free( p_sys->p_buffer, p_aout_buf->i_buffer * 2 );
+ assert( p_sys->p_buffer );
+ p_sys->i_buffer = p_aout_buf->i_buffer * 2;
}
- for( i = 0 ; i < p_aout_buf->i_nb_bytes / 2 ; i++ )
+ for( i = 0 ; i < p_aout_buf->i_buffer / 2 ; i++ )
{
p_sys->p_buffer[i]= ((int16_t *)p_aout_buf->p_buffer)[i];
}
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 );
}
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;
/* Backup the STREAMINFO metadata block */
p_enc->fmt_out.i_extra = STREAMINFO_SIZE + 4;
p_enc->fmt_out.p_extra = malloc( STREAMINFO_SIZE + 4 );
+ assert( p_enc->fmt_out.p_extra );
memcpy( p_enc->fmt_out.p_extra, "fLaC", 4 );
memcpy( ((uint8_t *)p_enc->fmt_out.p_extra) + 4, buffer,
STREAMINFO_SIZE );
return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
}
+#endif
projects / vlc / blobdiff