/*****************************************************************************
* es_out.c: Es Out handler for input.
*****************************************************************************
- * Copyright (C) 2003-2004 VideoLAN
+ * Copyright (C) 2003-2004 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * Jean-Paul Saman <jpsaman #_at_# m2x dot nl>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
/* Clock for this program */
input_clock_t clock;
+ char *psz_now_playing;
+
} es_out_pgrm_t;
struct es_out_id_t
int i_id;
es_out_pgrm_t *p_pgrm;
- /* */
+ /* Signal a discontinuity in the timeline for every PID */
+ vlc_bool_t b_discontinuity;
+
+ /* Misc. */
int64_t i_preroll_end;
/* Channel in the track type */
int i_sub;
/* es to select */
- int i_audio_last;
- int i_sub_last;
+ int i_audio_last, i_audio_id;
+ int i_sub_last, i_sub_id;
char **ppsz_audio_language;
char **ppsz_sub_language;
}
if( val.psz_string ) free( val.psz_string );
+ var_Get( p_input, "audio-track-id", &val );
+ p_sys->i_audio_id = val.i_int;
+
+ var_Get( p_input, "sub-track-id", &val );
+ p_sys->i_sub_id = val.i_int;
+
p_sys->p_es_audio = NULL;
p_sys->p_es_video = NULL;
p_sys->p_es_sub = NULL;
for( i = 0; i < p_sys->i_pgrm; i++ )
{
+ if( p_sys->pgrm[i]->psz_now_playing )
+ free( p_sys->pgrm[i]->psz_now_playing );
free( p_sys->pgrm[i] );
}
if( p_sys->pgrm )
for( i = 0; i < p_sys->i_es; i++ )
{
es_out_id_t *es = p_sys->es[i];
-
+ es->b_discontinuity = VLC_TRUE; /* signal discontinuity */
+
/* Send a dummy block to let decoder know that
* there is a discontinuity */
if( es->p_dec && ( !b_audio || es->fmt.i_cat == AUDIO_ES ) )
EsOutSelect( out, p_sys->es[i], VLC_FALSE );
}
+ /* Update now playing if defined per program */
+ if( p_pgrm->psz_now_playing )
+ {
+ char *psz_cat = malloc( strlen(_("Program")) + 10 );
+
+ sprintf( psz_cat, "%s %d", _("Program"), p_pgrm->i_id );
+ input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"),
+ VLC_META_NOW_PLAYING, "%s", p_pgrm->psz_now_playing );
+ free( psz_cat );
+ }
+
+
var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
}
p_pgrm->i_id = i_group;
p_pgrm->i_es = 0;
p_pgrm->b_selected = VLC_FALSE;
+ p_pgrm->psz_now_playing = NULL;
input_ClockInit( &p_pgrm->clock, VLC_FALSE, p_input->input.i_cr_average );
/* Append it */
return p_pgrm;
}
+/* EsOutDelProgram:
+ * Delete a program
+ */
+static int EsOutProgramDel( es_out_t *out, int i_group )
+{
+ es_out_sys_t *p_sys = out->p_sys;
+ input_thread_t *p_input = p_sys->p_input;
+ es_out_pgrm_t *p_pgrm = NULL;
+ vlc_value_t val;
+ int i;
+
+ for( i = 0; i < p_sys->i_pgrm; i++ )
+ {
+ if( p_sys->pgrm[i]->i_id == i_group )
+ {
+ p_pgrm = p_sys->pgrm[i];
+ break;
+ }
+ }
+
+ if( p_pgrm == NULL )
+ return VLC_EGENERIC;
+
+ if( p_pgrm->i_es )
+ {
+ msg_Dbg( p_input, "can't delete program %d which still has %i ES",
+ i_group, p_pgrm->i_es );
+ return VLC_EGENERIC;
+ }
+
+ 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 = 0;
+
+ if( p_pgrm->psz_now_playing ) free( p_pgrm->psz_now_playing );
+ free( p_pgrm );
+
+ /* Update "program" variable */
+ val.i_int = i_group;
+ var_Change( p_input, "program", VLC_VAR_DELCHOICE, &val, NULL );
+
+ var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
+
+ return VLC_SUCCESS;
+}
+
+/* EsOutProgramMeta:
+ */
+static void EsOutProgramMeta( es_out_t *out, int i_group, vlc_meta_t *p_meta )
+{
+ es_out_sys_t *p_sys = out->p_sys;
+ es_out_pgrm_t *p_pgrm = NULL;
+ input_thread_t *p_input = p_sys->p_input;
+ char *psz_cat = malloc( strlen(_("Program")) + 10 );
+ char *psz_name = NULL;
+ char *psz_now_playing = NULL;
+ char *psz_provider = NULL;
+ int i;
+
+ msg_Dbg( p_input, "EsOutProgramMeta: number=%d", i_group );
+ sprintf( psz_cat, "%s %d", _("Program"), i_group );
+
+ for( i = 0; i < p_meta->i_meta; i++ )
+ {
+ msg_Dbg( p_input, " - %s = %s", p_meta->name[i], p_meta->value[i] );
+
+ input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+ _(p_meta->name[i]), "%s", p_meta->value[i] );
+ if( !strcasecmp( p_meta->name[i], "Name" ) )
+ psz_name = p_meta->value[i];
+ else if( !strcasecmp( p_meta->name[i], "Provider" ) )
+ psz_provider = p_meta->value[i];
+ else if( !strcasecmp( p_meta->name[i], VLC_META_NOW_PLAYING ) )
+ psz_now_playing = p_meta->value[i];
+ }
+
+ if( !psz_name && !psz_now_playing )
+ {
+ free( psz_cat );
+ return;
+ }
+
+ for( i = 0; i < p_sys->i_pgrm; i++ )
+ {
+ if( p_sys->pgrm[i]->i_id == i_group )
+ {
+ p_pgrm = p_sys->pgrm[i];
+ break;
+ }
+ }
+
+ if( p_pgrm == NULL )
+ p_pgrm = EsOutProgramAdd( out, i_group );
+
+ /* Update the description text of the program */
+ if( psz_name && *psz_name )
+ {
+ vlc_value_t val;
+ vlc_value_t text;
+
+ /* ugly but it works */
+ val.i_int = i_group;
+ var_Change( p_input, "program", VLC_VAR_DELCHOICE, &val, NULL );
+
+ if( psz_provider && *psz_provider )
+ {
+ asprintf( &text.psz_string, "%s [%s]", psz_name, psz_provider );
+ var_Change( p_input, "program", VLC_VAR_ADDCHOICE, &val, &text );
+ free( text.psz_string );
+ }
+ else
+ {
+ text.psz_string = psz_name;
+ var_Change( p_input, "program", VLC_VAR_ADDCHOICE, &val, &text );
+ }
+ }
+ if( psz_now_playing )
+ {
+ p_pgrm->psz_now_playing = strdup(psz_now_playing);
+
+ if( p_sys->p_pgrm == p_pgrm )
+ {
+ input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"),
+ VLC_META_NOW_PLAYING, "%s", psz_now_playing );
+ }
+ }
+ free( psz_cat );
+}
+
/* EsOutAdd:
* Add an es_out
*/
es->p_pgrm = p_pgrm;
es_format_Copy( &es->fmt, fmt );
es->i_preroll_end = -1;
+ es->b_discontinuity = VLC_FALSE;
switch( fmt->i_cat )
{
case VIDEO_ES:
es->i_channel = p_sys->i_video;
+ if( fmt->video.i_frame_rate && fmt->video.i_frame_rate_base )
+ vlc_ureduce( &es->fmt.video.i_frame_rate,
+ &es->fmt.video.i_frame_rate_base,
+ fmt->video.i_frame_rate,
+ fmt->video.i_frame_rate_base, 0 );
break;
case SPU_ES:
return;
}
}
+ if( es->fmt.i_cat == SPU_ES )
+ {
+ var_Get( p_input, "spu", &val );
+ if( !var_GetBool( p_input, "spu" ) ||
+ ( p_input->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( p_sys->i_audio_last >= 0 )
i_wanted = p_sys->i_audio_last;
+
+ if( p_sys->i_audio_id >= 0 )
+ {
+ if( es->i_id == p_sys->i_audio_id )
+ i_wanted = es->i_channel;
+ else
+ return;
+ }
}
else if( i_cat == SPU_ES )
{
}
if( p_sys->i_sub_last >= 0 )
i_wanted = p_sys->i_sub_last;
+
+ if( p_sys->i_sub_id >= 0 )
+ {
+ if( es->i_id == p_sys->i_sub_id )
+ i_wanted = es->i_channel;
+ else
+ return;
+ }
}
else if( i_cat == VIDEO_ES )
{
static void EsOutDel( es_out_t *out, es_out_id_t *es )
{
es_out_sys_t *p_sys = out->p_sys;
+ vlc_bool_t b_reselect = VLC_FALSE;
+ int i;
/* We don't try to reselect */
if( es->p_dec )
es->p_pgrm->i_es--;
if( es->p_pgrm->i_es == 0 )
{
- msg_Warn( p_sys->p_input, "Program doesn't contain anymore ES, "
- "TODO cleaning ?" );
+ msg_Dbg( p_sys->p_input, "Program doesn't contain anymore ES" );
}
+ if( p_sys->p_es_audio == es || p_sys->p_es_video == es ||
+ p_sys->p_es_sub == es ) b_reselect = VLC_TRUE;
+
if( p_sys->p_es_audio == es ) p_sys->p_es_audio = NULL;
if( p_sys->p_es_video == es ) p_sys->p_es_video = NULL;
if( p_sys->p_es_sub == es ) p_sys->p_es_sub = NULL;
break;
}
+ /* Re-select another track when needed */
+ if( b_reselect )
+ for( i = 0; i < p_sys->i_es; i++ )
+ {
+ if( es->fmt.i_cat == p_sys->es[i]->fmt.i_cat )
+ EsOutSelect( out, p_sys->es[i], VLC_FALSE );
+ }
+
if( es->psz_language )
free( es->psz_language );
if( es->psz_language_code )
return VLC_SUCCESS;
}
+ case ES_OUT_SET_GROUP_META:
+ {
+ int i_group = (int)va_arg( args, int );
+ vlc_meta_t *p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t * );
+
+ EsOutProgramMeta( out, i_group, p_meta );
+ return VLC_SUCCESS;
+ }
+ case ES_OUT_DEL_GROUP:
+ {
+ int i_group = (int)va_arg( args, int );
+
+ return EsOutProgramDel( out, i_group );
+ }
default:
msg_Err( p_sys->p_input, "unknown query in es_out_Control" );
_("Display resolution"), "%dx%d",
fmt->video.i_visible_width,
fmt->video.i_visible_height);
+ if( fmt->video.i_frame_rate > 0 &&
+ fmt->video.i_frame_rate_base > 0 )
+ input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+ _("Frame rate"), "%f",
+ (float)fmt->video.i_frame_rate /
+ fmt->video.i_frame_rate_base );
break;
case SPU_ES:
projects / vlc / blobdiff