input.c 60.4 KB
Newer Older
1 2
/*****************************************************************************
 * input.c: input thread
3
 *****************************************************************************
4
 * Copyright (C) 1998-2004 VideoLAN
5
 * $Id$
6
 *
7
 * Authors: Christophe Massiot <massiot@via.ecp.fr>
8
 *          Laurent Aimar <fenrir@via.ecp.fr>
9 10 11 12 13
 *
 * 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
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
14
 *
15 16
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17 18
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
19
 *
20 21 22
 * 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.
23
 *****************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
24

25
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
26
 * Preamble
27
 *****************************************************************************/
28
#include <stdlib.h>
Sam Hocevar's avatar
 
Sam Hocevar committed
29

30
#include <vlc/vlc.h>
31
#include <vlc/input.h>
32
#include <vlc/decoder.h>
33
#include <vlc/vout.h>
Sam Hocevar's avatar
 
Sam Hocevar committed
34

35
#include "input_internal.h"
36

37 38
#include "stream_output.h"

39
#include "vlc_interface.h"
40
#include "vlc_meta.h"
Sam Hocevar's avatar
 
Sam Hocevar committed
41

42
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
43
 * Local prototypes
44
 *****************************************************************************/
45 46 47 48 49 50 51 52 53
static  int Run  ( input_thread_t *p_input );

static  int Init ( input_thread_t *p_input );
static void Error( input_thread_t *p_input );
static void End  ( input_thread_t *p_input );

static inline int ControlPopNoLock( input_thread_t *, int *, vlc_value_t * );
static void       ControlReduce( input_thread_t * );
static vlc_bool_t Control( input_thread_t *, int, vlc_value_t );
54

55

56 57
static void UpdateFromAccess( input_thread_t * );
static void UpdateFromDemux( input_thread_t * );
Michel Kaempf's avatar
Michel Kaempf committed
58

59 60
static void UpdateItemLength( input_thread_t *, int64_t i_length );

61 62 63
static void ParseOption( input_thread_t *p_input, const char *psz_option );

static void DecodeUrl  ( char * );
64
static void MRLSplit( input_thread_t *, char *, char **, char **, char ** );
65 66

static input_source_t *InputSourceNew( input_thread_t *);
Laurent Aimar's avatar
 
Laurent Aimar committed
67 68
static int  InputSourceInit( input_thread_t *, input_source_t *,
                             char *, char *psz_forced_demux );
69 70 71 72
static void InputSourceClean( input_thread_t *, input_source_t * );

static void SlaveDemux( input_thread_t *p_input );
static void SlaveSeek( input_thread_t *p_input );
73

74 75
static vlc_meta_t *InputMetaUser( input_thread_t *p_input );

76
/*****************************************************************************
77
 * input_CreateThread: creates a new input thread
78
 *****************************************************************************
79 80
 * This function creates a new input, and returns a pointer
 * to its description. On error, it returns NULL.
81 82 83 84 85 86 87 88 89 90
 *
 * Variables for _public_ use:
 * * Get and Set:
 *  - state
 *  - rate,rate-slower, rate-faster
 *  - position, position-offset
 *  - time, time-offset
 *  - title,title-next,title-prev
 *  - chapter,chapter-next, chapter-prev
 *  - program, audio-es, video-es, spu-es
91
 *  - audio-delay, spu-delay
92 93 94 95
 *  - bookmark
 * * Get only:
 *  - length
 *  - bookmarks
96
 *  - seekable (if you can seek, it doesn't say if 'bar display' has be shown or not, for that check position != 0.0)
97 98 99 100
 * * For intf callback upon changes
 *  - intf-change
 * TODO explain when Callback is called
 * TODO complete this list (?)
101
 *****************************************************************************/
102 103
input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
                                      input_item_t *p_item )
104

