input.c 41.1 KB
Newer Older
1
2
/*****************************************************************************
 * input.c: input thread
Michel Kaempf's avatar
Michel Kaempf committed
3
4
 * Read an MPEG2 stream, demultiplex and parse it before sending it to
 * decoders.
5
 *****************************************************************************
6
 * Copyright (C) 1998-2002 VideoLAN
7
 * $Id: input.c,v 1.242 2003/09/20 13:50:14 fenrir Exp $
8
 *
9
 * Authors: Christophe Massiot <massiot@via.ecp.fr>
10
11
12
13
14
 *
 * 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.
15
 *
16
17
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18
19
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
20
 *
21
22
23
 * 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.
24
 *****************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
25

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

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

35
36
#ifdef HAVE_SYS_TIMES_H
#   include <sys/times.h>
37
#endif
38

39
#include "vlc_playlist.h"
40

41
42
#include "stream_output.h"

43
#include "vlc_interface.h"
44
45
#include "codecs.h"
#include "modules/demux/util/sub.h"
Sam Hocevar's avatar
   
Sam Hocevar committed
46

47
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
48
 * Local prototypes
49
 *****************************************************************************/
50
51
52
53
54
55
56
struct input_thread_sys_t
{
    /* subtitles */
    int              i_sub;
    subtitle_demux_t **sub;
};

Sam Hocevar's avatar
   
Sam Hocevar committed
57
static  int RunThread       ( input_thread_t *p_input );
Sam Hocevar's avatar
   
Sam Hocevar committed
58
59
60
static  int InitThread      ( input_thread_t *p_input );
static void ErrorThread     ( input_thread_t *p_input );
static void EndThread       ( input_thread_t *p_input );
Michel Kaempf's avatar
Michel Kaempf committed
61

gbazin's avatar
   
gbazin committed
62
63
static void ParseOption     ( input_thread_t *p_input,
                              const char *psz_option );
64
65
66
67

static es_out_t *EsOutCreate ( input_thread_t * );
static void      EsOutRelease( es_out_t * );

68
69
70
71
72
73
74
75
76
77
78
/*****************************************************************************
 * Callbacks
 *****************************************************************************/
static int PositionCallback( vlc_object_t *p_this, char const *psz_cmd,
                             vlc_value_t oldval, vlc_value_t newval, void *p_data );
static int TimeCallback    ( vlc_object_t *p_this, char const *psz_cmd,
                             vlc_value_t oldval, vlc_value_t newval, void *p_data );
static int StateCallback   ( vlc_object_t *p_this, char const *psz_cmd,
                             vlc_value_t oldval, vlc_value_t newval, void *p_data );
static int RateCallback    ( vlc_object_t *p_this, char const *psz_cmd,
                             vlc_value_t oldval, vlc_value_t newval, void *p_data );
gbazin's avatar
   
gbazin committed
79

80
/*****************************************************************************
81
 * input_CreateThread: creates a new input thread
82
 *****************************************************************************
83
84
 * This function creates a new input, and returns a pointer
 * to its description. On error, it returns NULL.
85
 *****************************************************************************/
86
input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
87
                                      playlist_item_t *p_item )
