input.c 54.6 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
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
 *****************************************************************************
 * Copyright (C) 1998, 1999, 2000 VideoLAN
 *
 * Authors:
 *
 * 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-1307, USA.
24
 *****************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
25

26
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
27
 * Preamble
28
 *****************************************************************************/
29
30
#include "defs.h"

31
#include <errno.h>                                                  /* errno */
32
33
#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
#include <sys/uio.h>                                            /* "input.h" */
34
#include <string.h>                                            /* strerror() */
Michel Kaempf's avatar
Michel Kaempf committed
35

36
37
#include <stdlib.h>                                                /* free() */
#include <netinet/in.h>                                           /* ntohs() */
Michel Kaempf's avatar
Michel Kaempf committed
38
39

#include "config.h"
40
41
#include "common.h"
#include "threads.h"
Michel Kaempf's avatar
Michel Kaempf committed
42
43
#include "mtime.h"
#include "intf_msg.h"
44
#include "plugins.h"
Michel Kaempf's avatar
Michel Kaempf committed
45
46
47
48
49
50
51
52
53
54
#include "debug.h"

#include "input.h"
#include "input_psi.h"
#include "input_pcr.h"
#include "input_netlist.h"
#include "decoder_fifo.h"
#include "input_file.h"
#include "input_network.h"

55
#include "audio_output.h"                                   /* aout_thread_t */
56

Michel Lespinasse's avatar
   
Michel Lespinasse committed
57
58
#include "audio_decoder.h"        /* audiodec_t (for audio_decoder_thread.h) */
#include "audio_decoder_thread.h"                           /* adec_thread_t */
59

60
61
62
#include "ac3_decoder.h"              /* ac3dec_t (for ac3_decoder_thread.h) */
#include "ac3_decoder_thread.h"                           /* ac3dec_thread_t */

63
64
65
66
67
68
69
70
71
72
73
#include "video.h"                          /* picture_t (for video_output.h) */
#include "video_output.h"                                   /* vout_thread_t */

#include "vdec_idct.h"                     /* dctelem_t (for video_parser.h) */
#include "vdec_motion.h"                  /* f_motion_t (for video_parser.h) */
#include "vpar_blocks.h"                /* macroblock_t (for video_parser.h) */
#include "vpar_headers.h"                 /* sequence_t (for video_parser.h) */
#include "vpar_synchro.h"            /* video_synchro_t (for video_parser.h) */
#include "video_parser.h"                                   /* vpar_thread_t */

#include "spu_decoder.h"                                  /* spudec_thread_t */
Michel Lespinasse's avatar
Yop,    
Michel Lespinasse committed
74
75

#include "main.h"
Michel Kaempf's avatar
Michel Kaempf committed
76

77
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
78
 * Local prototypes
79
 *****************************************************************************/
80
81
82
83
84
85
86
87
static void RunThread   ( input_thread_t *p_input );
static void ErrorThread ( input_thread_t *p_input );
static void EndThread   ( input_thread_t *p_input );

static __inline__ int   input_ReadPacket( input_thread_t *p_input );
static __inline__ void  input_SortPacket( input_thread_t *p_input,
                                          ts_packet_t *ts_packet );
static __inline__ void  input_DemuxTS( input_thread_t *p_input,
Michel Kaempf's avatar
Michel Kaempf committed
88
                                       ts_packet_t *ts_packet,
89
90
91
92
93
94
95
96
97
                                       es_descriptor_t *es_descriptor );
static __inline__ void  input_DemuxPES( input_thread_t *p_input,
                                        ts_packet_t *ts_packet,
                                        es_descriptor_t *p_es_descriptor,
                                        boolean_t b_unit_start, boolean_t b_packet_lost );
static __inline__ void  input_DemuxPSI( input_thread_t *p_input,
                                        ts_packet_t *ts_packet,
                                        es_descriptor_t *p_es_descriptor,
                                        boolean_t b_unit_start, boolean_t b_packet_lost );
Michel Kaempf's avatar
Michel Kaempf committed
98

99
/*****************************************************************************
100
 * input_CreateThread: creates a new input thread
101
 *****************************************************************************
102
103
104
105
 * This function creates a new input, and returns a pointer
 * to its description. On error, it returns NULL.
 * If pi_status is NULL, then the function will block until the thread is ready.
 * If not, it will be updated using one of the THREAD_* constants.
106
 *****************************************************************************/
107
108
input_thread_t *input_CreateThread ( int i_method, char *psz_source, int i_port, int i_vlan,
                                     p_vout_thread_t p_vout, p_aout_thread_t p_aout, int *pi_status )