Michel Kaempf's avatar
Michel Kaempf committed
105
{
106
    input_thread_t *p_input;                        /* thread descriptor */
107 108
    vlc_value_t val;
    int i;
109

110
    /* Allocate descriptor */
111
    p_input = vlc_object_create( p_parent, VLC_OBJECT_INPUT );
112
    if( p_input == NULL )
Michel Kaempf's avatar
Michel Kaempf committed
113
    {
114
        msg_Err( p_parent, "out of memory" );
115
        return NULL;
Michel Kaempf's avatar
Michel Kaempf committed
116
    }
117

118 119 120 121 122 123 124 125 126 127 128 129 130 131
    /* Init Common fields */
    p_input->b_eof = VLC_FALSE;
    p_input->b_can_pace_control = VLC_TRUE;
    p_input->i_start = 0;
    p_input->i_time  = 0;
    p_input->i_stop  = 0;
    p_input->i_title = 0;
    p_input->title   = NULL;
    p_input->i_state = INIT_S;
    p_input->i_rate  = INPUT_RATE_DEFAULT;
    p_input->i_bookmark = 0;
    p_input->bookmark = NULL;
    p_input->p_es_out = NULL;
    p_input->p_sout  = NULL;
132
    p_input->b_out_pace_control = VLC_FALSE;
133 134 135 136 137 138 139 140 141 142 143 144 145 146 147
    p_input->i_pts_delay = 0;


    /* Init Input fields */
    p_input->input.p_item = p_item;
    p_input->input.p_access = NULL;
    p_input->input.p_stream = NULL;
    p_input->input.p_demux  = NULL;
    p_input->input.b_title_demux = VLC_FALSE;
    p_input->input.i_title  = 0;
    p_input->input.title    = NULL;
    p_input->input.b_can_pace_control = VLC_TRUE;
    p_input->input.b_eof = VLC_FALSE;
    p_input->input.i_cr_average = 0;

148 149 150 151
    /* No slave */
    p_input->i_slave = 0;
    p_input->slave   = NULL;

152 153 154
    /* Init control buffer */
    vlc_mutex_init( p_input, &p_input->lock_control );
    p_input->i_control = 0;
155

Gildas Bazin's avatar
 
Gildas Bazin committed
156
    /* Parse input options */
157 158
    vlc_mutex_lock( &p_item->lock );
    for( i = 0; i < p_item->i_options; i++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
159
    {
160 161
        msg_Dbg( p_input, "option: %s", p_item->ppsz_options[i] );
        ParseOption( p_input, p_item->ppsz_options[i] );
Gildas Bazin's avatar
 
Gildas Bazin committed
162
    }
163
    vlc_mutex_unlock( &p_item->lock );
Gildas Bazin's avatar
 
Gildas Bazin committed
164

165 166
    /* Create Object Variables for private use only */
    input_ConfigVarInit( p_input );
Michel Kaempf's avatar
Michel Kaempf committed
167

168 169 170
    /* Create Objects variables for public Get and Set */
    input_ControlVarInit( p_input );
    p_input->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
Gildas Bazin's avatar
Gildas Bazin committed
171

172
    /* TODO */
Gildas Bazin's avatar
Gildas Bazin committed
173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202
    var_Get( p_input, "bookmarks", &val );
    if( val.psz_string )
    {
        /* FIXME: have a common cfg parsing routine used by sout and others */
        char *psz_parser, *psz_start, *psz_end;
        psz_parser = val.psz_string;
        while( (psz_start = strchr( psz_parser, '{' ) ) )
        {
            seekpoint_t seekpoint;
            char backup;
            psz_start++;
            psz_end = strchr( psz_start, '}' );
            if( !psz_end ) break;
            psz_parser = psz_end + 1;
            backup = *psz_parser;
            *psz_parser = 0;
            *psz_end = ',';

            seekpoint.psz_name = 0;
            seekpoint.i_byte_offset = 0;
            seekpoint.i_time_offset = 0;
            while( (psz_end = strchr( psz_start, ',' ) ) )
            {
                *psz_end = 0;
                if( !strncmp( psz_start, "name=", 5 ) )
                {
                    seekpoint.psz_name = psz_start + 5;
                }
                else if( !strncmp( psz_start, "bytes=", 6 ) )
                {
203
                    seekpoint.i_byte_offset = atoll(psz_start + 6);
Gildas Bazin's avatar
Gildas Bazin committed
204 205 206
                }
                else if( !strncmp( psz_start, "time=", 5 ) )
                {
207
                    seekpoint.i_time_offset = atoll(psz_start + 5) * 1000000;
Gildas Bazin's avatar
Gildas Bazin committed
208 209 210 211 212 213 214 215 216 217 218 219
                }
                psz_start = psz_end + 1;
            }
            msg_Dbg( p_input, "adding bookmark: %s, bytes="I64Fd", time="I64Fd,
                     seekpoint.psz_name, seekpoint.i_byte_offset,
                     seekpoint.i_time_offset );
            input_Control( p_input, INPUT_ADD_BOOKMARK, &seekpoint );
            *psz_parser = backup;
        }
        free( val.psz_string );
    }

220
    /* Now we can attach our new input */
221
    vlc_object_attach( p_input, p_parent );
Sam Hocevar's avatar
 
Sam Hocevar committed
222

Sam Hocevar's avatar
Sam Hocevar committed
223
    /* Create thread and wait for its readiness. */
224
    if( vlc_thread_create( p_input, "input", Run,
225
                           VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) )
Michel Kaempf's avatar
Michel Kaempf committed
226
    {
227
        msg_Err( p_input, "cannot create input thread" );
228 229
        vlc_object_detach( p_input );
        vlc_object_destroy( p_input );
230
        return NULL;
Michel Kaempf's avatar
Michel Kaempf committed
231
    }
232

233
    return p_input;
Michel Kaempf's avatar
Michel Kaempf committed
234 235
}

236
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
237
 * input_StopThread: mark an input thread as zombie
238
 *****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
239
 * This function should not return until the thread is effectively cancelled.
240
 *****************************************************************************/
Sam Hocevar's avatar
Sam Hocevar committed
241
void input_StopThread( input_thread_t *p_input )
Michel Kaempf's avatar
Michel Kaempf committed
242
{
243 244
    vlc_list_t *p_list;
    int i;
245

246 247
    /* Set die for input */
    p_input->b_die = VLC_TRUE;
248

249 250
    /* We cannot touch p_input fields directly (we can from another thread),
     * so use the vlc_object_find way, it's perfectly safe */
251

252 253 254
    /* Set die for all access */
    p_list = vlc_list_find( p_input, VLC_OBJECT_ACCESS, FIND_CHILD );
    for( i = 0; i < p_list->i_count; i++ )
255
    {
256
        p_list->p_values[i].p_object->b_die = VLC_TRUE;
257
    }
258
    vlc_list_release( p_list );
259

260 261 262
    /* Set die for all stream */
    p_list = vlc_list_find( p_input, VLC_OBJECT_STREAM, FIND_CHILD );
    for( i = 0; i < p_list->i_count; i++ )
263
    {
264
        p_list->p_values[i].p_object->b_die = VLC_TRUE;
265
    }
266
    vlc_list_release( p_list );
267

268 269 270 271 272 273 274
    /* Set die for all demux */
    p_list = vlc_list_find( p_input, VLC_OBJECT_DEMUX, FIND_CHILD );
    for( i = 0; i < p_list->i_count; i++ )
    {
        p_list->p_values[i].p_object->b_die = VLC_TRUE;
    }
    vlc_list_release( p_list );
Michel Kaempf's avatar
Michel Kaempf committed
275

276
    input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
Sam Hocevar's avatar
 
Sam Hocevar committed
277 278 279 280 281 282 283 284 285 286
}

/*****************************************************************************
 * input_DestroyThread: mark an input thread as zombie
 *****************************************************************************
 * This function should not return until the thread is effectively cancelled.
 *****************************************************************************/
void input_DestroyThread( input_thread_t *p_input )
{
    /* Join the thread */
287
    vlc_thread_join( p_input );
Sam Hocevar's avatar
 
Sam Hocevar committed
288

289 290 291 292 293
    /* Delete input lock (only after thread joined) */
    vlc_mutex_destroy( &p_input->lock_control );

    /* TODO: maybe input_DestroyThread should also delete p_input instead
     * of the playlist but I'm not sure if it's possible */
Michel Kaempf's avatar
Michel Kaempf committed
294 295
}

296
/*****************************************************************************
297
 * Run: main thread loop
298
 *****************************************************************************
299
 * Thread in charge of processing the network packets and demultiplexing.
300 301 302 303
 *
 * TODO:
 *  read subtitle support (XXX take care of spu-delay in the right way).
 *  multi-input support (XXX may be done with subs)
304
 *****************************************************************************/
305
static int Run( input_thread_t *p_input )
Michel Kaempf's avatar
Michel Kaempf committed
306
{
307
    int64_t i_intf_update = 0;
308

309
    /* Signal that the thread is launched */
Sam Hocevar's avatar
Sam Hocevar committed
310 311
    vlc_thread_ready( p_input );

312
    if( Init( p_input ) )
Sam Hocevar's avatar
 
Sam Hocevar committed
313 314
    {
        /* If we failed, wait before we are killed, and exit */
315
        p_input->b_error = VLC_TRUE;
316

317
        Error( p_input );
318 319

        /* Tell we're dead */
320
        p_input->b_dead = VLC_TRUE;
321

Sam Hocevar's avatar
 
Sam Hocevar committed
322
        return 0;
Sam Hocevar's avatar
 
Sam Hocevar committed
323
    }
Michel Kaempf's avatar
Michel Kaempf committed
324

325
    /* Main loop */
326
    while( !p_input->b_die && !p_input->b_error && !p_input->input.b_eof )
Sam Hocevar's avatar
 
Sam Hocevar committed
327
    {
328 329 330 331
        vlc_bool_t b_force_update = VLC_FALSE;
        int i_ret;
        int i_type;
        vlc_value_t val;
332

333 334
        /* Do the read */
        if( p_input->i_state != PAUSE_S  )
335
        {
336 337 338 339
            if( p_input->i_stop <= 0 || p_input->i_time < p_input->i_stop )
                i_ret=p_input->input.p_demux->pf_demux(p_input->input.p_demux);
            else
                i_ret = 0;  /* EOF */
340

341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360
            if( i_ret > 0 )
            {
                /* TODO */
                if( p_input->input.b_title_demux &&
                    p_input->input.p_demux->info.i_update )
                {
                    UpdateFromDemux( p_input );
                    b_force_update = VLC_TRUE;
                }
                else if( !p_input->input.b_title_demux &&
                          p_input->input.p_access &&
                          p_input->input.p_access->info.i_update )
                {
                    UpdateFromAccess( p_input );
                    b_force_update = VLC_TRUE;
                }
            }
            else if( i_ret == 0 )    /* EOF */
            {
                vlc_value_t repeat;
361

362 363 364 365 366 367 368 369 370
                var_Get( p_input, "input-repeat", &repeat );
                if( repeat.i_int == 0 )
                {
                    /* End of file - we do not set b_die because only the
                     * playlist is allowed to do so. */
                    msg_Dbg( p_input, "EOF reached" );
                    p_input->input.b_eof = VLC_TRUE;
                }
                else
371
                {
Gildas Bazin's avatar
Gildas Bazin committed
372 373
                    msg_Dbg( p_input, "repeating the same input (%d)",
                             repeat.i_int );
374 375 376 377 378
                    if( repeat.i_int > 0 )
                    {
                        repeat.i_int--;
                        var_Set( p_input, "input-repeat", repeat );
                    }
379

380 381 382 383 384 385 386 387 388 389 390 391 392 393 394
                    /* Seek to title 0 position 0(start) */
                    val.i_int = 0;
                    input_ControlPush( p_input, INPUT_CONTROL_SET_TITLE, &val );
                    if( p_input->i_start > 0 )
                    {
                        val.i_time = p_input->i_start;
                        input_ControlPush( p_input, INPUT_CONTROL_SET_TIME,
                                           &val );
                    }
                    else
                    {
                        val.f_float = 0.0;
                        input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION,
                                           &val );
                    }
395 396
                }
            }
397 398 399 400
            else if( i_ret < 0 )
            {
                p_input->b_error = VLC_TRUE;
            }
401 402 403 404 405

            if( i_ret > 0 && p_input->i_slave > 0 )
            {
                SlaveDemux( p_input );
            }
406
        }
407
        else
408
        {
409 410 411
            /* Small wait */
            msleep( 10*1000 );
        }
412

413 414 415 416 417 418 419 420 421 422
        /* Handle control */
        vlc_mutex_lock( &p_input->lock_control );
        ControlReduce( p_input );
        while( !ControlPopNoLock( p_input, &i_type, &val ) )
        {
            msg_Dbg( p_input, "control type=%d", i_type );
            if( Control( p_input, i_type, val ) )
                b_force_update = VLC_TRUE;
        }
        vlc_mutex_unlock( &p_input->lock_control );
423

424 425 426 427 428 429 430
        if( b_force_update ||
            i_intf_update < mdate() )
        {
            vlc_value_t val;
            double f_pos;
            int64_t i_time, i_length;
            /* update input status variables */
Gildas Bazin's avatar
Gildas Bazin committed
431 432
            if( !demux2_Control( p_input->input.p_demux,
                                 DEMUX_GET_POSITION, &f_pos ) )
433 434 435 436
            {
                val.f_float = (float)f_pos;
                var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL );
            }
Gildas Bazin's avatar
Gildas Bazin committed
437 438
            if( !demux2_Control( p_input->input.p_demux,
                                 DEMUX_GET_TIME, &i_time ) )
439 440 441 442 443
            {
                p_input->i_time = i_time;
                val.i_time = i_time;
                var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );
            }
Gildas Bazin's avatar
Gildas Bazin committed
444 445
            if( !demux2_Control( p_input->input.p_demux,
                                 DEMUX_GET_LENGTH, &i_length ) )
446 447 448 449 450
            {
                vlc_value_t old_val;
                var_Get( p_input, "length", &old_val );
                val.i_time = i_length;
                var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
451

452
                if( old_val.i_time != val.i_time )
453
                {
454
                    UpdateItemLength( p_input, i_length );
455 456
                }
            }
457 458 459

            var_SetBool( p_input, "intf-change", VLC_TRUE );
            i_intf_update = mdate() + I64C(150000);
460
        }