Michel Kaempf's avatar
Michel Kaempf committed
88
{
89
    input_thread_t *    p_input;                        /* thread descriptor */
90
    input_info_category_t * p_info;
91
    vlc_value_t val;
gbazin's avatar
   
gbazin committed
92
    int i;
93

94
    /* Allocate descriptor */
95
    p_input = vlc_object_create( p_parent, VLC_OBJECT_INPUT );
96
    if( p_input == NULL )
Michel Kaempf's avatar
Michel Kaempf committed
97
    {
98
        msg_Err( p_parent, "out of memory" );
99
        return NULL;
Michel Kaempf's avatar
Michel Kaempf committed
100
    }
101

gbazin's avatar
   
gbazin committed
102
103
104
105
106
107
    /* Parse input options */
    for( i = 0; i < p_item->i_options; i++ )
    {
        ParseOption( p_input, p_item->ppsz_options[i] );
    }

gbazin's avatar
   
gbazin committed
108
109
110
111
112
113
114
115
116
    /* Create a few object variables we'll need later on */
    var_Create( p_input, "video", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
    var_Create( p_input, "audio", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
    var_Create( p_input, "audio-channel", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
    var_Create( p_input, "spu-channel", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );

    var_Create( p_input, "sout", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
    var_Create( p_input, "sout-audio", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
    var_Create( p_input, "sout-video", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
117
118
119
120
121
    var_Create( p_input, "sout-keep",  VLC_VAR_BOOL | VLC_VAR_DOINHERIT );

    /* play status */

    /* position variable */
122
123
    var_Create( p_input, "position",  VLC_VAR_FLOAT );  /* position 0.0->1.0 */
    var_Create( p_input, "position-offset",  VLC_VAR_FLOAT );  /* relative */
124
125
126
127
128
129
    val.f_float = 0.0;
    var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL );
    var_AddCallback( p_input, "position", PositionCallback, NULL );

    /* time variable */
    var_Create( p_input, "time",  VLC_VAR_TIME );
130
    var_Create( p_input, "time-offset",  VLC_VAR_TIME );    /* relative */
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
    val.i_time = 0;
    var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );
    var_AddCallback( p_input, "time", TimeCallback, NULL );

    /* length variable */
    var_Create( p_input, "length",  VLC_VAR_TIME );
    val.i_time = 0;
    var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );

    /* rate variable */
    var_Create( p_input, "rate", VLC_VAR_INTEGER );
    var_Create( p_input, "rate-slower", VLC_VAR_VOID );
    var_Create( p_input, "rate-faster", VLC_VAR_VOID );
    val.i_int = DEFAULT_RATE;
    var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL );
    var_AddCallback( p_input, "rate", RateCallback, NULL );
    var_AddCallback( p_input, "rate-slower", RateCallback, NULL );
    var_AddCallback( p_input, "rate-faster", RateCallback, NULL );

    /* state variable */
    var_Create( p_input, "state", VLC_VAR_INTEGER );
    val.i_int = INIT_S;
    var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
    var_AddCallback( p_input, "state", StateCallback, NULL );

gbazin's avatar
   
gbazin committed
156

157
    /* Initialize thread properties */
Sam Hocevar's avatar
   
Sam Hocevar committed
158
    p_input->b_eof      = 0;
159
    p_input->p_sys      = NULL;
Sam Hocevar's avatar
   
Sam Hocevar committed
160
161

    /* Set target */
162
    p_input->psz_source = strdup( p_item->psz_uri );
Sam Hocevar's avatar
   
Sam Hocevar committed
163

164
165
166
    /* Stream */
    p_input->s = NULL;

167
168
169
    /* es out */
    p_input->p_es_out = NULL;

Stéphane Borel's avatar
   
Stéphane Borel committed
170
    /* Demux */
171
172
173
174
    p_input->p_demux   = NULL;
    p_input->pf_demux  = NULL;
    p_input->pf_rewind = NULL;
    p_input->pf_demux_control = NULL;
Stéphane Borel's avatar
   
Stéphane Borel committed
175
176

    /* Access */
177
    p_input->p_access = NULL;
178

Sam Hocevar's avatar
   
Sam Hocevar committed
179
180
    p_input->i_bufsize = 0;
    p_input->i_mtu = 0;
gbazin's avatar
   
gbazin committed
181
    p_input->i_pts_delay = DEFAULT_PTS_DELAY;
Sam Hocevar's avatar
   
Sam Hocevar committed
182

183
184
185
186
187
188
    /* Initialize statistics */
    p_input->c_loops                    = 0;
    p_input->stream.c_packets_read      = 0;
    p_input->stream.c_packets_trashed   = 0;

    /* Set locks. */
189
    vlc_mutex_init( p_input, &p_input->stream.stream_lock );
190
    vlc_cond_init( p_input, &p_input->stream.stream_wait );
191
    vlc_mutex_init( p_input, &p_input->stream.control.control_lock );
Michel Kaempf's avatar
Michel Kaempf committed
192

193
    /* Initialize stream description */
Stéphane Borel's avatar
   
Stéphane Borel committed
194
    p_input->stream.b_changed = 0;
195
196
    p_input->stream.i_es_number = 0;
    p_input->stream.i_selected_es_number = 0;
197
    p_input->stream.i_pgrm_number = 0;
198
    p_input->stream.i_new_status = p_input->stream.i_new_rate = 0;
199
    p_input->stream.b_new_mute = MUTE_NO_CHANGE;
Christophe Massiot's avatar
Christophe Massiot committed
200
    p_input->stream.i_mux_rate = 0;
201
    p_input->stream.b_seekable = 0;
202
    p_input->stream.p_sout = NULL;
Michel Kaempf's avatar
Michel Kaempf committed
203

Sam Hocevar's avatar
   
Sam Hocevar committed
204
205
206
    /* no stream, no program, no area, no es */
    p_input->stream.p_new_program = NULL;

Stéphane Borel's avatar
   
Stéphane Borel committed
207
208
    p_input->stream.i_area_nb = 0;
    p_input->stream.pp_areas = NULL;
209
    p_input->stream.p_selected_area = NULL;
210
    p_input->stream.p_new_area = NULL;
Sam Hocevar's avatar
   
Sam Hocevar committed
211

Sam Hocevar's avatar
   
Sam Hocevar committed
212
213
214
215
    p_input->stream.pp_selected_es = NULL;
    p_input->stream.p_removed_es = NULL;
    p_input->stream.p_newly_selected_es = NULL;

Sam Hocevar's avatar
   
Sam Hocevar committed
216
    /* By default there is one area in a stream */
gbazin's avatar
   
gbazin committed
217
    input_AddArea( p_input, 0, 1 );
218
    p_input->stream.p_selected_area = p_input->stream.pp_areas[0];
Stéphane Borel's avatar
   
Stéphane Borel committed
219

220
    /* Initialize stream control properties. */
221
    p_input->stream.control.i_status = INIT_S;
222
223
    p_input->stream.control.i_rate = DEFAULT_RATE;
    p_input->stream.control.b_mute = 0;
224
225
    p_input->stream.control.b_grayscale = config_GetInt( p_input, "grayscale" );

226
227
228
229
230
231
232
233
234
235
236
    /* Initialize input info */
    p_input->stream.p_info = malloc( sizeof( input_info_category_t ) );
    if( !p_input->stream.p_info )
    {
        msg_Err( p_input, "No memory!" );
        return NULL;
    }
    p_input->stream.p_info->psz_name = strdup("General") ;
    p_input->stream.p_info->p_info = NULL;
    p_input->stream.p_info->p_next = NULL;

237
    msg_Info( p_input, "playlist item `%s'", p_input->psz_source );
Michel Kaempf's avatar
Michel Kaempf committed
238

239
240
    p_info = input_InfoCategory( p_input, _("General") );
    input_AddInfo( p_info, _("Playlist Item"), p_input->psz_source );
241
    vlc_object_attach( p_input, p_parent );
Sam Hocevar's avatar
   
Sam Hocevar committed
242

Sam Hocevar's avatar
Sam Hocevar committed
243
    /* Create thread and wait for its readiness. */
244
245
    if( vlc_thread_create( p_input, "input", RunThread,
                           VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) )
Michel Kaempf's avatar
Michel Kaempf committed
246
    {
247
        msg_Err( p_input, "cannot create input thread" );
Michel Kaempf's avatar
Michel Kaempf committed
248
        free( p_input );
249
        return NULL;
Michel Kaempf's avatar
Michel Kaempf committed
250
    }
251

252
    return p_input;
Michel Kaempf's avatar
Michel Kaempf committed
253
254
}

255
/*****************************************************************************
Sam Hocevar's avatar
   
Sam Hocevar committed
256
 * input_StopThread: mark an input thread as zombie
257
 *****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
258
 * This function should not return until the thread is effectively cancelled.
259
 *****************************************************************************/
Sam Hocevar's avatar
Sam Hocevar committed
260
void input_StopThread( input_thread_t *p_input )
Michel Kaempf's avatar
Michel Kaempf committed
261
{
Sam Hocevar's avatar
   
Sam Hocevar committed
262
263
    /* Make the thread exit from a possible vlc_cond_wait() */
    vlc_mutex_lock( &p_input->stream.stream_lock );
264
265
    /* Request thread destruction */
    p_input->b_die = 1;
Michel Kaempf's avatar
Michel Kaempf committed
266

267
268
    vlc_cond_signal( &p_input->stream.stream_wait );
    vlc_mutex_unlock( &p_input->stream.stream_lock );
Sam Hocevar's avatar
   
Sam Hocevar committed
269
270
271
272
273
274
275
276
277
278
}

/*****************************************************************************
 * 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 */
279
    vlc_thread_join( p_input );
Sam Hocevar's avatar
   
Sam Hocevar committed
280
281
282

    /* Destroy Mutex locks */
    vlc_mutex_destroy( &p_input->stream.control.control_lock );
Sam Hocevar's avatar
   
Sam Hocevar committed
283
    vlc_cond_destroy( &p_input->stream.stream_wait );
Sam Hocevar's avatar
   
Sam Hocevar committed
284
    vlc_mutex_destroy( &p_input->stream.stream_lock );
Michel Kaempf's avatar
Michel Kaempf committed
285
286
}

287
/*****************************************************************************
288
 * RunThread: main thread loop
289
 *****************************************************************************
290
 * Thread in charge of processing the network packets and demultiplexing.
291
 *****************************************************************************/
Sam Hocevar's avatar
   
Sam Hocevar committed
292
static int RunThread( input_thread_t *p_input )
Michel Kaempf's avatar
Michel Kaempf committed
293
{
294
295
296
    vlc_value_t  val;
    mtime_t      i_update_next = -1;

Sam Hocevar's avatar
Sam Hocevar committed
297
298
299
    /* Signal right now, otherwise we'll get stuck in a peek */
    vlc_thread_ready( p_input );

Sam Hocevar's avatar
   
Sam Hocevar committed
300
301
302
303
304
    if( InitThread( p_input ) )
    {
        /* If we failed, wait before we are killed, and exit */
        p_input->b_error = 1;
        ErrorThread( p_input );
Sam Hocevar's avatar
Sam Hocevar committed
305
        p_input->b_dead = 1;
Sam Hocevar's avatar
   
Sam Hocevar committed
306
        return 0;
Sam Hocevar's avatar
   
Sam Hocevar committed
307
    }
Michel Kaempf's avatar
Michel Kaempf committed
308

309
    /* initialization is complete */
310
    vlc_mutex_lock( &p_input->stream.stream_lock );
311
312
    p_input->stream.b_changed        = 1;
    p_input->stream.control.i_status = PLAYING_S;
313
314
    vlc_mutex_unlock( &p_input->stream.stream_lock );

315
316
317
    val.i_int = PLAYING_S;
    var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );

Sam Hocevar's avatar
   
Sam Hocevar committed
318
319
    while( !p_input->b_die && !p_input->b_error && !p_input->b_eof )
    {
320
        unsigned int i, i_count;
321

Sam Hocevar's avatar
   
Sam Hocevar committed
322
        p_input->c_loops++;
Sam Hocevar's avatar
   
Sam Hocevar committed
323

324
        vlc_mutex_lock( &p_input->stream.stream_lock );
325

326
327
328
329
330
        if( p_input->stream.p_new_program )
        {
            if( p_input->pf_set_program != NULL )
            {

Johan Bilien's avatar
   
Johan Bilien committed
331
332
                /* Reinitialize buffer manager. */
                input_AccessReinit( p_input );
333
334

                p_input->pf_set_program( p_input,
335
                                         p_input->stream.p_new_program );
336

337
338
339
340
                /* Escape all decoders for the stream discontinuity they
                 * will encounter. */
                input_EscapeDiscontinuity( p_input );

341
342
343
344
345
346
347
348
349
350
351
                for( i = 0; i < p_input->stream.i_pgrm_number; i++ )
                {
                    pgrm_descriptor_t * p_pgrm
                                            = p_input->stream.pp_programs[i];

                    /* Reinitialize synchro. */
                    p_pgrm->i_synchro_state = SYNCHRO_REINIT;
                }
            }
            p_input->stream.p_new_program = NULL;
        }
352

353
354
        if( p_input->stream.p_new_area )
        {
355
356
            if( p_input->stream.b_seekable && p_input->pf_set_area != NULL )
            {
357
                input_AccessReinit( p_input );
358
359
360

                p_input->pf_set_area( p_input, p_input->stream.p_new_area );

361
362
363
364
                /* Escape all decoders for the stream discontinuity they
                 * will encounter. */
                input_EscapeDiscontinuity( p_input );

365
366
367
368
369
370
371
372
373
                for( i = 0; i < p_input->stream.i_pgrm_number; i++ )
                {
                    pgrm_descriptor_t * p_pgrm
                                            = p_input->stream.pp_programs[i];

                    /* Reinitialize synchro. */
                    p_pgrm->i_synchro_state = SYNCHRO_REINIT;
                }
            }
374
375
376
            p_input->stream.p_new_area = NULL;
        }

377
        if( p_input->stream.p_selected_area->i_seek != NO_SEEK )
Sam Hocevar's avatar
   
Sam Hocevar committed
378
        {
379
            if( p_input->stream.p_selected_area->i_size > 0 )
380
            {
381
                unsigned int i;
382
                mtime_t      i_time;
383
384
                double f = (double)p_input->stream.p_selected_area->i_seek /
                           (double)p_input->stream.p_selected_area->i_size;
385

Christophe Massiot's avatar
Christophe Massiot committed
386
                vlc_mutex_unlock( &p_input->stream.stream_lock );
387
                demux_Control( p_input, DEMUX_SET_POSITION, f );
Christophe Massiot's avatar
Christophe Massiot committed
388
                vlc_mutex_lock( &p_input->stream.stream_lock );
389

390
391
392
393
                /* Escape all decoders for the stream discontinuity they
                 * will encounter. */
                input_EscapeDiscontinuity( p_input );

394
395
                for( i = 0; i < p_input->stream.i_pgrm_number; i++ )
                {
396
                    pgrm_descriptor_t * p_pgrm=p_input->stream.pp_programs[i];
397
398
399
400

                    /* Reinitialize synchro. */
                    p_pgrm->i_synchro_state = SYNCHRO_REINIT;
                }
401

Laurent Aimar's avatar
Laurent Aimar committed
402
                vlc_mutex_unlock( &p_input->stream.stream_lock );
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
                if( !demux_Control( p_input, DEMUX_GET_TIME, &i_time ) )
                {
                    int i;
                    vlc_value_t val;

                    /* Help in bar display */
                    val.i_time = i_time;
                    var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );

                    /* Seek subs */
                    for( i = 0; i < p_input->p_sys->i_sub; i++ )
                    {
                        subtitle_Seek( p_input->p_sys->sub[i], i_time );
                    }
                }
Laurent Aimar's avatar
Laurent Aimar committed
418
                vlc_mutex_lock( &p_input->stream.stream_lock );
419
            }
420
            p_input->stream.p_selected_area->i_seek = NO_SEEK;
Sam Hocevar's avatar
   
Sam Hocevar committed
421
        }
422

423
424
425
426
427
428
429
430
431
432
433
434
        if( p_input->stream.p_removed_es )
        {
            input_UnselectES( p_input, p_input->stream.p_removed_es );
            p_input->stream.p_removed_es = NULL;
        }

        if( p_input->stream.p_newly_selected_es )
        {
            input_SelectES( p_input, p_input->stream.p_newly_selected_es );
            p_input->stream.p_newly_selected_es = NULL;
        }

435
436
437
438
439
440
441
442
443
444
445
446
447
448
        if( p_input->stream.b_new_mute != MUTE_NO_CHANGE )
        {
            if( p_input->stream.b_new_mute )
            {
                input_EscapeAudioDiscontinuity( p_input );
            }

            vlc_mutex_lock( &p_input->stream.control.control_lock );
            p_input->stream.control.b_mute = p_input->stream.b_new_mute;
            vlc_mutex_unlock( &p_input->stream.control.control_lock );

            p_input->stream.b_new_mute = MUTE_NO_CHANGE;
        }

449
        vlc_mutex_unlock( &p_input->stream.stream_lock );
Sam Hocevar's avatar
   
Sam Hocevar committed
450

Christophe Massiot's avatar
Christophe Massiot committed
451
452
        /* Read and demultiplex some data. */
        i_count = p_input->pf_demux( p_input );
Sam Hocevar's avatar
   
Sam Hocevar committed
453

gbazin's avatar
   
gbazin committed
454
        if( i_count == 0 )
Sam Hocevar's avatar
   
Sam Hocevar committed
455
        {
456
            /* End of file - we do not set b_die because only the
457
             * playlist is allowed to do so. */
458
            msg_Info( p_input, "EOF reached" );
459
460
461
462
463
            p_input->b_eof = 1;
        }
        else if( i_count < 0 )
        {
            p_input->b_error = 1;
464
        }
465
466
467

        if( !p_input->b_error && !p_input->b_eof && i_update_next < mdate() )
        {
468
469
470
471
            int i;
            mtime_t i_time;
            mtime_t i_length;
            double  d_pos;
472
473

            /* update input status variables */
474
            if( !demux_Control( p_input, DEMUX_GET_POSITION, &d_pos ) )
475
            {
476
                val.f_float = (float)d_pos;
477
478
                var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL );
            }
479
            if( !demux_Control( p_input, DEMUX_GET_TIME, &i_time ) )
480
            {
481
                val.i_time = i_time;
482
483
                var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );
            }