Michel Kaempf's avatar
Michel Kaempf committed
109
{
110
111
112
113
    input_thread_t *    p_input;                        /* thread descriptor */
    int                 i_status;                           /* thread status */
    int                 i_index;          /* index for tables initialization */

114
115
116
117
    /* Allocate descriptor */
    intf_DbgMsg("\n");
    p_input = (input_thread_t *)malloc( sizeof(input_thread_t) );
    if( p_input == NULL )
Michel Kaempf's avatar
Michel Kaempf committed
118
    {
119
        intf_ErrMsg("error: %s\n", strerror(ENOMEM));
Michel Kaempf's avatar
Michel Kaempf committed
120
121
        return( NULL );
    }
122
123
124
125
126
127
128
129
130
131
132
133
134

    /* Initialize thread properties */
    p_input->b_die              = 0;
    p_input->b_error            = 0;
    p_input->pi_status          = (pi_status != NULL) ? pi_status : &i_status;
    *p_input->pi_status         = THREAD_CREATE;

    /* Initialize input method description */
    p_input->i_method           = i_method;
    p_input->psz_source         = psz_source;
    p_input->i_port             = i_port;
    p_input->i_vlan             = i_vlan;
    switch( i_method )
Michel Kaempf's avatar
Michel Kaempf committed
135
    {
136
    case INPUT_METHOD_TS_FILE:                               /* file methods */
137
138
139
140
        p_input->p_Open =   input_FileOpen;
        p_input->p_Read =   input_FileRead;
        p_input->p_Close =  input_FileClose;
        break;
141
    case INPUT_METHOD_TS_VLAN_BCAST:                  /* vlan network method */
142
143
144
145
        if( !p_main->b_vlans )
        {
            intf_ErrMsg("error: vlans are not activated\n");
            free( p_input );
146
147
            return( NULL );
        }
148
        /* ... pass through */
149
    case INPUT_METHOD_TS_UCAST:                           /* network methods */
150
151
152
153
154
155
156
157
158
    case INPUT_METHOD_TS_MCAST:
    case INPUT_METHOD_TS_BCAST:
        p_input->p_Open =   input_NetworkOpen;
        p_input->p_Read =   input_NetworkRead;
        p_input->p_Close =  input_NetworkClose;
        break;
    default:
        intf_ErrMsg("error: unknow input method\n");
        free( p_input );
159
160
        return( NULL );
        break;
Michel Kaempf's avatar
Michel Kaempf committed
161
162
    }

163
164
    /* Initialize stream description */
    for( i_index = 0; i_index < INPUT_MAX_ES; i_index++ )
Michel Kaempf's avatar
Michel Kaempf committed
165
    {
166
        p_input->p_es[i_index].i_id = EMPTY_PID;
167
        p_input->pp_selected_es[i_index] = NULL;
Michel Kaempf's avatar
Michel Kaempf committed
168
    }
169

170
171
    /* Initialize default settings for spawned decoders */
    p_input->p_aout                     = p_aout;
172
    p_input->p_vout                     = p_vout;
Michel Kaempf's avatar
Michel Kaempf committed
173

174
175
#ifdef STATS
    /* Initialize statistics */
176
    p_input->c_loops                    = 0;
177
178
179
180
    p_input->c_bytes                    = 0;
    p_input->c_payload_bytes            = 0;
    p_input->c_packets_read             = 0;
    p_input->c_packets_trashed          = 0;
Michel Kaempf's avatar
Michel Kaempf committed
181
182
#endif

183
184
    /* Initialize PSI and PCR decoders */
    if( input_PsiInit( p_input ) )
Michel Kaempf's avatar
Michel Kaempf committed
185
186
187
188
189
    {
        free( p_input );
        return( NULL );
    }

190
    if( input_PcrInit( p_input ) )
Michel Kaempf's avatar
Michel Kaempf committed
191
    {
192
        input_PsiEnd( p_input );
Michel Kaempf's avatar
Michel Kaempf committed
193
194
195
196
        free( p_input );
        return( NULL );
    }

197
198
    /* Initialize netlists */
    if( input_NetlistInit( p_input ) )
Michel Kaempf's avatar
Michel Kaempf committed
199
    {
200
201
        input_PsiEnd( p_input );
        input_PcrEnd( p_input );
Michel Kaempf's avatar
Michel Kaempf committed
202
203
204
205
        free( p_input );
        return( NULL );
    }

206
207
    intf_DbgMsg("configuration: method=%d, source=%s, port=%d, vlan=%d\n",
                i_method, psz_source, i_port, i_vlan );
Michel Kaempf's avatar
Michel Kaempf committed
208
209

    /* Let the appropriate method open the socket. */
210
    if( p_input->p_Open( p_input ) )
Michel Kaempf's avatar
Michel Kaempf committed
211
    {
212
213
214
        input_NetlistEnd( p_input );
        input_PsiEnd( p_input );
        input_PcrEnd( p_input );
Michel Kaempf's avatar
Michel Kaempf committed
215
216
217
218
219
        free( p_input );
        return( NULL );
    }

    /* Create thread and set locks. */
220
221
222
    vlc_mutex_init( &p_input->netlist.lock );
    vlc_mutex_init( &p_input->programs_lock );
    vlc_mutex_init( &p_input->es_lock );
223
    if( vlc_thread_create(&p_input->thread_id, "input", (void *) RunThread, (void *) p_input) )
Michel Kaempf's avatar
Michel Kaempf committed
224
    {
225
226
227
228
229
        intf_ErrMsg("error: %s\n", strerror(errno) );
        p_input->p_Close( p_input );
        input_NetlistEnd( p_input );;
        input_PsiEnd( p_input );
        input_PcrEnd( p_input );
Michel Kaempf's avatar
Michel Kaempf committed
230
231
232
        free( p_input );
        return( NULL );
    }
233

234
    intf_Msg("Input initialized\n");
235

236
237
238
239
    /* If status is NULL, wait until the thread is created */
    if( pi_status == NULL )
    {
        do
240
        {
241
            msleep( THREAD_SLEEP );
242
        }while( (i_status != THREAD_READY) && (i_status != THREAD_ERROR)
243
244
245
                && (i_status != THREAD_FATAL) );
        if( i_status != THREAD_READY )
        {
246
247
            return( NULL );
        }
248
    }
Michel Kaempf's avatar
Michel Kaempf committed
249
250
251
    return( p_input );
}

252
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
253
 * input_DestroyThread: mark an input thread as zombie
254
 *****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
255
 * This function should not return until the thread is effectively cancelled.
256
 *****************************************************************************/
257
void input_DestroyThread( input_thread_t *p_input, int *pi_status )
Michel Kaempf's avatar
Michel Kaempf committed
258
{
259
    int         i_status;                                   /* thread status */
260
261
262

    /* Set status */
    p_input->pi_status = (pi_status != NULL) ? pi_status : &i_status;
263
264
    *p_input->pi_status = THREAD_DESTROY;

265
266
    /* Request thread destruction */
    p_input->b_die = 1;
Michel Kaempf's avatar
Michel Kaempf committed
267

268
269
270
271
272
273
    /* If status is NULL, wait until thread has been destroyed */
    if( pi_status == NULL )
    {
        do
        {
            msleep( THREAD_SLEEP );
274
275
        }while( (i_status != THREAD_OVER) && (i_status != THREAD_ERROR)
                && (i_status != THREAD_FATAL) );
276
    }
Michel Kaempf's avatar
Michel Kaempf committed
277
278
279
}

#if 0
280
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
281
 * input_OpenAudioStream: open an audio stream
282
 *****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
283
284
 * This function spawns an audio decoder and plugs it on the audio output
 * thread.
285
 *****************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
286
287
int input_OpenAudioStream( input_thread_t *p_input, int i_id )
{
288
    /* XXX?? */
Michel Kaempf's avatar
Michel Kaempf committed
289
290
}

291
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
292
 * input_CloseAudioStream: close an audio stream
293
 *****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
294
 * This function destroys an audio decoder.
295
 *****************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
296
297
void input_CloseAudioStream( input_thread_t *p_input, int i_id )
{
298
    /* XXX?? */
Michel Kaempf's avatar
Michel Kaempf committed
299
300
}

301
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
302
 * input_OpenVideoStream: open a video stream
303
 *****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
304
 * This function spawns a video decoder and plugs it on a video output thread.
305
306
 *****************************************************************************/
int input_OpenVideoStream( input_thread_t *p_input,
Michel Kaempf's avatar
Michel Kaempf committed
307
308
                           struct vout_thread_s *p_vout, struct video_cfg_s * p_cfg )
{
309
    /* XXX?? */
Michel Kaempf's avatar
Michel Kaempf committed
310
311
}

312
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
313
 * input_CloseVideoStream: close a video stream
314
 *****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
315
 * This function destroys an video decoder.
316
 *****************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
317
318
void input_CloseVideoStream( input_thread_t *p_input, int i_id )
{
319
    /* XXX?? */
Michel Kaempf's avatar
Michel Kaempf committed
320
321
322
323
324
}
#endif

/* following functions are local */

325
/*****************************************************************************
326
 * InitThread: initialize input thread
327
 *****************************************************************************
328
329
330
 * This function is called from RunThread and performs the second step of the
 * initialization. It returns 0 on success. Note that the thread's flag are not
 * modified inside this function.
331
 *****************************************************************************/
332
333
334
335
static int InitThread( input_thread_t *p_input )
{
    /* Mark thread as running and return */
    intf_DbgMsg("\n");
336
337
338
    *p_input->pi_status =        THREAD_READY;
    intf_DbgMsg("thread ready\n");
    return( 0 );
339
340
}

341
/*****************************************************************************
342
 * RunThread: main thread loop
343
 *****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
344
 * Thread in charge of processing the network packets and demultiplexing.
345
 *****************************************************************************/