461 462
    }

463
    if( !p_input->b_eof && !p_input->b_error && p_input->input.b_eof )
464
    {
465 466
        /* We have finish to demux data but not to play them */
        while( !p_input->b_die )
Sam Hocevar's avatar
 
Sam Hocevar committed
467
        {
468 469
            if( input_EsOutDecodersEmpty( p_input->p_es_out ) )
                break;
470

471
            msg_Dbg( p_input, "waiting decoder fifos to empty" );
472

473
            msleep( INPUT_IDLE_SLEEP );
Sam Hocevar's avatar
 
Sam Hocevar committed
474
        }
475

476 477
        /* We have finished */
        p_input->b_eof = VLC_TRUE;
478 479
    }

480 481
    /* Wait we are asked to die */
    if( !p_input->b_die )
482
    {
483
        Error( p_input );
484
    }
485

486 487
    /* Clean up */
    End( p_input );
Sam Hocevar's avatar
 
Sam Hocevar committed
488

Sam Hocevar's avatar
 
Sam Hocevar committed
489
    return 0;
490 491
}

492
/*****************************************************************************
493
 * Init: init the input Thread
494
 *****************************************************************************/
495
static int Init( input_thread_t * p_input )
Michel Kaempf's avatar
Michel Kaempf committed
496
{
497
    char *psz;
Laurent Aimar's avatar
 
Laurent Aimar committed
498
    char *psz_subtitle;
499
    vlc_value_t val;
Laurent Aimar's avatar
 
Laurent Aimar committed
500
    double f_fps;
501 502
    vlc_meta_t *p_meta, *p_meta_user;
    int i;
503

504 505 506
    /* Initialize optional stream output. (before access/demuxer) */
    psz = var_GetString( p_input, "sout" );
    if( *psz )
507
    {
508 509
        p_input->p_sout = sout_NewInstance( p_input, psz );
        if( p_input->p_sout == NULL )
510 511
        {
            msg_Err( p_input, "cannot start stream output instance, aborting" );
512
            free( psz );
513 514
            return VLC_EGENERIC;
        }
515
    }
516
    free( psz );
Christophe Massiot's avatar
Christophe Massiot committed
517

518
    /* Create es out */
519
    p_input->p_es_out = input_EsOutNew( p_input );
520 521
    es_out_Control( p_input->p_es_out, ES_OUT_SET_ACTIVE, VLC_FALSE );
    es_out_Control( p_input->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE );
522

523
    if( InputSourceInit( p_input, &p_input->input,
Laurent Aimar's avatar
 
Laurent Aimar committed
524
                         p_input->input.p_item->psz_uri, NULL ) )
525
    {
526
        goto error;
527
    }
528

529
    /* Create global title (from master) */
530
    p_input->i_title = p_input->input.i_title;
531
    p_input->title   = p_input->input.title;
532
    if( p_input->i_title > 0 )
533
    {
534 535 536
        /* Setup variables */
        input_ControlVarNavigation( p_input );
        input_ControlVarTitle( p_input, 0 );
537
    }
538

539 540 541 542 543 544 545
    /* Global flag */
    p_input->b_can_pace_control = p_input->input.b_can_pace_control;
    p_input->b_can_pause        = p_input->input.b_can_pause;

    /* Fix pts delay */
    if( p_input->i_pts_delay <= 0 )
        p_input->i_pts_delay = DEFAULT_PTS_DELAY;
546

Gildas Bazin's avatar
 
Gildas Bazin committed
547 548
    /* If the desynchronisation requested by the user is < 0, we need to
     * cache more data. */
Gildas Bazin's avatar
 
Gildas Bazin committed
549 550 551
    var_Get( p_input, "audio-desync", &val );
    if( val.i_int < 0 )
        p_input->i_pts_delay -= (val.i_int * 1000);
Gildas Bazin's avatar
 
Gildas Bazin committed
552

553
    /* Load master infos */
554
    /* Init length */
Gildas Bazin's avatar
Gildas Bazin committed
555 556
    if( !demux2_Control( p_input->input.p_demux, DEMUX_GET_LENGTH,
                         &val.i_time ) && val.i_time > 0 )
557 558
    {
        var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
559 560

        UpdateItemLength( p_input, val.i_time );
561 562 563 564 565 566 567 568 569 570 571
    }
    /* Start time*/
    /* Set start time */
    p_input->i_start = (int64_t)var_GetInteger( p_input, "start-time" ) *
                       I64C(1000000);
    p_input->i_stop  = (int64_t)var_GetInteger( p_input, "stop-time" ) *
                       I64C(1000000);

    if( p_input->i_start > 0 )
    {
        if( p_input->i_start >= val.i_time )
572
        {
573
            msg_Warn( p_input, "invalid start-time ignored" );
574
        }
575
        else
576
        {
577 578 579 580 581 582 583
            vlc_value_t s;

            msg_Dbg( p_input, "start-time: %ds",
                     (int)( p_input->i_start / I64C(1000000) ) );

            s.i_time = p_input->i_start;
            input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &s );
584
        }
585 586 587 588 589
    }
    if( p_input->i_stop > 0 && p_input->i_stop <= p_input->i_start )
    {
        msg_Warn( p_input, "invalid stop-time ignored" );
        p_input->i_stop = 0;
590 591
    }

