es_out.c 38.7 KB
Newer Older
1
2
3
/*****************************************************************************
 * es_out.c: Es Out handler for input.
 *****************************************************************************
zorglub's avatar
zorglub committed
4
 * Copyright (C) 2003-2004 VideoLAN
5
 * $Id$
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
 *
 * Authors: Laurent Aimar <fenrir@via.ecp.fr>
 *
 * 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.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * 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.
 *****************************************************************************/

/*****************************************************************************
 * Preamble
 *****************************************************************************/
#include <stdlib.h>

#include <vlc/vlc.h>
#include <vlc/input.h>
#include <vlc/decoder.h>

Laurent Aimar's avatar
Laurent Aimar committed
33
34
#include "input_internal.h"

zorglub's avatar
zorglub committed
35
#include "vlc_playlist.h"
36
#include "iso_lang.h"
37
38
/* FIXME we should find a better way than including that */
#include "../misc/iso-639_def.h"
39
40
41
42

/*****************************************************************************
 * Local prototypes
 *****************************************************************************/
Laurent Aimar's avatar
Laurent Aimar committed
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
typedef struct
{
    /* Program ID */
    int i_id;

    /* Number of es for this pgrm */
    int i_es;

    vlc_bool_t b_selected;

    /* Clock for this program */
    input_clock_t clock;

} es_out_pgrm_t;

58
59
struct es_out_id_t
{
Laurent Aimar's avatar
Laurent Aimar committed
60
61
62
63
64
65
66
    /* ES ID */
    int       i_id;
    es_out_pgrm_t *p_pgrm;

    /* Channel in the track type */
    int         i_channel;
    es_format_t fmt;
hartman's avatar
hartman committed
67
    char        *psz_language;
68
    char        *psz_language_code;
Laurent Aimar's avatar
Laurent Aimar committed
69
    decoder_t   *p_dec;
70
71
};

72
73
74
75
struct es_out_sys_t
{
    input_thread_t *p_input;

Laurent Aimar's avatar
Laurent Aimar committed
76
77
78
    /* all programs */
    int           i_pgrm;
    es_out_pgrm_t **pgrm;
79
    es_out_pgrm_t **pp_selected_pgrm; /* --programs */
Laurent Aimar's avatar
Laurent Aimar committed
80
81
    es_out_pgrm_t *p_pgrm;  /* Master program */

82
    /* all es */
83
    int         i_id;
84
85
    int         i_es;
    es_out_id_t **es;
86

87
88
89
90
91
92
93
94
95
96
97
98
    /* mode gestion */
    vlc_bool_t  b_active;
    int         i_mode;

    /* es count */
    int         i_audio;
    int         i_video;
    int         i_sub;

    /* es to select */
    int         i_audio_last;
    int         i_sub_last;
99
100
    char        **ppsz_audio_language;
    char        **ppsz_sub_language;
101
102
103
104
105

    /* current main es */
    es_out_id_t *p_es_audio;
    es_out_id_t *p_es_video;
    es_out_id_t *p_es_sub;
106
107
108
109

    /* delay */
    int64_t i_audio_delay;
    int64_t i_spu_delay;
110
111
112
113
114
};

static es_out_id_t *EsOutAdd    ( es_out_t *, es_format_t * );
static int          EsOutSend   ( es_out_t *, es_out_id_t *, block_t * );
static void         EsOutDel    ( es_out_t *, es_out_id_t * );
Laurent Aimar's avatar
Laurent Aimar committed
115
static void         EsOutSelect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_force );
116
117
static int          EsOutControl( es_out_t *, int i_query, va_list );

118
static void         EsOutAddInfo( es_out_t *, es_out_id_t *es );
Laurent Aimar's avatar
Laurent Aimar committed
119
120
121

static void EsSelect( es_out_t *out, es_out_id_t *es );
static void EsUnselect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_update );
122
static char *LanguageGetName( const char *psz_code );
123
124
125
static char *LanguageGetCode( const char *psz_lang );
static char **LanguageSplit( const char *psz_langs );
static int LanguageArrayIndex( char **ppsz_langs, char *psz_lang );
126

Laurent Aimar's avatar
Laurent Aimar committed
127
128
129
/*****************************************************************************
 * input_EsOutNew:
 *****************************************************************************/
130
131
es_out_t *input_EsOutNew( input_thread_t *p_input )
{
132
133
134
    es_out_t     *out = malloc( sizeof( es_out_t ) );
    es_out_sys_t *p_sys = malloc( sizeof( es_out_sys_t ) );
    vlc_value_t  val;
135
    int i;
136
137
138
139
140

    out->pf_add     = EsOutAdd;
    out->pf_send    = EsOutSend;
    out->pf_del     = EsOutDel;
    out->pf_control = EsOutControl;
141
142
143
144
145
146
147
148
    out->p_sys      = p_sys;

    p_sys->p_input = p_input;

    p_sys->b_active = VLC_FALSE;
    p_sys->i_mode   = ES_OUT_MODE_AUTO;


Laurent Aimar's avatar
Laurent Aimar committed
149
150
151
152
153
    p_sys->i_pgrm   = 0;
    p_sys->pgrm     = NULL;
    p_sys->p_pgrm   = NULL;

    p_sys->i_id    = 0;
154
155
156
157
158
159
160
    p_sys->i_es    = 0;
    p_sys->es      = NULL;

    p_sys->i_audio = 0;
    p_sys->i_video = 0;
    p_sys->i_sub   = 0;

161
    /* */
162
    var_Get( p_input, "audio-track", &val );
163
164
    p_sys->i_audio_last = val.i_int;

165
    var_Get( p_input, "spu-track", &val );
166
167
    p_sys->i_sub_last = val.i_int;

168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
    var_Get( p_input, "audio-language", &val );
    p_sys->ppsz_audio_language = LanguageSplit(val.psz_string);
    if( p_sys->ppsz_audio_language )
    {
        for( i = 0; p_sys->ppsz_audio_language[i]; i++ )
            msg_Dbg( p_input, "Select audio in language[%d] %s",
                     i, p_sys->ppsz_audio_language[i] );
    }

    var_Get( p_input, "spu-language", &val );
    p_sys->ppsz_sub_language = LanguageSplit(val.psz_string);
    if( p_sys->ppsz_sub_language )
    {
        for( i = 0; p_sys->ppsz_sub_language[i]; i++ )
            msg_Dbg( p_input, "Select subtitle in language[%d] %s",
                     i, p_sys->ppsz_sub_language[i] );
    }

    /* */
187
188
189
    p_sys->p_es_audio = NULL;
    p_sys->p_es_video = NULL;
    p_sys->p_es_sub   = NULL;
190

191
192
193
    p_sys->i_audio_delay= 0;
    p_sys->i_spu_delay  = 0;

194
195
196
    return out;
}