346
static void RunThread( input_thread_t *p_input )
Michel Kaempf's avatar
Michel Kaempf committed
347
{
348
349
    /*
     * Initialize thread and free configuration
350
351
352
353
     */
    p_input->b_error = InitThread( p_input );
    if( p_input->b_error )
    {
354
355
        free( p_input );                               /* destroy descriptor */
        return;
356
357
358
359
360
361
    }

    /*
     * Main loop
     */
    intf_DbgMsg("\n");
362
    while( !p_input->b_die && !p_input->b_error )
Michel Kaempf's avatar
Michel Kaempf committed
363
364
365
366
    {
        /* Scatter read the UDP packet from the network or the file. */
        if( (input_ReadPacket( p_input )) == (-1) )
        {
367
            /* FIXME??: Normally, a thread can't kill itself, but we don't have
Michel Kaempf's avatar
Michel Kaempf committed
368
             * any method in case of an error condition ... */
369
            p_input->b_error = 1;
Michel Kaempf's avatar
Michel Kaempf committed
370
371
        }

Christophe Massiot's avatar
Christophe Massiot committed
372
#ifdef STATS
Michel Kaempf's avatar
Michel Kaempf committed
373
374
375
376
        p_input->c_loops++;
#endif
    }

377
378
379
    /*
     * Error loop
     */
380
381
382
383
384
    if( p_input->b_error )
    {
        ErrorThread( p_input );
    }

385
    /* End of thread */
386
    EndThread( p_input );
387
    intf_DbgMsg("thread end\n");
Michel Kaempf's avatar
Michel Kaempf committed
388
389
}

390

391
/*****************************************************************************
392
 * ErrorThread: RunThread() error loop
393
394
395
 *****************************************************************************
 * This function is called when an error occured during thread main's loop.
 *****************************************************************************/
396
397
static void ErrorThread( input_thread_t *p_input )
{
398
399
    /* Wait until a `die' order */
    intf_DbgMsg("\n");
400
401
    while( !p_input->b_die )
    {
402
403
        /* Sleep a while */
        msleep( VOUT_IDLE_SLEEP );
404
405
406
    }
}

407
/*****************************************************************************
408
 * EndThread: end the input thread
409
 *****************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
410
static void EndThread( input_thread_t * p_input )
411
{
412
413
    int *       pi_status;                                  /* threas status */
    int         i_es_loop;                                       /* es index */
414
415
416

    /* Store status */
    intf_DbgMsg("\n");
417
418
    pi_status = p_input->pi_status;
    *pi_status = THREAD_END;
419

420
421
    /* Close input method */
    p_input->p_Close( p_input );
422

423
    /* Destroy all decoder threads */
424
425
    for( i_es_loop = 0;
         (i_es_loop < INPUT_MAX_ES) && (p_input->pp_selected_es[i_es_loop] != NULL) ;
426
         i_es_loop++ )
427
    {
428
        switch( p_input->pp_selected_es[i_es_loop]->i_type )
429
        {
430
431
        case MPEG1_VIDEO_ES:
        case MPEG2_VIDEO_ES:
432
#ifdef OLD_DECODER
433
            vdec_DestroyThread( (vdec_thread_t*)(p_input->pp_selected_es[i_es_loop]->p_dec) /*, NULL */ );
434
#else
435
            vpar_DestroyThread( (vpar_thread_t*)(p_input->pp_selected_es[i_es_loop]->p_dec) /*, NULL */ );
436
#endif
437
            break;
438
439
440
441
442
443
        case MPEG1_AUDIO_ES:
        case MPEG2_AUDIO_ES:
            adec_DestroyThread( (adec_thread_t*)(p_input->pp_selected_es[i_es_loop]->p_dec) );
            break;
        case AC3_AUDIO_ES:
            ac3dec_DestroyThread( (ac3dec_thread_t *)(p_input->pp_selected_es[i_es_loop]->p_dec) );
444
            break;
445
446
447
        case DVD_SPU_ES:
            spudec_DestroyThread( (spudec_thread_t *)(p_input->pp_selected_es[i_es_loop]->p_dec) );
            break;
448
449
450
        case 0:
            /* Special streams for the PSI decoder, PID 0 and 1 */
            break;
451
452
453
#ifdef DEBUG
        default:
            intf_DbgMsg("error: unknown decoder type %d\n", p_input->pp_selected_es[i_es_loop]->i_type );
454
            break;
455
#endif
456
457
458
        }
    }

459
460
461
462
    input_NetlistEnd( p_input );                            /* clean netlist */
    input_PsiEnd( p_input );                        /* clean PSI information */
    input_PcrEnd( p_input );                        /* clean PCR information */
    free( p_input );                          /* free input_thread structure */
463

464
    /* Update status */
465
    *pi_status = THREAD_OVER;
466
467
}

468
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
469
 * input_ReadPacket: reads a packet from the network or the file
470
 *****************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