Sam Hocevar's avatar
 
Sam Hocevar committed
592

Laurent Aimar's avatar
 
Laurent Aimar committed
593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632
    /* Load subtitles */
    /* Get fps and set it if not already set */
    if( !demux2_Control( p_input->input.p_demux, DEMUX_GET_FPS, &f_fps ) &&
        f_fps > 1.0 )
    {
        vlc_value_t fps;

        if( var_Get( p_input, "sub-fps", &fps ) )
        {
            var_Create( p_input, "sub-fps", VLC_VAR_FLOAT| VLC_VAR_DOINHERIT );
            var_SetFloat( p_input, "sub-fps", f_fps );
        }
    }

    /* Look for and add subtitle files */
    psz_subtitle = var_GetString( p_input, "sub-file" );
    if( *psz_subtitle )
    {
        input_source_t *sub;
        vlc_value_t count;
        vlc_value_t list;

        msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle );

        var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &count, NULL );

        /* */
        sub = InputSourceNew( p_input );
        if( !InputSourceInit( p_input, sub, psz_subtitle, "subtitle" ) )
        {
            TAB_APPEND( p_input->i_slave, p_input->slave, sub );

            /* Select the ES */
            if( !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) )
            {
                if( count.i_int == 0 )
                    count.i_int++;  /* if it was first one, there is disable too */

                if( count.i_int < list.p_list->i_count )
                {
Gildas Bazin's avatar
Gildas Bazin committed
633 634
                    input_ControlPush( p_input, INPUT_CONTROL_SET_ES,
                                       &list.p_list->p_values[count.i_int] );
Laurent Aimar's avatar
 
Laurent Aimar committed
635 636 637 638 639 640 641 642 643 644 645 646 647
                }
                var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list, NULL );
            }
        }
    }

    var_Get( p_input, "sub-autodetect-file", &val );
    if( val.b_bool )
    {
        char *psz_autopath = var_GetString( p_input, "sub-autodetect-path" );
        char **subs = subtitles_Detect( p_input, psz_autopath,
                                        p_input->input.p_item->psz_uri );
        input_source_t *sub;
648

Laurent Aimar's avatar
 
Laurent Aimar committed
649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664
        for( i = 0; subs[i] != NULL; i++ )
        {
            if( strcmp( psz_subtitle, subs[i] ) )
            {
                sub = InputSourceNew( p_input );
                if( !InputSourceInit( p_input, sub, subs[i], "subtitle" ) )
                {
                    TAB_APPEND( p_input->i_slave, p_input->slave, sub );
                }
            }
            free( subs[i] );
        }
        free( subs );
        free( psz_autopath );
    }
    free( psz_subtitle );
