FPS_LONGTEXT, false )
add_bool( SOUT_CFG_PREFIX "hurry-up", true, NULL, HURRYUP_TEXT,
HURRYUP_LONGTEXT, false )
- add_bool( SOUT_CFG_PREFIX "deinterlace", 0, NULL, DEINTERLACE_TEXT,
+ add_bool( SOUT_CFG_PREFIX "deinterlace", false, NULL, DEINTERLACE_TEXT,
DEINTERLACE_LONGTEXT, false )
add_string( SOUT_CFG_PREFIX "deinterlace-module", "deinterlace", NULL,
DEINTERLACE_MODULE_TEXT, DEINTERLACE_MODULE_LONGTEXT,
ACHANS_LONGTEXT, false )
add_integer( SOUT_CFG_PREFIX "samplerate", 0, NULL, ARATE_TEXT,
ARATE_LONGTEXT, true )
- add_bool( SOUT_CFG_PREFIX "audio-sync", 0, NULL, ASYNC_TEXT,
+ add_bool( SOUT_CFG_PREFIX "audio-sync", false, NULL, ASYNC_TEXT,
ASYNC_LONGTEXT, false )
add_module_list( SOUT_CFG_PREFIX "afilter", "audio filter2",
NULL, NULL,
SENC_LONGTEXT, false )
add_string( SOUT_CFG_PREFIX "scodec", NULL, NULL, SCODEC_TEXT,
SCODEC_LONGTEXT, false )
- add_bool( SOUT_CFG_PREFIX "soverlay", 0, NULL, SCODEC_TEXT,
+ add_bool( SOUT_CFG_PREFIX "soverlay", false, NULL, SCODEC_TEXT,
SCODEC_LONGTEXT, false )
add_module_list( SOUT_CFG_PREFIX "sfilter", "video filter",
NULL, NULL,
SFILTER_TEXT, SFILTER_LONGTEXT, false )
set_section( N_("On Screen Display"), NULL )
- add_bool( SOUT_CFG_PREFIX "osd", 0, NULL, OSD_TEXT,
+ add_bool( SOUT_CFG_PREFIX "osd", false, NULL, OSD_TEXT,
OSD_LONGTEXT, false )
set_section( N_("Miscellaneous"), NULL )
add_integer( SOUT_CFG_PREFIX "threads", 0, NULL, THREADS_TEXT,
THREADS_LONGTEXT, true )
- add_bool( SOUT_CFG_PREFIX "high-priority", 0, NULL, HP_TEXT, HP_LONGTEXT,
+ add_bool( SOUT_CFG_PREFIX "high-priority", false, NULL, HP_TEXT, HP_LONGTEXT,
true )
vlc_module_end ()
block_t *in, block_t **out )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- aout_buffer_t *p_audio_buf;
- block_t *p_block, *p_audio_block;
+ block_t *p_block, *p_audio_buf;
*out = NULL;
while( (p_audio_buf = id->p_decoder->pf_decode_audio( id->p_decoder,
if( p_sys->b_master_sync )
{
mtime_t i_dts = date_Get( &id->interpolated_pts ) + 1;
- if ( p_audio_buf->start_date - i_dts > MASTER_SYNC_MAX_DRIFT
- || p_audio_buf->start_date - i_dts < -MASTER_SYNC_MAX_DRIFT )
+ if ( p_audio_buf->i_pts - i_dts > MASTER_SYNC_MAX_DRIFT
+ || p_audio_buf->i_pts - i_dts < -MASTER_SYNC_MAX_DRIFT )
{
msg_Dbg( p_stream, "drift is too high, resetting master sync" );
- date_Set( &id->interpolated_pts, p_audio_buf->start_date );
- i_dts = p_audio_buf->start_date + 1;
+ date_Set( &id->interpolated_pts, p_audio_buf->i_pts );
+ i_dts = p_audio_buf->i_pts + 1;
}
- p_sys->i_master_drift = p_audio_buf->start_date - i_dts;
+ p_sys->i_master_drift = p_audio_buf->i_pts - i_dts;
date_Increment( &id->interpolated_pts, p_audio_buf->i_nb_samples );
- p_audio_buf->start_date -= p_sys->i_master_drift;
- p_audio_buf->end_date -= p_sys->i_master_drift;
+ p_audio_buf->i_pts -= p_sys->i_master_drift;
}
- p_audio_block = p_audio_buf->p_sys;
- p_audio_block->i_buffer = p_audio_buf->i_nb_bytes;
- p_audio_block->i_dts = p_audio_block->i_pts =
- p_audio_buf->start_date;
- p_audio_block->i_length = p_audio_buf->end_date -
- p_audio_buf->start_date;
- p_audio_block->i_samples = p_audio_buf->i_nb_samples;
+ p_audio_buf->i_dts = p_audio_buf->i_pts;
/* Run filter chain */
if( id->p_uf_chain )
{
- p_audio_block = filter_chain_AudioFilter( id->p_uf_chain, p_audio_block );
- assert( p_audio_block );
+ p_audio_buf = filter_chain_AudioFilter( id->p_uf_chain,
+ p_audio_buf );
+ if( !p_audio_buf )
+ abort();
}
- p_audio_block = filter_chain_AudioFilter( id->p_f_chain, p_audio_block );
- assert( p_audio_block );
+ p_audio_buf = filter_chain_AudioFilter( id->p_f_chain, p_audio_buf );
+ if( !p_audio_buf )
+ abort();
- p_audio_buf->p_buffer = p_audio_block->p_buffer;
- p_audio_buf->i_nb_bytes = p_audio_block->i_buffer;
- p_audio_buf->i_nb_samples = p_audio_block->i_samples;
- p_audio_buf->start_date = p_audio_block->i_dts;
- p_audio_buf->end_date = p_audio_block->i_dts + p_audio_block->i_length;
+ p_audio_buf->i_pts = p_audio_buf->i_dts;
audio_timer_start( id->p_encoder );
p_block = id->p_encoder->pf_encode_audio( id->p_encoder, p_audio_buf );
audio_timer_stop( id->p_encoder );
block_ChainAppend( out, p_block );
- block_Release( p_audio_block );
- free( p_audio_buf );
+ block_Release( p_audio_buf );
}
return VLC_SUCCESS;
}
-static void audio_release_buffer( aout_buffer_t *p_buffer )
-{
- if( p_buffer && p_buffer->p_sys ) block_Release( p_buffer->p_sys );
- free( p_buffer );
-}
-
static aout_buffer_t *audio_new_buffer( decoder_t *p_dec, int i_samples )
{
- aout_buffer_t *p_buffer;
block_t *p_block;
int i_size;
i_size = i_samples * 4 * p_dec->fmt_out.audio.i_channels;
}
- p_buffer = malloc( sizeof(aout_buffer_t) );
- if( !p_buffer ) return NULL;
- p_buffer->b_discontinuity = false;
- p_buffer->pf_release = audio_release_buffer;
- p_buffer->p_sys = p_block = block_New( p_dec, i_size );
-
- p_buffer->p_buffer = p_block->p_buffer;
- p_buffer->i_size = p_buffer->i_nb_bytes = p_block->i_buffer;
- p_buffer->i_nb_samples = i_samples;
- p_block->i_samples = i_samples;
-
- return p_buffer;
+ p_block = block_New( p_dec, i_size );
+ p_block->i_nb_samples = i_samples;
+ return p_block;
}
static void audio_del_buffer( decoder_t *p_dec, aout_buffer_t *p_buffer )
{
VLC_UNUSED(p_dec);
- if( p_buffer && p_buffer->p_sys ) block_Release( p_buffer->p_sys );
- free( p_buffer );
+ block_Release( p_buffer );
}
/*
{
/* Encoder still has stuff to encode, wait to clear-up the list */
while( p_ssys->i_first_pic == i_first_pic )
- msleep( 5000 );
+ {
+#warning THERE IS A DEFINITELY BUG! LOCKING IS INSUFFICIENT!
+ msleep( 10000 );
+ barrier ();
+ }
}
}
projects / vlc / blobdiff