static __inline__ int input_ReadPacket( input_thread_t *p_input )
{
    int                 i_base_index; /* index of the first free iovec */
    int                 i_current_index;
    int                 i_packet_size;
#ifdef INPUT_LIFO_TS_NETLIST
    int                 i_meanwhile_released;
    int                 i_currently_removed;
#endif
    ts_packet_t *       p_ts_packet;

    /* In this function, we only care about the TS netlist. PES netlist
     * is for the demultiplexer. */
#ifdef INPUT_LIFO_TS_NETLIST
    i_base_index = p_input->netlist.i_ts_index;

    /* Verify that we still have packets in the TS netlist */
    if( (INPUT_MAX_TS + INPUT_TS_READ_ONCE - 1 - p_input->netlist.i_ts_index) <= INPUT_TS_READ_ONCE )
    {
        intf_ErrMsg("input error: TS netlist is empty !\n");
        return( -1 );
    }

#else /* FIFO netlist */
    i_base_index = p_input->netlist.i_ts_start;
    if( p_input->netlist.i_ts_start + INPUT_TS_READ_ONCE -1 > INPUT_MAX_TS )
    {
        /* The netlist is splitted in 2 parts. We must gather them to consolidate
           the FIFO (we make the loop easily in having the same iovec at the far
           end and in the beginning of netlist_free).
           That's why the netlist is (INPUT_MAX_TS +1) + (INPUT_TS_READ_ONCE -1)
           large. */
        memcpy( p_input->netlist.p_ts_free + INPUT_MAX_TS + 1,
                p_input->netlist.p_ts_free,
                (p_input->netlist.i_ts_start + INPUT_TS_READ_ONCE - 1 - INPUT_MAX_TS)
                  * sizeof(struct iovec) );
    }

    /* Verify that we still have packets in the TS netlist */
    if( ((p_input->netlist.i_ts_end -1 - p_input->netlist.i_ts_start) & INPUT_MAX_TS) <= INPUT_TS_READ_ONCE )
    {
        intf_ErrMsg("input error: TS netlist is empty !\n");
513
        return( -1 );
Michel Kaempf's avatar
Michel Kaempf committed
514
515
516
517
    }
#endif /* FIFO netlist */

    /* Scatter read the buffer. */
518
    i_packet_size = (*p_input->p_Read)( p_input,
Michel Kaempf's avatar
Michel Kaempf committed
519
520
521
522
                           &p_input->netlist.p_ts_free[i_base_index],
                           INPUT_TS_READ_ONCE );
    if( i_packet_size == (-1) )
    {
523
524
525
526
527
528
#if 0
        intf_DbgMsg("Read packet %d %p %d %d\n", i_base_index,
                    &p_input->netlist.p_ts_free[i_base_index],
                    p_input->netlist.i_ts_start,
                    p_input->netlist.i_ts_end);
#endif
Michel Kaempf's avatar
Michel Kaempf committed
529
530
531
532
533
534
535
536
537
        intf_ErrMsg("input error: readv() failed (%s)\n", strerror(errno));
        return( -1 );
    }

    if( i_packet_size == 0 )
    {
        /* No packet has been received, so stop here. */
        return( 0 );
    }
538

Michel Kaempf's avatar
Michel Kaempf committed
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
    /* Demultiplex the TS packets (1..INPUT_TS_READ_ONCE) received. */
    for( i_current_index = i_base_index;
         (i_packet_size -= TS_PACKET_SIZE) >= 0;
         i_current_index++ )
    {
        /* BTW, something REALLY bad could happen if we receive packets with
           a wrong size. */
        p_ts_packet = (ts_packet_t*)(p_input->netlist.p_ts_free[i_current_index].iov_base);
        /* Don't cry :-), we are allowed to do that cast, because initially,
           our buffer was malloc'ed with sizeof(ts_packet_t) */

        /* Find out if we need this packet and demultiplex. */
        input_SortPacket( p_input /* for current PIDs and netlist */,
                          p_ts_packet);
    }

    if( i_packet_size > 0 )
    {
        intf_ErrMsg("input error: wrong size\n");
        return( -1 );
    }

    /* Remove the TS packets we have just filled from the netlist */
#ifdef INPUT_LIFO_TS_NETLIST
    /* We need to take a lock here while we're calculating index positions. */
564
    vlc_mutex_lock( &p_input->netlist.lock );
Michel Kaempf's avatar
Michel Kaempf committed
565
566
567
568
569
570
571
572

    i_meanwhile_released = i_base_index - p_input->netlist.i_ts_index;
    if( i_meanwhile_released )
    {
        /* That's where it becomes funny :-). Since we didn't take locks for
           efficiency reasons, other threads (including ourselves, with
           input_DemuxPacket) might have released packets to the netlist.
           So we have to copy these iovec where they should go.
573

Michel Kaempf's avatar
Michel Kaempf committed
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
           BTW, that explains why the TS netlist is
           (INPUT_MAX_TS +1) + (TS_READ_ONCE -1) large. */

        i_currently_removed = i_current_index - i_base_index;
        if( i_meanwhile_released < i_currently_removed )
        {
            /* Copy all iovecs in that case */
            memcpy( &p_input->netlist.p_ts_free[p_input->netlist.i_ts_index]
                     + i_currently_removed,
                    &p_input->netlist.p_ts_free[p_input->netlist.i_ts_index],
                    i_meanwhile_released * sizeof(struct iovec) );
        }
        else
        {
            /* We have fewer places than items, so we only move
               i_currently_removed of them. */
            memcpy( &p_input->netlist.p_ts_free[i_base_index],
                    &p_input->netlist.p_ts_free[p_input->netlist.i_ts_index],
                    i_currently_removed * sizeof(struct iovec) );
        }

        /* Update i_netlist_index with the information gathered above. */
        p_input->netlist.i_ts_index += i_currently_removed;
    }
    else
    {
        /* Nothing happened. */
        p_input->netlist.i_ts_index = i_current_index;
    }

604
    vlc_mutex_unlock( &p_input->netlist.lock );
Michel Kaempf's avatar
Michel Kaempf committed
605
606
607
608
609
610
611

#else /* FIFO netlist */
    /* & is modulo ; that's where we make the loop. */
    p_input->netlist.i_ts_start = i_current_index & INPUT_MAX_TS;
#endif

#ifdef STATS
612
    p_input->c_packets_read += i_current_index - i_base_index;
Michel Kaempf's avatar
Michel Kaempf committed
613
614
    p_input->c_bytes += (i_current_index - i_base_index) * TS_PACKET_SIZE;
#endif
615
    return( 0 );
Michel Kaempf's avatar
Michel Kaempf committed
616
617
}

618
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
619
 * input_SortPacket: find out whether we need that packet
620
 *****************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
static __inline__ void input_SortPacket( input_thread_t *p_input,
                                         ts_packet_t *p_ts_packet )
{
    int             i_current_pid;
    int             i_es_loop;

    /* Verify that sync_byte, error_indicator and scrambling_control are
       what we expected. */
    if( !(p_ts_packet->buffer[0] == 0x47) || (p_ts_packet->buffer[1] & 0x80) ||
        (p_ts_packet->buffer[3] & 0xc0) )
    {
        intf_DbgMsg("input debug: invalid TS header (%p)\n", p_ts_packet);
    }
    else
    {
        /* Get the PID of the packet. Note that ntohs is needed, for endianness
           purposes (see man page). */
        i_current_pid = U16_AT(&p_ts_packet->buffer[1]) & 0x1fff;

640
641
        //intf_DbgMsg("input debug: pid %d received (%p)\n",
        //            i_current_pid, p_ts_packet);
Michel Kaempf's avatar
Michel Kaempf committed
642
643

        /* Lock current ES state. */
644
        vlc_mutex_lock( &p_input->es_lock );
645

646
    /* Verify that we actually want this PID. */
Michel Kaempf's avatar
Michel Kaempf committed
647
648
649
650
651
652
653
654
655
656
657
658
        for( i_es_loop = 0; i_es_loop < INPUT_MAX_SELECTED_ES; i_es_loop++ )
        {
            if( p_input->pp_selected_es[i_es_loop] != NULL)
            {
                if( (*p_input->pp_selected_es[i_es_loop]).i_id
                     == i_current_pid )
                {
                    /* Don't need the lock anymore, since the value pointed
                       out by p_input->pp_selected_es[i_es_loop] can only be
                       modified from inside the input_thread (by the PSI
                       decoder): interface thread is only allowed to modify
                       the pp_selected_es table */
659
                    vlc_mutex_unlock( &p_input->es_lock );
Michel Kaempf's avatar
Michel Kaempf committed
660
661
662
663
664

                    /* We're interested. Pass it to the demultiplexer. */
                    input_DemuxTS( p_input, p_ts_packet,
                                   p_input->pp_selected_es[i_es_loop] );
                    return;
665
                }
Michel Kaempf's avatar
Michel Kaempf committed
666
667
668
669
670
671
672
            }
            else
            {
                /* pp_selected_es should not contain any hole. */
                break;
            }
        }
673
        vlc_mutex_unlock( &p_input->es_lock );
Michel Kaempf's avatar
Michel Kaempf committed
674
675
676
677
    }

    /* We weren't interested in receiving this packet. Give it back to the
       netlist. */
678
679
    //intf_DbgMsg("SortPacket: freeing unwanted TS %p (pid %d)\n", p_ts_packet,
    //                 U16_AT(&p_ts_packet->buffer[1]) & 0x1fff);
Michel Kaempf's avatar
Michel Kaempf committed
680
681
    input_NetlistFreeTS( p_input, p_ts_packet );
#ifdef STATS
682
    p_input->c_packets_trashed++;
Michel Kaempf's avatar
Michel Kaempf committed
683
684
685
#endif
}