665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699

    /* Look for slave */
    psz = var_GetString( p_input, "input-slave" );
    if( *psz )
    {
        char *psz_delim = strchr( psz, '#' );

        for( ;; )
        {
            input_source_t *slave;

            if( psz_delim )
            {
                *psz_delim++ = '\0';
            }

            if( *psz == '\0' )
            {
                if( psz_delim )
                    continue;
                else
                    break;
            }

            msg_Dbg( p_input, "adding slave '%s'", psz );
            slave = InputSourceNew( p_input );
            if( !InputSourceInit( p_input, slave, psz, NULL ) )
            {
                TAB_APPEND( p_input->i_slave, p_input->slave, slave );
            }
            if( !psz_delim )
                break;
        }
    }
    free( psz );
700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715

    /* Set up es_out */
    es_out_Control( p_input->p_es_out, ES_OUT_SET_ACTIVE, VLC_TRUE );
    val.b_bool =  VLC_FALSE;
    if( p_input->p_sout )
    {
        var_Get( p_input, "sout-all", &val );
    }
    es_out_Control( p_input->p_es_out, ES_OUT_SET_MODE,
                    val.b_bool ? ES_OUT_MODE_ALL : ES_OUT_MODE_AUTO );

    if( p_input->p_sout )
    {
        if( p_input->p_sout->i_out_pace_nocontrol > 0 )
        {
            p_input->b_out_pace_control = VLC_FALSE;
716
        }
717 718 719 720 721 722
        else
        {
            p_input->b_out_pace_control = VLC_TRUE;
        }
        msg_Dbg( p_input, "starting in %s mode",
                 p_input->b_out_pace_control ? "asynch" : "synch" );
723 724
    }

725 726
    /* Get meta data from users */
    p_meta_user = InputMetaUser( p_input );
727

728 729 730
    /* Get meta data from master input */
    if( demux2_Control( p_input->input.p_demux, DEMUX_GET_META, &p_meta ) )
        p_meta = NULL;
731

732 733
    /* Merge them */
    if( p_meta == NULL )
734
    {
735
        p_meta = p_meta_user;
736
    }
737
    else if( p_meta_user )
738
    {
739 740 741
        vlc_meta_Merge( p_meta, p_meta_user );
        vlc_meta_Delete( p_meta_user );
    }
742

