* flac.c: flac decoder/packetizer/encoder module making use of libflac
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: flac.c,v 1.5 2003/11/22 23:39:14 fenrir Exp $
+ * $Id: flac.c,v 1.9 2004/02/25 17:48:52 fenrir Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Sigmund Augdal <sigmunau@idi.ntnu.no>
*****************************************************************************/
struct decoder_sys_t
{
- /* Module mode */
- vlc_bool_t b_packetizer;
-
/*
* Input properties
*/
/* Misc init */
aout_DateSet( &p_sys->end_date, 0 );
- p_sys->b_packetizer = VLC_FALSE;
p_sys->i_state = STATE_NOSYNC;
p_sys->b_stream_info = VLC_FALSE;
if( i_ret != VLC_SUCCESS ) return i_ret;
- p_dec->p_sys->b_packetizer = VLC_TRUE;
-
es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
return i_ret;
if( !pp_block || !*pp_block ) return NULL;
-#if 0
- if( (*pp_block)->b_discontinuity )
+ if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts )
+ {
+ /* We've just started the stream, wait for the first PTS. */
+ block_Release( *pp_block );
+ return NULL;
+ }
+
+ if( (*pp_block)->i_flags&BLOCK_FLAG_DISCONTINUITY )
{
p_sys->i_state = STATE_NOSYNC;
}
-#endif
block_BytestreamPush( &p_sys->bytestream, *pp_block );
if( p_header[0] == 0xFF && p_header[1] == 0xF8 )
{
/* Check if frame is valid and get frame info */
- p_sys->i_frame_length =
+ int i_frame_length =
SyncInfo( p_dec, p_header,
&p_sys->i_channels,
&p_sys->i_channels_conf,
&p_sys->i_rate,
&p_sys->i_bits_per_sample );
- if( p_sys->i_frame_length )
+ if( i_frame_length )
{
p_sys->i_state = STATE_SEND_DATA;
break;
/* 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_length =
- aout_DateIncrement( &p_sys->end_date, p_sys->i_frame_length );
+ aout_DateGet( &p_sys->end_date ) - p_sout_block->i_pts;
return p_sout_block;
}
if( !pp_block || !*pp_block ) return NULL;
- if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts )
- {
- /* We've just started the stream, wait for the first PTS. */
- block_Release( *pp_block );
- return NULL;
- }
-
p_sys->p_aout_buffer = 0;
if( ( p_sys->p_block = PacketizeBlock( p_dec, pp_block ) ) )
{
}
block_Release( p_sys->p_block );
+ p_sys->p_block = NULL;
}
return p_sys->p_aout_buffer;
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 );
}
decoder_t *p_dec = (decoder_t *)client_data;
decoder_sys_t *p_sys = p_dec->p_sys;
- if( p_sys->p_block && p_sys->p_block->i_pts != 0 &&
- p_sys->p_block->i_pts != aout_DateGet( &p_sys->end_date ) )
- {
- aout_DateSet( &p_sys->end_date, p_sys->p_block->i_pts );
- }
- else if( !aout_DateGet( &p_sys->end_date ) )
- {
- return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
- }
-
- if( p_sys->p_block ) p_sys->p_block->i_pts = 0;
-
p_sys->p_aout_buffer =
p_dec->pf_aout_buffer_new( p_dec, frame->header.blocksize );
frame->header.channels, frame->header.blocksize );
}
- /* Date management */
- p_sys->p_aout_buffer->start_date = aout_DateGet( &p_sys->end_date );
+ /* 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 =
- aout_DateIncrement( &p_sys->end_date, frame->header.blocksize );
+ p_sys->p_block->i_pts + p_sys->p_block->i_length;
return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
}
p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE;
break;
default:
- msg_Dbg( p_dec, "strange bps %d",
+ 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( status )
{
case FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC:
- msg_Err( p_dec, "An error in the stream caused the decoder to "
- "loose synchronization." );
+ msg_Err( p_dec, "an error in the stream caused the decoder to "
+ "lose synchronization." );
break;
case FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER:
- msg_Err( p_dec, "The decoder encountered a corrupted frame header." );
+ msg_Err( p_dec, "the decoder encountered a corrupted frame header." );
break;
case FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH:
- msg_Err( p_dec, "The frame's data did not match the CRC in the "
+ msg_Err( p_dec, "frame's data did not match the CRC in the "
"footer." );
break;
default:
switch ( state )
{
case FLAC__STREAM_DECODER_SEARCH_FOR_METADATA:
- msg_Err( p_dec, "The decoder is ready to search for metadata." );
+ msg_Err( 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_Err( 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_Err( 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_Err( 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_Err( p_dec, "the decoder has reached the end of the stream." );
break;
case FLAC__STREAM_DECODER_ABORTED:
- msg_Err( p_dec, "The decoder was aborted by the read callback." );
+ msg_Err( p_dec, "the decoder was aborted by the read callback." );
break;
case FLAC__STREAM_DECODER_UNPARSEABLE_STREAM:
- msg_Err( p_dec, "The decoder encountered reserved fields in use "
+ msg_Err( p_dec, "the decoder encountered reserved fields in use "
"in the stream." );
break;
case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR:
- msg_Err( p_dec, "An error occurred allocating memory." );
+ msg_Err( p_dec, "error when allocating memory." );
break;
case FLAC__STREAM_DECODER_ALREADY_INITIALIZED:
msg_Err( p_dec, "FLAC__stream_decoder_init() was called when the "
"all callbacks being set." );
break;
case FLAC__STREAM_DECODER_UNINITIALIZED:
- msg_Err( p_dec, "The decoder is in the uninitialized state." );
+ msg_Err( p_dec, "decoder in uninitialized state." );
break;
default:
msg_Err(p_dec, "unknown error" );
p_sys->i_headers = 0;
p_sys->p_buffer = 0;
p_sys->i_buffer = 0;
+ p_sys->i_samples_delay = 0;
/* Create flac encoder */
p_sys->p_flac = FLAC__stream_encoder_new();
encoder_sys_t *p_sys = p_enc->p_sys;
block_t *p_block;
- if( samples == 0 && p_sys->i_headers <= 1 )
+ if( samples == 0 )
{
if( p_sys->i_headers == 1 )
{
- msg_Err( p_enc, "Writing STREAMINFO: %i", bytes );
+ msg_Dbg( p_enc, "Writing STREAMINFO: %i", bytes );
/* Backup the STREAMINFO metadata block */
p_enc->fmt_out.i_extra = STREAMINFO_SIZE + 4;
p_enc->fmt_out.p_extra = malloc( STREAMINFO_SIZE + 4 );
memcpy( p_enc->fmt_out.p_extra, "fLaC", 4 );
memcpy( ((uint8_t *)p_enc->fmt_out.p_extra) + 4, buffer,
- STREAMINFO_SIZE + 4 );
+ STREAMINFO_SIZE );
/* Fake this as the last metadata block */
((uint8_t*)p_enc->fmt_out.p_extra)[4] |= 0x80;
p_block = block_New( p_enc, bytes );
memcpy( p_block->p_buffer, buffer, bytes );
- p_block->i_dts = p_block->i_pts = p_block->i_length = 0;
+ p_block->i_dts = p_block->i_pts = p_sys->i_pts;
+
+ p_sys->i_samples_delay -= samples;
+
+ p_block->i_length = (mtime_t)1000000 *
+ (mtime_t)samples / (mtime_t)p_enc->fmt_in.audio.i_rate;
+
+ /* Update pts */
+ p_sys->i_pts += p_block->i_length;
block_ChainAppend( &p_sys->p_chain, p_block );
projects / vlc / blobdiff