686
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
687
 * input_DemuxTS: first step of demultiplexing: the TS header
688
 *****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
689
 * Stream must also only contain PES and PSI, so PID must have been filtered
690
 *****************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
691
692
693
694
695
static __inline__ void input_DemuxTS( input_thread_t *p_input,
                                      ts_packet_t *p_ts_packet,
                                      es_descriptor_t *p_es_descriptor )
{
    int         i_dummy;
696
697
698
699
700
    boolean_t   b_adaption;                     /* Adaption field is present */
    boolean_t   b_payload;                         /* Packet carries payload */
    boolean_t   b_unit_start;          /* A PSI or a PES start in the packet */
    boolean_t   b_trash = 0;                 /* Must the packet be trashed ? */
    boolean_t   b_lost = 0;                     /* Was there a packet lost ? */
Michel Kaempf's avatar
Michel Kaempf committed
701
702
703
704
705
706
707

    ASSERT(p_input);
    ASSERT(p_ts_packet);
    ASSERT(p_es_descriptor);

#define p (p_ts_packet->buffer)

708
709
    //intf_DbgMsg("input debug: TS-demultiplexing packet %p, pid %d, number %d\n",
    //            p_ts_packet, U16_AT(&p[1]) & 0x1fff, p[3] & 0x0f);
Michel Kaempf's avatar
Michel Kaempf committed
710
711
712
713
714
715
716
717
718
719

#ifdef STATS
    p_es_descriptor->c_packets++;
    p_es_descriptor->c_bytes += TS_PACKET_SIZE;
#endif

    /* Extract flags values from TS common header. */
    b_unit_start = (p[1] & 0x40);
    b_adaption = (p[3] & 0x20);
    b_payload = (p[3] & 0x10);
720

Michel Kaempf's avatar
Michel Kaempf committed
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
    /* Extract adaption field informations if any */
    if( !b_adaption )
    {
        /* We don't have any adaptation_field, so payload start immediately
         after the 4 byte TS header */
        p_ts_packet->i_payload_start = 4;
    }
    else
    {
        /* p[4] is adaptation_field_length minus one */
        p_ts_packet->i_payload_start = 5 + p[4];

        /* The adaption field can be limited to the adaptation_field_length byte,
           so that there is nothing to do: skip this possibility */
        if( p[4] )
        {
            /* If the packet has both adaptation_field and payload, adaptation_field
Benoit Steiner's avatar
   
Benoit Steiner committed
738
               cannot be more than 182 bytes long; if there is only an
739
           adaptation_field, it must fill the next 183 bytes. */
Michel Kaempf's avatar
Michel Kaempf committed
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
            if( b_payload ? (p[4] > 182) : (p[4] != 183) )
            {
                intf_DbgMsg("input debug: invalid TS adaptation field (%p)\n",
                            p_ts_packet);
#ifdef STATS
                p_es_descriptor->c_invalid_packets++;
#endif
                b_trash = 1;
            }

            /* No we are sure that the byte containing flags is present: read it */
            else
            {
                /* discontinuity_indicator */
                if( p[5] & 0x80 )
                {
                    intf_DbgMsg("discontinuity_indicator encountered by TS demux " \
                                "(position read: %d, saved: %d)\n", p[5] & 0x80,
                                p_es_descriptor->i_continuity_counter);

                    /* If the PID carries the PCR, there will be a system time-base
                       discontinuity. We let the PCR decoder handle that. */
                    p_es_descriptor->b_discontinuity = 1;
763

Benoit Steiner's avatar
   
Benoit Steiner committed
764
                    /* There also may be a continuity_counter discontinuity:
765
               resynchronise our counter with the one of the stream */
Michel Kaempf's avatar
Michel Kaempf committed
766
767
768
769
770
771
                    p_es_descriptor->i_continuity_counter = (p[3] & 0x0f) - 1;
                }

                /* random_access_indicator */
                p_es_descriptor->b_random |= p[5] & 0x40;

Benoit Steiner's avatar
   
Benoit Steiner committed
772
                /* If this is a PCR_PID, and this TS packet contains a PCR,
773
           we pass it along to the PCR decoder. */
Michel Kaempf's avatar
Michel Kaempf committed
774
775
                if( (p_es_descriptor->b_pcr) && (p[5] & 0x10) )
                {
Benoit Steiner's avatar
   
Benoit Steiner committed
776
                    /* There should be a PCR field in the packet, check if the
777
               adaption field is long enough to carry it */
Michel Kaempf's avatar
Michel Kaempf committed
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
                    if( p[4] >= 7 )
                    {
                        /* Call the PCR decoder */
                        input_PcrDecode( p_input, p_es_descriptor, &p[6] );
                    }
                }
            }
        }
    }

    /* Check the continuity of the stream. */
    i_dummy = ((p[3] & 0x0f) - p_es_descriptor->i_continuity_counter) & 0x0f;
    if( i_dummy == 1 )
    {
        /* Everything is ok, just increase our counter */
        p_es_descriptor->i_continuity_counter++;
    }
    else
    {
        if( !b_payload && i_dummy == 0 )
        {
            /* This is a packet without payload, this is allowed by the draft
               As there is nothing interessant in this packet (except PCR that
               have already been handled), we can trash the packet. */
            intf_DbgMsg("Packet without payload received by TS demux\n");
            b_trash = 1;
        }
        else if( i_dummy <= 0 )
        {
            /* Duplicate packet: mark it as being to be trashed. */
            intf_DbgMsg("Duplicate packet received by TS demux\n");
            b_trash = 1;
        }
Benoit Steiner's avatar
   
Benoit Steiner committed
811
812
813
814
        else if( p_es_descriptor->i_continuity_counter == 0xFF )
        {
            /* This means that the packet is the first one we receive for this
               ES since the continuity counter ranges between 0 and 0x0F
815
               excepts when it has been initialized by the input: Init the
Benoit Steiner's avatar
   
Benoit Steiner committed
816
817
818
819
820
               counter to the correct value. */
            intf_DbgMsg("First packet for PID %d received by TS demux\n",
                        p_es_descriptor->i_id);
            p_es_descriptor->i_continuity_counter = (p[3] & 0x0f);
        }
Michel Kaempf's avatar
Michel Kaempf committed
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
        else
        {
            /* This can indicate that we missed a packet or that the
               continuity_counter wrapped and we received a dup packet: as we
               don't know, do as if we missed a packet to be sure to recover
               from this situation */
            intf_DbgMsg("Packet lost by TS demux: current %d, packet %d\n",
                        p_es_descriptor->i_continuity_counter & 0x0f,
                        p[3] & 0x0f);
            b_lost = 1;
            p_es_descriptor->i_continuity_counter = p[3] & 0x0f;
        }
    }

    /* Trash the packet if it has no payload or if it is bad */
    if( b_trash )
    {
        input_NetlistFreeTS( p_input, p_ts_packet );
#ifdef STATS
840
        p_input->c_packets_trashed++;
Michel Kaempf's avatar
Michel Kaempf committed
841
842
843
844
845
846
847
848
849
850
851
852
#endif
    }
    else
    {
        if( p_es_descriptor->b_psi )
        {
            /* The payload contains PSI tables */
            input_DemuxPSI( p_input, p_ts_packet, p_es_descriptor,
                            b_unit_start, b_lost );
        }
        else
        {
853
            /* The payload carries a PES stream */
Michel Kaempf's avatar
Michel Kaempf committed
854
855
856
857
858
859
860
861
862
863
864
            input_DemuxPES( p_input, p_ts_packet, p_es_descriptor,
                            b_unit_start, b_lost );
        }
    }

#undef p
}