743 744 745 746
    /* Get meta data from slave input */
    for( i = 0; i < p_input->i_slave; i++ )
    {
        vlc_meta_t *p_meta_slave;
747

748
        if( !demux2_Control( p_input->slave[i]->p_demux, DEMUX_GET_META, &p_meta_slave ) )
749
        {
750
            if( p_meta == NULL )
751
            {
752
                p_meta = p_meta_slave;
753
            }
754 755 756 757 758 759 760 761 762 763
            else if( p_meta_slave )
            {
                vlc_meta_Merge( p_meta, p_meta_slave );
                vlc_meta_Delete( p_meta_slave );
            }
        }
    }

    if( p_meta && p_meta->i_meta > 0 )
    {
764
        msg_Dbg( p_input, "meta information:" );
765 766 767 768 769 770 771 772 773 774 775 776
        for( i = 0; i < p_meta->i_meta; i++ )
        {
            msg_Dbg( p_input, "  - '%s' = '%s'",
                    _(p_meta->name[i]), p_meta->value[i] );

            if( !strcmp(p_meta->name[i], VLC_META_TITLE) && p_meta->value[i] )
                input_Control( p_input, INPUT_SET_NAME, p_meta->value[i] );

            if( !strcmp( p_meta->name[i], VLC_META_AUTHOR ) )
                input_Control( p_input, INPUT_ADD_INFO, _("General"),
                               _("Author"), p_meta->value[i] );

777
            input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"),
778
                          _(p_meta->name[i]), "%s", p_meta->value[i] );
779
        }
780

781
        for( i = 0; i < p_meta->i_track; i++ )
782
        {
783
            vlc_meta_t *tk = p_meta->track[i];
784 785 786 787 788 789
            int j;

            if( tk->i_meta > 0 )
            {
                char *psz_cat = malloc( strlen(_("Stream")) + 10 );

790 791 792
                msg_Dbg( p_input, "  - track[%d]:", i );

                sprintf( psz_cat, "%s %d", _("Stream"), i );
793 794
                for( j = 0; j < tk->i_meta; j++ )
                {
795 796
                    msg_Dbg( p_input, "     - '%s' = '%s'", _(tk->name[j]),
                             tk->value[j] );
797 798 799

                    input_Control( p_input, INPUT_ADD_INFO, psz_cat,
                                   _(tk->name[j]), "%s", tk->value[j] );
800 801 802 803
                }
            }
        }

804
        if( p_input->p_sout && p_input->p_sout->p_meta == NULL )
805
        {
806
            p_input->p_sout->p_meta = p_meta;
807 808 809
        }
        else
        {
810
            vlc_meta_Delete( p_meta );
811
        }
812 813
    }

814 815
    msg_Dbg( p_input, "`%s' sucessfully opened",
             p_input->input.p_item->psz_uri );
816

817 818
    /* initialization is complete */
    p_input->i_state = PLAYING_S;
819

820 821
    val.i_int = PLAYING_S;
    var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
822

823
    return VLC_SUCCESS;
824

825 826 827
error:
    if( p_input->p_es_out )
        input_EsOutDelete( p_input->p_es_out );
Laurent Aimar's avatar
Laurent Aimar committed
828

829 830
    if( p_input->p_sout )
        sout_DeleteInstance( p_input->p_sout );
831

832 833 834 835 836 837
    /* Mark them deleted */
    p_input->input.p_demux = NULL;
    p_input->input.p_stream = NULL;
    p_input->input.p_access = NULL;
    p_input->p_es_out = NULL;
    p_input->p_sout = NULL;
838

839
    return VLC_EGENERIC;
Michel Kaempf's avatar
Michel Kaempf committed
840 841
}

842
/*****************************************************************************
843
 * Error: RunThread() error loop
844
 *****************************************************************************
845
 * This function is called when an error occured during thread main's loop.
846
 *****************************************************************************/
847
static void Error( input_thread_t *p_input )
Michel Kaempf's avatar
Michel Kaempf committed
848
{
849
    while( !p_input->b_die )
Michel Kaempf's avatar
Michel Kaempf committed
850
    {
851 852
        /* Sleep a while */
        msleep( INPUT_IDLE_SLEEP );
Michel Kaempf's avatar
Michel Kaempf committed
853 854 855
    }
}

856
/*****************************************************************************
857
 * End: end the input thread
858
 *****************************************************************************/
859
static void End( input_thread_t * p_input )
860
{
861
    vlc_value_t val;
862
    int i;
863

864 865
    msg_Dbg( p_input, "closing `%s'",
             p_input->input.p_item->psz_uri );
866

867 868 869 870 871 872 873 874
    /* We are at the end */
    p_input->i_state = END_S;

    val.i_int = END_S;
    var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );

    /* Clean control variables */
    input_ControlVarClean( p_input );
875

876 877
    /* Clean up master */
    InputSourceClean( p_input, &p_input->input );
878

879 880 881 882 883 884 885
    /* Delete slave */
    for( i = 0; i < p_input->i_slave; i++ )
    {
        InputSourceClean( p_input, p_input->slave[i] );
        free( p_input->slave[i] );
    }
    if( p_input->slave ) free( p_input->slave );
886

887
    /* Unload all modules */
888 889
    if( p_input->p_es_out )
        input_EsOutDelete( p_input->p_es_out );
Gildas Bazin's avatar
 
Gildas Bazin committed
890

891
    /* Close optional stream output instance */
892
    if( p_input->p_sout )
893
    {
894 895
        vlc_object_t *p_pl =
            vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
896 897 898 899 900 901
        vlc_value_t keep;

        if( var_Get( p_input, "sout-keep", &keep ) >= 0 && keep.b_bool && p_pl )
        {
            /* attach sout to the playlist */
            msg_Warn( p_input, "keeping sout" );
902 903
            vlc_object_detach( p_input->p_sout );
            vlc_object_attach( p_input->p_sout, p_pl );
904 905 906 907
        }
        else
        {
            msg_Warn( p_input, "destroying sout" );
908
            sout_DeleteInstance( p_input->p_sout );
909 910 911
        }
        if( p_pl )
            vlc_object_release( p_pl );
912 913
    }

914 915 916
    /* Tell we're dead */
    p_input->b_dead = VLC_TRUE;
}
917