484
            if( !demux_Control( p_input, DEMUX_GET_LENGTH, &i_length ) )
485
            {
486
                val.i_time = i_length;
487
488
489
                var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
            }

490
491
492
493
494
495
496
            /* update subs */
            for( i = 0; i < p_input->p_sys->i_sub; i++ )
            {
                subtitle_Demux( p_input->p_sys->sub[i], i_time );
            }

            i_update_next = mdate() + 150000LL;
497
        }
498
499
    }

Sam Hocevar's avatar
   
Sam Hocevar committed
500
    if( p_input->b_error || p_input->b_eof )
501
502
503
    {
        ErrorThread( p_input );
    }
504

505
    EndThread( p_input );
Sam Hocevar's avatar
   
Sam Hocevar committed
506

Sam Hocevar's avatar
   
Sam Hocevar committed
507
    return 0;
508
509
}

510
/*****************************************************************************
Sam Hocevar's avatar
   
Sam Hocevar committed
511
 * InitThread: init the input Thread
512
 *****************************************************************************/
Sam Hocevar's avatar
   
Sam Hocevar committed
513
static int InitThread( input_thread_t * p_input )
Michel Kaempf's avatar
Michel Kaempf committed
514
{
515
    float f_fps;
Christophe Massiot's avatar
Christophe Massiot committed
516
    /* Parse source string. Syntax : [[<access>][/<demux>]:][<source>] */
517
    char * psz_parser = p_input->psz_dupsource = strdup(p_input->psz_source);
gbazin's avatar
   
gbazin committed
518
    vlc_value_t val;
519
520
    subtitle_demux_t *p_sub;
    int64_t i_microsecondperframe;
gbazin's avatar
   
gbazin committed
521

Christophe Massiot's avatar
Christophe Massiot committed
522
523
524
525
526
    /* Skip the plug-in names */
    while( *psz_parser && *psz_parser != ':' )
    {
        psz_parser++;
    }
527
#if defined( WIN32 ) || defined( UNDER_CE )
Christophe Massiot's avatar
Christophe Massiot committed
528
    if( psz_parser - p_input->psz_dupsource == 1 )
gbazin's avatar
   
gbazin committed
529
    {
530
        msg_Warn( p_input, "drive letter %c: found in source string",
Christophe Massiot's avatar
Christophe Massiot committed
531
                           p_input->psz_dupsource[0] ) ;
Stéphane Borel's avatar
   
Stéphane Borel committed
532
        psz_parser = "";
gbazin's avatar
   
gbazin committed
533
534
    }
#endif
Sam Hocevar's avatar
   
Sam Hocevar committed
535

Christophe Massiot's avatar
Christophe Massiot committed
536
    if( !*psz_parser )
537
    {
Sam Hocevar's avatar
   
Sam Hocevar committed
538
        p_input->psz_access = p_input->psz_demux = "";
Christophe Massiot's avatar
Christophe Massiot committed
539
        p_input->psz_name = p_input->psz_source;
Christophe Massiot's avatar
Christophe Massiot committed
540
        free( p_input->psz_dupsource );
541
        p_input->psz_dupsource = NULL;
Michel Kaempf's avatar
Michel Kaempf committed
542
    }
Christophe Massiot's avatar
Christophe Massiot committed
543
544
545
    else
    {
        *psz_parser++ = '\0';
546

Xavier Marchesini's avatar
   
Xavier Marchesini committed
547
548
549
550
        /* let's skip '//' */
        if( psz_parser[0] == '/' && psz_parser[1] == '/' )
        {
            psz_parser += 2 ;
551
        }
Xavier Marchesini's avatar
   
Xavier Marchesini committed
552
553

        p_input->psz_name = psz_parser ;
Sam Hocevar's avatar
   
Sam Hocevar committed
554

Christophe Massiot's avatar
Christophe Massiot committed
555
        /* Come back to parse the access and demux plug-ins */
Christophe Massiot's avatar
Christophe Massiot committed
556
        psz_parser = p_input->psz_dupsource;
gbazin's avatar
   
gbazin committed
557

Stéphane Borel's avatar
   
Stéphane Borel committed
558
        if( !*psz_parser )
Christophe Massiot's avatar
Christophe Massiot committed
559
560
        {
            /* No access */
Sam Hocevar's avatar
   
Sam Hocevar committed
561
            p_input->psz_access = "";
Christophe Massiot's avatar
Christophe Massiot committed
562
563
564
565
        }
        else if( *psz_parser == '/' )
        {
            /* No access */
Sam Hocevar's avatar
   
Sam Hocevar committed
566
            p_input->psz_access = "";
Christophe Massiot's avatar
Christophe Massiot committed
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
            psz_parser++;
        }
        else
        {
            p_input->psz_access = psz_parser;

            while( *psz_parser && *psz_parser != '/' )
            {
                psz_parser++;
            }

            if( *psz_parser == '/' )
            {
                *psz_parser++ = '\0';
            }
        }
gbazin's avatar
   
gbazin committed
583

Christophe Massiot's avatar
Christophe Massiot committed
584
585
586
        if( !*psz_parser )
        {
            /* No demux */
Sam Hocevar's avatar
   
Sam Hocevar committed
587
            p_input->psz_demux = "";
Christophe Massiot's avatar
Christophe Massiot committed
588
589
590
591
592
        }
        else
        {
            p_input->psz_demux = psz_parser;
        }
Sam Hocevar's avatar
   
Sam Hocevar committed
593
    }
Christophe Massiot's avatar
Christophe Massiot committed
594

595
596
    msg_Dbg( p_input, "access `%s', demux `%s', name `%s'",
             p_input->psz_access, p_input->psz_demux, p_input->psz_name );
Christophe Massiot's avatar
Christophe Massiot committed
597
598

    if( input_AccessInit( p_input ) == -1 )
599
    {
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
        return VLC_EGENERIC;
    }

    /* Initialize optional stream output. (before demuxer)*/
    var_Get( p_input, "sout", &val );
    if( val.psz_string != NULL )
    {
        if ( *val.psz_string && (p_input->stream.p_sout =
             sout_NewInstance( p_input, val.psz_string )) == NULL )
        {
            msg_Err( p_input, "cannot start stream output instance, aborting" );
            free( val.psz_string );
            return VLC_EGENERIC;
        }
        free( val.psz_string );
615
    }
Christophe Massiot's avatar
Christophe Massiot committed
616

617
618
    p_input->p_es_out = EsOutCreate( p_input );

619
    /* Find and open appropriate access module */
620
621
    p_input->p_access = module_Need( p_input, "access",
                                     p_input->psz_access );
Christophe Massiot's avatar
Christophe Massiot committed
622

623
624
625
626
627
628
629
630
631
632
633
634
635
636
    if ( p_input->p_access == NULL
          && (*p_input->psz_demux || *p_input->psz_access) )
    {
        /* Maybe we got something like :
         * /Volumes/toto:titi/gabu.mpg */
        p_input->psz_access = p_input->psz_demux = "";
        p_input->psz_name = p_input->psz_source;
        free( p_input->psz_dupsource);
        p_input->psz_dupsource = NULL;

        p_input->p_access = module_Need( p_input, "access",
                                         p_input->psz_access );
    }

637
    if( p_input->p_access == NULL )
638
    {
639
        msg_Err( p_input, "no suitable access module for `%s/%s://%s'",
640
                 p_input->psz_access, p_input->psz_demux, p_input->psz_name );
641
642
643
644
645
        if ( p_input->stream.p_sout != NULL )
        {
            sout_DeleteInstance( p_input->stream.p_sout );
        }
        return VLC_EGENERIC;
646
    }
Christophe Massiot's avatar
Christophe Massiot committed
647
648
649

    /* Waiting for stream. */
    if( p_input->i_mtu )
Christophe Massiot's avatar
Christophe Massiot committed
650
    {
Christophe Massiot's avatar
Christophe Massiot committed
651
        p_input->i_bufsize = p_input->i_mtu;
Christophe Massiot's avatar
Christophe Massiot committed
652
    }
653
654
    else
    {
Christophe Massiot's avatar
Christophe Massiot committed
655
        p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
656
    }
657

gbazin's avatar
   
gbazin committed
658
659
660
661
662
    /* If the desynchronisation requested by the user is < 0, we need to
     * cache more data. */
    if( p_input->p_vlc->i_desync < 0 )
        p_input->i_pts_delay -= p_input->p_vlc->i_desync;

Sam Hocevar's avatar
   
Sam Hocevar committed
663
    if( p_input->p_current_data == NULL && p_input->pf_read != NULL )
664
    {
Christophe Massiot's avatar
Christophe Massiot committed
665
666
        while( !input_FillBuffer( p_input ) )
        {
667
            if( p_input->b_die || p_input->b_error || p_input->b_eof )
Christophe Massiot's avatar
Christophe Massiot committed
668
            {
669
                module_Unneed( p_input, p_input->p_access );
670
671
672
673
674
                if ( p_input->stream.p_sout != NULL )
                {
                    sout_DeleteInstance( p_input->stream.p_sout );
                }
                return VLC_EGENERIC;
Christophe Massiot's avatar
Christophe Massiot committed
675
676
            }
        }
677
    }
Sam Hocevar's avatar
   
Sam Hocevar committed
678

679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
    /* Create the stream_t facilities */
    p_input->s = stream_OpenInput( p_input );
    if( p_input->s == NULL )
    {
        /* should nver occur yet */

        msg_Err( p_input, "cannot create stream_t !" );
        module_Unneed( p_input, p_input->p_access );
        if ( p_input->stream.p_sout != NULL )
        {
            sout_DeleteInstance( p_input->stream.p_sout );
        }
        return VLC_EGENERIC;
    }

694
    /* Find and open appropriate demux module */
695
696
    p_input->p_demux = module_Need( p_input, "demux",
                                    p_input->psz_demux );
Sam Hocevar's avatar
   
Sam Hocevar committed
697

698
    if( p_input->p_demux == NULL )
699
    {
700
        msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
701
                 p_input->psz_access, p_input->psz_demux, p_input->psz_name );
702
        stream_Release( p_input->s );
703
        module_Unneed( p_input, p_input->p_access );
704
        if ( p_input->stream.p_sout != NULL )
705
        {
706
            sout_DeleteInstance( p_input->stream.p_sout );
707
        }
708
        return VLC_EGENERIC;
709
710
    }