865
866
867
/*****************************************************************************
 * input_DemuxPES:
 *****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
868
 * Gather a PES packet and analyzes its header.
869
 *****************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
870
871
872
873
874
875
876
877
878
879
880
881
static __inline__ void input_DemuxPES( input_thread_t *p_input,
                                       ts_packet_t *p_ts_packet,
                                       es_descriptor_t *p_es_descriptor,
                                       boolean_t b_unit_start,
                                       boolean_t b_packet_lost )
{
    decoder_fifo_t *            p_fifo;
    u8                          i_pes_header_size;
    int                         i_dummy;
    pes_packet_t*               p_last_pes;
    ts_packet_t *               p_ts;
    int                         i_ts_payload_size;
882

Michel Kaempf's avatar
Michel Kaempf committed
883
884
885
886
887
888
889

#define p_pes (p_es_descriptor->p_pes_packet)

    ASSERT(p_input);
    ASSERT(p_ts_packet);
    ASSERT(p_es_descriptor);

890
    //intf_DbgMsg("PES-demultiplexing %p (%p)\n", p_ts_packet, p_pes);
Michel Kaempf's avatar
Michel Kaempf committed
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906

    /* If we lost data, discard the PES packet we are trying to reassemble
       if any and wait for the beginning of a new one in order to synchronise
       again */
    if( b_packet_lost && p_pes != NULL )
    {
        intf_DbgMsg("PES %p trashed because of packet lost\n", p_pes);
        input_NetlistFreePES( p_input, p_pes );
        p_pes = NULL;
    }

    /* If the TS packet contains the begining of a new PES packet, and if we
       were reassembling a PES packet, then the PES should be complete now,
       so parse its header and give it to the decoders */
    if( b_unit_start && p_pes != NULL )
    {
907
        //intf_DbgMsg("End of PES packet %p\n", p_pes);
Michel Kaempf's avatar
Michel Kaempf committed
908

909
        /* Parse the header. The header has a variable length, but in order
Michel Kaempf's avatar
Michel Kaempf committed
910
911
912
913
914
915
916
917
           to improve the algorithm, we will read the 14 bytes we may be
           interested in */
        p_ts = p_pes->p_first_ts;
        i_ts_payload_size = p_ts->i_payload_end - p_ts->i_payload_start;
        i_dummy = 0;

        if(i_ts_payload_size >= PES_HEADER_SIZE)
        {
918
            /* This part of the header entirely fits in the payload of
Michel Kaempf's avatar
Michel Kaempf committed
919
920
921
922
923
924
925
               the first TS packet */
            p_pes->p_pes_header = &(p_ts->buffer[p_ts->i_payload_start]);
        }
        else
        {
            /* This part of the header does not fit in the current TS packet:
               copy the part of the header we are interested in to the
Benoit Steiner's avatar
   
Benoit Steiner committed
926
               p_pes_header_save buffer. The buffer is dynamicly allocated if
927
               needed so it's time expensive but this situation almost never occur. */
Benoit Steiner's avatar
   
Benoit Steiner committed
928
            intf_DbgMsg("Code never tested encountered, WARNING ! (benny)\n");
929
930
            if( !p_pes->p_pes_header_save )
            {
931
                p_pes->p_pes_header_save = malloc(PES_HEADER_SIZE);
932
            }
Benoit Steiner's avatar
   
Benoit Steiner committed
933

Michel Kaempf's avatar
Michel Kaempf committed
934
935
936
937
938
            do
            {
                memcpy(p_pes->p_pes_header_save + i_dummy,
                       &p_ts->buffer[p_ts->i_payload_start], i_ts_payload_size);
                i_dummy += i_ts_payload_size;
939

Michel Kaempf's avatar
Michel Kaempf committed
940
941
942
943
944
                p_ts = p_ts->p_next_ts;
                if(!p_ts)
                {
                  /* The payload of the PES packet is shorter than the 14 bytes
                     we would read. This means that high packet lost occured
945
                     so the PES won't be useful for any decoder. Moreover,
Michel Kaempf's avatar
Michel Kaempf committed
946
947
                     this should never happen so we can trash the packet and
                     exit roughly without regrets */
948
                  intf_DbgMsg("PES packet too short: trashed\n");
Michel Kaempf's avatar
Michel Kaempf committed
949
950
                  input_NetlistFreePES( p_input, p_pes );
                  p_pes = NULL;
951
                  /* Stats XXX?? */
Michel Kaempf's avatar
Michel Kaempf committed
952
953
                  return;
                }
954

Michel Kaempf's avatar
Michel Kaempf committed
955
956
957
958
959
960
961
962
963
964
965
966
967
                i_ts_payload_size = p_ts->i_payload_end - p_ts->i_payload_start;
            }
            while(i_ts_payload_size + i_dummy < PES_HEADER_SIZE);

            /* This last TS packet is partly header, partly payload, so just
               copy the header part */
            memcpy(p_pes->p_pes_header_save + i_dummy,
                   &p_ts->buffer[p_ts->i_payload_start],
                   PES_HEADER_SIZE - i_dummy);

            /* The header must be read in the buffer not in any TS packet */
           p_pes->p_pes_header = p_pes->p_pes_header_save;
        }
968

Michel Kaempf's avatar
Michel Kaempf committed
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
        /* Now we have the part of the PES header we were interested in:
           parse it */

        /* First read the 6 header bytes common to all PES packets:
           use them to test the PES validity */
        if( (p_pes->p_pes_header[0] || p_pes->p_pes_header[1] ||
            (p_pes->p_pes_header[2] != 1)) ||
                                     /* packet_start_code_prefix != 0x000001 */
            ((i_dummy = U16_AT(p_pes->p_pes_header + 4)) &&
             (i_dummy + 6 != p_pes->i_pes_size)) )
                   /* PES_packet_length is set and != total received payload */
        {
          /* Trash the packet and set p_pes to NULL to be sure the next PES
             packet will have its b_data_lost flag set */
          intf_DbgMsg("Corrupted PES packet received: trashed\n");
          input_NetlistFreePES( p_input, p_pes );
          p_pes = NULL;
986
          /* Stats XXX?? */
Michel Kaempf's avatar
Michel Kaempf committed
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
        }
        else
        {
            /* The PES packet is valid. Check its type to test if it may
               carry additional informations in a header extension */
            p_pes->i_stream_id =  p_pes->p_pes_header[3];

            switch( p_pes->i_stream_id )
            {
            case 0xBE:  /* Padding */
            case 0xBC:  /* Program stream map */
            case 0xBF:  /* Private stream 2 */
            case 0xB0:  /* ECM */
            case 0xB1:  /* EMM */
            case 0xFF:  /* Program stream directory */
            case 0xF2:  /* DSMCC stream */
            case 0xF8:  /* ITU-T H.222.1 type E stream */
                /* The payload begins immediatly after the 6 bytes header, so
                   we have finished with the parsing */
                i_pes_header_size = 6;
                break;

            default:
                /* The PES header contains at least 3 more bytes: parse them */
Michel Kaempf's avatar
Michel Kaempf committed
1011
1012
                p_pes->b_data_alignment = p_pes->p_pes_header[6] & 0x04;
                p_pes->b_has_pts = p_pes->p_pes_header[7] & 0x80;
1013
                i_pes_header_size = p_pes->p_pes_header[8] + 9;
Michel Kaempf's avatar
Michel Kaempf committed
1014

Michel Kaempf's avatar
Michel Kaempf committed
1015
1016
1017
1018
                /* Now parse the optional header extensions (in the limit of
                   the 14 bytes */
                if( p_pes->b_has_pts )
                {
Michel Kaempf's avatar
Michel Kaempf committed
1019
                    pcr_descriptor_t * p_pcr;
1020
1021

                    p_pcr = p_input->p_pcr;
1022
1023

                    p_pes->i_pts =
1024
1025
1026
1027
                        ( ((mtime_t)(p_pes->p_pes_header[9] & 0x0E) << 29) |
                          (((mtime_t)U16_AT(p_pes->p_pes_header + 10) << 14) - (1 << 14)) |
                          ((mtime_t)U16_AT(p_pes->p_pes_header + 12) >> 1) ) * 300;
                    p_pes->i_pts /= 27;
1028

1029
                    if( p_pcr->i_synchro_state )
1030
                    {
1031
1032
1033
1034
1035
1036
1037
1038
                        switch( p_pcr->i_synchro_state )
                        {
                            case SYNCHRO_NOT_STARTED:
                                p_pes->b_has_pts = 0;
                                break;

                            case SYNCHRO_START:
                                p_pes->i_pts += p_pcr->delta_pcr;
1039
                                p_pcr->delta_absolute = mdate() - p_pes->i_pts + INPUT_PTS_DELAY;
1040
1041
1042
1043
1044
1045
1046
1047
1048
                                p_pes->i_pts += p_pcr->delta_absolute;
                                p_pcr->i_synchro_state = 0;
                                break;

                            case SYNCHRO_REINIT: /* We skip a PES */
                                p_pes->b_has_pts = 0;
                                p_pcr->i_synchro_state = SYNCHRO_START;
                                break;
                        }
1049
1050
1051
                    }
                    else
                    {
1052
                        p_pes->i_pts += p_pcr->delta_pcr + p_pcr->delta_absolute;
1053
                    }
Michel Kaempf's avatar
Michel Kaempf committed
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
                }
                break;
            }

            /* Now we've parsed the header, we just have to indicate in some
               specific TS packets where the PES payload begins (renumber
               i_payload_start), so that the decoders can find the beginning
               of their data right out of the box. */
            p_ts = p_pes->p_first_ts;
            i_ts_payload_size = p_ts->i_payload_end - p_ts->i_payload_start;
            while( i_pes_header_size > i_ts_payload_size )
            {
                /* These packets are entirely filled by the PES header. */
                i_pes_header_size -= i_ts_payload_size;
                p_ts->i_payload_start = p_ts->i_payload_end;
                /* Go to the next TS packet: here we won't have to test it is
                   not NULL because we trash the PES packets when packet lost
                   occurs */
                p_ts = p_ts->p_next_ts;
                i_ts_payload_size = p_ts->i_payload_end - p_ts->i_payload_start;
            }
            /* This last packet is partly header, partly payload. */
            p_ts->i_payload_start += i_pes_header_size;

1078

Michel Kaempf's avatar
Michel Kaempf committed
1079
1080
1081
1082
            /* Now we can eventually put the PES packet in the decoder's
               PES fifo */
            switch( p_es_descriptor->i_type )
            {
1083
1084
                case MPEG1_VIDEO_ES:
                case MPEG2_VIDEO_ES:
1085
#ifdef OLD_DECODER
1086
                    p_fifo = &(((vdec_thread_t*)(p_es_descriptor->p_dec))->fifo);
1087
1088
1089
#else
                    p_fifo = &(((vpar_thread_t*)(p_es_descriptor->p_dec))->fifo);
#endif
1090
1091
1092
1093
1094
1095
1096
1097
                    break;

                case MPEG1_AUDIO_ES:
                case MPEG2_AUDIO_ES:
                    p_fifo = &(((adec_thread_t*)(p_es_descriptor->p_dec))->fifo);
                    break;

                case AC3_AUDIO_ES:
Michel Lespinasse's avatar
   
Michel Lespinasse committed
1098
#if 0
1099
                    /* we skip 4 bytes at the beginning of the AC3 payload */
1100
                    p_ts->i_payload_start += 4;
Michel Lespinasse's avatar
   
Michel Lespinasse committed
1101
#endif
1102
1103
1104
                    p_fifo = &(((ac3dec_thread_t *)(p_es_descriptor->p_dec))->fifo);
                    break;

1105
1106
1107
1108
1109
1110
                case DVD_SPU_ES:
                    /* we skip 4 bytes at the beginning of the subpicture payload */
                    p_ts->i_payload_start += 4;
                    p_fifo = &(((spudec_thread_t *)(p_es_descriptor->p_dec))->fifo);
                    break;

1111
1112
1113
1114
1115
1116
                default:
                    /* This should never happen */
                    intf_DbgMsg("Unknown stream type (%d, %d): PES trashed\n",
                        p_es_descriptor->i_id, p_es_descriptor->i_type);
                    p_fifo = NULL;
                    break;
Michel Kaempf's avatar
Michel Kaempf committed
1117
1118
1119
1120
            }

            if( p_fifo != NULL )
            {
1121
                vlc_mutex_lock( &p_fifo->data_lock );
Michel Kaempf's avatar
Michel Kaempf committed
1122
1123
1124
1125
                if( DECODER_FIFO_ISFULL( *p_fifo ) )
                {
                    /* The FIFO is full !!! This should not happen. */
#ifdef STATS
1126
                    p_input->c_packets_trashed += p_pes->i_ts_packets;
Michel Kaempf's avatar
Michel Kaempf committed
1127
1128
1129
1130
1131
1132
                    p_es_descriptor->c_invalid_packets += p_pes->i_ts_packets;
#endif
                    input_NetlistFreePES( p_input, p_pes );
                    intf_DbgMsg("PES trashed - fifo full ! (%d, %d)\n",
                               p_es_descriptor->i_id, p_es_descriptor->i_type);
                }
1133
        else
Michel Kaempf's avatar
Michel Kaempf committed
1134
                {
1135
1136
                    //intf_DbgMsg("Putting %p into fifo %p/%d\n",
                    //            p_pes, p_fifo, p_fifo->i_end);
Michel Kaempf's avatar
Michel Kaempf committed
1137
1138
1139
1140
                    p_fifo->buffer[p_fifo->i_end] = p_pes;
                    DECODER_FIFO_INCEND( *p_fifo );

                    /* Warn the decoder that it's got work to do. */
1141
                    vlc_cond_signal( &p_fifo->data_wait );
Michel Kaempf's avatar
Michel Kaempf committed
1142
                }
1143
                vlc_mutex_unlock( &p_fifo->data_lock );
Michel Kaempf's avatar
Michel Kaempf committed
1144
1145
1146
1147
1148
            }
            else
            {
                intf_DbgMsg("No fifo to receive PES %p: trash\n", p_pes);
#ifdef STATS
1149
                p_input->c_packets_trashed += p_pes->i_ts_packets;
Michel Kaempf's avatar
Michel Kaempf committed
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
                p_es_descriptor->c_invalid_packets += p_pes->i_ts_packets;
#endif
                input_NetlistFreePES( p_input, p_pes );
            }
        }
    }


    /* If we are at the beginning of a new PES packet, we must fetch a new
       PES buffer to begin with the reassembly of this PES packet. This is
       also here that we can synchronise with the stream if we we lost
1161
       packets or if the decoder has just started */