Laurent Aimar's avatar
Laurent Aimar committed
197
198
199
/*****************************************************************************
 * input_EsOutDelete:
 *****************************************************************************/
200
201
202
203
204
void input_EsOutDelete( es_out_t *out )
{
    es_out_sys_t *p_sys = out->p_sys;
    int i;

205
    for( i = 0; i < p_sys->i_es; i++ )
206
    {
Laurent Aimar's avatar
Laurent Aimar committed
207
208
209
210
        if( p_sys->es[i]->p_dec )
        {
            input_DecoderDelete( p_sys->es[i]->p_dec );
        }
hartman's avatar
hartman committed
211
212
        if( p_sys->es[i]->psz_language )
            free( p_sys->es[i]->psz_language );
213
214
        if( p_sys->es[i]->psz_language_code )
            free( p_sys->es[i]->psz_language_code );
Laurent Aimar's avatar
Laurent Aimar committed
215
216
        es_format_Clean( &p_sys->es[i]->fmt );

217
        free( p_sys->es[i] );
218
    }
219
220
221
222
223
224
225
226
227
228
229
230
231
    if( p_sys->ppsz_audio_language )
    {
        for( i = 0; p_sys->ppsz_audio_language[i]; i++ )
            free( p_sys->ppsz_audio_language[i] );
        free( p_sys->ppsz_audio_language );
    }
    if( p_sys->ppsz_sub_language )
    {
        for( i = 0; p_sys->ppsz_sub_language[i]; i++ )
            free( p_sys->ppsz_sub_language[i] );
        free( p_sys->ppsz_sub_language );
    }

232
233
    if( p_sys->es )
        free( p_sys->es );
Laurent Aimar's avatar
Laurent Aimar committed
234
235
236
237

    for( i = 0; i < p_sys->i_pgrm; i++ )
    {
        free( p_sys->pgrm[i] );
238
    }
Laurent Aimar's avatar
Laurent Aimar committed
239
240
241
    if( p_sys->pgrm )
        free( p_sys->pgrm );

242
243
244
    free( p_sys );
    free( out );
}
zorglub's avatar
zorglub committed
245

Laurent Aimar's avatar
Laurent Aimar committed
246
es_out_id_t *input_EsOutGetFromID( es_out_t *out, int i_id )
247
{
Laurent Aimar's avatar
Laurent Aimar committed
248
249
250
251
252
253
    int i;
    if( i_id < 0 )
    {
        /* Special HACK, -i_id is tha cat of the stream */
        return (es_out_id_t*)((uint8_t*)NULL-i_id);
    }
254

Laurent Aimar's avatar
Laurent Aimar committed
255
256
257
258
259
260
261
    for( i = 0; i < out->p_sys->i_es; i++ )
    {
        if( out->p_sys->es[i]->i_id == i_id )
            return out->p_sys->es[i];
    }
    return NULL;
}
262

Laurent Aimar's avatar
Laurent Aimar committed
263
264
265
266
void input_EsOutDiscontinuity( es_out_t *out, vlc_bool_t b_audio )
{
    es_out_sys_t      *p_sys = out->p_sys;
    int i;
267

Laurent Aimar's avatar
Laurent Aimar committed
268
    for( i = 0; i < p_sys->i_es; i++ )
269
    {
Laurent Aimar's avatar
Laurent Aimar committed
270
        es_out_id_t *es = p_sys->es[i];
271

Laurent Aimar's avatar
Laurent Aimar committed
272
273
274
275
276
277
278
        /* Send a dummy block to let decoder know that
         * there is a discontinuity */
        if( es->p_dec && ( !b_audio || es->fmt.i_cat == AUDIO_ES ) )
        {
            input_DecoderDiscontinuity( es->p_dec );
        }
    }
279
}
280

281
282
283
284
285
286
287
288
289
290
void input_EsOutSetDelay( es_out_t *out, int i_cat, int64_t i_delay )
{
    es_out_sys_t *p_sys = out->p_sys;

    if( i_cat == AUDIO_ES )
        p_sys->i_audio_delay = i_delay;
    else if( i_cat == SPU_ES )
        p_sys->i_spu_delay = i_delay;
}

Laurent Aimar's avatar
   
Laurent Aimar committed
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
vlc_bool_t input_EsOutDecodersEmpty( es_out_t *out )
{
    es_out_sys_t      *p_sys = out->p_sys;
    int i;

    for( i = 0; i < p_sys->i_es; i++ )
    {
        es_out_id_t *es = p_sys->es[i];

        if( es->p_dec && !input_DecoderEmpty( es->p_dec ) )
            return VLC_FALSE;
    }
    return VLC_TRUE;
}

Laurent Aimar's avatar
Laurent Aimar committed
306
/*****************************************************************************
zorglub's avatar
zorglub committed
307
 *
Laurent Aimar's avatar
Laurent Aimar committed
308
 *****************************************************************************/
309
310
static void EsOutESVarUpdate( es_out_t *out, es_out_id_t *es,
                              vlc_bool_t b_delete )