711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
    /* Init input_thread_sys_t */
    p_input->p_sys = malloc( sizeof( input_thread_sys_t ) );
    p_input->p_sys->i_sub = 0;
    p_input->p_sys->sub   = NULL;

    /* get fps */
    if( demux_Control( p_input, DEMUX_GET_FPS, &f_fps ) || f_fps < 0.1 )
    {
        i_microsecondperframe = 0;
    }
    else
    {
        i_microsecondperframe = (int64_t)( (double)1000000.0 / (double)f_fps );
    }

    /* Now add subtitles (for now only one) */
    if( ( p_sub = subtitle_New( p_input, NULL, i_microsecondperframe ) ) )
    {
        TAB_APPEND( p_input->p_sys->i_sub, p_input->p_sys->sub, p_sub );

        /* see if it should be selected */
        var_Get( p_sub, "sub-file", &val );
        if( val.psz_string && *val.psz_string )
        {
            subtitle_Select( p_sub );
        }
    }

739
    return VLC_SUCCESS;
Michel Kaempf's avatar
Michel Kaempf committed
740
741
}

742
/*****************************************************************************
743
 * ErrorThread: RunThread() error loop
744
 *****************************************************************************
745
 * This function is called when an error occured during thread main's loop.
746
 *****************************************************************************/