Michel Kaempf's avatar
Michel Kaempf committed
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
    if( b_unit_start )
    {
        p_last_pes = p_pes;

        /* Get a new one PES from the PES netlist. */
        if( (p_pes = input_NetlistGetPES( p_input )) == (NULL) )
        {
            /* PES netlist is empty ! */
            p_input->b_error = 1;
        }
        else
        {
1174
            //intf_DbgMsg("New PES packet %p (first TS: %p)\n", p_pes, p_ts_packet);
Michel Kaempf's avatar
Michel Kaempf committed
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186

            /* Init the PES fields so that the first TS packet could be correctly
               added to the PES packet (see below) */
            p_pes->p_first_ts = p_ts_packet;
            p_pes->p_last_ts = NULL;

            /* If the last pes packet was null, this means that the synchronisation
               was lost and so warn the decoder that he will have to find a way to
               recover */
            if( !p_last_pes )
                p_pes->b_data_loss = 1;

1187
            /* Read the b_random_access flag status and then reinit it */
Michel Kaempf's avatar
Michel Kaempf committed
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
            p_pes->b_random_access = p_es_descriptor->b_random;
            p_es_descriptor->b_random = 0;
        }
    }


    /* If we are synchronised with the stream, and so if we are ready to
       receive correctly the data, add the TS packet to the current PES
       packet */
    if( p_pes != NULL )
    {
1199
        //intf_DbgMsg("Adding TS %p to PES %p\n", p_ts_packet, p_pes);
Michel Kaempf's avatar
Michel Kaempf committed
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230

        /* Size of the payload carried in the TS packet */
        i_ts_payload_size = p_ts_packet->i_payload_end -
                            p_ts_packet->i_payload_start;

        /* Update the relations between the TS packets */
        p_ts_packet->p_prev_ts = p_pes->p_last_ts;
        p_ts_packet->p_next_ts = NULL;
        if( p_pes->i_ts_packets != 0 )
        {
            /* Regarder si il serait pas plus efficace de ne creer que les liens
               precedent->suivant pour le moment, et les liens suivant->precedent
               quand le paquet est termine */
            /* Otherwise it is the first TS packet. */
            p_pes->p_last_ts->p_next_ts = p_ts_packet;
        }
        /* Now add the TS to the PES packet */
        p_pes->p_last_ts = p_ts_packet;
        p_pes->i_ts_packets++;
        p_pes->i_pes_size += i_ts_payload_size;

        /* Stats */
#ifdef STATS
        i_dummy = p_ts_packet->i_payload_end - p_ts_packet->i_payload_start;
        p_es_descriptor->c_payload_bytes += i_dummy;
#endif
    }
    else
    {
        /* Since we don't use the TS packet to build a PES packet, we don't
           need it anymore, so give it back to the netlist */
1231
        //intf_DbgMsg("Trashing TS %p: no PES being build\n", p_ts_packet);
1232
        input_NetlistFreeTS( p_input, p_ts_packet );
Michel Kaempf's avatar
Michel Kaempf committed
1233
    }
