/*****************************************************************************
* 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
+#include <vlc/vlc.h>
+
+#include <stdio.h>
#include <stdlib.h>
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/decoder.h>
+#include <vlc_input.h>
+#include <vlc_es_out.h>
+#include <vlc_block.h>
#include "input_internal.h"
#include "vlc_playlist.h"
#include "iso_lang.h"
/* FIXME we should find a better way than including that */
-#include "../misc/iso-639_def.h"
+#include "../text/iso-639_def.h"
/*****************************************************************************
* Local prototypes
/* 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_channel;
es_format_t fmt;
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;
out->pf_del = EsOutDel;
out->pf_control = EsOutControl;
out->p_sys = p_sys;
+ out->b_sout = (p_input->p->p_sout != NULL ? VLC_TRUE : VLC_FALSE);
p_sys->p_input = p_input;
var_Get( p_input, "sub-track", &val );
p_sys->i_sub_last = val.i_int;
- var_Get( p_input, "audio-language", &val );
- p_sys->ppsz_audio_language = LanguageSplit(val.psz_string);
- if( p_sys->ppsz_audio_language )
+ if( !p_input->b_preparsing )
{
- for( i = 0; p_sys->ppsz_audio_language[i]; i++ )
- msg_Dbg( p_input, "Select audio in language[%d] %s",
- i, p_sys->ppsz_audio_language[i] );
- }
+ var_Get( p_input, "audio-language", &val );
+ p_sys->ppsz_audio_language = LanguageSplit(val.psz_string);
+ if( p_sys->ppsz_audio_language )
+ {
+ for( i = 0; p_sys->ppsz_audio_language[i]; i++ )
+ msg_Dbg( p_input, "selected audio language[%d] %s",
+ i, p_sys->ppsz_audio_language[i] );
+ }
+ if( val.psz_string ) free( val.psz_string );
- var_Get( p_input, "sub-language", &val );
- p_sys->ppsz_sub_language = LanguageSplit(val.psz_string);
- if( p_sys->ppsz_sub_language )
+ var_Get( p_input, "sub-language", &val );
+ p_sys->ppsz_sub_language = LanguageSplit(val.psz_string);
+ if( p_sys->ppsz_sub_language )
+ {
+ for( i = 0; p_sys->ppsz_sub_language[i]; i++ )
+ msg_Dbg( p_input, "selected subtitle language[%d] %s",
+ i, p_sys->ppsz_sub_language[i] );
+ }
+ if( val.psz_string ) free( val.psz_string );
+ }
+ else
{
- for( i = 0; p_sys->ppsz_sub_language[i]; i++ )
- msg_Dbg( p_input, "Select subtitle in language[%d] %s",
- i, p_sys->ppsz_sub_language[i] );
+ p_sys->ppsz_sub_language = NULL;
+ p_sys->ppsz_audio_language = NULL;
}
- /* */
+ 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 */
input_thread_t *p_input = p_sys->p_input;
vlc_value_t val, text;
- char *psz_var;
+ const char *psz_var;
if( es->fmt.i_cat == AUDIO_ES )
psz_var = "audio-es";
{
if( es->psz_language && *es->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( es->fmt.psz_description) +
+ strlen( es->psz_language ) + 10 );
+ sprintf( text.psz_string, "%s - [%s]", es->fmt.psz_description,
+ es->psz_language );
}
else text.psz_string = strdup( es->fmt.psz_description );
}
if( es->psz_language && *es->psz_language )
{
char *temp;
- text.psz_string = malloc( strlen( _("Track %i") )+ strlen( es->psz_language ) + 30 );
+ text.psz_string = malloc( strlen( _("Track %i") )+
+ strlen( es->psz_language ) + 30 );
asprintf( &temp, _("Track %i"), val.i_int );
sprintf( text.psz_string, "%s - [%s]", temp, es->psz_language );
free( temp );
if( p_sys->p_pgrm )
{
es_out_pgrm_t *old = p_sys->p_pgrm;
- msg_Dbg( p_input, "Unselecting program id=%d", old->i_id );
+ msg_Dbg( p_input, "unselecting program id=%d", old->i_id );
for( i = 0; i < p_sys->i_es; i++ )
{
p_sys->p_es_video = NULL;
}
- msg_Dbg( p_input, "Selecting program id=%d", p_pgrm->i_id );
+ msg_Dbg( p_input, "selecting program id=%d", p_pgrm->i_id );
/* Mark it selected */
p_pgrm->b_selected = VLC_TRUE;
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, _(VLC_META_INFO_CAT),
+ _(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;
- input_ClockInit( &p_pgrm->clock, VLC_FALSE, p_input->input.i_cr_average );
+ p_pgrm->psz_now_playing = NULL;
+ input_ClockInit( &p_pgrm->clock, VLC_FALSE, p_input->p->input.i_cr_average );
/* Append it */
TAB_APPEND( p_sys->i_pgrm, p_sys->pgrm, p_pgrm );
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_title = 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 );
+
+ if( p_meta->psz_title ) psz_title = p_meta->psz_title;
+ if( p_meta->psz_publisher ) psz_provider = p_meta->psz_publisher;
+ if( p_meta->psz_nowplaying ) psz_now_playing = p_meta->psz_nowplaying;
+
+ if( !psz_title && !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 ) {
+ free( psz_cat );
+ msg_Dbg( p_input, "Trying to add meta for non-existing program" );
+ return;
+ }
+
+ /* Update the description text of the program */
+ if( psz_title && *psz_title )
+ {
+ 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_title, psz_provider );
+ var_Change( p_input, "program", VLC_VAR_ADDCHOICE, &val, &text );
+ free( text.psz_string );
+ }
+ else
+ {
+ text.psz_string = psz_title;
+ var_Change( p_input, "program", VLC_VAR_ADDCHOICE, &val, &text );
+ }
+ }
+ if( psz_now_playing )
+ {
+ if( p_pgrm->psz_now_playing ) free( p_pgrm->psz_now_playing );
+ p_pgrm->psz_now_playing = strdup(psz_now_playing);
+
+ if( p_sys->p_pgrm == p_pgrm )
+ {
+ vlc_meta_SetNowPlaying( p_input->p->input.p_item->p_meta,
+ psz_now_playing );
+ }
+ }
+ free( psz_cat );
+}
+
/* EsOutAdd:
* Add an es_out
*/
es->i_id = fmt->i_id;
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 AUDIO_ES:
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:
es_out_sys_t *p_sys = out->p_sys;
input_thread_t *p_input = p_sys->p_input;
vlc_value_t val;
- char *psz_var;
+ const char *psz_var;
if( es->p_dec )
{
if( es->fmt.i_cat == VIDEO_ES || es->fmt.i_cat == SPU_ES )
{
if( !var_GetBool( p_input, "video" ) ||
- ( p_input->p_sout && !var_GetBool( p_input, "sout-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 );
{
var_Get( p_input, "audio", &val );
if( !var_GetBool( p_input, "audio" ) ||
- ( p_input->p_sout && !var_GetBool( p_input, "sout-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_out_sys_t *p_sys = out->p_sys;
input_thread_t *p_input = p_sys->p_input;
vlc_value_t val;
- char *psz_var;
+ const char *psz_var;
if( es->p_dec == NULL )
{
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 )
{
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;
if( es->fmt.i_cat == AUDIO_ES )
i_delay = p_sys->i_audio_delay;
else
i_delay = 0;
+ if( p_input->p_libvlc->b_stats )
+ {
+ vlc_mutex_lock( &p_input->p->counters.counters_lock );
+ stats_UpdateInteger( p_input, p_input->p->counters.p_demux_read,
+ p_block->i_buffer, &i_total );
+ stats_UpdateFloat( p_input , p_input->p->counters.p_demux_bitrate,
+ (float)i_total, NULL );
+ vlc_mutex_unlock( &p_input->p->counters.counters_lock );
+ }
+
+ /* Mark preroll blocks */
+ if( es->i_preroll_end >= 0 )
+ {
+ int64_t i_date = p_block->i_pts;
+ if( i_date <= 0 )
+ i_date = p_block->i_dts;
+
+ if( i_date < es->i_preroll_end )
+ p_block->i_flags |= BLOCK_FLAG_PREROLL;
+ else
+ es->i_preroll_end = -1;
+ }
+
/* +11 -> avoid null value with non null dts/pts */
if( p_block->i_dts > 0 )
{
}
}
- p_block->i_rate = p_input->i_rate;
+ p_block->i_rate = p_input->p->i_rate;
/* TODO handle mute */
if( es->p_dec && ( es->fmt.i_cat != AUDIO_ES ||
- p_input->i_rate == INPUT_RATE_DEFAULT ) )
+ p_input->p->i_rate == INPUT_RATE_DEFAULT ) )
{
input_DecoderDecode( es->p_dec, p_block );
}
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 )
}
}
}
+ {
+ playlist_t * p_playlist = pl_Yield( p_sys->p_input );
+ PL_LOCK;
+ p_playlist->gc_date = mdate();
+ vlc_cond_signal( &p_playlist->object_wait );
+ PL_UNLOCK;
+ pl_Release( p_playlist );
+ }
return VLC_SUCCESS;
case ES_OUT_SET_PCR:
if( !es->p_dec ) return VLC_SUCCESS;
+#if 1
+ input_DecoderDelete( es->p_dec );
+ es->p_dec = input_DecoderNew( p_sys->p_input,
+ &es->fmt, VLC_FALSE );
+
+#else
es->p_dec->fmt_in.i_extra = p_fmt->i_extra;
es->p_dec->fmt_in.p_extra =
realloc( es->p_dec->fmt_in.p_extra, p_fmt->i_extra );
memcpy( es->p_dec->fmt_in.p_extra,
p_fmt->p_extra, p_fmt->i_extra );
+#endif
}
return VLC_SUCCESS;
}
+ case ES_OUT_SET_NEXT_DISPLAY_TIME:
+ {
+ int64_t i_date;
+
+ es = (es_out_id_t*) va_arg( args, es_out_id_t * );
+ i_date = (int64_t)va_arg( args, int64_t );
+
+ if( !es || !es->p_dec )
+ return VLC_EGENERIC;
+
+ es->i_preroll_end = i_date;
+ input_DecoderPreroll( es->p_dec, i_date );
+
+ 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" );
return VLC_EGENERIC;
char **ppsz = NULL;
int i_psz = 0;
- if( psz_langs == NULL )
- return NULL;
+ if( psz_langs == NULL ) return NULL;
psz_parser = psz_dup = strdup(psz_langs);
char *psz_code;
psz = strchr(psz_parser, ',' );
- if( psz )
- {
- *psz++ = '\0';
- }
+ if( psz ) *psz++ = '\0';
psz_code = LanguageGetCode( psz_parser );
if( strcmp( psz_code, "??" ) )
TAB_APPEND( i_psz, ppsz, NULL );
}
+ free( psz_dup );
return ppsz;
}
{
int i;
- if( !ppsz_langs || !psz_lang )
- return -1;
+ 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 ) ) return i;
return -1;
}
input_thread_t *p_input = p_sys->p_input;
es_format_t *fmt = &es->fmt;
char *psz_cat;
+ lldiv_t div;
/* Add stream info */
asprintf( &psz_cat, _("Stream %d"), out->p_sys->i_id - 1 );
"%d", fmt->audio.i_channels );
if( fmt->audio.i_rate > 0 )
+ {
input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Sample rate"),
_("%d Hz"), fmt->audio.i_rate );
+ var_SetInteger( p_input, "sample-rate", fmt->audio.i_rate );
+ }
if( fmt->audio.i_bitspersample > 0 )
input_Control( p_input, INPUT_ADD_INFO, psz_cat,
fmt->audio.i_bitspersample );
if( fmt->i_bitrate > 0 )
+ {
input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Bitrate"),
_("%d kb/s"), fmt->i_bitrate / 1000 );
+ var_SetInteger( p_input, "bit-rate", fmt->i_bitrate );
+ }
break;
case VIDEO_ES:
_("Display resolution"), "%dx%d",
fmt->video.i_visible_width,
fmt->video.i_visible_height);
- break;
+ if( fmt->video.i_frame_rate > 0 &&
+ fmt->video.i_frame_rate_base > 0 )
+ {
+ div = lldiv( (float)fmt->video.i_frame_rate /
+ fmt->video.i_frame_rate_base * 1000000,
+ 1000000 );
+ input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+ _("Frame rate"), I64Fd".%06u",
+ div.quot, (unsigned int )div.rem );
+ }
+ break;
case SPU_ES:
input_Control( p_input, INPUT_ADD_INFO, psz_cat,