747
static void ErrorThread( input_thread_t *p_input )
Michel Kaempf's avatar
Michel Kaempf committed
748
{
749
    while( !p_input->b_die )
Michel Kaempf's avatar
Michel Kaempf committed
750
    {
751
752
        /* Sleep a while */
        msleep( INPUT_IDLE_SLEEP );
Michel Kaempf's avatar
Michel Kaempf committed
753
754
755
    }
}

756
/*****************************************************************************
757
 * EndThread: end the input thread
758
 *****************************************************************************/
759
static void EndThread( input_thread_t * p_input )
760
{
761
    int i;
762
#ifdef HAVE_SYS_TIMES_H
763
764
765
    /* Display statistics */
    struct tms  cpu_usage;
    times( &cpu_usage );
Sam Hocevar's avatar
   
Sam Hocevar committed
766

767
    msg_Dbg( p_input, "%ld loops consuming user: %ld, system: %ld",
768
             p_input->c_loops, cpu_usage.tms_utime, cpu_usage.tms_stime );
769
#else
770
    msg_Dbg( p_input, "%ld loops", p_input->c_loops );
771
#endif
772

773
774
    input_DumpStream( p_input );

Sam Hocevar's avatar
   
Sam Hocevar committed
775
776
777
    /* Free all ES and destroy all decoder threads */
    input_EndStream( p_input );

778
779
780
    /* Close optional stream output instance */
    if ( p_input->stream.p_sout != NULL )
    {
781
782
        vlc_object_t *p_pl =
            vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
        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" );
            vlc_object_detach( p_input->stream.p_sout );
            vlc_object_attach( p_input->stream.p_sout, p_pl );
        }
        else
        {
            msg_Warn( p_input, "destroying sout" );
            sout_DeleteInstance( p_input->stream.p_sout );
        }
        if( p_pl )
        {
            vlc_object_release( p_pl );
        }
801
802
    }

