/*****************************************************************************
* 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.
*****************************************************************************/
/*****************************************************************************
#include <vlc/input.h>
#include <vlc/decoder.h>
+#include "input_internal.h"
+
#include "vlc_playlist.h"
-#include "codecs.h"
#include "iso_lang.h"
+/* FIXME we should find a better way than including that */
+#include "../misc/iso-639_def.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+typedef struct
+{
+ /* Program ID */
+ int i_id;
+
+ /* Number of es for this pgrm */
+ int i_es;
+
+ vlc_bool_t b_selected;
+
+ /* Clock for this program */
+ input_clock_t clock;
+
+ char *psz_now_playing;
+
+} es_out_pgrm_t;
+
struct es_out_id_t
{
- int i_channel;
- es_descriptor_t *p_es;
+ /* ES ID */
+ 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;
+ char *psz_language;
+ char *psz_language_code;
+ decoder_t *p_dec;
};
struct es_out_sys_t
{
input_thread_t *p_input;
- vlc_bool_t b_pcr_set;
+
+ /* all programs */
+ int i_pgrm;
+ es_out_pgrm_t **pgrm;
+ es_out_pgrm_t **pp_selected_pgrm; /* --programs */
+ es_out_pgrm_t *p_pgrm; /* Master program */
/* all es */
int i_id;
-
int i_es;
es_out_id_t **es;
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;
/* current main es */
es_out_id_t *p_es_audio;
es_out_id_t *p_es_video;
es_out_id_t *p_es_sub;
+
+ /* delay */
+ int64_t i_audio_delay;
+ int64_t i_spu_delay;
};
static es_out_id_t *EsOutAdd ( es_out_t *, es_format_t * );
static int EsOutSend ( es_out_t *, es_out_id_t *, block_t * );
static void EsOutDel ( es_out_t *, es_out_id_t * );
+static void EsOutSelect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_force );
static int EsOutControl( es_out_t *, int i_query, va_list );
+static void EsOutAddInfo( es_out_t *, 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 *LanguageGetCode( const char *psz_lang );
+static char **LanguageSplit( const char *psz_langs );
+static int LanguageArrayIndex( char **ppsz_langs, char *psz_lang );
-/**
- * Create a new es_out structure
- *
- * \param p_input The related input thread
- * \return the new es_out_t
- */
+/*****************************************************************************
+ * input_EsOutNew:
+ *****************************************************************************/
es_out_t *input_EsOutNew( input_thread_t *p_input )
{
es_out_t *out = malloc( sizeof( es_out_t ) );
es_out_sys_t *p_sys = malloc( sizeof( es_out_sys_t ) );
vlc_value_t val;
+ int i;
out->pf_add = EsOutAdd;
out->pf_send = EsOutSend;
out->p_sys = p_sys;
p_sys->p_input = p_input;
- p_sys->b_pcr_set = VLC_FALSE;
p_sys->b_active = VLC_FALSE;
p_sys->i_mode = ES_OUT_MODE_AUTO;
- p_sys->i_id = 1;
+ p_sys->i_pgrm = 0;
+ p_sys->pgrm = NULL;
+ p_sys->p_pgrm = NULL;
+
+ p_sys->i_id = 0;
p_sys->i_es = 0;
p_sys->es = NULL;
p_sys->i_video = 0;
p_sys->i_sub = 0;
- var_Get( p_input, "audio-channel", &val );
+ /* */
+ var_Get( p_input, "audio-track", &val );
p_sys->i_audio_last = val.i_int;
- var_Get( p_input, "spu-channel", &val );
+ 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 )
+ {
+ 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] );
+ }
+ 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 )
+ {
+ 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] );
+ }
+ 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;
+ p_sys->i_audio_delay= 0;
+ p_sys->i_spu_delay = 0;
+
return out;
}
-/**
- * Deletes an es_out structure
- *
- * \param out the es_out structure to destroy
- * \return nothing
- */
+/*****************************************************************************
+ * input_EsOutDelete:
+ *****************************************************************************/
void input_EsOutDelete( es_out_t *out )
{
es_out_sys_t *p_sys = out->p_sys;
for( i = 0; i < p_sys->i_es; i++ )
{
+ if( p_sys->es[i]->p_dec )
+ {
+ input_DecoderDelete( p_sys->es[i]->p_dec );
+ }
+ if( p_sys->es[i]->psz_language )
+ free( p_sys->es[i]->psz_language );
+ if( p_sys->es[i]->psz_language_code )
+ free( p_sys->es[i]->psz_language_code );
+ es_format_Clean( &p_sys->es[i]->fmt );
+
free( p_sys->es[i] );
}
- if( p_sys->es )
+ if( p_sys->ppsz_audio_language )
+ {
+ for( i = 0; p_sys->ppsz_audio_language[i]; i++ )
+ free( p_sys->ppsz_audio_language[i] );
+ free( p_sys->ppsz_audio_language );
+ }
+ if( p_sys->ppsz_sub_language )
{
+ for( i = 0; p_sys->ppsz_sub_language[i]; i++ )
+ free( p_sys->ppsz_sub_language[i] );
+ free( p_sys->ppsz_sub_language );
+ }
+
+ if( p_sys->es )
free( p_sys->es );
+
+ 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 )
+ free( p_sys->pgrm );
+
free( p_sys );
free( out );
}
-/**
- * Add a program
- *
- * \param out the es_out
- * \param i_group ...
- * \return a program descriptor for the new program
- */
-static pgrm_descriptor_t *EsOutAddProgram( es_out_t *out, int i_group )
+es_out_id_t *input_EsOutGetFromID( es_out_t *out, int i_id )
{
- input_thread_t *p_input = out->p_sys->p_input;
- pgrm_descriptor_t *p_prgm;
- es_descriptor_t *p_pmt;
-
- /* FIXME we should use a object variable but a lot of place in src/input
- * have to be changed */
- int i_select = config_GetInt( p_input, "program" );
+ int i;
+ if( i_id < 0 )
+ {
+ /* Special HACK, -i_id is tha cat of the stream */
+ return (es_out_id_t*)((uint8_t*)NULL-i_id);
+ }
- /* create it */
- p_prgm = input_AddProgram( p_input, i_group, 0 );
+ for( i = 0; i < out->p_sys->i_es; i++ )
+ {
+ if( out->p_sys->es[i]->i_id == i_id )
+ return out->p_sys->es[i];
+ }
+ return NULL;
+}
- /* XXX welcome to kludge, add a dummy es, if you want to understand
- * why have a look at input_SetProgram. Basicaly, it assume the first
- * es to be the PMT, how that is stupid, nevertheless it is needed for
- * the old ts demuxer */
- p_pmt = input_AddES( p_input, p_prgm, 0, UNKNOWN_ES, NULL, 0 );
- p_pmt->i_fourcc = VLC_FOURCC( 'n', 'u', 'l', 'l' );
+void input_EsOutDiscontinuity( es_out_t *out, vlc_bool_t b_audio )
+{
+ es_out_sys_t *p_sys = out->p_sys;
+ int i;
- /* Select i_select or the first by default */
- if( p_input->stream.p_selected_program == NULL &&
- ( i_select <= 0 || i_select == i_group ) )
+ for( i = 0; i < p_sys->i_es; i++ )
{
- p_input->stream.p_selected_program = p_prgm;
+ 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 ) )
+ {
+ input_DecoderDiscontinuity( es->p_dec );
+ }
}
+}
+
+void input_EsOutSetDelay( es_out_t *out, int i_cat, int64_t i_delay )
+{
+ es_out_sys_t *p_sys = out->p_sys;
- return p_prgm;
+ if( i_cat == AUDIO_ES )
+ p_sys->i_audio_delay = i_delay;
+ else if( i_cat == SPU_ES )
+ p_sys->i_spu_delay = i_delay;
}
-/**
- * Select an ES given the current mode
- * XXX: you need to take a the lock before (stream.stream_lock)
+vlc_bool_t input_EsOutDecodersEmpty( es_out_t *out )
+{
+ es_out_sys_t *p_sys = out->p_sys;
+ int i;
+
+ for( i = 0; i < p_sys->i_es; i++ )
+ {
+ es_out_id_t *es = p_sys->es[i];
+
+ if( es->p_dec && !input_DecoderEmpty( es->p_dec ) )
+ return VLC_FALSE;
+ }
+ return VLC_TRUE;
+}
+
+/*****************************************************************************
*
- * \param out The es_out structure
- * \param es es_out_id structure
- * \param b_force ...
- * \return nothing
- */
-static void EsOutSelect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_force )
+ *****************************************************************************/
+static void EsOutESVarUpdate( es_out_t *out, es_out_id_t *es,
+ vlc_bool_t b_delete )
{
es_out_sys_t *p_sys = out->p_sys;
input_thread_t *p_input = p_sys->p_input;
+ vlc_value_t val, text;
- int i_cat = es->p_es->i_cat;
+ char *psz_var;
- if( !p_sys->b_active ||
- ( !b_force && es->p_es->fmt.i_priority < 0 ) )
+ if( es->fmt.i_cat == AUDIO_ES )
+ psz_var = "audio-es";
+ else if( es->fmt.i_cat == VIDEO_ES )
+ psz_var = "video-es";
+ else if( es->fmt.i_cat == SPU_ES )
+ psz_var = "spu-es";
+ else
+ return;
+
+ if( b_delete )
{
+ val.i_int = es->i_id;
+ var_Change( p_input, psz_var, VLC_VAR_DELCHOICE, &val, NULL );
+ var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
return;
}
- if( p_sys->i_mode == ES_OUT_MODE_ALL || b_force )
+ /* Get the number of ES already added */
+ var_Change( p_input, psz_var, VLC_VAR_CHOICESCOUNT, &val, NULL );
+ if( val.i_int == 0 )
+ {
+ vlc_value_t val2;
+
+ /* First one, we need to add the "Disable" choice */
+ val2.i_int = -1; text.psz_string = _("Disable");
+ var_Change( p_input, psz_var, VLC_VAR_ADDCHOICE, &val2, &text );
+ val.i_int++;
+ }
+
+ /* Take care of the ES description */
+ if( es->fmt.psz_description && *es->fmt.psz_description )
{
- if( !es->p_es->p_dec )
+ if( es->psz_language && *es->psz_language )
{
- input_SelectES( p_input, es->p_es );
+ 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 );
}
- else if( p_sys->i_mode == ES_OUT_MODE_AUTO )
+ else
{
- int i_wanted = -1;
-
- if( es->p_es->p_pgrm != NULL &&
- es->p_es->p_pgrm != p_input->stream.p_selected_program )
+ if( es->psz_language && *es->psz_language )
{
- return;
+ char *temp;
+ 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( i_cat == AUDIO_ES )
+ else
{
- if( p_sys->p_es_audio &&
- p_sys->p_es_audio->p_es->fmt.i_priority >=
- es->p_es->fmt.i_priority )
- {
- return;
- }
- i_wanted = p_sys->i_audio_last >= 0 ?
- p_sys->i_audio_last : es->i_channel;
+ text.psz_string = malloc( strlen( _("Track %i") ) + 20 );
+ sprintf( text.psz_string, _("Track %i"), val.i_int );
}
- else if( i_cat == SPU_ES )
+ }
+
+ val.i_int = es->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 );
+}
+
+/* EsOutProgramSelect:
+ * Select a program and update the object variable
+ */
+static void EsOutProgramSelect( es_out_t *out, es_out_pgrm_t *p_pgrm )
+{
+ es_out_sys_t *p_sys = out->p_sys;
+ input_thread_t *p_input = p_sys->p_input;
+ vlc_value_t val;
+ int i;
+
+ if( p_sys->p_pgrm == p_pgrm )
+ return; /* Nothing to do */
+
+ 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 );
+
+ for( i = 0; i < p_sys->i_es; i++ )
{
- if( p_sys->p_es_sub &&
- p_sys->p_es_sub->p_es->fmt.i_priority >=
- es->p_es->fmt.i_priority )
- {
- return;
- }
- i_wanted = p_sys->i_sub_last;
+ if( p_sys->es[i]->p_pgrm == old && p_sys->es[i]->p_dec &&
+ p_sys->i_mode != ES_OUT_MODE_ALL )
+ EsUnselect( out, p_sys->es[i], VLC_TRUE );
}
- else if( i_cat == VIDEO_ES )
+
+ p_sys->p_es_audio = NULL;
+ p_sys->p_es_sub = NULL;
+ p_sys->p_es_video = NULL;
+ }
+
+ msg_Dbg( p_input, "selecting program id=%d", p_pgrm->i_id );
+
+ /* Mark it selected */
+ p_pgrm->b_selected = VLC_TRUE;
+
+ /* Switch master stream */
+ if( p_sys->p_pgrm && p_sys->p_pgrm->clock.b_master )
+ {
+ p_sys->p_pgrm->clock.b_master = VLC_FALSE;
+ }
+ p_pgrm->clock.b_master = VLC_TRUE;
+ p_sys->p_pgrm = p_pgrm;
+
+ /* Update "program" */
+ val.i_int = p_pgrm->i_id;
+ var_Change( p_input, "program", VLC_VAR_SETVALUE, &val, NULL );
+
+ /* Update "es-*" */
+ var_Change( p_input, "audio-es", VLC_VAR_CLEARCHOICES, NULL, NULL );
+ var_Change( p_input, "video-es", VLC_VAR_CLEARCHOICES, NULL, NULL );
+ var_Change( p_input, "spu-es", VLC_VAR_CLEARCHOICES, NULL, NULL );
+ for( i = 0; i < p_sys->i_es; i++ )
+ {
+ if( p_sys->es[i]->p_pgrm == p_sys->p_pgrm )
+ EsOutESVarUpdate( out, p_sys->es[i], VLC_FALSE );
+ 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 );
+}
+
+/* EsOutAddProgram:
+ * Add a program
+ */
+static es_out_pgrm_t *EsOutProgramAdd( 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;
+ vlc_value_t val;
+
+ es_out_pgrm_t *p_pgrm = malloc( sizeof( es_out_pgrm_t ) );
+
+ /* Init */
+ 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 */
+ TAB_APPEND( p_sys->i_pgrm, p_sys->pgrm, p_pgrm );
+
+ /* Update "program" variable */
+ val.i_int = i_group;
+ var_Change( p_input, "program", VLC_VAR_ADDCHOICE, &val, NULL );
+
+ if( i_group == var_GetInteger( p_input, "program" ) )
+ {
+ EsOutProgramSelect( out, p_pgrm );
+ }
+ else
+ {
+ var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
+ }
+ 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 )
{
- i_wanted = es->i_channel;
+ 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;
+ }
- if( i_wanted == es->i_channel && es->p_es->p_dec == NULL )
+ for( i = 0; i < p_sys->i_pgrm; i++ )
+ {
+ if( p_sys->pgrm[i]->i_id == i_group )
{
- input_SelectES( p_input, es->p_es );
+ p_pgrm = p_sys->pgrm[i];
+ break;
}
}
- /* FIXME TODO handle priority here */
- if( es->p_es->p_dec )
+ if( p_pgrm == NULL )
+ p_pgrm = EsOutProgramAdd( out, i_group );
+
+ /* Update the description text of the program */
+ if( psz_name && *psz_name )
{
- if( i_cat == AUDIO_ES )
+ 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 )
{
- if( p_sys->i_mode == ES_OUT_MODE_AUTO &&
- p_sys->p_es_audio && p_sys->p_es_audio->p_es->p_dec )
- {
- input_UnselectES( p_input, p_sys->p_es_audio->p_es );
- }
- p_sys->p_es_audio = es;
+ 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 if( i_cat == SPU_ES )
+ else
{
- if( p_sys->i_mode == ES_OUT_MODE_AUTO &&
- p_sys->p_es_sub && p_sys->p_es_sub->p_es->p_dec )
- {
- input_UnselectES( p_input, p_sys->p_es_sub->p_es );
- }
- p_sys->p_es_sub = es;
+ text.psz_string = psz_name;
+ var_Change( p_input, "program", VLC_VAR_ADDCHOICE, &val, &text );
}
- else if( i_cat == VIDEO_ES )
+ }
+ if( psz_now_playing )
+ {
+ p_pgrm->psz_now_playing = strdup(psz_now_playing);
+
+ if( p_sys->p_pgrm == p_pgrm )
{
- p_sys->p_es_video = es;
+ input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"),
+ VLC_META_NOW_PLAYING, "%s", psz_now_playing );
}
}
+ free( psz_cat );
}
-/**
- * Add an es_out
- *
- * \param out the es_out to add
- * \param fmt the es_format of the es_out
- * \return an es_out id
+/* EsOutAdd:
+ * Add an es_out
*/
static es_out_id_t *EsOutAdd( es_out_t *out, es_format_t *fmt )
{
es_out_sys_t *p_sys = out->p_sys;
input_thread_t *p_input = p_sys->p_input;
+
es_out_id_t *es = malloc( sizeof( es_out_id_t ) );
- pgrm_descriptor_t *p_prgm = NULL;
- char psz_cat[sizeof( _("Stream ") ) + 10];
- char *psz_description;
+ es_out_pgrm_t *p_pgrm = NULL;
+ int i;
- vlc_mutex_lock( &p_input->stream.stream_lock );
- if( fmt->i_group >= 0 )
+ if( fmt->i_group < 0 )
{
- /* search program */
- p_prgm = input_FindProgram( p_input, fmt->i_group );
+ msg_Err( p_input, "invalid group number" );
+ return NULL;
+ }
- if( p_prgm == NULL )
+ /* Search the program */
+ for( i = 0; i < p_sys->i_pgrm; i++ )
+ {
+ if( fmt->i_group == p_sys->pgrm[i]->i_id )
{
- /* Create it */
- p_prgm = EsOutAddProgram( out, fmt->i_group );
+ p_pgrm = p_sys->pgrm[i];
+ break;
}
}
- if( fmt->i_id < 0 )
+ if( p_pgrm == NULL )
{
- fmt->i_id = out->p_sys->i_id - 1;
+ /* Create a new one */
+ p_pgrm = EsOutProgramAdd( out, fmt->i_group );
}
- psz_description = LanguageGetName( fmt->psz_language );
- es->p_es = input_AddES( p_input, p_prgm, fmt->i_id + 1,
- fmt->i_cat, psz_description, 0 );
- es->p_es->i_stream_id = fmt->i_id;
- es->p_es->i_fourcc = fmt->i_codec;
+ /* Increase ref count for program */
+ p_pgrm->i_es++;
+
+ /* Set up ES */
+ if( fmt->i_id < 0 )
+ fmt->i_id = out->p_sys->i_id;
+ 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 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:
- {
- subtitle_data_t *p_sub = malloc( sizeof( subtitle_data_t ) );
- memset( p_sub, 0, sizeof( subtitle_data_t ) );
- if( fmt->i_extra > 0 )
- {
- p_sub->psz_header = malloc( fmt->i_extra + 1 );
- memcpy( p_sub->psz_header, fmt->p_extra , fmt->i_extra );
- /* just to be sure */
- ((uint8_t*)fmt->p_extra)[fmt->i_extra] = '\0';
- }
- /* FIXME beuuuuuurk */
- es->p_es->p_demux_data = p_sub;
-
- es->i_channel = p_sys->i_sub;
- break;
- }
+ es->i_channel = p_sys->i_sub;
+ break;
default:
es->i_channel = 0;
break;
}
+ 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;
- /* Add stream info */
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- sprintf( psz_cat, _("Stream %d"), out->p_sys->i_id - 1 );
-
- input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Codec"),
- "%.4s", (char*)&fmt->i_codec );
+ if( es->p_pgrm == p_sys->p_pgrm )
+ EsOutESVarUpdate( out, es, VLC_FALSE );
- if( *psz_description )
- input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Language"),
- "%s", psz_description );
+ /* Select it if needed */
+ EsOutSelect( out, es, VLC_FALSE );
- if( fmt->psz_description && *fmt->psz_description )
- input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Description"),
- "%s", fmt->psz_description );
- /* Add information */
+ TAB_APPEND( out->p_sys->i_es, out->p_sys->es, es );
+ p_sys->i_id++; /* always incremented */
switch( fmt->i_cat )
{
- case AUDIO_ES:
- input_Control( p_input, INPUT_ADD_INFO, psz_cat,
- _("Type"), _("Audio") );
+ case AUDIO_ES:
+ p_sys->i_audio++;
+ break;
+ case SPU_ES:
+ p_sys->i_sub++;
+ break;
+ case VIDEO_ES:
+ p_sys->i_video++;
+ break;
+ }
- if( fmt->audio.i_channels > 0 )
- input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Channels"),
- "%d", fmt->audio.i_channels );
+ EsOutAddInfo( out, es );
- if( fmt->audio.i_rate > 0 )
- input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Sample rate"),
- _("%d Hz"), fmt->audio.i_rate );
+ return es;
+}
- if( fmt->audio.i_bitspersample > 0 )
- input_Control( p_input, INPUT_ADD_INFO, psz_cat,
- _("Bits per sample"), "%d",
- fmt->audio.i_bitspersample );
+static void EsSelect( es_out_t *out, es_out_id_t *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;
- if( fmt->i_bitrate > 0 )
- input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Bitrate"),
- _("%d bps"), fmt->i_bitrate );
- break;
+ if( es->p_dec )
+ {
+ msg_Warn( p_input, "ES 0x%x is already selected", es->i_id );
+ return;
+ }
- case VIDEO_ES:
- input_Control( p_input, INPUT_ADD_INFO, psz_cat,
- _("Type"), _("Video") );
+ 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" ) ) )
+ {
+ msg_Dbg( p_input, "video is disabled, not selecting ES 0x%x",
+ es->i_id );
+ return;
+ }
+ }
+ else if( es->fmt.i_cat == AUDIO_ES )
+ {
+ var_Get( p_input, "audio", &val );
+ if( !var_GetBool( p_input, "audio" ) ||
+ ( p_input->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_sout && !var_GetBool( p_input, "sout-spu" ) ) )
+ {
+ msg_Dbg( p_input, "spu is disabled, not selecting ES 0x%x",
+ es->i_id );
+ return;
+ }
+ }
- if( fmt->video.i_width > 0 && fmt->video.i_height > 0 )
- input_Control( p_input, INPUT_ADD_INFO, psz_cat,
- _("Resolution"), "%dx%d",
- fmt->video.i_width, fmt->video.i_height );
+ 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( fmt->video.i_visible_width > 0 &&
- fmt->video.i_visible_height > 0 )
- input_Control( p_input, INPUT_ADD_INFO, psz_cat,
- _("Display resolution"), "%dx%d",
- fmt->video.i_visible_width,
- fmt->video.i_visible_height);
- break;
+ if( es->fmt.i_cat == VIDEO_ES )
+ psz_var = "video-es";
+ else if( es->fmt.i_cat == AUDIO_ES )
+ psz_var = "audio-es";
+ else if( es->fmt.i_cat == SPU_ES )
+ psz_var = "spu-es";
+ else
+ return;
- case SPU_ES:
- input_Control( p_input, INPUT_ADD_INFO, psz_cat,
- _("Type"), _("Subtitle") );
- break;
+ /* Mark it as selected */
+ val.i_int = es->i_id;
+ var_Change( p_input, psz_var, VLC_VAR_SETVALUE, &val, NULL );
- default:
- break;
+
+ var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
+}
+
+static void EsUnselect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_update )
+{
+ 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;
+
+ if( es->p_dec == NULL )
+ {
+ msg_Warn( p_input, "ES 0x%x is already unselected", es->i_id );
+ return;
+ }
+
+ input_DecoderDelete( es->p_dec );
+ es->p_dec = NULL;
+
+ if( !b_update )
+ return;
+
+ /* Update var */
+ if( es->p_dec == NULL )
+ return;
+ if( es->fmt.i_cat == VIDEO_ES )
+ psz_var = "video-es";
+ else if( es->fmt.i_cat == AUDIO_ES )
+ psz_var = "audio-es";
+ else if( es->fmt.i_cat == SPU_ES )
+ psz_var = "spu-es";
+ else
+ return;
+
+ /* Mark it as selected */
+ val.i_int = -1;
+ var_Change( p_input, psz_var, VLC_VAR_SETVALUE, &val, NULL );
+
+ var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
+}
+
+/**
+ * Select an ES given the current mode
+ * XXX: you need to take a the lock before (stream.stream_lock)
+ *
+ * \param out The es_out structure
+ * \param es es_out_id structure
+ * \param b_force ...
+ * \return nothing
+ */
+static void EsOutSelect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_force )
+{
+ es_out_sys_t *p_sys = out->p_sys;
+
+ int i_cat = es->fmt.i_cat;
+
+ if( !p_sys->b_active ||
+ ( !b_force && es->fmt.i_priority < 0 ) )
+ {
+ return;
}
- vlc_mutex_lock( &p_input->stream.stream_lock );
- free( psz_description );
+ if( p_sys->i_mode == ES_OUT_MODE_ALL || b_force )
+ {
+ if( !es->p_dec )
+ EsSelect( out, es );
+ }
+ else if( p_sys->i_mode == ES_OUT_MODE_PARTIAL )
+ {
+ vlc_value_t val;
+ int i;
+ var_Get( p_sys->p_input, "programs", &val );
+ for ( i = 0; i < val.p_list->i_count; i++ )
+ {
+ if ( val.p_list->p_values[i].i_int == es->p_pgrm->i_id || b_force )
+ {
+ if( !es->p_dec )
+ EsSelect( out, es );
+ break;
+ }
+ }
+ var_Change( p_sys->p_input, "programs", VLC_VAR_FREELIST, &val, NULL );
+ }
+ else if( p_sys->i_mode == ES_OUT_MODE_AUTO )
+ {
+ int i_wanted = -1;
+
+ if( es->p_pgrm != p_sys->p_pgrm )
+ return;
+
+ if( i_cat == AUDIO_ES )
+ {
+ int idx1 = LanguageArrayIndex( p_sys->ppsz_audio_language,
+ es->psz_language_code );
+
+ if( p_sys->p_es_audio &&
+ p_sys->p_es_audio->fmt.i_priority >= es->fmt.i_priority )
+ {
+ int idx2 = LanguageArrayIndex( p_sys->ppsz_audio_language,
+ p_sys->p_es_audio->psz_language_code );
+
+ if( idx1 < 0 || ( idx2 >= 0 && idx2 <= idx1 ) )
+ return;
+ i_wanted = es->i_channel;
+ }
+ else
+ {
+ /* Select audio if (no audio selected yet)
+ * - no audio-language
+ * - no audio code for the ES
+ * - audio code in the requested list */
+ if( idx1 >= 0 ||
+ !strcmp( es->psz_language_code, "??" ) ||
+ !p_sys->ppsz_audio_language )
+ i_wanted = es->i_channel;
+ }
+
+ 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 )
+ {
+ int idx1 = LanguageArrayIndex( p_sys->ppsz_sub_language,
+ es->psz_language_code );
+
+ if( p_sys->p_es_sub &&
+ p_sys->p_es_sub->fmt.i_priority >= es->fmt.i_priority )
+ {
+ int idx2 = LanguageArrayIndex( p_sys->ppsz_sub_language,
+ p_sys->p_es_sub->psz_language_code );
+
+ msg_Dbg( p_sys->p_input, "idx1=%d(%s) idx2=%d(%s)",
+ idx1, es->psz_language_code, idx2,
+ p_sys->p_es_sub->psz_language_code );
- es_format_Copy( &es->p_es->fmt, fmt );
+ if( idx1 < 0 || ( idx2 >= 0 && idx2 <= idx1 ) )
+ return;
+ /* We found a SPU that matches our language request */
+ i_wanted = es->i_channel;
+ }
+ else if( idx1 >= 0 )
+ {
+ msg_Dbg( p_sys->p_input, "idx1=%d(%s)",
+ idx1, es->psz_language_code );
- /* Apply mode
- * XXX change that when we do group too */
- if( 1 )
- {
- EsOutSelect( out, es, VLC_FALSE );
+ i_wanted = es->i_channel;
+ }
+ 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 )
+ {
+ i_wanted = es->i_channel;
+ }
+
+ if( i_wanted == es->i_channel && es->p_dec == NULL )
+ EsSelect( out, es );
}
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- TAB_APPEND( out->p_sys->i_es, out->p_sys->es, es );
- p_sys->i_id++; /* always incremented */
- switch( fmt->i_cat )
+ /* FIXME TODO handle priority here */
+ if( es->p_dec )
{
- case AUDIO_ES:
- p_sys->i_audio++;
- break;
- case SPU_ES:
- p_sys->i_sub++;
- break;
- case VIDEO_ES:
- p_sys->i_video++;
- break;
+ 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 )
+ {
+ EsUnselect( out, p_sys->p_es_audio, VLC_FALSE );
+ }
+ p_sys->p_es_audio = es;
+ }
+ else if( i_cat == SPU_ES )
+ {
+ 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 )
+ {
+ EsUnselect( out, p_sys->p_es_sub, VLC_FALSE );
+ }
+ p_sys->p_es_sub = es;
+ }
+ else if( i_cat == VIDEO_ES )
+ {
+ p_sys->p_es_video = es;
+ }
}
-
- return es;
}
/**
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;
+ int64_t i_delay;
- if( p_sys->b_pcr_set )
- {
- pgrm_descriptor_t *p_pgrm = es->p_es->p_pgrm;
- input_thread_t *p_input = p_sys->p_input;
+ if( es->fmt.i_cat == AUDIO_ES )
+ i_delay = p_sys->i_audio_delay;
+ else if( es->fmt.i_cat == SPU_ES )
+ i_delay = p_sys->i_spu_delay;
+ else
+ i_delay = 0;
- if( p_pgrm == NULL )
- {
- p_pgrm = p_sys->p_input->stream.p_selected_program;
- }
+ /* 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;
+ }
- if( p_block->i_dts > 0 && p_pgrm )
- {
- p_block->i_dts =
- input_ClockGetTS( p_input, p_pgrm, p_block->i_dts * 9 / 100 );
- }
- if( p_block->i_pts > 0 && p_pgrm )
+ /* +11 -> avoid null value with non null dts/pts */
+ if( p_block->i_dts > 0 )
+ {
+ p_block->i_dts =
+ input_ClockGetTS( p_input, &p_pgrm->clock,
+ ( p_block->i_dts + 11 ) * 9 / 100 ) + i_delay;
+ }
+ if( p_block->i_pts > 0 )
+ {
+ p_block->i_pts =
+ input_ClockGetTS( p_input, &p_pgrm->clock,
+ ( p_block->i_pts + 11 ) * 9 / 100 ) + i_delay;
+ }
+ if ( es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) )
+ {
+ mtime_t current_date = mdate();
+ if( !p_block->i_pts
+ || p_block->i_pts > current_date + 10000000
+ || current_date > p_block->i_pts )
{
- p_block->i_pts =
- input_ClockGetTS( p_input, p_pgrm, p_block->i_pts * 9 / 100 );
+ /* 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;
}
}
- vlc_mutex_lock( &out->p_sys->p_input->stream.stream_lock );
- p_block->i_rate = out->p_sys->p_input->stream.control.i_rate;
- if( es->p_es->p_dec &&
- (es->p_es->i_cat!=AUDIO_ES || !p_sys->p_input->stream.control.b_mute) )
+ p_block->i_rate = p_input->i_rate;
+
+ /* TODO handle mute */
+ if( es->p_dec && ( es->fmt.i_cat != AUDIO_ES ||
+ p_input->i_rate == INPUT_RATE_DEFAULT ) )
{
- vlc_mutex_unlock( &out->p_sys->p_input->stream.stream_lock );
- input_DecodeBlock( es->p_es->p_dec, p_block );
+ input_DecoderDecode( es->p_dec, p_block );
}
else
{
- vlc_mutex_unlock( &out->p_sys->p_input->stream.stream_lock );
block_Release( 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 )
+ EsUnselect( out, es, es->p_pgrm == p_sys->p_pgrm );
+
+ if( es->p_pgrm == p_sys->p_pgrm )
+ EsOutESVarUpdate( out, es, VLC_TRUE );
TAB_REMOVE( p_sys->i_es, p_sys->es, es );
- switch( es->p_es->i_cat )
+ es->p_pgrm->i_es--;
+ if( es->p_pgrm->i_es == 0 )
+ {
+ 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;
+
+ switch( es->fmt.i_cat )
{
case AUDIO_ES:
p_sys->i_audio--;
break;
}
- /* We don't try to reselect */
- vlc_mutex_lock( &p_sys->p_input->stream.stream_lock );
- if( es->p_es->p_dec )
- {
- input_UnselectES( p_sys->p_input, es->p_es );
- }
-
- if( es->p_es->p_waveformatex )
- {
- free( es->p_es->p_waveformatex );
- es->p_es->p_waveformatex = NULL;
- }
- if( es->p_es->p_bitmapinfoheader )
- {
- free( es->p_es->p_bitmapinfoheader );
- es->p_es->p_bitmapinfoheader = NULL;
- }
- input_DelES( p_sys->p_input, es->p_es );
+ /* 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( 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;
+ if( es->psz_language )
+ free( es->psz_language );
+ if( es->psz_language_code )
+ free( es->psz_language_code );
- vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock );
+ es_format_Clean( &es->fmt );
free( es );
}
switch( i_query )
{
case ES_OUT_SET_ES_STATE:
- vlc_mutex_lock( &p_sys->p_input->stream.stream_lock );
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_es->p_dec == NULL )
+ if( b && es->p_dec == NULL )
{
- input_SelectES( p_sys->p_input, es->p_es );
- vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock );
- return es->p_es->p_dec ? VLC_SUCCESS : VLC_EGENERIC;
+ EsSelect( out, es );
+ return es->p_dec ? VLC_SUCCESS : VLC_EGENERIC;
}
- else if( !b && es->p_es->p_dec )
+ else if( !b && es->p_dec )
{
- input_UnselectES( p_sys->p_input, es->p_es );
- vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock );
+ EsUnselect( out, es, es->p_pgrm == p_sys->p_pgrm );
return VLC_SUCCESS;
}
- vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock );
return VLC_SUCCESS;
case ES_OUT_GET_ES_STATE:
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_es->p_dec ? VLC_TRUE : VLC_FALSE;
+ *pb = es->p_dec ? VLC_TRUE : VLC_FALSE;
return VLC_SUCCESS;
case ES_OUT_SET_ACTIVE:
{
b = (vlc_bool_t) va_arg( args, vlc_bool_t );
p_sys->b_active = b;
-
+ /* Needed ? */
if( b )
- {
- vlc_value_t val;
- val.b_bool = VLC_TRUE;
- var_Set( p_sys->p_input, "intf-change", val );
- }
+ var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
return VLC_SUCCESS;
}
case ES_OUT_SET_MODE:
i = (int) va_arg( args, int );
if( i == ES_OUT_MODE_NONE || i == ES_OUT_MODE_ALL ||
- i == ES_OUT_MODE_AUTO )
+ i == ES_OUT_MODE_AUTO || i == ES_OUT_MODE_PARTIAL )
{
- vlc_value_t val;
-
p_sys->i_mode = i;
/* Reapply policy mode */
- vlc_mutex_lock( &p_sys->p_input->stream.stream_lock );
for( i = 0; i < p_sys->i_es; i++ )
{
- if( p_sys->es[i]->p_es->p_dec )
+ if( p_sys->es[i]->p_dec )
{
- input_UnselectES( p_sys->p_input, p_sys->es[i]->p_es );
+ 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++ )
{
EsOutSelect( out, p_sys->es[i], VLC_FALSE );
}
- vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock );
-
- val.b_bool = VLC_TRUE;
- var_Set( p_sys->p_input, "intf-change", val );
-
return VLC_SUCCESS;
}
return VLC_EGENERIC;
case ES_OUT_SET_ES:
es = (es_out_id_t*) va_arg( args, es_out_id_t * );
+ /* Special case NULL, NULL+i_cat */
if( es == NULL )
{
for( i = 0; i < p_sys->i_es; i++ )
{
- vlc_mutex_lock( &p_sys->p_input->stream.stream_lock );
- if( p_sys->es[i]->p_es->p_dec )
- {
- input_UnselectES( p_sys->p_input, p_sys->es[i]->p_es );
- }
- vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock );
+ if( p_sys->es[i]->p_dec )
+ EsUnselect( out, p_sys->es[i],
+ p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
+ }
+ }
+ else if( es == (es_out_id_t*)((uint8_t*)NULL+AUDIO_ES) )
+ {
+ 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 )
+ EsUnselect( out, p_sys->es[i],
+ p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
+ }
+ }
+ else if( es == (es_out_id_t*)((uint8_t*)NULL+VIDEO_ES) )
+ {
+ 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 )
+ EsUnselect( out, p_sys->es[i],
+ p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
+ }
+ }
+ else if( es == (es_out_id_t*)((uint8_t*)NULL+SPU_ES) )
+ {
+ 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 )
+ EsUnselect( out, p_sys->es[i],
+ p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
}
}
else
{
- vlc_mutex_lock( &p_sys->p_input->stream.stream_lock );
- EsOutSelect( out, es, VLC_TRUE );
- vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock );
+ for( i = 0; i < p_sys->i_es; i++ )
+ {
+ if( es == p_sys->es[i] )
+ {
+ EsOutSelect( out, es, VLC_TRUE );
+ break;
+ }
+ }
}
return VLC_SUCCESS;
case ES_OUT_SET_PCR:
case ES_OUT_SET_GROUP_PCR:
{
- pgrm_descriptor_t *p_prgm = NULL;
- int64_t i_pcr;
+ es_out_pgrm_t *p_pgrm = NULL;
+ int i_group = 0;
+ int64_t i_pcr;
if( i_query == ES_OUT_SET_PCR )
{
- p_prgm = p_sys->p_input->stream.p_selected_program;
+ p_pgrm = p_sys->p_pgrm;
}
else
{
- int i_group = (int)va_arg( args, int );
- p_prgm = input_FindProgram( p_sys->p_input, i_group );
- if( p_prgm == NULL )
+ int i;
+ i_group = (int)va_arg( args, int );
+ for( i = 0; i < p_sys->i_pgrm; i++ )
{
- /* we create the requested program */
- p_prgm = EsOutAddProgram( out, i_group );
+ if( p_sys->pgrm[i]->i_id == i_group )
+ {
+ p_pgrm = p_sys->pgrm[i];
+ break;
+ }
}
}
- i_pcr = (int64_t)va_arg( args, int64_t );
+ if( p_pgrm == NULL )
+ p_pgrm = EsOutProgramAdd( out, i_group ); /* Create it */
+ i_pcr = (int64_t)va_arg( args, int64_t );
/* search program */
- if( p_prgm )
+ /* 11 is a vodoo trick to avoid non_pcr*9/100 to be null */
+ input_ClockSetPCR( p_sys->p_input, &p_pgrm->clock,
+ (i_pcr + 11 ) * 9 / 100);
+ return VLC_SUCCESS;
+ }
+
+ case ES_OUT_RESET_PCR:
+ for( i = 0; i < p_sys->i_pgrm; i++ )
{
- input_ClockManageRef( p_sys->p_input, p_prgm, i_pcr * 9 / 100);
+ p_sys->pgrm[i]->clock.i_synchro_state = SYNCHRO_REINIT;
+ p_sys->pgrm[i]->clock.last_pts = 0;
}
- p_sys->b_pcr_set = VLC_TRUE;
return VLC_SUCCESS;
+
+ case ES_OUT_GET_TS:
+ if( p_sys->p_pgrm )
+ {
+ 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 + 11 ) * 9 / 100 );
+ return VLC_SUCCESS;
+ }
+ return VLC_EGENERIC;
+
+ case ES_OUT_GET_GROUP:
+ pi = (int*) va_arg( args, int* );
+ if( p_sys->p_pgrm )
+ *pi = p_sys->p_pgrm->i_id;
+ else
+ *pi = -1; /* FIXME */
+ return VLC_SUCCESS;
+
+ case ES_OUT_SET_GROUP:
+ {
+ int j;
+ i = (int) va_arg( args, int );
+ for( j = 0; j < p_sys->i_pgrm; j++ )
+ {
+ es_out_pgrm_t *p_pgrm = p_sys->pgrm[j];
+ if( p_pgrm->i_id == i )
+ {
+ EsOutProgramSelect( out, p_pgrm );
+ return VLC_SUCCESS;
+ }
+ }
+ return VLC_EGENERIC;
}
- case ES_OUT_RESET_PCR:
- for( i = 0; i < p_sys->p_input->stream.i_pgrm_number; i++ )
+ case ES_OUT_SET_FMT:
+ {
+ /* This ain't pretty but is need by some demuxers (eg. Ogg )
+ * to update the p_extra data */
+ es_format_t *p_fmt;
+ es = (es_out_id_t*) va_arg( args, es_out_id_t * );
+ p_fmt = (es_format_t*) va_arg( args, es_format_t * );
+ if( es == NULL ) return VLC_EGENERIC;
+
+ if( p_fmt->i_extra )
{
- p_sys->p_input->stream.pp_programs[i]->i_synchro_state = SYNCHRO_REINIT;
+ es->fmt.i_extra = p_fmt->i_extra;
+ es->fmt.p_extra = realloc( es->fmt.p_extra, p_fmt->i_extra );
+ memcpy( es->fmt.p_extra, p_fmt->p_extra, p_fmt->i_extra );
+
+ 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
}
- p_sys->b_pcr_set = VLC_TRUE;
+
+ 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 strdup( pl->psz_eng_name );
}
}
+
+/* Get a 2 char code */
+static char *LanguageGetCode( const char *psz_lang )
+{
+ const iso639_lang_t *pl;
+
+ if( psz_lang == NULL || *psz_lang == '\0' )
+ return strdup("??");
+
+ for( pl = p_languages; pl->psz_iso639_1 != NULL; pl++ )
+ {
+ if( !strcasecmp( pl->psz_eng_name, psz_lang ) ||
+ !strcasecmp( pl->psz_native_name, psz_lang ) ||
+ !strcasecmp( pl->psz_iso639_1, psz_lang ) ||
+ !strcasecmp( pl->psz_iso639_2T, psz_lang ) ||
+ !strcasecmp( pl->psz_iso639_2B, psz_lang ) )
+ break;
+ }
+
+ if( pl->psz_iso639_1 != NULL )
+ return strdup( pl->psz_iso639_1 );
+
+ return strdup("??");
+}
+
+static char **LanguageSplit( const char *psz_langs )
+{
+ char *psz_dup;
+ char *psz_parser;
+ char **ppsz = NULL;
+ int i_psz = 0;
+
+ if( psz_langs == NULL ) return NULL;
+
+ psz_parser = psz_dup = strdup(psz_langs);
+
+ while( psz_parser && *psz_parser )
+ {
+ char *psz;
+ char *psz_code;
+
+ psz = strchr(psz_parser, ',' );
+ if( psz ) *psz++ = '\0';
+
+ psz_code = LanguageGetCode( psz_parser );
+ if( strcmp( psz_code, "??" ) )
+ {
+ TAB_APPEND( i_psz, ppsz, psz_code );
+ }
+
+ psz_parser = psz;
+ }
+
+ if( i_psz )
+ {
+ TAB_APPEND( i_psz, ppsz, NULL );
+ }
+
+ free( psz_dup );
+ return ppsz;
+}
+
+static int LanguageArrayIndex( char **ppsz_langs, char *psz_lang )
+{
+ int i;
+
+ if( !ppsz_langs || !psz_lang ) return -1;
+
+ for( i = 0; ppsz_langs[i]; i++ )
+ if( !strcasecmp( ppsz_langs[i], psz_lang ) ) return i;
+
+ return -1;
+}
+
+/****************************************************************************
+ * EsOutAddInfo:
+ * - add meta info to the playlist item
+ ****************************************************************************/
+static void EsOutAddInfo( es_out_t *out, es_out_id_t *es )
+{
+ es_out_sys_t *p_sys = out->p_sys;
+ input_thread_t *p_input = p_sys->p_input;
+ es_format_t *fmt = &es->fmt;
+ char *psz_cat;
+
+ /* Add stream info */
+ asprintf( &psz_cat, _("Stream %d"), out->p_sys->i_id - 1 );
+
+ input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Codec"),
+ "%.4s", (char*)&fmt->i_codec );
+
+ input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Language"),
+ "%s", es->psz_language );
+
+ /* Add information */
+ switch( fmt->i_cat )
+ {
+ case AUDIO_ES:
+ input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+ _("Type"), _("Audio") );
+
+ if( fmt->audio.i_channels > 0 )
+ input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Channels"),
+ "%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 );
+
+ if( fmt->audio.i_bitspersample > 0 )
+ input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+ _("Bits per sample"), "%d",
+ 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 );
+ break;
+
+ case VIDEO_ES:
+ input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+ _("Type"), _("Video") );
+
+ if( fmt->video.i_width > 0 && fmt->video.i_height > 0 )
+ input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+ _("Resolution"), "%dx%d",
+ fmt->video.i_width, fmt->video.i_height );
+
+ if( fmt->video.i_visible_width > 0 &&
+ fmt->video.i_visible_height > 0 )
+ input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+ _("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:
+ input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+ _("Type"), _("Subtitle") );
+ break;
+
+ default:
+ break;
+ }
+
+ free( psz_cat );
+}
projects / vlc / blobdiff