311
312
313
{
    es_out_sys_t      *p_sys = out->p_sys;
    input_thread_t    *p_input = p_sys->p_input;
Laurent Aimar's avatar
Laurent Aimar committed
314
    vlc_value_t       val, text;
315

Laurent Aimar's avatar
Laurent Aimar committed
316
    char *psz_var;
317

Laurent Aimar's avatar
Laurent Aimar committed
318
319
320
321
322
323
324
    if( es->fmt.i_cat == AUDIO_ES )
        psz_var = "audio-es";
    else if( es->fmt.i_cat == VIDEO_ES )
        psz_var = "video-es";
    else if( es->fmt.i_cat == SPU_ES )
        psz_var = "spu-es";
    else
325
        return;
Laurent Aimar's avatar
Laurent Aimar committed
326

327
328
329
330
331
332
333
334
    if( b_delete )
    {
        val.i_int = es->i_id;
        var_Change( p_input, psz_var, VLC_VAR_DELCHOICE, &val, NULL );
        var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
        return;
    }

Laurent Aimar's avatar
Laurent Aimar committed
335
336
337
338
339
340
341
342
343
344
    /* Get the number of ES already added */
    var_Change( p_input, psz_var, VLC_VAR_CHOICESCOUNT, &val, NULL );
    if( val.i_int == 0 )
    {
        vlc_value_t val2;

        /* First one, we need to add the "Disable" choice */
        val2.i_int = -1; text.psz_string = _("Disable");
        var_Change( p_input, psz_var, VLC_VAR_ADDCHOICE, &val2, &text );
        val.i_int++;
345
346
    }

Laurent Aimar's avatar
Laurent Aimar committed
347
    /* Take care of the ES description */
hartman's avatar
hartman committed
348
    if( es->fmt.psz_description && *es->fmt.psz_description )
349
    {
hartman's avatar
hartman committed
350
        if( es->psz_language && *es->psz_language )
351
352
353
354
355
        {
            text.psz_string = malloc( strlen( es->fmt.psz_description) + strlen( es->psz_language ) + 10 );
            sprintf( text.psz_string, "%s - [%s]", es->fmt.psz_description, es->psz_language );
        }
        else text.psz_string = strdup( es->fmt.psz_description );
356
    }
Laurent Aimar's avatar
Laurent Aimar committed
357
    else
358
    {
hartman's avatar
hartman committed
359
360
361
362
363
364
365
366
367
368
369
370
371
        if( es->psz_language && *es->psz_language )
        {
            char *temp;
            text.psz_string = malloc( strlen( _("Track %i") )+ strlen( es->psz_language ) + 30 );
            asprintf( &temp,  _("Track %i"), val.i_int );
            sprintf( text.psz_string, "%s - [%s]", temp, es->psz_language );
            free( temp );
        }
        else
        {
            text.psz_string = malloc( strlen( _("Track %i") ) + 20 );
            sprintf( text.psz_string, _("Track %i"), val.i_int );
        }
Laurent Aimar's avatar
Laurent Aimar committed
372
    }
373

Laurent Aimar's avatar
Laurent Aimar committed
374
375
    val.i_int = es->i_id;
    var_Change( p_input, psz_var, VLC_VAR_ADDCHOICE, &val, &text );
376

Laurent Aimar's avatar
Laurent Aimar committed
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
    free( text.psz_string );

    var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
}

/* EsOutProgramSelect:
 *  Select a program and update the object variable
 */
static void EsOutProgramSelect( es_out_t *out, es_out_pgrm_t *p_pgrm )
{
    es_out_sys_t      *p_sys = out->p_sys;
    input_thread_t    *p_input = p_sys->p_input;
    vlc_value_t       val;
    int               i;

    if( p_sys->p_pgrm == p_pgrm )
        return; /* Nothing to do */

    if( p_sys->p_pgrm )
    {
        es_out_pgrm_t *old = p_sys->p_pgrm;
        msg_Dbg( p_input, "Unselecting program id=%d", old->i_id );
399

Laurent Aimar's avatar
Laurent Aimar committed
400
        for( i = 0; i < p_sys->i_es; i++ )
401
        {
Laurent Aimar's avatar
Laurent Aimar committed
402
403
404
            if( p_sys->es[i]->p_pgrm == old && p_sys->es[i]->p_dec &&
                p_sys->i_mode != ES_OUT_MODE_ALL )
                EsUnselect( out, p_sys->es[i], VLC_TRUE );
405
        }
406
407
408
409

        p_sys->p_es_audio = NULL;
        p_sys->p_es_sub = NULL;
        p_sys->p_es_video = NULL;
410
411
    }

Laurent Aimar's avatar
Laurent Aimar committed
412
413
414
415
416
417
418
    msg_Dbg( p_input, "Selecting program id=%d", p_pgrm->i_id );

    /* Mark it selected */
    p_pgrm->b_selected = VLC_TRUE;

    /* Switch master stream */
    if( p_sys->p_pgrm && p_sys->p_pgrm->clock.b_master )
419
    {
Laurent Aimar's avatar
Laurent Aimar committed
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
        p_sys->p_pgrm->clock.b_master = VLC_FALSE;
    }
    p_pgrm->clock.b_master = VLC_TRUE;
    p_sys->p_pgrm = p_pgrm;

    /* Update "program" */
    val.i_int = p_pgrm->i_id;
    var_Change( p_input, "program", VLC_VAR_SETVALUE, &val, NULL );

    /* Update "es-*" */
    var_Change( p_input, "audio-es", VLC_VAR_CLEARCHOICES, NULL, NULL );
    var_Change( p_input, "video-es", VLC_VAR_CLEARCHOICES, NULL, NULL );
    var_Change( p_input, "spu-es",   VLC_VAR_CLEARCHOICES, NULL, NULL );
    for( i = 0; i < p_sys->i_es; i++ )
    {
435
436
        if( p_sys->es[i]->p_pgrm == p_sys->p_pgrm )
            EsOutESVarUpdate( out, p_sys->es[i], VLC_FALSE );
Laurent Aimar's avatar
Laurent Aimar committed
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
        EsOutSelect( out, p_sys->es[i], VLC_FALSE );
    }

    var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
}

/* EsOutAddProgram:
 *  Add a program
 */
static es_out_pgrm_t *EsOutProgramAdd( es_out_t *out, int i_group )
{
    es_out_sys_t      *p_sys = out->p_sys;
    input_thread_t    *p_input = p_sys->p_input;
    vlc_value_t       val;

    es_out_pgrm_t *p_pgrm = malloc( sizeof( es_out_pgrm_t ) );

    /* Init */
    p_pgrm->i_id = i_group;
    p_pgrm->i_es = 0;
    p_pgrm->b_selected = VLC_FALSE;
    input_ClockInit( &p_pgrm->clock, VLC_FALSE, p_input->input.i_cr_average );

    /* Append it */
    TAB_APPEND( p_sys->i_pgrm, p_sys->pgrm, p_pgrm );

    /* Update "program" variable */
    val.i_int = i_group;
    var_Change( p_input, "program", VLC_VAR_ADDCHOICE, &val, NULL );

    if( i_group == var_GetInteger( p_input, "program" ) )
    {
        EsOutProgramSelect( out, p_pgrm );
    }
    else
    {
        var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
474
    }
Laurent Aimar's avatar
Laurent Aimar committed
475
    return p_pgrm;
476
477
}

Laurent Aimar's avatar
Laurent Aimar committed
478
479
/* EsOutAdd:
 *  Add an es_out
zorglub's avatar
zorglub committed
480
 */