918 919 920 921 922 923 924 925 926 927
/*****************************************************************************
 * Control
 *****************************************************************************/
static inline int ControlPopNoLock( input_thread_t *p_input,
                                    int *pi_type, vlc_value_t *p_val )
{
    if( p_input->i_control <= 0 )
    {
        return VLC_EGENERIC;
    }
928

929 930
    *pi_type = p_input->control[0].i_type;
    *p_val   = p_input->control[0].val;
Sam Hocevar's avatar
 
Sam Hocevar committed
931

932 933 934 935
    p_input->i_control--;
    if( p_input->i_control > 0 )
    {
        int i;
Christophe Massiot's avatar
Christophe Massiot committed
936

937 938 939 940 941 942
        for( i = 0; i < p_input->i_control; i++ )
        {
            p_input->control[i].i_type = p_input->control[i+1].i_type;
            p_input->control[i].val    = p_input->control[i+1].val;
        }
    }
943

944 945
    return VLC_SUCCESS;
}
946

947 948 949 950 951 952 953 954 955
static void ControlReduce( input_thread_t *p_input )
{
    int i;
    for( i = 1; i < p_input->i_control; i++ )
    {
        const int i_lt = p_input->control[i-1].i_type;
        const int i_ct = p_input->control[i].i_type;

        /* XXX We can't merge INPUT_CONTROL_SET_ES */
Gildas Bazin's avatar
Gildas Bazin committed
956 957
        msg_Dbg( p_input, "[%d/%d] l=%d c=%d", i, p_input->i_control,
                 i_lt, i_ct );
958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984
        if( i_lt == i_ct &&
            ( i_ct == INPUT_CONTROL_SET_STATE ||
              i_ct == INPUT_CONTROL_SET_RATE ||
              i_ct == INPUT_CONTROL_SET_POSITION ||
              i_ct == INPUT_CONTROL_SET_TIME ||
              i_ct == INPUT_CONTROL_SET_PROGRAM ||
              i_ct == INPUT_CONTROL_SET_TITLE ||
              i_ct == INPUT_CONTROL_SET_SEEKPOINT ||
              i_ct == INPUT_CONTROL_SET_BOOKMARK ) )
        {
            int j;
            msg_Dbg( p_input, "merged at %d", i );
            /* Remove the i-1 */
            for( j = i; j <  p_input->i_control; j++ )
                p_input->control[j-1] = p_input->control[j];
            p_input->i_control--;
        }
        else
        {
            /* TODO but that's not that important
                - merge SET_X with SET_X_CMD
                - remove SET_SEEKPOINT/SET_POSITION/SET_TIME before a SET_TITLE
                - remove SET_SEEKPOINT/SET_POSITION/SET_TIME before another among them
                - ?
                */
        }
    }
Sam Hocevar's avatar
 
Sam Hocevar committed
985
}
986

Gildas Bazin's avatar
Gildas Bazin committed
987 988
static vlc_bool_t Control( input_thread_t *p_input, int i_type,
                           vlc_value_t val )
989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016
{
    vlc_bool_t b_force_update = VLC_FALSE;

    switch( i_type )
    {
        case INPUT_CONTROL_SET_DIE:
            msg_Dbg( p_input, "control: INPUT_CONTROL_SET_DIE proceed" );
            /* Mark all submodules to die */
            if( p_input->input.p_access )
                p_input->input.p_access->b_die = VLC_TRUE;
            if( p_input->input.p_stream )
                p_input->input.p_stream->b_die = VLC_TRUE;
            p_input->input.p_demux->b_die = VLC_TRUE;

            p_input->b_die = VLC_TRUE;
            break;

        case INPUT_CONTROL_SET_POSITION:
        case INPUT_CONTROL_SET_POSITION_OFFSET:
        {
            double f_pos;
            if( i_type == INPUT_CONTROL_SET_POSITION )
            {
                f_pos = val.f_float;
            }
            else
            {
                /* Should not fail */
Gildas Bazin's avatar
Gildas Bazin committed
1017 1018
                demux2_Control( p_input->input.p_demux,
                                DEMUX_GET_POSITION, &f_pos );
1019 1020 1021 1022
                f_pos += val.f_float;
            }
            if( f_pos < 0.0 ) f_pos = 0.0;
            if( f_pos > 1.0 ) f_pos = 1.0;
Gildas Bazin's avatar
Gildas Bazin committed
1023 1024
            if( demux2_Control( p_input->input.p_demux, DEMUX_SET_POSITION,
                                f_pos ) )
1025
            {
Gildas Bazin's avatar
Gildas Bazin committed
1026 1027
                msg_Err( p_input, "INPUT_CONTROL_SET_POSITION(_OFFSET) "
                         "%2.1f%% failed", f_pos * 100 );
1028 1029 1030
            }
            else
            {
1031 1032 1033
                if( p_input->i_slave > 0 )
                    SlaveSeek( p_input );

1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076
                input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
                es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
                b_force_update = VLC_TRUE;
            }
            break;
        }

        case INPUT_CONTROL_SET_TIME:
        case INPUT_CONTROL_SET_TIME_OFFSET:
        {
            int64_t i_time;
            int i_ret;

            if( i_type == INPUT_CONTROL_SET_TIME )
            {
                i_time = val.i_time;
            }
            else
            {
                /* Should not fail */
                demux2_Control( p_input->input.p_demux,
                                DEMUX_GET_TIME, &i_time );
                i_time += val.i_time;
            }
            if( i_time < 0 ) i_time = 0;
            i_ret = demux2_Control( p_input->input.p_demux,
                                    DEMUX_SET_TIME, i_time );
            if( i_ret )
            {
                int64_t i_length;
                /* Emulate it with a SET_POS */

                demux2_Control( p_input->input.p_demux,
                                DEMUX_GET_LENGTH, &i_length );
                if( i_length > 0 )
                {
                    double f_pos = (double)i_time / (double)i_length;
                    i_ret = demux2_Control( p_input->input.p_demux,
                                            DEMUX_SET_POSITION, f_pos );
                }
            }
            if( i_ret )
            {
Gildas Bazin's avatar
Gildas Bazin committed
1077 1078
                msg_Err( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) "I64Fd
                         " failed", i_time );
1079 1080 1081
            }
            else
            {
1082 1083 1084
                if( p_input->i_slave > 0 )
                    SlaveSeek( p_input );

1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121
                input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );

                es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
                b_force_update = VLC_TRUE;
            }
            break;
        }

        case INPUT_CONTROL_SET_STATE:
            if( ( val.i_int == PLAYING_S && p_input->i_state == PAUSE_S ) ||
                ( val.i_int == PAUSE_S && p_input->i_state == PAUSE_S ) )
            {
                int i_ret;
                if( p_input->input.p_access )
                    i_ret = access2_Control( p_input->input.p_access,
                                             ACCESS_SET_PAUSE_STATE, VLC_FALSE );
                else
                    i_ret = demux2_Control( p_input->input.p_demux,
                                            DEMUX_SET_PAUSE_STATE, VLC_FALSE );

                if( i_ret )
                {
                    /* FIXME What to do ? */
                    msg_Warn( p_input, "cannot unset pause -> EOF" );
                    input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
                }

                b_force_update = VLC_TRUE;

                /* Switch to play */
                p_input->i_state = PLAYING_S;
                val.i_int = PLAYING_S;
                var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );

                /* Reset clock */
                es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
            }
