static void* Manage( void * );
static int vlm_MediaVodControl( void *, vod_media_t *, const char *, int, va_list );
+typedef struct preparse_data_t
+{
+ vlc_sem_t *p_sem;
+ bool b_mux;
+} preparse_data_t;
+
static int InputEventPreparse( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
- vlc_sem_t *p_sem_preparse = p_data;
+ preparse_data_t *p_pre = p_data;
if( newval.i_int == INPUT_EVENT_DEAD ||
- newval.i_int == INPUT_EVENT_ITEM_META )
- vlc_sem_post( p_sem_preparse );
+ ( p_pre->b_mux && newval.i_int == INPUT_EVENT_ITEM_META ) )
+ vlc_sem_post( p_pre->p_sem );
return VLC_SUCCESS;
}
switch( i_query )
{
case VOD_MEDIA_PLAY:
+ {
psz = (const char *)va_arg( args, const char * );
+ int64_t *i_time = (int64_t *)va_arg( args, int64_t *);
+ bool b_retry = false;
+ if (*i_time < 0)
+ {
+ /* No start time requested: return the current NPT */
+ i_ret = vlm_ControlInternal( vlm, VLM_GET_MEDIA_INSTANCE_TIME, id, psz_id, i_time );
+ /* The instance is not running yet, it will start at 0 */
+ if (i_ret)
+ *i_time = 0;
+ }
+ else
+ {
+ /* We want to seek before unpausing, but it won't
+ * work if the instance is not running yet. */
+ b_retry = vlm_ControlInternal( vlm, VLM_SET_MEDIA_INSTANCE_TIME, id, psz_id, *i_time );
+ }
+
i_ret = vlm_ControlInternal( vlm, VLM_START_MEDIA_VOD_INSTANCE, id, psz_id, 0, psz );
+
+ if (!i_ret && b_retry)
+ i_ret = vlm_ControlInternal( vlm, VLM_SET_MEDIA_INSTANCE_TIME, id, psz_id, *i_time );
break;
+ }
case VOD_MEDIA_PAUSE:
+ {
+ int64_t *i_time = (int64_t *)va_arg( args, int64_t *);
i_ret = vlm_ControlInternal( vlm, VLM_PAUSE_MEDIA_INSTANCE, id, psz_id );
+ if (!i_ret)
+ i_ret = vlm_ControlInternal( vlm, VLM_GET_MEDIA_INSTANCE_TIME, id, psz_id, i_time );
break;
+ }
case VOD_MEDIA_STOP:
i_ret = vlm_ControlInternal( vlm, VLM_STOP_MEDIA_INSTANCE, id, psz_id );
case VOD_MEDIA_SEEK:
{
- double d_position = (double)va_arg( args, double );
- i_ret = vlm_ControlInternal( vlm, VLM_SET_MEDIA_INSTANCE_POSITION, id, psz_id, d_position/100.0 );
+ int64_t i_time = (int64_t)va_arg( args, int64_t );
+ i_ret = vlm_ControlInternal( vlm, VLM_SET_MEDIA_INSTANCE_TIME, id, psz_id, i_time );
break;
}
{
mtime_t i_real_date = vlm->schedule[i]->i_date;
- if( vlm->schedule[i]->b_enabled == true )
+ if( vlm->schedule[i]->b_enabled )
{
if( vlm->schedule[i]->i_date == 0 ) // now !
{
if( asprintf( &psz_header, _("Media: %s"), p_cfg->psz_name ) == -1 )
psz_header = NULL;
+ sout_description_data_t data;
+ TAB_INIT(data.i_es, data.es);
+
p_input = input_Create( p_vlm->p_vod, p_media->vod.p_item, psz_header, NULL );
if( p_input )
{
vlc_sem_t sem_preparse;
vlc_sem_init( &sem_preparse, 0 );
- var_AddCallback( p_input, "intf-event", InputEventPreparse, &sem_preparse );
+
+ preparse_data_t preparse = { .p_sem = &sem_preparse,
+ .b_mux = (p_cfg->vod.psz_mux != NULL) };
+ var_AddCallback( p_input, "intf-event", InputEventPreparse,
+ &preparse );
+
+ data.sem = &sem_preparse;
+ var_Create( p_input, "sout-description-data", VLC_VAR_ADDRESS );
+ var_SetAddress( p_input, "sout-description-data", &data );
if( !input_Start( p_input ) )
- {
- while( !p_input->b_dead && ( !p_cfg->vod.psz_mux || !input_item_IsPreparsed( p_media->vod.p_item ) ) )
- vlc_sem_wait( &sem_preparse );
- }
+ vlc_sem_wait( &sem_preparse );
- var_DelCallback( p_input, "intf-event", InputEventPreparse, &sem_preparse );
- vlc_sem_destroy( &sem_preparse );
+ var_DelCallback( p_input, "intf-event", InputEventPreparse,
+ &preparse );
input_Stop( p_input, true );
vlc_thread_join( p_input );
vlc_object_release( p_input );
+ vlc_sem_destroy( &sem_preparse );
}
free( psz_header );
+ /* XXX: Don't do it that way, but properly use a new input item ref. */
+ input_item_t item = *p_media->vod.p_item;;
if( p_cfg->vod.psz_mux )
{
- input_item_t item;
+ const char *psz_mux;
+ if (!strcmp(p_cfg->vod.psz_mux, "ps"))
+ psz_mux = "mp2p";
+ else if (!strcmp(p_cfg->vod.psz_mux, "ts"))
+ psz_mux = "mp2t";
+ else
+ psz_mux = p_cfg->vod.psz_mux;
+
es_format_t es, *p_es = &es;
union { char text[5]; uint32_t value; } fourcc;
- sprintf( fourcc.text, "%4.4s", p_cfg->vod.psz_mux );
+ sprintf( fourcc.text, "%4.4s", psz_mux );
fourcc.text[0] = tolower(fourcc.text[0]);
fourcc.text[1] = tolower(fourcc.text[1]);
fourcc.text[2] = tolower(fourcc.text[2]);
fourcc.text[3] = tolower(fourcc.text[3]);
- /* XXX: Don't do it that way, but properly use a new input item ref. */
- item = *p_media->vod.p_item;
item.i_es = 1;
item.es = &p_es;
es_format_Init( &es, VIDEO_ES, fourcc.value );
-
- p_media->vod.p_media =
- p_vlm->p_vod->pf_media_new( p_vlm->p_vod, p_cfg->psz_name, &item );
}
else
{
- p_media->vod.p_media =
- p_vlm->p_vod->pf_media_new( p_vlm->p_vod, p_cfg->psz_name, p_media->vod.p_item );
+ item.i_es = data.i_es;
+ item.es = data.es;
}
+ p_media->vod.p_media = p_vlm->p_vod->pf_media_new( p_vlm->p_vod,
+ p_cfg->psz_name, &item );
+
+ TAB_CLEAN(data.i_es, data.es);
}
}
else if ( p_cfg->b_vod )
p_vlm->p_vod = vlc_custom_create( VLC_OBJECT(p_vlm), sizeof( vod_t ),
VLC_OBJECT_GENERIC, "vod server" );
vlc_object_attach( p_vlm->p_vod, p_vlm->p_libvlc );
- p_vlm->p_vod->p_module = module_need( p_vlm->p_vod, "vod server", NULL, false );
+ p_vlm->p_vod->p_module = module_need( p_vlm->p_vod, "vod server", "$vod-server", false );
if( !p_vlm->p_vod->p_module )
{
msg_Err( p_vlm, "cannot find vod server" );
p_instance->i_index = 0;
p_instance->b_sout_keep = false;
+ p_instance->p_parent = vlc_object_create( p_vlm, sizeof (vlc_object_t) );
+ vlc_object_attach( p_instance->p_parent, p_vlm->p_libvlc );
p_instance->p_input = NULL;
p_instance->p_input_resource = NULL;
input_resource_Terminate( p_instance->p_input_resource );
input_resource_Release( p_instance->p_input_resource );
}
+ vlc_object_release( p_instance->p_parent );
TAB_REMOVE( p_media->i_instance, p_media->instance, p_instance );
vlc_gc_decref( p_instance->p_item );
if( !p_instance )
return VLC_ENOMEM;
+ if ( p_cfg->b_vod )
+ {
+ var_Create( p_instance->p_parent, "vod-media", VLC_VAR_ADDRESS );
+ var_SetAddress( p_instance->p_parent, "vod-media",
+ p_media->vod.p_media );
+ var_Create( p_instance->p_parent, "vod-session", VLC_VAR_STRING );
+ var_SetString( p_instance->p_parent, "vod-session", psz_id );
+ }
+
if( p_cfg->psz_output != NULL || psz_vod_output != NULL )
{
char *psz_buffer;
if( asprintf( &psz_log, _("Media: %s"), p_media->cfg.psz_name ) != -1 )
{
- vlc_object_t *p_parent = p_media->cfg.b_vod ?
- VLC_OBJECT(p_vlm->p_vod) :
- VLC_OBJECT(p_vlm->p_libvlc);
if( !p_instance->p_input_resource )
- p_instance->p_input_resource = input_resource_New( VLC_OBJECT( p_vlm->p_libvlc ) );
- p_instance->p_input = input_Create( p_parent, p_instance->p_item,
- psz_log, p_instance->p_input_resource );
+ p_instance->p_input_resource = input_resource_New( p_instance->p_parent );
+
+ p_instance->p_input = input_Create( p_instance->p_parent,
+ p_instance->p_item, psz_log,
+ p_instance->p_input_resource );
if( p_instance->p_input )
{
var_AddCallback( p_instance->p_input, "intf-event", InputEvent, p_media );
+
if( input_Start( p_instance->p_input ) != VLC_SUCCESS )
{
var_DelCallback( p_instance->p_input, "intf-event", InputEvent, p_media );
/* Toggle pause state */
i_state = var_GetInteger( p_instance->p_input, "state" );
- if( i_state == PAUSE_S )
+ if( i_state == PAUSE_S && !p_media->cfg.b_vod )
var_SetInteger( p_instance->p_input, "state", PLAYING_S );
else if( i_state == PLAYING_S )
var_SetInteger( p_instance->p_input, "state", PAUSE_S );
projects / vlc / blobdiff