481
482
483
484
static es_out_id_t *EsOutAdd( es_out_t *out, es_format_t *fmt )
{
    es_out_sys_t      *p_sys = out->p_sys;
    input_thread_t    *p_input = p_sys->p_input;
Laurent Aimar's avatar
Laurent Aimar committed
485

486
    es_out_id_t       *es = malloc( sizeof( es_out_id_t ) );
Laurent Aimar's avatar
Laurent Aimar committed
487
488
    es_out_pgrm_t     *p_pgrm = NULL;
    int i;
489

Laurent Aimar's avatar
Laurent Aimar committed
490
    if( fmt->i_group < 0 )
491
    {
492
        msg_Err( p_input, "invalid group number" );
Laurent Aimar's avatar
Laurent Aimar committed
493
494
        return NULL;
    }
495

Laurent Aimar's avatar
Laurent Aimar committed
496
497
498
499
    /* Search the program */
    for( i = 0; i < p_sys->i_pgrm; i++ )
    {
        if( fmt->i_group == p_sys->pgrm[i]->i_id )
500
        {
Laurent Aimar's avatar
Laurent Aimar committed
501
502
            p_pgrm = p_sys->pgrm[i];
            break;
503
504
        }
    }
Laurent Aimar's avatar
Laurent Aimar committed
505
    if( p_pgrm == NULL )
506
    {
Laurent Aimar's avatar
Laurent Aimar committed
507
508
        /* Create a new one */
        p_pgrm = EsOutProgramAdd( out, fmt->i_group );
509
    }
510

Laurent Aimar's avatar
Laurent Aimar committed
511
512
    /* Increase ref count for program */
    p_pgrm->i_es++;
513

Laurent Aimar's avatar
Laurent Aimar committed
514
515
516
517
518
519
    /* Set up ES */
    if( fmt->i_id < 0 )
        fmt->i_id = out->p_sys->i_id;
    es->i_id = fmt->i_id;
    es->p_pgrm = p_pgrm;
    es_format_Copy( &es->fmt, fmt );
520
521
    switch( fmt->i_cat )
    {
522
523
524
    case AUDIO_ES:
        es->i_channel = p_sys->i_audio;
        break;
525

526
527
528
    case VIDEO_ES:
        es->i_channel = p_sys->i_video;
        break;
529

530
    case SPU_ES:
531
532
        es->i_channel = p_sys->i_sub;
        break;
533

534
535
536
    default:
        es->i_channel = 0;
        break;
537
    }
hartman's avatar
hartman committed
538
    es->psz_language = LanguageGetName( fmt->psz_language ); /* remember so we only need to do it once */
539
    es->psz_language_code = LanguageGetCode( fmt->psz_language );
Laurent Aimar's avatar
Laurent Aimar committed
540
541
542
    es->p_dec = NULL;

    if( es->p_pgrm == p_sys->p_pgrm )
543
        EsOutESVarUpdate( out, es, VLC_FALSE );
544

Laurent Aimar's avatar
Laurent Aimar committed
545
546
    /* Select it if needed */
    EsOutSelect( out, es, VLC_FALSE );
547

548
549
550
551

    TAB_APPEND( out->p_sys->i_es, out->p_sys->es, es );
    p_sys->i_id++;  /* always incremented */
    switch( fmt->i_cat )
552
    {
553
554
555
556
557
558
559
560
561
        case AUDIO_ES:
            p_sys->i_audio++;
            break;
        case SPU_ES:
            p_sys->i_sub++;
            break;
        case VIDEO_ES:
            p_sys->i_video++;
            break;
562
    }
563

564
565
    EsOutAddInfo( out, es );

566
    return es;
567
568
}

Laurent Aimar's avatar
Laurent Aimar committed
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
static void EsSelect( es_out_t *out, es_out_id_t *es )
{
    es_out_sys_t   *p_sys = out->p_sys;
    input_thread_t *p_input = p_sys->p_input;
    vlc_value_t    val;
    char           *psz_var;

    if( es->p_dec )
    {
        msg_Warn( p_input, "ES 0x%x is already selected", es->i_id );
        return;
    }

    if( es->fmt.i_cat == VIDEO_ES || es->fmt.i_cat == SPU_ES )
    {
584
585
        if( !var_GetBool( p_input, "video" ) ||
            ( p_input->p_sout && !var_GetBool( p_input, "sout-video" ) ) )
Laurent Aimar's avatar
Laurent Aimar committed
586
        {
587
588
            msg_Dbg( p_input, "video is disabled, not selecting ES 0x%x",
                     es->i_id );
Laurent Aimar's avatar
Laurent Aimar committed
589
590
591
592
593
594
            return;
        }
    }
    else if( es->fmt.i_cat == AUDIO_ES )
    {
        var_Get( p_input, "audio", &val );
595
596
        if( !var_GetBool( p_input, "audio" ) ||
            ( p_input->p_sout && !var_GetBool( p_input, "sout-audio" ) ) )
Laurent Aimar's avatar
Laurent Aimar committed
597
        {
598
599
            msg_Dbg( p_input, "audio is disabled, not selecting ES 0x%x",
                     es->i_id );
Laurent Aimar's avatar
Laurent Aimar committed
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
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
            return;
        }
    }

    es->p_dec = input_DecoderNew( p_input, &es->fmt, VLC_FALSE );
    if( es->p_dec == NULL || es->p_pgrm != p_sys->p_pgrm )
        return;

    if( es->fmt.i_cat == VIDEO_ES )
        psz_var = "video-es";
    else if( es->fmt.i_cat == AUDIO_ES )
        psz_var = "audio-es";
    else if( es->fmt.i_cat == SPU_ES )
        psz_var = "spu-es";
    else
        return;

    /* Mark it as selected */
    val.i_int = es->i_id;
    var_Change( p_input, psz_var, VLC_VAR_SETVALUE, &val, NULL );


    var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
}

static void EsUnselect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_update )
{
    es_out_sys_t   *p_sys = out->p_sys;
    input_thread_t *p_input = p_sys->p_input;
    vlc_value_t    val;
    char           *psz_var;

    if( es->p_dec == NULL )
    {
        msg_Warn( p_input, "ES 0x%x is already unselected", es->i_id );
        return;
    }

    input_DecoderDelete( es->p_dec );
    es->p_dec = NULL;

    if( !b_update )
        return;

    /* Update var */
    if( es->p_dec == NULL )
        return;
    if( es->fmt.i_cat == VIDEO_ES )
        psz_var = "video-es";
    else if( es->fmt.i_cat == AUDIO_ES )
        psz_var = "audio-es";
    else if( es->fmt.i_cat == SPU_ES )
        psz_var = "spu-es";
    else
        return;

    /* Mark it as selected */
    val.i_int = -1;
    var_Change( p_input, psz_var, VLC_VAR_SETVALUE, &val, NULL );

    var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
}

