/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <stdio.h>
es_format_t fmt;
char *psz_language;
char *psz_language_code;
+
decoder_t *p_dec;
+
+ /* Fields for Video with CC */
+ vlc_bool_t pb_cc_present[4];
+ es_out_id_t *pp_cc_es[4];
+
+ /* Field for CC track from a master video */
+ es_out_id_t *p_master;
};
struct es_out_sys_t
/* es to select */
int i_audio_last, i_audio_id;
int i_sub_last, i_sub_id;
+ int i_default_sub_id; /* As specified in container; if applicable */
char **ppsz_audio_language;
char **ppsz_sub_language;
/* delay */
int64_t i_audio_delay;
int64_t i_spu_delay;
+
+ /* Rate used to rescale ES ts */
+ int i_rate;
};
static es_out_id_t *EsOutAdd ( es_out_t *, es_format_t * );
static void EsOutAddInfo( es_out_t *, es_out_id_t *es );
+static vlc_bool_t EsIsSelected( es_out_id_t *es );
static void EsSelect( es_out_t *out, es_out_id_t *es );
static void EsUnselect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_update );
static char *LanguageGetName( const char *psz_code );
static char *EsOutProgramGetMetaName( es_out_pgrm_t *p_pgrm );
+static const vlc_fourcc_t EsOutFourccClosedCaptions[4] = {
+ VLC_FOURCC('c', 'c', '1', ' '),
+ VLC_FOURCC('c', 'c', '2', ' '),
+ VLC_FOURCC('c', 'c', '3', ' '),
+ VLC_FOURCC('c', 'c', '4', ' '),
+};
+static inline int EsOutGetClosedCaptionsChannel( vlc_fourcc_t fcc )
+{
+ int i;
+ for( i = 0; i < 4; i++ )
+ {
+ if( fcc == EsOutFourccClosedCaptions[i] )
+ return i;
+ }
+ return -1;
+}
+
+
/*****************************************************************************
* input_EsOutNew:
*****************************************************************************/
-es_out_t *input_EsOutNew( input_thread_t *p_input )
+es_out_t *input_EsOutNew( input_thread_t *p_input, int i_rate )
{
es_out_t *out = malloc( sizeof( es_out_t ) );
es_out_sys_t *p_sys = malloc( sizeof( es_out_sys_t ) );
var_Get( p_input, "sub-track", &val );
p_sys->i_sub_last = val.i_int;
+ p_sys->i_default_sub_id = -1;
+
if( !p_input->b_preparsing )
{
var_Get( p_input, "audio-language", &val );
p_sys->i_audio_delay= 0;
p_sys->i_spu_delay = 0;
+ p_sys->i_rate = i_rate;
+
return out;
}
return NULL;
}
-void input_EsOutDiscontinuity( es_out_t *out, vlc_bool_t b_flush, vlc_bool_t b_audio )
+static void EsOutDiscontinuity( es_out_t *out, vlc_bool_t b_flush, vlc_bool_t b_audio )
{
es_out_sys_t *p_sys = out->p_sys;
int i;
input_DecoderDiscontinuity( es->p_dec, b_flush );
}
}
-void input_EsOutSetRate( es_out_t *out )
+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, VLC_FALSE, VLC_FALSE );
+
for( i = 0; i < p_sys->i_pgrm; i++ )
- input_ClockSetRate( p_sys->p_input, &p_sys->pgrm[i]->clock );
+ input_ClockSetRate( &p_sys->pgrm[i]->clock, i_rate );
}
void input_EsOutSetDelay( es_out_t *out, int i_cat, int64_t i_delay )
else if( i_cat == SPU_ES )
p_sys->i_spu_delay = i_delay;
}
+void input_EsOutChangeState( es_out_t *out )
+{
+ 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 )
+ {
+ /* Send discontinuity to decoders (it will allow them to flush
+ * * if implemented */
+ EsOutDiscontinuity( out, VLC_FALSE, VLC_FALSE );
+ }
+ else
+ {
+ /* Out of pause, reset pcr */
+ es_out_Control( out, ES_OUT_RESET_PCR );
+ }
+}
+void input_EsOutChangePosition( es_out_t *out )
+{
+ //es_out_sys_t *p_sys = out->p_sys;
+
+ es_out_Control( out, ES_OUT_RESET_PCR );
+ EsOutDiscontinuity( out, VLC_TRUE, VLC_FALSE );
+}
vlc_bool_t input_EsOutDecodersEmpty( es_out_t *out )
{
/*****************************************************************************
*
*****************************************************************************/
-static void EsOutESVarUpdate( es_out_t *out, es_out_id_t *es,
- vlc_bool_t b_delete )
+static void EsOutESVarUpdateGeneric( es_out_t *out, int i_id, es_format_t *fmt, const char *psz_language,
+ vlc_bool_t b_delete )
{
es_out_sys_t *p_sys = out->p_sys;
input_thread_t *p_input = p_sys->p_input;
const char *psz_var;
- if( es->fmt.i_cat == AUDIO_ES )
+ if( fmt->i_cat == AUDIO_ES )
psz_var = "audio-es";
- else if( es->fmt.i_cat == VIDEO_ES )
+ else if( fmt->i_cat == VIDEO_ES )
psz_var = "video-es";
- else if( es->fmt.i_cat == SPU_ES )
+ else if( fmt->i_cat == SPU_ES )
psz_var = "spu-es";
else
return;
if( b_delete )
{
- val.i_int = es->i_id;
+ val.i_int = i_id;
var_Change( p_input, psz_var, VLC_VAR_DELCHOICE, &val, NULL );
var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
return;
}
/* Take care of the ES description */
- if( es->fmt.psz_description && *es->fmt.psz_description )
+ if( fmt->psz_description && *fmt->psz_description )
{
- if( es->psz_language && *es->psz_language )
+ if( psz_language && *psz_language )
{
- text.psz_string = malloc( strlen( es->fmt.psz_description) +
- strlen( es->psz_language ) + 10 );
- sprintf( text.psz_string, "%s - [%s]", es->fmt.psz_description,
- es->psz_language );
+ text.psz_string = malloc( strlen( fmt->psz_description) +
+ strlen( psz_language ) + 10 );
+ sprintf( text.psz_string, "%s - [%s]", fmt->psz_description,
+ psz_language );
}
- else text.psz_string = strdup( es->fmt.psz_description );
+ else text.psz_string = strdup( fmt->psz_description );
}
else
{
- if( es->psz_language && *es->psz_language )
+ if( psz_language && *psz_language )
{
char *temp;
text.psz_string = malloc( strlen( _("Track %i") )+
- strlen( es->psz_language ) + 30 );
+ strlen( psz_language ) + 30 );
asprintf( &temp, _("Track %i"), val.i_int );
- sprintf( text.psz_string, "%s - [%s]", temp, es->psz_language );
+ sprintf( text.psz_string, "%s - [%s]", temp, psz_language );
free( temp );
}
else
}
}
- val.i_int = es->i_id;
+ val.i_int = i_id;
var_Change( p_input, psz_var, VLC_VAR_ADDCHOICE, &val, &text );
free( text.psz_string );
var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
}
+static void EsOutESVarUpdate( es_out_t *out, es_out_id_t *es,
+ vlc_bool_t b_delete )
+{
+ EsOutESVarUpdateGeneric( out, es->i_id, &es->fmt, es->psz_language, b_delete );
+}
+
/* EsOutProgramSelect:
* Select a program and update the object variable
*/
for( i = 0; i < p_sys->i_es; i++ )
{
- if( p_sys->es[i]->p_pgrm == old && p_sys->es[i]->p_dec &&
+ if( p_sys->es[i]->p_pgrm == old && EsIsSelected( p_sys->es[i] ) &&
p_sys->i_mode != ES_OUT_MODE_ALL )
EsUnselect( out, p_sys->es[i], VLC_TRUE );
}
p_pgrm->psz_now_playing = NULL;
p_pgrm->psz_publisher = NULL;
p_pgrm->p_epg = NULL;
- input_ClockInit( p_input, &p_pgrm->clock, VLC_FALSE, p_input->p->input.i_cr_average );
+ input_ClockInit( &p_pgrm->clock, VLC_FALSE, p_input->p->input.i_cr_average, p_sys->i_rate );
/* Append it */
TAB_APPEND( p_sys->i_pgrm, p_sys->pgrm, p_pgrm );
!vlc_meta_Get( p_meta, vlc_meta_NowPlaying) &&
!vlc_meta_Get( p_meta, vlc_meta_Publisher) &&
vlc_dictionary_keys_count( &p_meta->extra_tags ) <= 0 )
- return;
+ {
+ return;
+ }
/* Find program */
for( i = 0; i < p_sys->i_pgrm; i++ )
{
switch( fmt->i_cat )
{
case AUDIO_ES:
+ {
+ audio_replay_gain_t rg;
+
es->i_channel = p_sys->i_audio;
+
+ vlc_mutex_lock( &p_input->p->input.p_item->lock );
+ memset( &rg, 0, sizeof(rg) );
+ vlc_audio_replay_gain_MergeFromMeta( &rg, p_input->p->input.p_item->p_meta );
+ vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+
+ for( i = 0; i < AUDIO_REPLAY_GAIN_MAX; i++ )
+ {
+ if( !es->fmt.audio_replay_gain.pb_peak[i] )
+ {
+ es->fmt.audio_replay_gain.pb_peak[i] = rg.pb_peak[i];
+ es->fmt.audio_replay_gain.pf_peak[i] = rg.pf_peak[i];
+ }
+ if( !es->fmt.audio_replay_gain.pb_gain[i] )
+ {
+ es->fmt.audio_replay_gain.pb_gain[i] = rg.pb_gain[i];
+ es->fmt.audio_replay_gain.pf_gain[i] = rg.pf_gain[i];
+ }
+ }
break;
+ }
case VIDEO_ES:
es->i_channel = p_sys->i_video;
es->psz_language = LanguageGetName( fmt->psz_language ); /* remember so we only need to do it once */
es->psz_language_code = LanguageGetCode( fmt->psz_language );
es->p_dec = NULL;
+ for( i = 0; i < 4; i++ )
+ es->pb_cc_present[i] = VLC_FALSE;
+ es->p_master = VLC_FALSE;
if( es->p_pgrm == p_sys->p_pgrm )
EsOutESVarUpdate( out, es, VLC_FALSE );
return es;
}
+static vlc_bool_t EsIsSelected( es_out_id_t *es )
+{
+ if( es->p_master )
+ {
+ vlc_bool_t b_decode = VLC_FALSE;
+ if( es->p_master->p_dec )
+ {
+ int i_channel = EsOutGetClosedCaptionsChannel( es->fmt.i_codec );
+ if( i_channel != -1 )
+ input_DecoderGetCcState( es->p_master->p_dec, &b_decode, i_channel );
+ }
+ return b_decode;
+ }
+ else
+ {
+ return es->p_dec != NULL;
+ }
+}
static void EsSelect( es_out_t *out, es_out_id_t *es )
{
es_out_sys_t *p_sys = out->p_sys;
vlc_value_t val;
const char *psz_var;
- if( es->p_dec )
+ if( EsIsSelected( es ) )
{
msg_Warn( p_input, "ES 0x%x is already selected", es->i_id );
return;
}
- if( es->fmt.i_cat == VIDEO_ES || es->fmt.i_cat == SPU_ES )
+ if( es->p_master )
{
- if( !var_GetBool( p_input, "video" ) ||
- ( p_input->p->p_sout && !var_GetBool( p_input, "sout-video" ) ) )
- {
- msg_Dbg( p_input, "video is disabled, not selecting ES 0x%x",
- es->i_id );
+ int i_channel;
+ if( !es->p_master->p_dec )
+ return;
+
+ i_channel = EsOutGetClosedCaptionsChannel( es->fmt.i_codec );
+ if( i_channel == -1 || input_DecoderSetCcState( es->p_master->p_dec, VLC_TRUE, i_channel ) )
return;
- }
}
- else if( es->fmt.i_cat == AUDIO_ES )
+ else
{
- var_Get( p_input, "audio", &val );
- if( !var_GetBool( p_input, "audio" ) ||
- ( p_input->p->p_sout && !var_GetBool( p_input, "sout-audio" ) ) )
+ if( es->fmt.i_cat == VIDEO_ES || es->fmt.i_cat == SPU_ES )
{
- msg_Dbg( p_input, "audio is disabled, not selecting ES 0x%x",
- es->i_id );
- return;
+ if( !var_GetBool( p_input, "video" ) ||
+ ( p_input->p->p_sout && !var_GetBool( p_input, "sout-video" ) ) )
+ {
+ msg_Dbg( p_input, "video is disabled, not selecting ES 0x%x",
+ es->i_id );
+ return;
+ }
}
- }
- if( es->fmt.i_cat == SPU_ES )
- {
- var_Get( p_input, "spu", &val );
- if( !var_GetBool( p_input, "spu" ) ||
- ( p_input->p->p_sout && !var_GetBool( p_input, "sout-spu" ) ) )
+ else if( es->fmt.i_cat == AUDIO_ES )
{
- msg_Dbg( p_input, "spu is disabled, not selecting ES 0x%x",
- es->i_id );
- return;
+ var_Get( p_input, "audio", &val );
+ if( !var_GetBool( p_input, "audio" ) ||
+ ( p_input->p->p_sout && !var_GetBool( p_input, "sout-audio" ) ) )
+ {
+ msg_Dbg( p_input, "audio is disabled, not selecting ES 0x%x",
+ es->i_id );
+ return;
+ }
+ }
+ if( es->fmt.i_cat == SPU_ES )
+ {
+ var_Get( p_input, "spu", &val );
+ if( !var_GetBool( p_input, "spu" ) ||
+ ( p_input->p->p_sout && !var_GetBool( p_input, "sout-spu" ) ) )
+ {
+ msg_Dbg( p_input, "spu is disabled, not selecting ES 0x%x",
+ es->i_id );
+ return;
+ }
}
- }
- es->i_preroll_end = -1;
- es->p_dec = input_DecoderNew( p_input, &es->fmt, VLC_FALSE );
- if( es->p_dec == NULL || es->p_pgrm != p_sys->p_pgrm )
- return;
+ es->i_preroll_end = -1;
+ es->p_dec = input_DecoderNew( p_input, &es->fmt, VLC_FALSE );
+ if( es->p_dec == NULL || es->p_pgrm != p_sys->p_pgrm )
+ return;
+ }
if( es->fmt.i_cat == VIDEO_ES )
psz_var = "video-es";
val.i_int = es->i_id;
var_Change( p_input, psz_var, VLC_VAR_SETVALUE, &val, NULL );
-
var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
}
vlc_value_t val;
const char *psz_var;
- if( es->p_dec == NULL )
+ if( !EsIsSelected( es ) )
{
msg_Warn( p_input, "ES 0x%x is already unselected", es->i_id );
return;
}
- input_DecoderDelete( es->p_dec );
- es->p_dec = NULL;
+ if( es->p_master )
+ {
+ if( es->p_master->p_dec )
+ {
+ int i_channel = EsOutGetClosedCaptionsChannel( es->fmt.i_codec );
+ if( i_channel != -1 )
+ input_DecoderSetCcState( es->p_master->p_dec, VLC_FALSE, i_channel );
+ }
+ }
+ else
+ {
+ const int i_spu_id = var_GetInteger( p_input, "spu-es");
+ int i;
+ for( i = 0; i < 4; i++ )
+ {
+ if( !es->pb_cc_present[i] || !es->pp_cc_es[i] )
+ continue;
+
+ if( i_spu_id == es->pp_cc_es[i]->i_id )
+ {
+ /* Force unselection of the CC */
+ val.i_int = -1;
+ var_Change( p_input, "spu-es", VLC_VAR_SETVALUE, &val, NULL );
+ if( !b_update )
+ var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
+ }
+ EsOutDel( out, es->pp_cc_es[i] );
+
+ es->pb_cc_present[i] = VLC_FALSE;
+ }
+ input_DecoderDelete( es->p_dec );
+ es->p_dec = NULL;
+ }
if( !b_update )
return;
else
return;
- /* Mark it as selected */
+ /* Mark it as unselected */
val.i_int = -1;
var_Change( p_input, psz_var, VLC_VAR_SETVALUE, &val, NULL );
if( p_sys->i_mode == ES_OUT_MODE_ALL || b_force )
{
- if( !es->p_dec )
+ if( !EsIsSelected( es ) )
EsSelect( out, es );
}
else if( p_sys->i_mode == ES_OUT_MODE_PARTIAL )
{
if ( val.p_list->p_values[i].i_int == es->p_pgrm->i_id || b_force )
{
- if( !es->p_dec )
+ if( !EsIsSelected( es ) )
EsSelect( out, es );
break;
}
i_wanted = es->i_channel;
}
+ else if( p_sys->i_default_sub_id >= 0 )
+ {
+ if( es->i_id == p_sys->i_default_sub_id )
+ i_wanted = es->i_channel;
+ }
+
if( p_sys->i_sub_last >= 0 )
i_wanted = p_sys->i_sub_last;
i_wanted = es->i_channel;
}
- if( i_wanted == es->i_channel && es->p_dec == NULL )
+ if( i_wanted == es->i_channel && !EsIsSelected( es ) )
EsSelect( out, es );
}
/* FIXME TODO handle priority here */
- if( es->p_dec )
+ if( EsIsSelected( es ) )
{
if( i_cat == AUDIO_ES )
{
if( p_sys->i_mode == ES_OUT_MODE_AUTO &&
p_sys->p_es_audio &&
p_sys->p_es_audio != es &&
- p_sys->p_es_audio->p_dec )
+ EsIsSelected( p_sys->p_es_audio ) )
{
EsUnselect( out, p_sys->p_es_audio, VLC_FALSE );
}
if( p_sys->i_mode == ES_OUT_MODE_AUTO &&
p_sys->p_es_sub &&
p_sys->p_es_sub != es &&
- p_sys->p_es_sub->p_dec )
+ EsIsSelected( p_sys->p_es_sub ) )
{
EsUnselect( out, p_sys->p_es_sub, VLC_FALSE );
}
}
}
- p_block->i_rate = p_input->p->i_rate;
+ p_block->i_rate = p_sys->i_rate;
/* TODO handle mute */
if( es->p_dec &&
( es->fmt.i_cat != AUDIO_ES ||
- ( p_input->p->i_rate >= INPUT_RATE_DEFAULT/AOUT_MAX_INPUT_RATE &&
- p_input->p->i_rate <= INPUT_RATE_DEFAULT*AOUT_MAX_INPUT_RATE ) ) )
+ ( p_sys->i_rate >= INPUT_RATE_DEFAULT/AOUT_MAX_INPUT_RATE &&
+ p_sys->i_rate <= INPUT_RATE_DEFAULT*AOUT_MAX_INPUT_RATE ) ) )
{
+ vlc_bool_t pb_cc[4];
+ vlc_bool_t b_cc_new = VLC_FALSE;
+ int i;
input_DecoderDecode( es->p_dec, p_block );
+
+ /* 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] = {
+ 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] = VLC_TRUE;
+ b_cc_new = VLC_TRUE;
+ }
+ if( b_cc_new )
+ var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
}
else
{
case ES_OUT_SET_ES_STATE:
es = (es_out_id_t*) va_arg( args, es_out_id_t * );
b = (vlc_bool_t) va_arg( args, vlc_bool_t );
- if( b && es->p_dec == NULL )
+ if( b && !EsIsSelected( es ) )
{
EsSelect( out, es );
- return es->p_dec ? VLC_SUCCESS : VLC_EGENERIC;
+ return EsIsSelected( es ) ? VLC_SUCCESS : VLC_EGENERIC;
}
- else if( !b && es->p_dec )
+ else if( !b && EsIsSelected( es ) )
{
EsUnselect( out, es, es->p_pgrm == p_sys->p_pgrm );
return VLC_SUCCESS;
es = (es_out_id_t*) va_arg( args, es_out_id_t * );
pb = (vlc_bool_t*) va_arg( args, vlc_bool_t * );
- *pb = es->p_dec ? VLC_TRUE : VLC_FALSE;
+ *pb = EsIsSelected( es );
return VLC_SUCCESS;
case ES_OUT_SET_ACTIVE:
/* Reapply policy mode */
for( i = 0; i < p_sys->i_es; i++ )
{
- if( p_sys->es[i]->p_dec )
+ if( EsIsSelected( p_sys->es[i] ) )
{
EsUnselect( out, p_sys->es[i],
p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
{
for( i = 0; i < p_sys->i_es; i++ )
{
- if( p_sys->es[i]->p_dec )
+ if( EsIsSelected( p_sys->es[i] ) )
EsUnselect( out, p_sys->es[i],
p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
}
{
for( i = 0; i < p_sys->i_es; i++ )
{
- if( p_sys->es[i]->p_dec &&
- p_sys->es[i]->fmt.i_cat == AUDIO_ES )
+ if( p_sys->es[i]->fmt.i_cat == AUDIO_ES &&
+ EsIsSelected( p_sys->es[i] ) )
EsUnselect( out, p_sys->es[i],
p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
}
{
for( i = 0; i < p_sys->i_es; i++ )
{
- if( p_sys->es[i]->p_dec &&
- p_sys->es[i]->fmt.i_cat == VIDEO_ES )
+ if( p_sys->es[i]->fmt.i_cat == VIDEO_ES &&
+ EsIsSelected( p_sys->es[i] ) )
EsUnselect( out, p_sys->es[i],
p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
}
{
for( i = 0; i < p_sys->i_es; i++ )
{
- if( p_sys->es[i]->p_dec &&
- p_sys->es[i]->fmt.i_cat == SPU_ES )
+ if( p_sys->es[i]->fmt.i_cat == SPU_ES &&
+ EsIsSelected( p_sys->es[i] ) )
EsUnselect( out, p_sys->es[i],
p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
}
playlist_t * p_playlist = pl_Yield( p_sys->p_input );
PL_LOCK;
p_playlist->gc_date = mdate();
- vlc_cond_signal( &p_playlist->object_wait );
+ vlc_object_signal_unlocked( p_playlist );
PL_UNLOCK;
pl_Release( p_playlist );
}
return VLC_SUCCESS;
+
+ case ES_OUT_SET_DEFAULT:
+ {
+ es = (es_out_id_t*) va_arg( args, es_out_id_t * );
+
+ if( es == NULL )
+ {
+ /*p_sys->i_default_video_id = -1;*/
+ /*p_sys->i_default_audio_id = -1;*/
+ p_sys->i_default_sub_id = -1;
+ }
+ else if( es == (es_out_id_t*)((uint8_t*)NULL+AUDIO_ES) )
+ {
+ /*p_sys->i_default_video_id = -1;*/
+ }
+ else if( es == (es_out_id_t*)((uint8_t*)NULL+VIDEO_ES) )
+ {
+ /*p_sys->i_default_audio_id = -1;*/
+ }
+ else if( es == (es_out_id_t*)((uint8_t*)NULL+SPU_ES) )
+ {
+ p_sys->i_default_sub_id = -1;
+ }
+ else
+ {
+ /*if( es->fmt.i_cat == VIDEO_ES )
+ p_sys->i_default_video_id = es->i_id;
+ else
+ if( es->fmt.i_cat == AUDIO_ES )
+ p_sys->i_default_audio_id = es->i_id;
+ else*/
+ if( es->fmt.i_cat == SPU_ES )
+ p_sys->i_default_sub_id = es->i_id;
+ }
+ return VLC_SUCCESS;
+ }
case ES_OUT_SET_PCR:
case ES_OUT_SET_GROUP_PCR:
case ES_OUT_RESET_PCR:
for( i = 0; i < p_sys->i_pgrm; i++ )
- {
- p_sys->pgrm[i]->clock.i_synchro_state = SYNCHRO_REINIT;
- p_sys->pgrm[i]->clock.last_pts = 0;
- }
+ input_ClockResetPCR( &p_sys->pgrm[i]->clock );
return VLC_SUCCESS;
case ES_OUT_GET_TS:
psz = strchr(psz_parser, ',' );
if( psz ) *psz++ = '\0';
- psz_code = LanguageGetCode( psz_parser );
- if( strcmp( psz_code, "??" ) )
+ if( !strcmp( psz_parser, "any" ) )
+ {
+ TAB_APPEND( i_psz, ppsz, strdup("any") );
+ }
+ else
{
- TAB_APPEND( i_psz, ppsz, psz_code );
+ psz_code = LanguageGetCode( psz_parser );
+ if( strcmp( psz_code, "??" ) )
+ {
+ TAB_APPEND( i_psz, ppsz, psz_code );
+ }
+ else
+ {
+ free( psz_code );
+ }
}
psz_parser = psz;
if( !ppsz_langs || !psz_lang ) return -1;
for( i = 0; ppsz_langs[i]; i++ )
- if( !strcasecmp( ppsz_langs[i], psz_lang ) ) return i;
+ {
+ if( !strcasecmp( ppsz_langs[i], psz_lang ) ||
+ !strcasecmp( ppsz_langs[i], "any" ) )
+ {
+ return i;
+ }
+ }
return -1;
}