803
804
805
806
807
808
809
810
811
812
813
814
815
    /* Destroy subtitles demuxers */
    for( i = 0; i < p_input->p_sys->i_sub; i++ )
    {
        subtitle_Close( p_input->p_sys->sub[i] );
    }
    if( p_input->p_sys->i_sub > 0 )
    {
        free( p_input->p_sys->sub );
    }

    /* Free input_thread_sys_t */
    free( p_input->p_sys );

Sam Hocevar's avatar
   
Sam Hocevar committed
816
    /* Free demultiplexer's data */
817
    module_Unneed( p_input, p_input->p_demux );
Sam Hocevar's avatar
   
Sam Hocevar committed
818

819
820
821
    /* Destroy the stream_t facilities */
    stream_Release( p_input->s );

822
823
824
    /* Destroy es out */
    EsOutRelease( p_input->p_es_out );

825
    /* Close the access plug-in */
826
    module_Unneed( p_input, p_input->p_access );
Sam Hocevar's avatar
   
Sam Hocevar committed
827

Christophe Massiot's avatar
Christophe Massiot committed
828
829
    input_AccessEnd( p_input );

830
831
832
833
    /* Free info structures XXX destroy es before 'cause vorbis */
    msg_Dbg( p_input, "freeing info structures...");
    input_DelInfo( p_input );