/**
 * Select an ES given the current mode
 * XXX: you need to take a the lock before (stream.stream_lock)
 *
 * \param out The es_out structure
 * \param es es_out_id structure
 * \param b_force ...
 * \return nothing
 */
static void EsOutSelect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_force )
{
    es_out_sys_t      *p_sys = out->p_sys;

    int i_cat = es->fmt.i_cat;

    if( !p_sys->b_active ||
        ( !b_force && es->fmt.i_priority < 0 ) )
    {
        return;
    }

    if( p_sys->i_mode == ES_OUT_MODE_ALL || b_force )
    {
        if( !es->p_dec )
            EsSelect( out, es );
    }
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
    else if( p_sys->i_mode == ES_OUT_MODE_PARTIAL )
    {
        vlc_value_t val;
        int i;
        var_Get( p_sys->p_input, "programs", &val );
        for ( i = 0; i < val.p_list->i_count; i++ )
        {
            if ( val.p_list->p_values[i].i_int == es->p_pgrm->i_id || b_force )
            {
                if( !es->p_dec )
                    EsSelect( out, es );
                break;
            }
        }
        var_Change( p_sys->p_input, "programs", VLC_VAR_FREELIST, &val, NULL );
    }
Laurent Aimar's avatar
Laurent Aimar committed
705
706
707
708
709
710
711
712
713
    else if( p_sys->i_mode == ES_OUT_MODE_AUTO )
    {
        int i_wanted  = -1;

        if( es->p_pgrm != p_sys->p_pgrm )
            return;

        if( i_cat == AUDIO_ES )
        {
714
715
716
            int idx1 = LanguageArrayIndex( p_sys->ppsz_audio_language,
                                     es->psz_language_code );

Laurent Aimar's avatar
Laurent Aimar committed
717
718
719
            if( p_sys->p_es_audio &&
                p_sys->p_es_audio->fmt.i_priority >= es->fmt.i_priority )
            {
720
721
722
723
724
725
                int idx2 = LanguageArrayIndex( p_sys->ppsz_audio_language,
                                         p_sys->p_es_audio->psz_language_code );

                if( idx1 < 0 || ( idx2 >= 0 && idx2 <= idx1 ) )
                    return;
                i_wanted = es->i_channel;
Laurent Aimar's avatar
Laurent Aimar committed
726
            }
727
728
729
730
731
732
733
734
735
736
737
738
739
740
            else
            {
                /* Select audio if (no audio selected yet)
                 * - no audio-language
                 * - no audio code for the ES
                 * - audio code in the requested list */
                if( idx1 >= 0 ||
                    !strcmp( es->psz_language_code, "??" ) ||
                    !p_sys->ppsz_audio_language )
                    i_wanted = es->i_channel;
            }

            if( p_sys->i_audio_last >= 0 )
                i_wanted = p_sys->i_audio_last;
Laurent Aimar's avatar
Laurent Aimar committed
741
742
743
        }
        else if( i_cat == SPU_ES )
        {
744
745
746
            int idx1 = LanguageArrayIndex( p_sys->ppsz_sub_language,
                                     es->psz_language_code );

Laurent Aimar's avatar
Laurent Aimar committed
747
            if( p_sys->p_es_sub &&
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
                p_sys->p_es_sub->fmt.i_priority >= es->fmt.i_priority )
            {
                int idx2 = LanguageArrayIndex( p_sys->ppsz_sub_language,
                                         p_sys->p_es_sub->psz_language_code );

                msg_Dbg( p_sys->p_input, "idx1=%d(%s) idx2=%d(%s)",
                        idx1, es->psz_language_code, idx2,
                        p_sys->p_es_sub->psz_language_code );

                if( idx1 < 0 || ( idx2 >= 0 && idx2 <= idx1 ) )
                    return;
                /* We found a SPU that matches our language request */
                i_wanted  = es->i_channel;
            }
            else if( idx1 >= 0 )
Laurent Aimar's avatar
Laurent Aimar committed
763
            {
764
765
766
767
                msg_Dbg( p_sys->p_input, "idx1=%d(%s)",
                        idx1, es->psz_language_code );

                i_wanted  = es->i_channel;
Laurent Aimar's avatar
Laurent Aimar committed
768
            }
769
770
            if( p_sys->i_sub_last >= 0 )
                i_wanted  = p_sys->i_sub_last;
Laurent Aimar's avatar
Laurent Aimar committed
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
        }
        else if( i_cat == VIDEO_ES )
        {
            i_wanted  = es->i_channel;
        }

        if( i_wanted == es->i_channel && es->p_dec == NULL )
            EsSelect( out, es );
    }

    /* FIXME TODO handle priority here */
    if( es->p_dec )
    {
        if( i_cat == AUDIO_ES )
        {
            if( p_sys->i_mode == ES_OUT_MODE_AUTO &&
787
788
789
                p_sys->p_es_audio &&
                p_sys->p_es_audio != es &&
                p_sys->p_es_audio->p_dec )
Laurent Aimar's avatar
Laurent Aimar committed
790
791
792
793
794
795
796
797
            {
                EsUnselect( out, p_sys->p_es_audio, VLC_FALSE );
            }
            p_sys->p_es_audio = es;
        }
        else if( i_cat == SPU_ES )
        {
            if( p_sys->i_mode == ES_OUT_MODE_AUTO &&
798
799
800
                p_sys->p_es_sub &&
                p_sys->p_es_sub != es &&
                p_sys->p_es_sub->p_dec )
Laurent Aimar's avatar
Laurent Aimar committed
801
802
803
804
805
806
807
808
809
810
811
812
            {
                EsUnselect( out, p_sys->p_es_sub, VLC_FALSE );
            }
            p_sys->p_es_sub = es;
        }
        else if( i_cat == VIDEO_ES )
        {
            p_sys->p_es_video = es;
        }
    }
}

zorglub's avatar
zorglub committed
813
814
815
816
817
818
819
/**
 * Send a block for the given es_out
 *
 * \param out the es_out to send from
 * \param es the es_out_id
 * \param p_block the data block to send
 */
