#include <vlc_aout.h>
#include "input_internal.h"
+#include "input_clock.h"
+#include "input_decoder.h"
#include "../stream_output/stream_output.h"
bool b_selected;
/* Clock for this program */
- input_clock_t clock;
+ input_clock_t *p_clock;
char *psz_name;
char *psz_now_playing;
int64_t i_audio_delay;
int64_t i_spu_delay;
- /* Rate used to rescale ES ts */
+ /* Rate used for clock */
int i_rate;
/* Record */
for( i = 0; i < p_sys->i_pgrm; i++ )
{
es_out_pgrm_t *p_pgrm = p_sys->pgrm[i];
+ input_clock_Delete( p_pgrm->p_clock );
free( p_pgrm->psz_now_playing );
free( p_pgrm->psz_publisher );
free( p_pgrm->psz_name );
return NULL;
}
+mtime_t input_EsOutGetWakeup( es_out_t *out )
+{
+ es_out_sys_t *p_sys = out->p_sys;
+ input_thread_t *p_input = p_sys->p_input;
+
+ if( !p_sys->p_pgrm )
+ return 0;
+
+ /* We do not have a wake up date if the input cannot have its speed
+ * controlled or sout is imposing its own */
+ if( !p_input->b_can_pace_control || p_input->p->b_out_pace_control )
+ return 0;
+
+ return input_clock_GetWakeup( p_sys->p_pgrm->p_clock );
+}
+
static void EsOutDiscontinuity( es_out_t *out, bool b_flush, bool b_audio )
{
es_out_sys_t *p_sys = out->p_sys;
}
}
}
+static void EsOutDecoderChangePause( es_out_t *out, bool b_paused, mtime_t i_date )
+{
+ es_out_sys_t *p_sys = out->p_sys;
+
+ /* Pause decoders first */
+ for( int i = 0; i < p_sys->i_es; i++ )
+ {
+ es_out_id_t *es = p_sys->es[i];
+
+ /* Send a dummy block to let decoder know that
+ * there is a discontinuity */
+ if( es->p_dec )
+ {
+ input_DecoderChangePause( es->p_dec, b_paused, i_date );
+ if( es->p_dec_record )
+ input_DecoderChangePause( es->p_dec_record, b_paused, i_date );
+ }
+ }
+}
+static void EsOutProgramChangePause( es_out_t *out, bool b_paused, mtime_t i_date )
+{
+ es_out_sys_t *p_sys = out->p_sys;
+
+ for( int i = 0; i < p_sys->i_pgrm; i++ )
+ input_clock_ChangePause( p_sys->pgrm[i]->p_clock, b_paused, i_date );
+}
+
void input_EsOutChangeRate( es_out_t *out, int i_rate )
{
es_out_sys_t *p_sys = out->p_sys;
int i;
p_sys->i_rate = i_rate;
- EsOutDiscontinuity( out, false, false );
for( i = 0; i < p_sys->i_pgrm; i++ )
- input_ClockSetRate( &p_sys->pgrm[i]->clock, i_rate );
+ input_clock_ChangeRate( p_sys->pgrm[i]->p_clock, i_rate );
}
int input_EsOutSetRecord( es_out_t *out, bool b_record )
if( !p_es->p_dec || p_es->p_master )
continue;
- p_es->p_dec_record = input_DecoderNew( p_input, &p_es->fmt, p_sys->p_sout_record );
+ p_es->p_dec_record = input_DecoderNew( p_input, &p_es->fmt, p_es->p_pgrm->p_clock, p_sys->p_sout_record );
}
}
else
else if( i_cat == SPU_ES )
p_sys->i_spu_delay = i_delay;
}
-void input_EsOutChangeState( es_out_t *out )
+void input_EsOutChangePause( es_out_t *out, bool b_paused, mtime_t i_date )
{
- es_out_sys_t *p_sys = out->p_sys;
- input_thread_t *p_input = p_sys->p_input;
-
- if( p_input->i_state == PAUSE_S )
+ /* XXX the order is important */
+ if( b_paused )
{
- /* Send discontinuity to decoders (it will allow them to flush
- * * if implemented */
- EsOutDiscontinuity( out, false, false );
+ EsOutDecoderChangePause( out, true, i_date );
+ EsOutProgramChangePause( out, true, i_date );
}
else
{
- /* Out of pause, reset pcr */
- es_out_Control( out, ES_OUT_RESET_PCR );
+ EsOutProgramChangePause( out, false, i_date );
+ EsOutDecoderChangePause( out, false, i_date );
}
}
void input_EsOutChangePosition( es_out_t *out )
free( text.psz_string );
if( b_teletext )
- var_SetInteger( p_sys->p_input, "teletext-es", i_id );
+ {
+ if( var_GetInteger( p_sys->p_input, "teletext-es" ) < 0 )
+ var_SetInteger( p_sys->p_input, "teletext-es", i_id );
+ }
var_SetBool( p_sys->p_input, "intf-change", true );
}
p_pgrm->b_selected = true;
/* Switch master stream */
- if( p_sys->p_pgrm && p_sys->p_pgrm->clock.b_master )
- {
- p_sys->p_pgrm->clock.b_master = false;
- }
- p_pgrm->clock.b_master = true;
p_sys->p_pgrm = p_pgrm;
/* Update "program" */
vlc_value_t val;
es_out_pgrm_t *p_pgrm = malloc( sizeof( es_out_pgrm_t ) );
- if( !p_pgrm ) return NULL;
+ if( !p_pgrm )
+ return NULL;
/* Init */
p_pgrm->i_id = i_group;
p_pgrm->psz_now_playing = NULL;
p_pgrm->psz_publisher = NULL;
p_pgrm->p_epg = NULL;
- input_ClockInit( &p_pgrm->clock, false, p_input->p->input.i_cr_average, p_sys->i_rate );
+ p_pgrm->p_clock = input_clock_New( p_input->p->input.i_cr_average, p_sys->i_rate );
+ if( !p_pgrm->p_clock )
+ {
+ free( p_pgrm );
+ return NULL;
+ }
/* Append it */
TAB_APPEND( p_sys->i_pgrm, p_sys->pgrm, p_pgrm );
TAB_REMOVE( p_sys->i_pgrm, p_sys->pgrm, p_pgrm );
/* If program is selected we need to unselect it */
- if( p_sys->p_pgrm == p_pgrm ) p_sys->p_pgrm = NULL;
+ if( p_sys->p_pgrm == p_pgrm )
+ p_sys->p_pgrm = NULL;
+
+ input_clock_Delete( p_pgrm->p_clock );
free( p_pgrm->psz_name );
free( p_pgrm->psz_now_playing );
es_out_sys_t *p_sys = out->p_sys;
input_thread_t *p_input = p_sys->p_input;
- p_es->p_dec = input_DecoderNew( p_input, &p_es->fmt, p_input->p->p_sout );
+ p_es->p_dec = input_DecoderNew( p_input, &p_es->fmt, p_es->p_pgrm->p_clock, p_input->p->p_sout );
if( p_es->p_dec && !p_es->p_master && p_sys->p_sout_record )
- p_es->p_dec_record = input_DecoderNew( p_input, &p_es->fmt, p_sys->p_sout_record );
+ p_es->p_dec_record = input_DecoderNew( p_input, &p_es->fmt, p_es->p_pgrm->p_clock, p_sys->p_sout_record );
}
static void EsDestroyDecoder( es_out_t *out, es_out_id_t *p_es )
{
- es_out_sys_t *p_sys = out->p_sys;
+ VLC_UNUSED(out);
if( !p_es->p_dec )
return;
*/
static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
{
- es_out_sys_t *p_sys = out->p_sys;
- input_thread_t *p_input = p_sys->p_input;
- es_out_pgrm_t *p_pgrm = es->p_pgrm;
+ es_out_sys_t *p_sys = out->p_sys;
+ input_thread_t *p_input = p_sys->p_input;
+ es_out_pgrm_t *p_pgrm = es->p_pgrm;
int64_t i_delay;
- int i_total=0;
+ int i_total = 0;
if( es->fmt.i_cat == AUDIO_ES )
i_delay = p_sys->i_audio_delay;
else
i_delay = 0;
- if( libvlc_stats (p_input) )
+ if( libvlc_stats( p_input ) )
{
vlc_mutex_lock( &p_input->p->counters.counters_lock );
stats_UpdateInteger( p_input, p_input->p->counters.p_demux_read,
es->i_preroll_end = -1;
}
- if( p_block->i_dts > 0 && (p_block->i_flags&BLOCK_FLAG_PREROLL) )
- {
+ if( p_block->i_dts > 0 )
p_block->i_dts += i_delay;
- }
- else if( p_block->i_dts > 0 )
- {
- p_block->i_dts =
- input_ClockGetTS( p_input, &p_pgrm->clock, p_block->i_dts ) + i_delay;
- }
- if( p_block->i_pts > 0 && (p_block->i_flags&BLOCK_FLAG_PREROLL) )
- {
+
+ if( p_block->i_pts > 0 )
p_block->i_pts += i_delay;
- }
- else if( p_block->i_pts > 0 )
+
+ p_block->i_rate = 0;
+
+ if( !es->p_dec )
{
- p_block->i_pts =
- input_ClockGetTS( p_input, &p_pgrm->clock, p_block->i_pts ) + i_delay;
+ block_Release( p_block );
+ return VLC_SUCCESS;
}
- if ( p_block->i_rate == INPUT_RATE_DEFAULT &&
- es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) )
+
+ /* Decode */
+ if( es->p_dec_record )
{
- mtime_t current_date = mdate();
- if( !p_block->i_pts
- || p_block->i_pts > current_date + 10000000
- || current_date > p_block->i_pts )
- {
- /* ETSI EN 300 472 Annex A : do not take into account the PTS
- * for teletext streams. */
- p_block->i_pts = current_date + 400000
- + p_input->i_pts_delay + i_delay;
- }
+ block_t *p_dup = block_Duplicate( p_block );
+ if( p_dup )
+ input_DecoderDecode( es->p_dec_record, p_dup );
}
+ input_DecoderDecode( es->p_dec, p_block );
- p_block->i_rate = p_sys->i_rate;
+ /* Check CC status */
+ bool pb_cc[4];
+ bool b_cc_new = false;
- /* TODO handle mute */
- if( es->p_dec &&
- ( es->fmt.i_cat != AUDIO_ES ||
- ( p_sys->i_rate >= INPUT_RATE_DEFAULT/AOUT_MAX_INPUT_RATE &&
- p_sys->i_rate <= INPUT_RATE_DEFAULT*AOUT_MAX_INPUT_RATE ) ) )
+ input_DecoderIsCcPresent( es->p_dec, pb_cc );
+ for( int i = 0; i < 4; i++ )
{
- bool pb_cc[4];
- bool b_cc_new = false;
- int i;
- if( es->p_dec_record )
- {
- block_t *p_dup = block_Duplicate( p_block );
- if( p_dup )
- input_DecoderDecode( es->p_dec_record, p_dup );
- }
- input_DecoderDecode( es->p_dec, p_block );
+ static const vlc_fourcc_t fcc[4] = {
+ VLC_FOURCC('c', 'c', '1', ' '),
+ VLC_FOURCC('c', 'c', '2', ' '),
+ VLC_FOURCC('c', 'c', '3', ' '),
+ VLC_FOURCC('c', 'c', '4', ' '),
+ };
+ es_format_t fmt;
- /* Check CC status */
- input_DecoderIsCcPresent( es->p_dec, pb_cc );
- for( i = 0; i < 4; i++ )
- {
- static const vlc_fourcc_t fcc[4] = {
- VLC_FOURCC('c', 'c', '1', ' '),
- VLC_FOURCC('c', 'c', '2', ' '),
- VLC_FOURCC('c', 'c', '3', ' '),
- VLC_FOURCC('c', 'c', '4', ' '),
- };
- static const char ppsz_description[4][18] = {
- N_("Closed captions 1"),
- N_("Closed captions 2"),
- N_("Closed captions 3"),
- N_("Closed captions 4"),
- };
- es_format_t fmt;
-
- if( es->pb_cc_present[i] || !pb_cc[i] )
- continue;
- msg_Dbg( p_input, "Adding CC track %d for es[%d]", 1+i, es->i_id );
-
- es_format_Init( &fmt, SPU_ES, fcc[i] );
- fmt.i_group = es->fmt.i_group;
- fmt.psz_description = strdup( _(ppsz_description[i] ) );
- es->pp_cc_es[i] = EsOutAdd( out, &fmt );
- es->pp_cc_es[i]->p_master = es;
- es_format_Clean( &fmt );
-
- /* */
- es->pb_cc_present[i] = true;
- b_cc_new = true;
- }
- if( b_cc_new )
- var_SetBool( p_sys->p_input, "intf-change", true );
- }
- else
- {
- block_Release( p_block );
+ if( es->pb_cc_present[i] || !pb_cc[i] )
+ continue;
+ msg_Dbg( p_input, "Adding CC track %d for es[%d]", 1+i, es->i_id );
+
+ es_format_Init( &fmt, SPU_ES, fcc[i] );
+ fmt.i_group = es->fmt.i_group;
+ if( asprintf( &fmt.psz_description,
+ _("Closed captions %u"), 1 + i ) == -1 )
+ fmt.psz_description = NULL;
+ es->pp_cc_es[i] = EsOutAdd( out, &fmt );
+ es->pp_cc_es[i]->p_master = es;
+ es_format_Clean( &fmt );
+
+ /* */
+ es->pb_cc_present[i] = true;
+ b_cc_new = true;
}
+ if( b_cc_new )
+ var_SetBool( p_sys->p_input, "intf-change", true );
return VLC_SUCCESS;
}
p_pgrm = EsOutProgramAdd( out, i_group ); /* Create it */
i_pcr = (int64_t)va_arg( args, int64_t );
- /* search program */
- input_ClockSetPCR( p_sys->p_input, &p_pgrm->clock, i_pcr );
+ /* search program
+ * TODO do not use mdate() but proper stream acquisition date */
+ input_clock_Update( p_pgrm->p_clock, VLC_OBJECT(p_sys->p_input),
+ p_sys->p_input->b_can_pace_control, i_pcr, mdate() );
return VLC_SUCCESS;
}
case ES_OUT_RESET_PCR:
for( i = 0; i < p_sys->i_pgrm; i++ )
- input_ClockResetPCR( &p_sys->pgrm[i]->clock );
+ input_clock_Reset( p_sys->pgrm[i]->p_clock );
return VLC_SUCCESS;
case ES_OUT_GET_TS:
{
int64_t i_ts = (int64_t)va_arg( args, int64_t );
int64_t *pi_ts = (int64_t *)va_arg( args, int64_t * );
- *pi_ts = input_ClockGetTS( p_sys->p_input,
- &p_sys->p_pgrm->clock, i_ts );
+ *pi_ts = input_clock_GetTS( p_sys->p_pgrm->p_clock,
+ p_sys->p_input->i_pts_delay, i_ts );
return VLC_SUCCESS;
}
return VLC_EGENERIC;
if( !es || !es->p_dec )
return VLC_EGENERIC;
- /* XXX We should call input_ClockGetTS but PCR has been reseted
- * and it will return 0, so we won't call input_ClockGetTS on all preroll samples
- * but that's ugly(more time discontinuity), it need to be improved -- fenrir */
es->i_preroll_end = i_date;
return VLC_SUCCESS;
projects / vlc / blobdiff