Christophe Massiot's avatar
Christophe Massiot committed
834
    free( p_input->psz_source );
835
    if ( p_input->psz_dupsource != NULL ) free( p_input->psz_dupsource );
836
837
838

    /* Tell we're dead */
    p_input->b_dead = 1;
Sam Hocevar's avatar
   
Sam Hocevar committed
839
840
}

gbazin's avatar
   
gbazin committed
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
/*****************************************************************************
 * ParseOption: parses the options for the input
 *****************************************************************************
 * This function parses the input (config) options and creates their associated
 * object variables.
 * Options are of the form "[no[-]]foo[=bar]" where foo is the option name and
 * bar is the value of the option.
 *****************************************************************************/
static void ParseOption( input_thread_t *p_input, const char *psz_option )
{
    char *psz_name = (char *)psz_option;
    char *psz_value = strchr( psz_option, '=' );
    int  i_name_len, i_type;
    vlc_bool_t b_isno = VLC_FALSE;
    vlc_value_t val;

    if( psz_value ) i_name_len = psz_value - psz_option;
    else i_name_len = strlen( psz_option );

    /* It's too much of an hassle to remove the ':' when we parse
     * the cmd line :) */
    if( i_name_len && *psz_name == ':' )
    {
        psz_name++;
        i_name_len--;
    }

    if( i_name_len == 0 ) return;

    psz_name = strndup( psz_name, i_name_len );
    if( psz_value ) psz_value++;

    i_type = config_GetType( p_input, psz_name );

    if( !i_type && !psz_value )
    {
        /* check for "no-foo" or "nofoo" */
        if( !strncmp( psz_name, "no-", 3 ) )
        {
            memmove( psz_name, psz_name + 3, strlen(psz_name) + 1 - 3 );
        }
        else if( !strncmp( psz_name, "no", 2 ) )
        {
            memmove( psz_name, psz_name + 2, strlen(psz_name) + 1 - 2 );
        }
        else goto cleanup;           /* Option doesn't exist */

        b_isno = VLC_TRUE;
        i_type = config_GetType( p_input, psz_name );

        if( !i_type ) goto cleanup;  /* Option doesn't exist */
    }
    else if( !i_type ) goto cleanup; /* Option doesn't exist */

    if( ( i_type != VLC_VAR_BOOL ) &&
        ( !psz_value || !*psz_value ) ) goto cleanup; /* Invalid value */

    /* Create the variable in the input object.
     * Children of the input object will be able to retreive this value
     * thanks to the inheritance property of the object variables. */
    var_Create( p_input, psz_name, i_type );

    switch( i_type )
    {
    case VLC_VAR_BOOL:
        val.b_bool = !b_isno;
        break;

    case VLC_VAR_INTEGER:
        val.i_int = atoi( psz_value );
        break;

    case VLC_VAR_FLOAT:
        val.f_float = atof( psz_value );
        break;

    case VLC_VAR_STRING:
    case VLC_VAR_FILE:
    case VLC_VAR_DIRECTORY:
        val.psz_string = psz_value;
        break;

    default:
        goto cleanup;
        break;
    }

    var_Set( p_input, psz_name, val );

    msg_Dbg( p_input, "set input option: %s to %s", psz_name, psz_value );

  cleanup:
    if( psz_name ) free( psz_name );
    return;
}
936

937
938
939
940
941
942
943
944
945
/*****************************************************************************
 * es_out_t input handler
 *****************************************************************************/
struct es_out_sys_t
{
    input_thread_t *p_input;

    int         i_id;
    es_out_id_t **id;
946
947
948

    vlc_bool_t  i_audio;
    vlc_bool_t  i_video;
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
};
struct es_out_id_t
{
    es_descriptor_t *p_es;
};

static es_out_id_t *EsOutAdd    ( es_out_t *, es_format_t * );
static int          EsOutSend   ( es_out_t *, es_out_id_t *, pes_packet_t * );
static void         EsOutDel    ( es_out_t *, es_out_id_t * );
static int          EsOutControl( es_out_t *, int i_query, va_list );