820
static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
821
{
822
    es_out_sys_t *p_sys = out->p_sys;
Laurent Aimar's avatar
Laurent Aimar committed
823
    input_thread_t    *p_input = p_sys->p_input;
Laurent Aimar's avatar
Laurent Aimar committed
824
    es_out_pgrm_t *p_pgrm = es->p_pgrm;
825
826
827
828
829
830
831
832
    int64_t i_delay;

    if( es->fmt.i_cat == AUDIO_ES )
        i_delay = p_sys->i_audio_delay;
    else if( es->fmt.i_cat == SPU_ES )
        i_delay = p_sys->i_spu_delay;
    else
        i_delay = 0;
833

Laurent Aimar's avatar
Laurent Aimar committed
834
    /* +11 -> avoid null value with non null dts/pts */
Laurent Aimar's avatar
Laurent Aimar committed
835
    if( p_block->i_dts > 0 )
Laurent Aimar's avatar
Laurent Aimar committed
836
837
    {
        p_block->i_dts =
838
839
            input_ClockGetTS( p_input, &p_pgrm->clock,
                              ( p_block->i_dts + 11 ) * 9 / 100 ) + i_delay;
Laurent Aimar's avatar
Laurent Aimar committed
840
    }
Laurent Aimar's avatar
Laurent Aimar committed
841
    if( p_block->i_pts > 0 )
Laurent Aimar's avatar
Laurent Aimar committed
842
843
    {
        p_block->i_pts =
844
845
            input_ClockGetTS( p_input, &p_pgrm->clock,
                              ( p_block->i_pts + 11 ) * 9 / 100 ) + i_delay;
846
847
848
849
850
851
852
    }
    if ( es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) )
    {
        mtime_t current_date = mdate();
        if( !p_block->i_pts
               || p_block->i_pts > current_date + 10000000
               || current_date > p_block->i_pts )
853
        {
854
855
856
857
            /* ETSI EN 300 472 Annex A : do not take into account the PTS
             * for teletext streams. */
            p_block->i_pts = current_date + 400000
                               + p_input->i_pts_delay + i_delay;
858
        }
859
    }
gbazin's avatar
   
gbazin committed
860

Laurent Aimar's avatar
Laurent Aimar committed
861
862
863
    p_block->i_rate = p_input->i_rate;

    /* TODO handle mute */
864
865
    if( es->p_dec && ( es->fmt.i_cat != AUDIO_ES ||
        p_input->i_rate == INPUT_RATE_DEFAULT ) )
866
    {
Laurent Aimar's avatar
Laurent Aimar committed
867
        input_DecoderDecode( es->p_dec, p_block );
868
869
870
    }
    else
    {
871
        block_Release( p_block );
872
    }
gbazin's avatar
   
gbazin committed
873

874
875
876
877
878
879
    return VLC_SUCCESS;
}

/*****************************************************************************
 * EsOutDel:
 *****************************************************************************/
880
static void EsOutDel( es_out_t *out, es_out_id_t *es )
881
882
883
{
    es_out_sys_t *p_sys = out->p_sys;

Laurent Aimar's avatar
Laurent Aimar committed
884
885
886
887
    /* We don't try to reselect */
    if( es->p_dec )
        EsUnselect( out, es, es->p_pgrm == p_sys->p_pgrm );

888
889
890
    if( es->p_pgrm == p_sys->p_pgrm )
        EsOutESVarUpdate( out, es, VLC_TRUE );

891
892
    TAB_REMOVE( p_sys->i_es, p_sys->es, es );

Laurent Aimar's avatar
Laurent Aimar committed
893
894
895
    es->p_pgrm->i_es--;
    if( es->p_pgrm->i_es == 0 )
    {
896
897
        msg_Warn( p_sys->p_input, "Program doesn't contain anymore ES, "
                  "TODO cleaning ?" );
Laurent Aimar's avatar
Laurent Aimar committed
898
899
900
901
902
903
904
    }

    if( p_sys->p_es_audio == es ) p_sys->p_es_audio = NULL;
    if( p_sys->p_es_video == es ) p_sys->p_es_video = NULL;
    if( p_sys->p_es_sub   == es ) p_sys->p_es_sub   = NULL;

    switch( es->fmt.i_cat )
905
906
907
908
909
910
911
912
913
914
915
    {
        case AUDIO_ES:
            p_sys->i_audio--;
            break;
        case SPU_ES:
            p_sys->i_sub--;
            break;
        case VIDEO_ES:
            p_sys->i_video--;
            break;
    }
916

hartman's avatar
hartman committed
917
918
    if( es->psz_language )
        free( es->psz_language );
919
920
    if( es->psz_language_code )
        free( es->psz_language_code );
921

Laurent Aimar's avatar
Laurent Aimar committed
922
    es_format_Clean( &es->fmt );
923

924
    free( es );
925
926
}

zorglub's avatar
zorglub committed
927
928
929
930
931
932
933
934
/**
 * Control query handler
 *
 * \param out the es_out to control
 * \param i_query A es_out query as defined in include/ninput.h
 * \param args a variable list of arguments for the query
 * \return VLC_SUCCESS or an error code
 */