Gildas Bazin's avatar
Gildas Bazin committed
1122 1123
            else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S &&
                     p_input->b_can_pause )
1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186
            {
                int i_ret;
                if( p_input->input.p_access )
                    i_ret = access2_Control( p_input->input.p_access,
                                             ACCESS_SET_PAUSE_STATE, VLC_TRUE );
                else
                    i_ret = demux2_Control( p_input->input.p_demux,
                                            DEMUX_SET_PAUSE_STATE, VLC_TRUE );

                b_force_update = VLC_TRUE;

                if( i_ret )
                {
                    msg_Warn( p_input, "cannot set pause state" );
                    val.i_int = p_input->i_state;
                }
                else
                {
                    val.i_int = PAUSE_S;
                }

                /* Switch to new state */
                p_input->i_state = val.i_int;
                var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
            }
            else if( val.i_int == PAUSE_S && !p_input->b_can_pause )
            {
                b_force_update = VLC_TRUE;

                /* Correct "state" value */
                val.i_int = p_input->i_state;
                var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
            }
            else if( val.i_int != PLAYING_S && val.i_int != PAUSE_S )
            {
                msg_Err( p_input, "invalid state in INPUT_CONTROL_SET_STATE" );
            }
            break;

        case INPUT_CONTROL_SET_RATE:
        case INPUT_CONTROL_SET_RATE_SLOWER:
        case INPUT_CONTROL_SET_RATE_FASTER:
        {
            int i_rate;

            if( i_type == INPUT_CONTROL_SET_RATE_SLOWER )
                i_rate = p_input->i_rate * 2;
            else if( i_type == INPUT_CONTROL_SET_RATE_FASTER )
                i_rate = p_input->i_rate / 2;
            else
                i_rate = val.i_int;

            if( i_rate < INPUT_RATE_MIN )
            {
                msg_Dbg( p_input, "cannot set rate faster" );
                i_rate = INPUT_RATE_MIN;
            }
            else if( i_rate > INPUT_RATE_MAX )
            {
                msg_Dbg( p_input, "cannot set rate slower" );
                i_rate = INPUT_RATE_MAX;
            }
            if( i_rate != INPUT_RATE_DEFAULT &&
Gildas Bazin's avatar
Gildas Bazin committed
1187
                ( !p_input->b_can_pace_control ||
1188
                  ( p_input->p_sout && !p_input->b_out_pace_control ) ) )
1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218
            {
                msg_Dbg( p_input, "cannot change rate" );
                i_rate = INPUT_RATE_DEFAULT;
            }
            if( i_rate != p_input->i_rate )
            {
                p_input->i_rate  = i_rate;
                val.i_int = i_rate;
                var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL );

                /* We haven't send data to decoder when rate != default */
                if( i_rate == INPUT_RATE_DEFAULT )
                    input_EsOutDiscontinuity( p_input->p_es_out, VLC_TRUE );

                /* Reset clock */
                es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );

                b_force_update = VLC_TRUE;
            }
            break;
        }

        case INPUT_CONTROL_SET_PROGRAM:
            /* No need to force update, es_out does it if needed */
            es_out_Control( p_input->p_es_out,
                            ES_OUT_SET_GROUP, val.i_int );
            break;

        case INPUT_CONTROL_SET_ES:
            /* No need to force update, es_out does it if needed */
Gildas Bazin's avatar
Gildas Bazin committed
1219 1220 1221
            es_out_Control( p_input->p_es_out, ES_OUT_SET_ES,
                            input_EsOutGetFromID( p_input->p_es_out,
                                                  val.i_int ) );
1222 1223
            break;

1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235
        case INPUT_CONTROL_SET_AUDIO_DELAY:
            input_EsOutSetDelay( p_input->p_es_out,
                                 AUDIO_ES, val.i_time );
            var_Change( p_input, "audio-delay", VLC_VAR_SETVALUE, &val, NULL );
            break;

        case INPUT_CONTROL_SET_SPU_DELAY:
            input_EsOutSetDelay( p_input->p_es_out,
                                 SPU_ES, val.i_time );
            var_Change( p_input, "spu-delay", VLC_VAR_SETVALUE, &val, NULL );
            break;

1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271