1234

Michel Kaempf's avatar
Michel Kaempf committed
1235
1236
1237
1238
1239
1240
#undef p_pes
}




1241
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
1242
 * input_DemuxPSI:
1243
 *****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
1244
 * Notice that current ES state has been locked by input_SortPacket. (No more true,
1245
 * changed by benny - FIXME: See if it's ok, and definitely change the code ?? )
1246
 *****************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
1247
1248
1249
1250
1251
static __inline__ void input_DemuxPSI( input_thread_t *p_input,
                                       ts_packet_t *p_ts_packet,
                                       es_descriptor_t *p_es_descriptor,
                                       boolean_t b_unit_start, boolean_t b_packet_lost )
{
1252
1253
    int i_data_offset;    /* Offset of the interesting data in the TS packet */
    u16 i_data_length;                               /* Length of those data */
Benoit Steiner's avatar
   
Benoit Steiner committed
1254
    //boolean_t b_first_section; /* Was there another section in the TS packet ? */
1255

Michel Kaempf's avatar
Michel Kaempf committed
1256
1257
1258
1259
1260
1261
    ASSERT(p_input);
    ASSERT(p_ts_packet);
    ASSERT(p_es_descriptor);

#define p_psi (p_es_descriptor->p_psi_section)

1262
    //intf_DbgMsg( "input debug: PSI demultiplexing %p (%p)\n", p_ts_packet, p_input);
Michel Kaempf's avatar
Michel Kaempf committed
1263

1264
    //intf_DbgMsg( "Packet: %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x (unit start: %d)\n", p_ts_packet->buffer[p_ts_packet->i_payload_start], p_ts_packet->buffer[p_ts_packet->i_payload_start+1], p_ts_packet->buffer[p_ts_packet->i_payload_start+2], p_ts_packet->buffer[p_ts_packet->i_payload_start+3], p_ts_packet->buffer[p_ts_packet->i_payload_start+4], p_ts_packet->buffer[p_ts_packet->i_payload_start+5], p_ts_packet->buffer[p_ts_packet->i_payload_start+6], p_ts_packet->buffer[p_ts_packet->i_payload_start+7], p_ts_packet->buffer[p_ts_packet->i_payload_start+8], p_ts_packet->buffer[p_ts_packet->i_payload_start+9], p_ts_packet->buffer[p_ts_packet->i_payload_start+10], p_ts_packet->buffer[p_ts_packet->i_payload_start+11], p_ts_packet->buffer[p_ts_packet->i_payload_start+12], p_ts_packet->buffer[p_ts_packet->i_payload_start+13], p_ts_packet->buffer[p_ts_packet->i_payload_start+14], p_ts_packet->buffer[p_ts_packet->i_payload_start+15], p_ts_packet->buffer[p_ts_packet->i_payload_start+16], p_ts_packet->buffer[p_ts_packet->i_payload_start+17], p_ts_packet->buffer[p_ts_packet->i_payload_start+18], p_ts_packet->buffer[p_ts_packet->i_payload_start+19], p_ts_packet->buffer[p_ts_packet->i_payload_start+20], b_unit_start);