VENC_LONGTEXT, false )
add_string( SOUT_CFG_PREFIX "vcodec", NULL, NULL, VCODEC_TEXT,
VCODEC_LONGTEXT, false )
- add_integer( SOUT_CFG_PREFIX "vb", 800 * 1000, NULL, VB_TEXT,
+ add_integer( SOUT_CFG_PREFIX "vb", 0, NULL, VB_TEXT,
VB_LONGTEXT, false )
add_float( SOUT_CFG_PREFIX "scale", 1, NULL, SCALE_TEXT,
SCALE_LONGTEXT, false )
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 ()
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->i_pts -= p_sys->i_master_drift;
p_audio_buf->end_date -= 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_buf->i_pts;
p_audio_block->i_length = p_audio_buf->end_date -
- p_audio_buf->start_date;
+ p_audio_buf->i_pts;
p_audio_block->i_samples = p_audio_buf->i_nb_samples;
/* Run filter chain */
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->i_pts = p_audio_block->i_dts;
p_audio_buf->end_date = p_audio_block->i_dts + p_audio_block->i_length;
audio_timer_start( id->p_encoder );
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;
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;
static int transcode_video_filter_allocation_init( filter_t *p_filter,
void *p_data )
{
+ VLC_UNUSED(p_data);
p_filter->pf_vout_buffer_new = transcode_video_filter_buffer_new;
p_filter->pf_vout_buffer_del = transcode_video_filter_buffer_del;
return VLC_SUCCESS;
static void transcode_video_filter_allocation_clear( filter_t *p_filter )
{
+ VLC_UNUSED(p_filter);
}
static int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id )
/* The dimensions will be set properly later on.
* Just put sensible values so we can test an encoder is available. */
id->p_encoder->fmt_in.video.i_width =
- id->p_encoder->fmt_out.video.i_width ?:
- id->p_decoder->fmt_in.video.i_width ?: 16;
+ id->p_encoder->fmt_out.video.i_width
+ ? id->p_encoder->fmt_out.video.i_width
+ : id->p_decoder->fmt_in.video.i_width
+ ? id->p_decoder->fmt_in.video.i_width : 16;
id->p_encoder->fmt_in.video.i_height =
- id->p_encoder->fmt_out.video.i_height ?:
- id->p_decoder->fmt_in.video.i_height ?: 16;
+ id->p_encoder->fmt_out.video.i_height
+ ? id->p_encoder->fmt_out.video.i_height
+ : id->p_decoder->fmt_in.video.i_height
+ ? id->p_decoder->fmt_in.video.i_height : 16;
id->p_encoder->fmt_in.video.i_frame_rate = ENC_FRAMERATE;
id->p_encoder->fmt_in.video.i_frame_rate_base = ENC_FRAMERATE_BASE;
/* Check if we have a subpicture to overlay */
if( p_sys->p_spu )
{
- p_subpic = spu_SortSubpictures( p_sys->p_spu, p_pic->date,
- false /* Fixme: check if stream is paused */, false );
+ p_subpic = spu_SortSubpictures( p_sys->p_spu, p_pic->date, false );
/* TODO: get another pic */
}
fmt.i_sar_num = fmt.i_aspect * fmt.i_height / fmt.i_width;
fmt.i_sar_den = VOUT_ASPECT_FACTOR;
+ /* FIXME the mdate() seems highly suspicious */
spu_RenderSubpictures( p_sys->p_spu, p_pic, &fmt,
- p_subpic, &id->p_decoder->fmt_out.video, false );
+ p_subpic, &id->p_decoder->fmt_out.video, mdate() );
}
/* Run user specified filter chain */
{
/* Encoder still has stuff to encode, wait to clear-up the list */
while( p_ssys->i_first_pic == i_first_pic )
- msleep( 100000 );
+ {
+#warning THERE IS A DEFINITELY BUG! LOCKING IS INSUFFICIENT!
+ msleep( 10000 );
+ barrier ();
+ }
}
}
/* Check if we have a subpicture to send */
if( p_sys->p_spu && in->i_dts > 0)
{
- p_subpic = spu_SortSubpictures( p_sys->p_spu, in->i_dts, false, false );
+ p_subpic = spu_SortSubpictures( p_sys->p_spu, in->i_dts, false );
}
else
{
projects / vlc / blobdiff