935
936
937
938
static int EsOutControl( es_out_t *out, int i_query, va_list args )
{
    es_out_sys_t *p_sys = out->p_sys;
    vlc_bool_t  b, *pb;
939
940
941
942
    int         i, *pi;

    es_out_id_t *es;

943
944
    switch( i_query )
    {
945
946
        case ES_OUT_SET_ES_STATE:
            es = (es_out_id_t*) va_arg( args, es_out_id_t * );
947
            b = (vlc_bool_t) va_arg( args, vlc_bool_t );
Laurent Aimar's avatar
Laurent Aimar committed
948
            if( b && es->p_dec == NULL )
949
            {
Laurent Aimar's avatar
Laurent Aimar committed
950
951
                EsSelect( out, es );
                return es->p_dec ? VLC_SUCCESS : VLC_EGENERIC;
952
            }
Laurent Aimar's avatar
Laurent Aimar committed
953
            else if( !b && es->p_dec )
954
            {
Laurent Aimar's avatar
Laurent Aimar committed
955
                EsUnselect( out, es, es->p_pgrm == p_sys->p_pgrm );
956
957
                return VLC_SUCCESS;
            }
Laurent Aimar's avatar
Laurent Aimar committed
958
959
            return VLC_SUCCESS;

960
961
        case ES_OUT_GET_ES_STATE:
            es = (es_out_id_t*) va_arg( args, es_out_id_t * );
962
963
            pb = (vlc_bool_t*) va_arg( args, vlc_bool_t * );

Laurent Aimar's avatar
Laurent Aimar committed
964
            *pb = es->p_dec ? VLC_TRUE : VLC_FALSE;
965
966
967
            return VLC_SUCCESS;

        case ES_OUT_SET_ACTIVE:
968
        {
969
970
            b = (vlc_bool_t) va_arg( args, vlc_bool_t );
            p_sys->b_active = b;
Laurent Aimar's avatar
Laurent Aimar committed
971
            /* Needed ? */
972
            if( b )
Laurent Aimar's avatar
Laurent Aimar committed
973
                var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
974
            return VLC_SUCCESS;
975
        }
976
977
978
979
980
981
982
983

        case ES_OUT_GET_ACTIVE:
            pb = (vlc_bool_t*) va_arg( args, vlc_bool_t * );
            *pb = p_sys->b_active;
            return VLC_SUCCESS;

        case ES_OUT_SET_MODE:
            i = (int) va_arg( args, int );
gbazin's avatar
   
gbazin committed
984
            if( i == ES_OUT_MODE_NONE || i == ES_OUT_MODE_ALL ||
985
                i == ES_OUT_MODE_AUTO || i == ES_OUT_MODE_PARTIAL )
986
987
988
989
990
991
            {
                p_sys->i_mode = i;

                /* Reapply policy mode */
                for( i = 0; i < p_sys->i_es; i++ )
                {
Laurent Aimar's avatar
Laurent Aimar committed
992
                    if( p_sys->es[i]->p_dec )
993
                    {
994
995
                        EsUnselect( out, p_sys->es[i],
                                    p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
                    }
                }
                for( i = 0; i < p_sys->i_es; i++ )
                {
                    EsOutSelect( out, p_sys->es[i], VLC_FALSE );
                }
                return VLC_SUCCESS;
            }
            return VLC_EGENERIC;

        case ES_OUT_GET_MODE:
            pi = (int*) va_arg( args, int* );
            *pi = p_sys->i_mode;
            return VLC_SUCCESS;

        case ES_OUT_SET_ES:
            es = (es_out_id_t*) va_arg( args, es_out_id_t * );
Laurent Aimar's avatar
Laurent Aimar committed
1013
            /* Special case NULL, NULL+i_cat */
1014
1015
1016
1017
            if( es == NULL )
            {
                for( i = 0; i < p_sys->i_es; i++ )
                {
Laurent Aimar's avatar
Laurent Aimar committed
1018
1019
1020
1021
1022
1023
1024
1025
1026
                    if( p_sys->es[i]->p_dec )
                        EsUnselect( out, p_sys->es[i],
                                    p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
                }
            }
            else if( es == (es_out_id_t*)((uint8_t*)NULL+AUDIO_ES) )
            {
                for( i = 0; i < p_sys->i_es; i++ )
                {
1027
1028
1029
1030
                    if( p_sys->es[i]->p_dec &&
                        p_sys->es[i]->fmt.i_cat == AUDIO_ES )
                        EsUnselect( out, p_sys->es[i],
                                    p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
Laurent Aimar's avatar
Laurent Aimar committed
1031
1032
1033
1034
1035
1036
                }
            }
            else if( es == (es_out_id_t*)((uint8_t*)NULL+VIDEO_ES) )
            {
                for( i = 0; i < p_sys->i_es; i++ )
                {
1037
1038
1039
1040
                    if( p_sys->es[i]->p_dec &&
                        p_sys->es[i]->fmt.i_cat == VIDEO_ES )
                        EsUnselect( out, p_sys->es[i],
                                    p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
Laurent Aimar's avatar
Laurent Aimar committed
1041
1042
1043
1044
1045
1046
                }
            }
            else if( es == (es_out_id_t*)((uint8_t*)NULL+SPU_ES) )
            {
                for( i = 0; i < p_sys->i_es; i++ )
                {
1047
1048
1049
1050
                    if( p_sys->es[i]->p_dec &&
                        p_sys->es[i]->fmt.i_cat == SPU_ES )
                        EsUnselect( out, p_sys->es[i],
                                    p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
1051
1052
1053
1054
                }
            }
            else
            {
Laurent Aimar's avatar
Laurent Aimar committed
1055
1056
1057
1058
1059
1060
1061
1062
                for( i = 0; i < p_sys->i_es; i++ )
                {
                    if( es == p_sys->es[i] )
                    {
                        EsOutSelect( out, es, VLC_TRUE );
                        break;
                    }
                }
1063
            }
1064
1065
            return VLC_SUCCESS;

1066
        case ES_OUT_SET_PCR:
1067
        case ES_OUT_SET_GROUP_PCR:
1068
        {
Laurent Aimar's avatar
Laurent Aimar committed
1069
1070
1071
            es_out_pgrm_t *p_pgrm = NULL;
            int            i_group = 0;
            int64_t        i_pcr;
1072

1073
1074
            if( i_query == ES_OUT_SET_PCR )
            {
Laurent Aimar's avatar
Laurent Aimar committed
1075
                p_pgrm = p_sys->p_pgrm;
1076
1077
1078
            }
            else
            {
Laurent Aimar's avatar
Laurent Aimar committed
1079
1080
1081
                int i;
                i_group = (int)va_arg( args, int );
                for( i = 0; i < p_sys->i_pgrm; i++ )
1082
                {
Laurent Aimar's avatar
Laurent Aimar committed
1083
1084
1085
1086
1087
                    if( p_sys->pgrm[i]->i_id == i_group )
                    {
                        p_pgrm = p_sys->pgrm[i];
                        break;
                    }
1088
                }
1089
            }
Laurent Aimar's avatar
Laurent Aimar committed
1090
1091
1092
            if( p_pgrm == NULL )
                p_pgrm = EsOutProgramAdd( out, i_group );   /* Create it */

1093
            i_pcr = (int64_t)va_arg( args, int64_t );
1094
            /* search program */
1095
1096
1097
            /* 11 is a vodoo trick to avoid non_pcr*9/100 to be null */
            input_ClockSetPCR( p_sys->p_input, &p_pgrm->clock,
                               (i_pcr + 11 ) * 9 / 100);
1098
1099
1100
1101
            return VLC_SUCCESS;
        }

        case ES_OUT_RESET_PCR:
Laurent Aimar's avatar
Laurent Aimar committed
1102
            for( i = 0; i < p_sys->i_pgrm; i++ )
1103
            {
Laurent Aimar's avatar
Laurent Aimar committed
1104
1105
                p_sys->pgrm[i]->clock.i_synchro_state =  SYNCHRO_REINIT;
                p_sys->pgrm[i]->clock.last_pts = 0;
1106
1107
1108
            }
            return VLC_SUCCESS;

1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
        case ES_OUT_GET_TS:
            if( p_sys->p_pgrm )
            {
                int64_t i_ts = (int64_t)va_arg( args, int64_t );
                int64_t *pi_ts = (int64_t *)va_arg( args, int64_t * );
                *pi_ts = input_ClockGetTS( p_sys->p_input,
                                           &p_sys->p_pgrm->clock,
                                           ( i_ts + 11 ) * 9 / 100 );
                return VLC_SUCCESS;
            }
            return VLC_EGENERIC;

Laurent Aimar's avatar
Laurent Aimar committed
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
        case ES_OUT_GET_GROUP:
            pi = (int*) va_arg( args, int* );
            if( p_sys->p_pgrm )
                *pi = p_sys->p_pgrm->i_id;
            else
                *pi = -1;    /* FIXME */
            return VLC_SUCCESS;

        case ES_OUT_SET_GROUP:
        {
            int j;
            i = (int) va_arg( args, int );
            for( j = 0; j < p_sys->i_pgrm; j++ )
            {
                es_out_pgrm_t *p_pgrm = p_sys->pgrm[j];
                if( p_pgrm->i_id == i )
                {
                    EsOutProgramSelect( out, p_pgrm );
                    return VLC_SUCCESS;
                }
            }
            return VLC_EGENERIC;
        }

1145
1146
1147
1148
        case ES_OUT_SET_FMT:
        {
            /* This ain't pretty but is need by some demuxers (eg. Ogg )
             * to update the p_extra data */
Eric Petit's avatar
Eric Petit committed
1149
            es_format_t *p_fmt;
1150
            es = (es_out_id_t*) va_arg( args, es_out_id_t * );
Eric Petit's avatar
Eric Petit committed
1151
            p_fmt = (es_format_t*) va_arg( args, es_format_t * );
1152
            if( es == NULL ) return VLC_EGENERIC;
1153
1154
1155
1156
1157
1158
1159

            if( p_fmt->i_extra )
            {
                es->fmt.i_extra = p_fmt->i_extra;
                es->fmt.p_extra = realloc( es->fmt.p_extra, p_fmt->i_extra );
                memcpy( es->fmt.p_extra, p_fmt->p_extra, p_fmt->i_extra );

1160
1161
                if( !es->p_dec ) return VLC_SUCCESS;

1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
                es->p_dec->fmt_in.i_extra = p_fmt->i_extra;
                es->p_dec->fmt_in.p_extra =
                    realloc( es->p_dec->fmt_in.p_extra, p_fmt->i_extra );
                memcpy( es->p_dec->fmt_in.p_extra,
                        p_fmt->p_extra, p_fmt->i_extra );
            }

            return VLC_SUCCESS;
        }

1172
1173
1174
1175
1176
        default:
            msg_Err( p_sys->p_input, "unknown query in es_out_Control" );
            return VLC_EGENERIC;
    }
}
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
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
1219

/****************************************************************************
 * LanguageGetName: try to expend iso639 into plain name
 ****************************************************************************/
static char *LanguageGetName( const char *psz_code )
{
    const iso639_lang_t *pl;

    if( psz_code == NULL )
    {
        return strdup( "" );
    }

    if( strlen( psz_code ) == 2 )
    {
        pl = GetLang_1( psz_code );
    }
    else if( strlen( psz_code ) == 3 )
    {
        pl = GetLang_2B( psz_code );
        if( !strcmp( pl->psz_iso639_1, "??" ) )
        {
            pl = GetLang_2T( psz_code );
        }
    }
    else
    {
        return strdup( psz_code );
    }

    if( !strcmp( pl->psz_iso639_1, "??" ) )
    {
       return strdup( psz_code );
    }
    else
    {
        if( *pl->psz_native_name )
        {
            return strdup( pl->psz_native_name );
        }
        return strdup( pl->psz_eng_name );
    }
}
1220

1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
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
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
/* Get a 2 char code */
static char *LanguageGetCode( const char *psz_lang )
{
    const iso639_lang_t *pl;

    if( psz_lang == NULL || *psz_lang == '\0' )
        return strdup("??");

    for( pl = p_languages; pl->psz_iso639_1 != NULL; pl++ )
    {
        if( !strcasecmp( pl->psz_eng_name, psz_lang ) ||
            !strcasecmp( pl->psz_native_name, psz_lang ) ||
            !strcasecmp( pl->psz_iso639_1, psz_lang ) ||
            !strcasecmp( pl->psz_iso639_2T, psz_lang ) ||
            !strcasecmp( pl->psz_iso639_2B, psz_lang ) )
            break;
    }

    if( pl->psz_iso639_1 != NULL )
        return strdup( pl->psz_iso639_1 );

    return strdup("??");
}

static char **LanguageSplit( const char *psz_langs )
{
    char *psz_dup;
    char *psz_parser;
    char **ppsz = NULL;
    int i_psz = 0;

    if( psz_langs == NULL )
        return NULL;

    psz_parser = psz_dup = strdup(psz_langs);

    while( psz_parser && *psz_parser )
    {
        char *psz;
        char *psz_code;

        psz = strchr(psz_parser, ',' );
        if( psz )
        {
            *psz++ = '\0';
        }

        psz_code = LanguageGetCode( psz_parser );
        if( strcmp( psz_code, "??" ) )
        {
            TAB_APPEND( i_psz, ppsz, psz_code );
        }

        psz_parser = psz;
    }

    if( i_psz )
    {
        TAB_APPEND( i_psz, ppsz, NULL );
    }

    return ppsz;
}

static int LanguageArrayIndex( char **ppsz_langs, char *psz_lang )
{
    int i;

    if( !ppsz_langs || !psz_lang )
        return -1;

    for( i = 0; ppsz_langs[i]; i++ )
        if( !strcasecmp( ppsz_langs[i], psz_lang ) )
            return i;

    return -1;
}

1299
1300
1301
1302
1303
1304
/****************************************************************************
 * EsOutAddInfo:
 * - add meta info to the playlist item
 ****************************************************************************/
static void EsOutAddInfo( es_out_t *out, es_out_id_t *es )
{
gbazin's avatar
gbazin committed
1305
1306
1307
1308
    es_out_sys_t   *p_sys = out->p_sys;
    input_thread_t *p_input = p_sys->p_input;
    es_format_t    *fmt = &es->fmt;
    char           *psz_cat;
1309
1310

    /* Add stream info */
gbazin's avatar
gbazin committed
1311
    asprintf( &psz_cat, _("Stream %d"), out->p_sys->i_id - 1 );
1312
1313
1314
1315
1316

    input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Codec"),
                   "%.4s", (char*)&fmt->i_codec );

    input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Language"),
hartman's avatar
hartman committed
1317
                   "%s", es->psz_language );
1318
1319
1320
1321