/*****************************************************************************
* 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
#include <vlc/vlc.h>
#include <vlc/decoder.h>
-#include <FLAC/stream_decoder.h>
-#include <FLAC/stream_encoder.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
/*
* 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
+ vlc_bool_t b_stream_info;
/*
* Common properties
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 );
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 );
*****************************************************************************/
vlc_module_begin();
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_ACODEC );
+
+#ifdef USE_LIBFLAC
set_description( _("Flac audio decoder") );
set_capability( "decoder", 100 );
set_callbacks( OpenDecoder, CloseDecoder );
- add_submodule();
- set_description( _("Flac audio packetizer") );
- set_capability( "packetizer", 100 );
- set_callbacks( OpenPacketizer, CloseDecoder );
-
add_submodule();
set_description( _("Flac audio encoder") );
set_capability( "encoder", 100 );
set_callbacks( OpenEncoder, CloseEncoder );
+ add_submodule();
+#endif
+ set_description( _("Flac audio packetizer") );
+ set_capability( "packetizer", 100 );
+ set_callbacks( OpenPacketizer, CloseDecoder );
+
add_shortcut( "flac" );
vlc_module_end();
p_sys->bytestream = block_BytestreamInit( p_dec );
+#ifdef USE_LIBFLAC
/* Take care of flac init */
if( !(p_sys->p_flac = FLAC__stream_decoder_new()) )
{
FLAC__stream_decoder_set_client_data( p_sys->p_flac, p_dec );
FLAC__stream_decoder_init( p_sys->p_flac );
+#endif
/* Set output properties */
p_dec->fmt_out.i_cat = AUDIO_ES;
p_dec->fmt_out.i_codec = VLC_FOURCC('f','l','3','2');
/* Set callbacks */
+#ifdef USE_LIBFLAC
p_dec->pf_decode_audio = DecodeBlock;
+#endif
p_dec->pf_packetize = PacketizeBlock;
return VLC_SUCCESS;
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
+
+ if( p_sys->p_block ) free( p_sys->p_block );
+ free( p_sys );
+}
+
/*****************************************************************************
* ProcessHeader: processe Flac header.
*****************************************************************************/
{
decoder_sys_t *p_sys = p_dec->p_sys;
+#ifdef USE_LIBFLAC
if( !p_dec->fmt_in.i_extra ) return;
/* Decode STREAMINFO */
FLAC__stream_decoder_process_until_end_of_metadata( p_sys->p_flac );
msg_Dbg( p_dec, "STREAMINFO decoded" );
+#else
+ bs_t bs;
+
+ if( !p_dec->fmt_in.i_extra ) return;
+
+ bs_init( &bs, p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra );
+
+ p_sys->stream_info.min_blocksize = bs_read( &bs, 16 );
+ p_sys->stream_info.max_blocksize = bs_read( &bs, 16 );
+
+ p_sys->stream_info.min_framesize = bs_read( &bs, 24 );
+ p_sys->stream_info.max_framesize = bs_read( &bs, 24 );
+
+ 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_FOURCC('f','l','a','c') )
aout_DateSet( &p_sys->end_date, (*pp_block)->i_pts );
}
- if( (*pp_block)->i_flags&BLOCK_FLAG_DISCONTINUITY )
+ if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
p_sys->i_state = STATE_NOSYNC;
}
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
*****************************************************************************/
msg_Err(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;
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
{
return crc;
}
+#ifdef USE_LIBFLAC
/*****************************************************************************
* encoder_sys_t : flac encoder descriptor
*****************************************************************************/
return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
}
+#endif
projects / vlc / blobdiff