static es_out_t *EsOutCreate( input_thread_t *p_input )
{
    es_out_t *out = malloc( sizeof( es_out_t ) );

    out->pf_add     = EsOutAdd;
    out->pf_send    = EsOutSend;
    out->pf_del     = EsOutDel;
    out->pf_control = EsOutControl;

    out->p_sys = malloc( sizeof( es_out_sys_t ) );
    out->p_sys->p_input = p_input;
    out->p_sys->i_id    = 0;
    out->p_sys->id      = NULL;
973
974
    out->p_sys->i_audio = -1;
    out->p_sys->i_video = -1;
975
976
977
978
    return out;
}
static void      EsOutRelease( es_out_t *out )
{
979
980
981
982
983
984
985
986
987
988
989
990
    es_out_sys_t *p_sys = out->p_sys;
    int i;

    for( i = 0; i < p_sys->i_id; i++ )
    {
        free( p_sys->id[i] );
    }
    if( p_sys->id )
    {
        free( p_sys->id );
    }
    free( p_sys );
991
992
993
994
995
    free( out );
}

static es_out_id_t *EsOutAdd( es_out_t *out, es_format_t *fmt )
{
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
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
1077
1078
1079
1080
1081
1082
1083
1084
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
    es_out_sys_t      *p_sys = out->p_sys;
    input_thread_t    *p_input = p_sys->p_input;
    es_out_id_t       *id = malloc( sizeof( es_out_id_t ) );
    pgrm_descriptor_t *p_prgm = NULL;

    vlc_mutex_lock( &p_input->stream.stream_lock );
    if( fmt->i_group >= 0 )
    {
        /* search program */
        p_prgm = input_FindProgram( p_input, fmt->i_group );

        if( p_prgm == NULL )
        {
            /* create it */
            p_prgm = input_AddProgram( p_input, fmt->i_group, 0 );

            /* Select the first by default */
            if( p_input->stream.p_selected_program == NULL )
            {
                p_input->stream.p_selected_program = p_prgm;
            }
        }
    }

    id->p_es = input_AddES( p_input,
                            p_prgm,
                            1 + out->p_sys->i_id,
                            fmt->i_cat,
                            fmt->psz_description, 0 );
    id->p_es->i_stream_id = 1 + out->p_sys->i_id;
    id->p_es->i_fourcc = fmt->i_codec;

    switch( fmt->i_cat )
    {
        case AUDIO_ES:
        {
            WAVEFORMATEX *p_wf = malloc( sizeof( WAVEFORMATEX ) + fmt->i_extra);

            p_wf->wFormatTag        = WAVE_FORMAT_UNKNOWN;
            p_wf->nChannels         = fmt->audio.i_channels;
            p_wf->nSamplesPerSec    = fmt->audio.i_samplerate;
            p_wf->nAvgBytesPerSec   = fmt->audio.i_bitrate / 8;
            p_wf->nBlockAlign       = fmt->audio.i_blockalign;
            p_wf->wBitsPerSample    = fmt->audio.i_bitspersample;
            p_wf->cbSize            = fmt->i_extra;
            if( fmt->i_extra > 0 )
            {
                if( fmt->i_extra_type != ES_EXTRA_TYPE_WAVEFORMATEX )
                {
                    msg_Warn( p_input, "extra type != WAVEFORMATEX for audio" );
                }
                memcpy( &p_wf[1], fmt->p_extra, fmt->i_extra );
            }
            id->p_es->p_waveformatex = p_wf;
            break;
        }
        case VIDEO_ES:
        {
            BITMAPINFOHEADER *p_bih = malloc( sizeof( BITMAPINFOHEADER ) +
                                              fmt->i_extra );
            p_bih->biSize           = sizeof(BITMAPINFOHEADER) + fmt->i_extra;
            p_bih->biWidth          = fmt->video.i_width;
            p_bih->biHeight         = fmt->video.i_height;
            p_bih->biPlanes         = 1;
            p_bih->biBitCount       = 24;
            p_bih->biCompression    = fmt->i_codec;
            p_bih->biSizeImage      = fmt->video.i_width * fmt->video.i_height;
            p_bih->biXPelsPerMeter  = 0;
            p_bih->biYPelsPerMeter  = 0;
            p_bih->biClrUsed        = 0;
            p_bih->biClrImportant   = 0;

            if( fmt->i_extra > 0 )
            {
                if( fmt->i_extra_type != ES_EXTRA_TYPE_BITMAPINFOHEADER )
                {
                    msg_Warn( p_input,
                              "extra type != BITMAPINFOHEADER for video" );
                }
                memcpy( &p_bih[1], fmt->p_extra, fmt->i_extra );
            }
            id->p_es->p_bitmapinfoheader = p_bih;
            break;
        }
        default:
            break;
    }

    if( fmt->i_cat == AUDIO_ES && fmt->i_priority > out->p_sys->i_audio )
    {
        if( out->p_sys->i_audio >= 0 )
        {
            msg_Err( p_input, "FIXME unselect es in es_out_Add" );
        }
        input_SelectES( p_input, id->p_es );
        if( id->p_es->p_decoder_fifo )
        {
            out->p_sys->i_audio = fmt->i_priority;
        }
    }
    else if( fmt->i_cat == VIDEO_ES && fmt->i_priority > out->p_sys->i_video )
    {
        if( out->p_sys->i_video >= 0 )
        {
            msg_Err( p_input, "FIXME unselect es in es_out_Add" );
        }
        input_SelectES( p_input, id->p_es );
        if( id->p_es->p_decoder_fifo )
        {
            out->p_sys->i_video = fmt->i_priority;
        }
    }
    vlc_mutex_unlock( &p_input->stream.stream_lock );


    TAB_APPEND( out->p_sys->i_id, out->p_sys->id, id );
1112
1113
1114
1115
1116

    return id;
}
static int EsOutSend( es_out_t *out