]> git.sesse.net Git - vlc/blob - modules/demux/mpeg/system.c
2a7a287e456fd7dc61b00d1fd48698f5097610b7
[vlc] / modules / demux / mpeg / system.c
1 /*****************************************************************************
2  * system.c: helper module for TS, PS and PES management
3  *****************************************************************************
4  * Copyright (C) 1998-2002 VideoLAN
5  * $Id: system.c,v 1.7 2002/11/20 13:37:36 sam Exp $
6  *
7  * Authors: Christophe Massiot <massiot@via.ecp.fr>
8  *          Michel Lespinasse <walken@via.ecp.fr>
9  *          BenoĆ®t Steiner <benny@via.ecp.fr>
10  *          Samuel Hocevar <sam@zoy.org>
11  *          Henri Fallon <henri@via.ecp.fr>
12  *
13  * This program is free software; you can redistribute it and/or modify
14  * it under the terms of the GNU General Public License as published by
15  * the Free Software Foundation; either version 2 of the License, or
16  * (at your option) any later version.
17  * 
18  * This program is distributed in the hope that it will be useful,
19  * but WITHOUT ANY WARRANTY; without even the implied warranty of
20  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
21  * GNU General Public License for more details.
22  *
23  * You should have received a copy of the GNU General Public License
24  * along with this program; if not, write to the Free Software
25  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
26  *****************************************************************************/
27
28 /*****************************************************************************
29  * Preamble
30  *****************************************************************************/
31 #include <stdlib.h>
32 #include <string.h>                                    /* memcpy(), memset() */
33
34 #include <vlc/vlc.h>
35 #include <vlc/input.h>
36
37 #include "system.h"
38
39 /*****************************************************************************
40  * Local prototypes
41  *****************************************************************************/
42 static int Activate ( vlc_object_t * );
43
44 static ssize_t           ReadPS  ( input_thread_t *, data_packet_t ** );
45 static es_descriptor_t * ParsePS ( input_thread_t *, data_packet_t * );
46 static void              DemuxPS ( input_thread_t *, data_packet_t * );
47
48 static ssize_t           ReadTS  ( input_thread_t *, data_packet_t ** );
49 static void              DemuxTS ( input_thread_t *, data_packet_t *,
50                                    psi_callback_t );
51
52 /*****************************************************************************
53  * Module descriptor
54  *****************************************************************************/
55 vlc_module_begin();
56     set_description( _("generic ISO 13818-1 MPEG demultiplexing") );
57     set_capability( "mpeg-system", 100 );
58     set_callbacks( Activate, NULL );
59 vlc_module_end();
60
61 /*****************************************************************************
62  * Activate: initializes helper functions
63  *****************************************************************************/
64 static int Activate ( vlc_object_t *p_this )
65 {
66     static mpeg_demux_t mpeg_demux =
67                     { NULL, ReadPS, ParsePS, DemuxPS, ReadTS, DemuxTS };
68
69     memcpy( p_this->p_private, &mpeg_demux, sizeof( mpeg_demux ) );
70
71     return VLC_SUCCESS;
72 }
73
74 /*
75  * PES Packet management
76  */
77
78 /*****************************************************************************
79  * MoveChunk
80  *****************************************************************************
81  * Small utility function used to parse discontinuous headers safely. Copies
82  * i_buf_len bytes of data to a buffer and returns the size copied.
83  * It also solves some alignment problems on non-IA-32, non-PPC processors.
84  * This is a variation on the theme of input_ext-dec.h:GetChunk().
85  *****************************************************************************/
86 static inline size_t MoveChunk( byte_t * p_dest, data_packet_t ** pp_data_src,
87                                 byte_t ** pp_src, size_t i_buf_len )
88 {
89     ptrdiff_t           i_available;
90
91     if( (i_available = (*pp_data_src)->p_payload_end - *pp_src)
92             >= i_buf_len )
93     {
94         if( p_dest != NULL )
95             memcpy( p_dest, *pp_src, i_buf_len );
96         *pp_src += i_buf_len;
97         return( i_buf_len );
98     }
99     else
100     {
101         size_t          i_init_len = i_buf_len;
102
103         do
104         {
105             if( p_dest != NULL )
106                 memcpy( p_dest, *pp_src, i_available );
107             *pp_data_src = (*pp_data_src)->p_next;
108             i_buf_len -= i_available;
109             p_dest += i_available;
110             if( *pp_data_src == NULL )
111             {
112                 *pp_src = NULL;
113                 return( i_init_len - i_buf_len );
114             }
115             *pp_src = (*pp_data_src)->p_payload_start;
116         }
117         while( (i_available = (*pp_data_src)->p_payload_end - *pp_src)
118                 <= i_buf_len );
119
120         if( i_buf_len )
121         {
122             if( p_dest != NULL )
123                 memcpy( p_dest, *pp_src, i_buf_len );
124             *pp_src += i_buf_len;
125         }
126         return( i_init_len );
127     }
128 }
129
130 /*****************************************************************************
131  * ParsePES
132  *****************************************************************************
133  * Parse a finished PES packet and analyze its header.
134  *****************************************************************************/
135 #define PES_HEADER_SIZE     7
136 static void ParsePES( input_thread_t * p_input, es_descriptor_t * p_es )
137 {
138     data_packet_t * p_data;
139     byte_t *        p_byte;
140     byte_t          p_header[PES_HEADER_SIZE];
141     int             i_done;
142
143 #define p_pes (p_es->p_pes)
144
145     /* Parse the header. The header has a variable length, but in order
146      * to improve the algorithm, we will read the 14 bytes we may be
147      * interested in */
148     p_data = p_pes->p_first;
149     p_byte = p_data->p_payload_start;
150     i_done = 0;
151
152     if( MoveChunk( p_header, &p_data, &p_byte, PES_HEADER_SIZE )
153             != PES_HEADER_SIZE )
154     {
155         msg_Warn( p_input, "PES packet too short to have a header" );
156         input_DeletePES( p_input->p_method_data, p_pes );
157         p_pes = NULL;
158         return;
159     }
160
161     /* Get the PES size if defined */
162     p_es->i_pes_real_size = U16_AT(p_header + 4);
163     if( p_es->i_pes_real_size )
164     {
165         p_es->i_pes_real_size += 6;
166     }
167
168     /* First read the 6 header bytes common to all PES packets:
169      * use them to test the PES validity */
170     if( (p_header[0] || p_header[1] || (p_header[2] != 1)) )
171     {
172         /* packet_start_code_prefix != 0x000001 */
173         msg_Err( p_input, "data loss, PES packet does not start with 000001" );
174         input_DeletePES( p_input->p_method_data, p_pes );
175         p_pes = NULL;
176     }
177     else
178     {
179         int i_pes_header_size, i_payload_size;
180
181         if ( p_es->i_pes_real_size &&
182              (p_es->i_pes_real_size != p_pes->i_pes_size) )
183         {
184             /* PES_packet_length is set and != total received payload */
185             /* Warn the decoder that the data may be corrupt. */
186             msg_Warn( p_input, "packet corrupted, PES sizes do not match" );
187         }
188
189         switch( p_es->i_stream_id )
190         {
191         case 0xBC:  /* Program stream map */
192         case 0xBE:  /* Padding */
193         case 0xBF:  /* Private stream 2 */
194         case 0xB0:  /* ECM */
195         case 0xB1:  /* EMM */
196         case 0xFF:  /* Program stream directory */
197         case 0xF2:  /* DSMCC stream */
198         case 0xF8:  /* ITU-T H.222.1 type E stream */
199             /* The payload begins immediately after the 6 bytes header, so
200              * we have finished with the parsing */
201             i_pes_header_size = 6;
202             break;
203
204         default:
205             if( (p_header[6] & 0xC0) == 0x80 )
206             {
207                 /* MPEG-2 : the PES header contains at least 3 more bytes. */
208                 size_t      i_max_len;
209                 vlc_bool_t  b_has_pts, b_has_dts;
210                 byte_t      p_full_header[12];
211
212                 p_pes->b_data_alignment = p_header[6] & 0x04;
213
214                 i_max_len = MoveChunk( p_full_header, &p_data, &p_byte, 12 );
215                 if( i_max_len < 2 )
216                 {
217                     msg_Warn( p_input, 
218                               "PES packet too short to have a MPEG-2 header" );
219                     input_DeletePES( p_input->p_method_data,
220                                             p_pes );
221                     p_pes = NULL;
222                     return;
223                 }
224
225                 b_has_pts = p_full_header[0] & 0x80;
226                 b_has_dts = p_full_header[0] & 0x40;
227                 i_pes_header_size = p_full_header[1] + 9;
228
229                 /* Now parse the optional header extensions */
230                 if( b_has_pts )
231                 {
232                     if( i_max_len < 7 )
233                     {
234                         msg_Warn( p_input,
235                              "PES packet too short to have a MPEG-2 header" );
236                         input_DeletePES( p_input->p_method_data,
237                                                 p_pes );
238                         p_pes = NULL;
239                         return;
240                     }
241                     p_pes->i_pts = input_ClockGetTS( p_input, p_es->p_pgrm,
242                     ( ((mtime_t)(p_full_header[2] & 0x0E) << 29) |
243                       ((mtime_t)(p_full_header[3]) << 22) |
244                       ((mtime_t)(p_full_header[4] & 0xFE) << 14) |
245                       ((mtime_t)p_full_header[5] << 7) |
246                       ((mtime_t)p_full_header[6] >> 1) ) );
247
248                     if( b_has_dts )
249                     {
250                         if( i_max_len < 12 )
251                         {
252                             msg_Warn( p_input,
253                               "PES packet too short to have a MPEG-2 header" );
254                             input_DeletePES( p_input->p_method_data,
255                                                     p_pes );
256                             p_pes = NULL;
257                             return;
258                         }
259                         p_pes->i_dts = input_ClockGetTS( p_input, p_es->p_pgrm,
260                         ( ((mtime_t)(p_full_header[7] & 0x0E) << 29) |
261                           (((mtime_t)U16_AT(p_full_header + 8) << 14)
262                                 - (1 << 14)) |
263                           ((mtime_t)U16_AT(p_full_header + 10) >> 1) ) );
264                     }
265                 }
266             }
267             else
268             {
269                 /* Probably MPEG-1 */
270                 vlc_bool_t      b_has_pts, b_has_dts;
271
272                 i_pes_header_size = 6;
273                 p_data = p_pes->p_first;
274                 p_byte = p_data->p_payload_start;
275                 /* Cannot fail because the previous one succeeded. */
276                 MoveChunk( NULL, &p_data, &p_byte, 6 );
277
278                 while( *p_byte == 0xFF && i_pes_header_size < 23 )
279                 {
280                     i_pes_header_size++;
281                     if( MoveChunk( NULL, &p_data, &p_byte, 1 ) != 1 )
282                     {
283                         msg_Warn( p_input,
284                             "PES packet too short to have a MPEG-1 header" );
285                         input_DeletePES( p_input->p_method_data, p_pes );
286                         p_pes = NULL;
287                         return;
288                     }
289                 }
290                 if( i_pes_header_size == 23 )
291                 {
292                     msg_Err( p_input, "too much MPEG-1 stuffing" );
293                     input_DeletePES( p_input->p_method_data, p_pes );
294                     p_pes = NULL;
295                     return;
296                 }
297
298                 if( (*p_byte & 0xC0) == 0x40 )
299                 {
300                     /* Don't ask why... --Meuuh */
301                     /* Erm... why ? --Sam */
302                     /* Well... According to the recommendation, it is for
303                      * STD_buffer_scale and STD_buffer_size. --Meuuh */
304                     i_pes_header_size += 2;
305                     if( MoveChunk( NULL, &p_data, &p_byte, 2 ) != 2 )
306                     {
307                         msg_Warn( p_input,
308                             "PES packet too short to have a MPEG-1 header" );
309                         input_DeletePES( p_input->p_method_data, p_pes );
310                         p_pes = NULL;
311                         return;
312                     }
313                 }
314
315                 i_pes_header_size++;
316
317                 b_has_pts = *p_byte & 0x20;
318                 b_has_dts = *p_byte & 0x10;
319
320                 if( b_has_pts )
321                 {
322                     byte_t      p_ts[5];
323
324                     i_pes_header_size += 4;
325                     if( MoveChunk( p_ts, &p_data, &p_byte, 5 ) != 5 )
326                     {
327                         msg_Warn( p_input,
328                             "PES packet too short to have a MPEG-1 header" );
329                         input_DeletePES( p_input->p_method_data, p_pes );
330                         p_pes = NULL;
331                         return;
332                     }
333
334                     p_pes->i_pts = input_ClockGetTS( p_input, p_es->p_pgrm,
335                        ( ((mtime_t)(p_ts[0] & 0x0E) << 29) |
336                          (((mtime_t)U32_AT(p_ts) & 0xFFFE00) << 6) |
337                          ((mtime_t)p_ts[3] << 7) |
338                          ((mtime_t)p_ts[4] >> 1) ) );
339
340                     if( b_has_dts )
341                     {
342                         i_pes_header_size += 5;
343                         if( MoveChunk( p_ts, &p_data, &p_byte, 5 ) != 5 )
344                         {
345                             msg_Warn( p_input,
346                               "PES packet too short to have a MPEG-1 header" );
347                             input_DeletePES( p_input->p_method_data, p_pes );
348                             p_pes = NULL;
349                             return;
350                         }
351
352                         p_pes->i_dts = input_ClockGetTS( p_input,
353                                                          p_es->p_pgrm,
354                             ( ((mtime_t)(p_ts[0] & 0x0E) << 29) |
355                               (((mtime_t)U32_AT(p_ts) & 0xFFFE00) << 6) |
356                               ((mtime_t)p_ts[3] << 7) |
357                               ((mtime_t)p_ts[4] >> 1) ) );
358                     }
359                 }
360             }
361
362             break;
363         }
364
365         /* Welcome to the kludge area ! --Meuuh */
366         if ( p_es->i_fourcc == VLC_FOURCC('a','5','2','b') )
367         {
368             /* With A/52 audio, we need to skip the first 4 bytes */
369             i_pes_header_size += 4;
370         }
371
372         if ( p_es->i_fourcc == VLC_FOURCC('l','p','c','b')
373               || p_es->i_fourcc == VLC_FOURCC('s','p','u','b')
374               || p_es->i_fourcc == VLC_FOURCC('d','t','s','b')
375               || p_es->i_fourcc == VLC_FOURCC('s','d','d','b') )
376         {
377             /* stream_private_id */
378             i_pes_header_size += 1;
379         }
380
381         /* Now we've parsed the header, we just have to indicate in some
382          * specific data packets where the PES payload begins (renumber
383          * p_payload_start), so that the decoders can find the beginning
384          * of their data right out of the box. */
385         p_data = p_pes->p_first;
386         i_payload_size = p_data->p_payload_end
387                                  - p_data->p_payload_start;
388         while( i_pes_header_size > i_payload_size )
389         {
390             /* These packets are entirely filled by the PES header. */
391             i_pes_header_size -= i_payload_size;
392             p_data->p_payload_start = p_data->p_payload_end;
393             /* Go to the next data packet. */
394             if( (p_data = p_data->p_next) == NULL )
395             {
396                 msg_Err( p_input, "PES header bigger than payload" );
397                 input_DeletePES( p_input->p_method_data, p_pes );
398                 p_pes = NULL;
399                 return;
400             }
401             i_payload_size = p_data->p_payload_end
402                                  - p_data->p_payload_start;
403         }
404         /* This last packet is partly header, partly payload. */
405         if( i_payload_size < i_pes_header_size )
406         {
407             msg_Err( p_input, "PES header bigger than payload" );
408             input_DeletePES( p_input->p_method_data, p_pes );
409             p_pes = NULL;
410             return;
411         }
412         p_data->p_payload_start += i_pes_header_size;
413
414
415         /* Now we can eventually put the PES packet in the decoder's
416          * PES fifo */
417         if( p_es->p_decoder_fifo != NULL )
418         {
419             input_DecodePES( p_es->p_decoder_fifo, p_pes );
420         }
421         else
422         {
423             msg_Err( p_input, "no fifo to receive PES %p "
424                               "(who wrote this damn code ?)", p_pes );
425             input_DeletePES( p_input->p_method_data, p_pes );
426         }
427         p_pes = NULL;
428     }
429 #undef p_pes
430
431 }
432
433 /*****************************************************************************
434  * GatherPES:
435  *****************************************************************************
436  * Gather a PES packet.
437  *****************************************************************************/
438 static void GatherPES( input_thread_t * p_input, data_packet_t * p_data,
439                        es_descriptor_t * p_es,
440                        vlc_bool_t b_unit_start, vlc_bool_t b_packet_lost )
441 {
442 #define p_pes (p_es->p_pes)
443
444     /* If we lost data, insert a NULL data packet (philosophy : 0 is quite
445      * often an escape sequence in decoders, so that should make them wait
446      * for the next start code). */
447     if( b_packet_lost )
448     {
449         input_NullPacket( p_input, p_es );
450     }
451
452     if( b_unit_start && p_pes != NULL )
453     {
454         /* If the data packet contains the begining of a new PES packet, and
455          * if we were reassembling a PES packet, then the PES should be
456          * complete now, so parse its header and give it to the decoders. */
457         ParsePES( p_input, p_es );
458     }
459
460     if( !b_unit_start && p_pes == NULL )
461     {
462         /* Random access... */
463         input_DeletePacket( p_input->p_method_data, p_data );
464     }
465     else
466     {
467         if( b_unit_start )
468         {
469             /* If we are at the beginning of a new PES packet, we must fetch
470              * a new PES buffer to begin with the reassembly of this PES
471              * packet. This is also here that we can synchronize with the
472              * stream if we lost packets or if the decoder has just
473              * started. */
474             if( (p_pes = input_NewPES( p_input->p_method_data ) ) == NULL )
475             {
476                 msg_Err( p_input, "out of memory" );
477                 p_input->b_error = 1;
478                 return;
479             }
480             p_pes->i_rate = p_input->stream.control.i_rate;
481             p_pes->p_first = p_data;
482             
483             /* If the PES header fits in the first data packet, we can
484              * already set p_gather->i_pes_real_size. */
485             if( p_data->p_payload_end - p_data->p_payload_start
486                     >= PES_HEADER_SIZE )
487             {
488                 p_es->i_pes_real_size = ((u16)p_data->p_payload_start[4] << 8)
489                                          + p_data->p_payload_start[5] + 6;
490             }
491             else
492             { 
493                 p_es->i_pes_real_size = 0;
494             } 
495         }
496         else
497         {
498             /* Update the relations between the data packets */
499             p_pes->p_last->p_next = p_data;
500         }
501
502         p_pes->p_last = p_data;
503         p_pes->i_nb_data++;
504
505         /* Size of the payload carried in the data packet */
506         p_pes->i_pes_size += (p_data->p_payload_end
507                                  - p_data->p_payload_start);
508     
509         /* We can check if the packet is finished */
510         if( p_pes->i_pes_size == p_es->i_pes_real_size )
511         {
512             /* The packet is finished, parse it */
513             ParsePES( p_input, p_es );
514         }
515     }
516 #undef p_pes
517 }
518
519
520 /*
521  * PS Demultiplexing
522  */
523
524 /*****************************************************************************
525  * GetID: Get the ID of a stream
526  *****************************************************************************/
527 static u16 GetID( data_packet_t * p_data )
528 {
529     u16         i_id;
530
531     i_id = p_data->p_demux_start[3];                            /* stream_id */
532     if( i_id == 0xBD )
533     {
534         /* FIXME : this is not valid if the header is split in multiple
535          * packets */
536         /* stream_private_id */
537         i_id |= p_data->p_demux_start[ 9 + p_data->p_demux_start[8] ] << 8;
538     }
539     return( i_id );
540 }
541
542 /*****************************************************************************
543  * DecodePSM: Decode the Program Stream Map information
544  *****************************************************************************
545  * FIXME : loads are not aligned in this function
546  *****************************************************************************/
547 static void DecodePSM( input_thread_t * p_input, data_packet_t * p_data )
548 {
549     stream_ps_data_t *  p_demux =
550                  (stream_ps_data_t *)p_input->stream.p_demux_data;
551     byte_t *            p_byte;
552     byte_t *            p_end;
553     int                 i;
554     int                 i_new_es_number = 0;
555
556     if( p_data->p_demux_start + 10 > p_data->p_payload_end )
557     {
558         msg_Err( p_input, "PSM too short, packet corrupt" );
559         return;
560     }
561
562     if( p_demux->b_has_PSM
563         && p_demux->i_PSM_version == (p_data->p_demux_start[6] & 0x1F) )
564     {
565         /* Already got that one. */
566         return;
567     }
568
569     p_demux->b_has_PSM = 1;
570     p_demux->i_PSM_version = p_data->p_demux_start[6] & 0x1F;
571
572     /* Go to elementary_stream_map_length, jumping over
573      * program_stream_info. */
574     p_byte = p_data->p_demux_start + 10
575               + U16_AT(&p_data->p_demux_start[8]);
576     if( p_byte > p_data->p_payload_end )
577     {
578         msg_Err( p_input, "PSM too short, packet corrupt" );
579         return;
580     }
581     /* This is the full size of the elementary_stream_map.
582      * 2 == elementary_stream_map_length
583      * Please note that CRC_32 is not included in the length. */
584     p_end = p_byte + 2 + U16_AT(p_byte);
585     p_byte += 2;
586     if( p_end > p_data->p_payload_end )
587     {
588         msg_Err( p_input, "PSM too short, packet corrupt" );
589         return;
590     }
591
592     vlc_mutex_lock( &p_input->stream.stream_lock );
593
594     /* 4 == minimum useful size of a section */
595     while( p_byte + 4 <= p_end )
596     {
597         es_descriptor_t *   p_es = NULL;
598         u8                  i_stream_id = p_byte[1];
599         /* FIXME: there will be a problem with private streams... (same
600          * stream_id) */
601
602         /* Look for the ES in the ES table */
603         for( i = i_new_es_number;
604              i < p_input->stream.pp_programs[0]->i_es_number;
605              i++ )
606         {
607             if( p_input->stream.pp_programs[0]->pp_es[i]->i_stream_id
608                     == i_stream_id )
609             {
610                 p_es = p_input->stream.pp_programs[0]->pp_es[i];
611                 /* FIXME: do something below */
612 #if 0
613                 if( p_es->i_type != p_byte[0] )
614                 {
615                     input_DelES( p_input, p_es );
616                     p_es = NULL;
617                 }
618                 else
619 #endif
620                 {
621                     /* Move the ES to the beginning. */
622                     p_input->stream.pp_programs[0]->pp_es[i]
623                         = p_input->stream.pp_programs[0]->pp_es[ i_new_es_number ];
624                     p_input->stream.pp_programs[0]->pp_es[ i_new_es_number ]
625                         = p_es;
626                     i_new_es_number++;
627                 }
628                 break;
629             }
630         }
631
632         /* The goal is to have all the ES we have just read in the
633          * beginning of the pp_es table, and all the others at the end,
634          * so that we can close them more easily at the end. */
635         if( p_es == NULL )
636         {
637             p_es = input_AddES( p_input, p_input->stream.pp_programs[0],
638                                 i_stream_id, 0 );
639             switch( p_byte[0] )
640             {
641             case MPEG1_VIDEO_ES:
642             case MPEG2_VIDEO_ES:
643                 p_es->i_fourcc = VLC_FOURCC('m','p','g','v');
644                 p_es->i_cat = VIDEO_ES;
645                 break;
646             case DVD_SPU_ES:
647                 p_es->i_fourcc = VLC_FOURCC('s','p','u','b');
648                 p_es->i_cat = SPU_ES;
649                 break;
650             case MPEG1_AUDIO_ES:
651             case MPEG2_AUDIO_ES:
652                 p_es->i_fourcc = VLC_FOURCC('m','p','g','a');
653                 p_es->i_cat = AUDIO_ES;
654                 break;
655             case A52_AUDIO_ES:
656             case A52DVB_AUDIO_ES:
657                 p_es->i_fourcc = VLC_FOURCC('a','5','2','b');
658                 p_es->i_cat = AUDIO_ES;
659                 break;
660             case LPCM_AUDIO_ES:
661                 p_es->i_fourcc = VLC_FOURCC('l','p','c','b');
662                 p_es->i_cat = AUDIO_ES;
663                 break;
664             default:
665                 p_es->i_fourcc = 0;
666                 break;
667             }
668
669             /* input_AddES has inserted the new element at the end. */
670             p_input->stream.pp_programs[0]->pp_es[
671                 p_input->stream.pp_programs[0]->i_es_number ]
672                 = p_input->stream.pp_programs[0]->pp_es[ i_new_es_number ];
673             p_input->stream.pp_programs[0]->pp_es[ i_new_es_number ] = p_es;
674             i_new_es_number++;
675         }
676         p_byte += 4 + U16_AT(&p_byte[2]);
677     }
678
679     /* Un-select the streams that are no longer parts of the program. */
680     while( i_new_es_number < p_input->stream.pp_programs[0]->i_es_number )
681     {
682         /* We remove pp_es[i_new_es_member] and not pp_es[i] because the
683          * list will be emptied starting from the end */
684         input_DelES( p_input,
685                      p_input->stream.pp_programs[0]->pp_es[i_new_es_number] );
686     }
687
688     msg_Dbg( p_input, "the stream map after the PSM is now:" );
689     input_DumpStream( p_input );
690
691     vlc_mutex_unlock( &p_input->stream.stream_lock );
692 }
693
694 /*****************************************************************************
695  * ReadPS: store a PS packet into a data_buffer_t
696  *****************************************************************************/
697 #define PEEK( SIZE )                                                        \
698     i_error = input_Peek( p_input, &p_peek, SIZE );                         \
699     if( i_error == -1 )                                                     \
700     {                                                                       \
701         return( -1 );                                                       \
702     }                                                                       \
703     else if( i_error < SIZE )                                               \
704     {                                                                       \
705         /* EOF */                                                           \
706         return( 0 );                                                        \
707     }
708
709 static ssize_t ReadPS( input_thread_t * p_input, data_packet_t ** pp_data )
710 {
711     byte_t *            p_peek;
712     size_t              i_packet_size;
713     ssize_t             i_error, i_read;
714
715     /* Read what we believe to be a packet header. */
716     PEEK( 4 );
717
718     if( p_peek[0] || p_peek[1] || p_peek[2] != 1 || p_peek[3] < 0xB9 )
719     {
720         if( p_peek[0] || p_peek[1] || p_peek[2] )
721         {
722             /* It is common for MPEG-1 streams to pad with zeros
723              * (although it is forbidden by the recommendation), so
724              * don't bother everybody in this case. */
725             msg_Warn( p_input, "garbage (0x%.2x%.2x%.2x%.2x)",
726                       p_peek[0], p_peek[1], p_peek[2], p_peek[3] );
727         }
728
729         /* This is not the startcode of a packet. Read the stream
730          * until we find one. */
731         while( p_peek[0] || p_peek[1] || p_peek[2] != 1 || p_peek[3] < 0xB9 )
732         {
733             p_input->p_current_data++;
734             PEEK( 4 );
735             if( p_input->b_die ) return( -1 );
736         }
737         /* Packet found. */
738     }
739
740     /* 0x1B9 == SYSTEM_END_CODE, it is only 4 bytes long. */
741     if( p_peek[3] != 0xB9 )
742     {
743         /* The packet is at least 6 bytes long. */
744         PEEK( 6 );
745
746         if( p_peek[3] != 0xBA )
747         {
748             /* That's the case for all packets, except pack header. */
749             i_packet_size = (p_peek[4] << 8) | p_peek[5];
750         }
751         else
752         {
753             /* Pack header. */
754             if( (p_peek[4] & 0xC0) == 0x40 )
755             {
756                 /* MPEG-2 */
757                 i_packet_size = 8;
758             }
759             else if( (p_peek[4] & 0xF0) == 0x20 )
760             {
761                 /* MPEG-1 */
762                 i_packet_size = 6;
763             }
764             else
765             {
766                 msg_Err( p_input, "unable to determine stream type" );
767                 return( -1 );
768             }
769         }
770     }
771     else
772     {
773         /* System End Code */
774         i_packet_size = -2;
775     }
776
777     /* Fetch a packet of the appropriate size. */
778     i_read = input_SplitBuffer( p_input, pp_data, i_packet_size + 6 );
779     if( i_read <= 0 )
780     {
781         return( i_read );
782     }
783
784     /* In MPEG-2 pack headers we still have to read stuffing bytes. */
785     if( ((*pp_data)->p_demux_start[3] == 0xBA) && (i_packet_size == 8) )
786     {
787         size_t i_stuffing = ((*pp_data)->p_demux_start[13] & 0x7);
788         /* Force refill of the input buffer - though we don't care
789          * about p_peek. Please note that this is unoptimized. */
790         PEEK( i_stuffing );
791         p_input->p_current_data += i_stuffing;
792     }
793
794     return( 1 );
795 }
796
797 #undef PEEK
798
799 /*****************************************************************************
800  * ParsePS: read the PS header
801  *****************************************************************************/
802 static es_descriptor_t * ParsePS( input_thread_t * p_input,
803                                   data_packet_t * p_data )
804 {
805     u32                 i_code;
806     es_descriptor_t *   p_es = NULL;
807
808     i_code = p_data->p_demux_start[3];
809
810     if( i_code > 0xBC ) /* ES start code */
811     {
812         u16                 i_id;
813         int                 i_dummy;
814
815         /* This is a PES packet. Find out if we want it or not. */
816         i_id = GetID( p_data );
817
818         vlc_mutex_lock( &p_input->stream.stream_lock );
819         if( p_input->stream.pp_programs[0]->b_is_ok )
820         {
821             /* Look only at the selected ES. */
822             for( i_dummy = 0; i_dummy < p_input->stream.i_selected_es_number;
823                  i_dummy++ )
824             {
825                 if( p_input->stream.pp_selected_es[i_dummy] != NULL
826                     && p_input->stream.pp_selected_es[i_dummy]->i_id == i_id )
827                 {
828                     p_es = p_input->stream.pp_selected_es[i_dummy];
829                     break;
830                 }
831             }
832         }
833         else
834         {
835             stream_ps_data_t * p_demux =
836               (stream_ps_data_t *)p_input->stream.pp_programs[0]->p_demux_data;
837
838             /* Search all ES ; if not found -> AddES */
839             p_es = input_FindES( p_input, i_id );
840
841             if( p_es == NULL && !p_demux->b_has_PSM )
842             {
843                 p_es = input_AddES( p_input, p_input->stream.pp_programs[0],
844                                     i_id, 0 );
845                 if( p_es != NULL )
846                 {
847                     p_es->i_stream_id = p_data->p_demux_start[3];
848
849                     /* Set stream type and auto-spawn. */
850                     if( (i_id & 0xF0) == 0xE0 )
851                     {
852                         /* MPEG video */
853                         p_es->i_fourcc = VLC_FOURCC('m','p','g','v');
854                         p_es->i_cat = VIDEO_ES;
855 #ifdef AUTO_SPAWN
856                         if( !p_input->stream.b_seekable )
857                             input_SelectES( p_input, p_es );
858 #endif
859                     }
860                     else if( (i_id & 0xE0) == 0xC0 )
861                     {
862                         /* MPEG audio */
863                         p_es->i_fourcc = VLC_FOURCC('m','p','g','a');
864                         p_es->i_cat = AUDIO_ES;
865 #ifdef AUTO_SPAWN
866                         if( !p_input->stream.b_seekable )
867                         if( config_GetInt( p_input, "audio-channel" )
868                                 == (p_es->i_id & 0x1F) ||
869                             ( config_GetInt( p_input, "audio-channel" ) < 0
870                               && !(p_es->i_id & 0x1F) ) )
871                         switch( config_GetInt( p_input, "audio-type" ) )
872                         {
873                         case -1:
874                         case REQUESTED_MPEG:
875                             input_SelectES( p_input, p_es );
876                         }
877 #endif
878                     }
879                     else if( (i_id & 0xF0FF) == 0x80BD )
880                     {
881                         /* A52 audio (0x80->0x8F) */
882                         p_es->i_fourcc = VLC_FOURCC('a','5','2','b');
883                         p_es->i_cat = AUDIO_ES;
884 #ifdef AUTO_SPAWN
885                         if( !p_input->stream.b_seekable )
886                         if( config_GetInt( p_input, "audio-channel" )
887                                 == ((p_es->i_id & 0xF00) >> 8) ||
888                             ( config_GetInt( p_input, "audio-channel" ) < 0
889                               && !((p_es->i_id & 0xF00) >> 8)) )
890                         switch( config_GetInt( p_input, "audio-type" ) )
891                         {
892                         case -1:
893                         case REQUESTED_A52:
894                             input_SelectES( p_input, p_es );
895                         }
896 #endif
897                     }
898                     else if( (i_id & 0xE0FF) == 0x20BD )
899                     {
900                         /* Subtitles video (0x20->0x3F) */
901                         p_es->i_fourcc = VLC_FOURCC('s','p','u','b');
902                         p_es->i_cat = SPU_ES;
903 #ifdef AUTO_SPAWN
904                         if( config_GetInt( p_input, "spu-channel" )
905                                 == ((p_es->i_id & 0x1F00) >> 8) )
906                         {
907                             if( !p_input->stream.b_seekable )
908                                 input_SelectES( p_input, p_es );
909                         }
910 #endif
911                     }
912                     else if( (i_id & 0xF0FF) == 0xA0BD )
913                     {
914                         /* LPCM audio (0xA0->0xAF) */
915                         p_es->i_fourcc = VLC_FOURCC('l','p','c','b');
916                         p_es->i_cat = AUDIO_ES;
917                     }
918                     else
919                     {
920                         p_es->i_fourcc = 0;
921                     }
922                 }
923
924                 /* Tell the interface the stream has changed */
925                 p_input->stream.b_changed = 1;
926             }
927         } /* stream.b_is_ok */
928         vlc_mutex_unlock( &p_input->stream.stream_lock );
929     } /* i_code > 0xBC */
930
931     return( p_es );
932 }
933
934 /*****************************************************************************
935  * DemuxPS: first step of demultiplexing: the PS header
936  *****************************************************************************/
937 static void DemuxPS( input_thread_t * p_input, data_packet_t * p_data )
938 {
939     u32                 i_code;
940     vlc_bool_t          b_trash = 0;
941     es_descriptor_t *   p_es = NULL;
942
943     i_code = ((u32)p_data->p_demux_start[0] << 24)
944                 | ((u32)p_data->p_demux_start[1] << 16)
945                 | ((u32)p_data->p_demux_start[2] << 8)
946                 | p_data->p_demux_start[3];
947     if( i_code <= 0x1BC )
948     {
949         switch( i_code )
950         {
951         case 0x1BA: /* PACK_START_CODE */
952             {
953                 /* Read the SCR. */
954                 mtime_t         scr_time;
955                 u32             i_mux_rate;
956
957                 if( (p_data->p_demux_start[4] & 0xC0) == 0x40 )
958                 {
959                     /* MPEG-2 */
960                     byte_t      p_header[14];
961                     byte_t *    p_byte;
962                     p_byte = p_data->p_demux_start;
963
964                     if( MoveChunk( p_header, &p_data, &p_byte, 14 ) != 14 )
965                     {
966                         msg_Warn( p_input,
967                                   "packet too short to have a header" );
968                         b_trash = 1;
969                         break;
970                     }
971                     scr_time =
972                          ((mtime_t)(p_header[4] & 0x38) << 27) |
973                          ((mtime_t)(U32_AT(p_header + 4) & 0x03FFF800)
974                                         << 4) |
975                          ((( ((mtime_t)U16_AT(p_header + 6) << 16)
976                             | (mtime_t)U16_AT(p_header + 8) ) & 0x03FFF800)
977                                         >> 11);
978
979                     /* mux_rate */
980                     i_mux_rate = ((u32)U16_AT(p_header + 10) << 6)
981                                    | (p_header[12] >> 2);
982                     /* FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME
983                      * This is the biggest kludge ever !
984                      * I don't know what's wrong with mux_rate calculation
985                      * but this heuristic works well : */
986                     i_mux_rate <<= 1;
987                     i_mux_rate /= 3;
988                 }
989                 else
990                 {
991                     /* MPEG-1 SCR is like PTS. */
992                     byte_t      p_header[12];
993                     byte_t *    p_byte;
994                     p_byte = p_data->p_demux_start;
995
996                     if( MoveChunk( p_header, &p_data, &p_byte, 12 ) != 12 )
997                     {
998                         msg_Warn( p_input,
999                                   "packet too short to have a header" );
1000                         b_trash = 1;
1001                         break;
1002                     }
1003                     scr_time =
1004                          ((mtime_t)(p_header[4] & 0x0E) << 29) |
1005                          (((mtime_t)U32_AT(p_header + 4) & 0xFFFE00) << 6) |
1006                          ((mtime_t)p_header[7] << 7) |
1007                          ((mtime_t)p_header[8] >> 1);
1008
1009                     /* mux_rate */
1010                     i_mux_rate = (U32_AT(p_header + 8) & 0x7FFFFE) >> 1;
1011                 }
1012                 /* Call the pace control. */
1013                 input_ClockManageRef( p_input,
1014                                       p_input->stream.p_selected_program,
1015                                       scr_time );
1016
1017                 if( i_mux_rate != p_input->stream.i_mux_rate
1018                      && p_input->stream.i_mux_rate )
1019                 {
1020                     msg_Warn( p_input,
1021                               "mux_rate changed, expect cosmetic errors" );
1022                 }
1023                 p_input->stream.i_mux_rate = i_mux_rate;
1024
1025                 b_trash = 1;
1026             }
1027             break;
1028
1029         case 0x1BB: /* SYSTEM_START_CODE */
1030             b_trash = 1;                              /* Nothing interesting */
1031             break;
1032
1033         case 0x1BC: /* PROGRAM_STREAM_MAP_CODE */
1034             DecodePSM( p_input, p_data );
1035             b_trash = 1;
1036             break;
1037     
1038         case 0x1B9: /* PROGRAM_END_CODE */
1039             b_trash = 1;
1040             break;
1041    
1042         default:
1043             /* This should not happen */
1044             b_trash = 1;
1045             msg_Warn( p_input, "unwanted packet received "
1046                                "with startcode 0x%.8x", i_code );
1047         }
1048     }
1049     else
1050     {
1051         p_es = ParsePS( p_input, p_data );
1052
1053         vlc_mutex_lock( &p_input->stream.control.control_lock );
1054         if( p_es != NULL && p_es->p_decoder_fifo != NULL
1055              && (p_es->i_cat != AUDIO_ES || !p_input->stream.control.b_mute) )
1056         {
1057             vlc_mutex_unlock( &p_input->stream.control.control_lock );
1058             p_es->c_packets++;
1059             GatherPES( p_input, p_data, p_es, 1, 0 );
1060         }
1061         else
1062         {
1063             vlc_mutex_unlock( &p_input->stream.control.control_lock );
1064             b_trash = 1;
1065         }
1066     }
1067
1068     /* Trash the packet if it has no payload or if it isn't selected */
1069     if( b_trash )
1070     {
1071         input_DeletePacket( p_input->p_method_data, p_data );
1072         p_input->stream.c_packets_trashed++;
1073     }
1074 }
1075
1076  
1077 /*
1078  * TS Demultiplexing
1079  */
1080
1081 /*****************************************************************************
1082  * ReadTS: store a TS packet into a data_buffer_t
1083  *****************************************************************************/
1084 #define PEEK( SIZE )                                                        \
1085     i_error = input_Peek( p_input, &p_peek, SIZE );                         \
1086     if( i_error == -1 )                                                     \
1087     {                                                                       \
1088         return( -1 );                                                       \
1089     }                                                                       \
1090     else if( i_error < SIZE )                                               \
1091     {                                                                       \
1092         /* EOF */                                                           \
1093         return( 0 );                                                        \
1094     }
1095
1096 static ssize_t ReadTS( input_thread_t * p_input, data_packet_t ** pp_data )
1097 {
1098     byte_t *            p_peek;
1099     ssize_t             i_error, i_read;
1100
1101     PEEK( 1 );
1102
1103     if( *p_peek != TS_SYNC_CODE )
1104     {
1105         msg_Warn( p_input, "garbage at input (%x)", *p_peek );
1106
1107         if( p_input->i_mtu )
1108         {
1109             while( *p_peek != TS_SYNC_CODE )
1110             {
1111                 /* Try to resync on next packet. */
1112                 PEEK( TS_PACKET_SIZE );
1113                 p_input->p_current_data += TS_PACKET_SIZE;
1114                 PEEK( 1 );
1115             }
1116         }
1117         else
1118         {
1119             /* Move forward until we find 0x47 (and hope it's the good
1120              * one... FIXME) */
1121             while( *p_peek != TS_SYNC_CODE )
1122             {
1123                 p_input->p_current_data++;
1124                 PEEK( 1 );
1125             }
1126         }
1127     }
1128
1129     i_read = input_SplitBuffer( p_input, pp_data, TS_PACKET_SIZE );
1130     if( i_read <= 0 )
1131     {
1132         return( i_read );
1133     }
1134
1135     return( 1 );
1136 }
1137
1138 /*****************************************************************************
1139  * DemuxTS: first step of demultiplexing: the TS header
1140  *****************************************************************************/
1141 static void DemuxTS( input_thread_t * p_input, data_packet_t * p_data,
1142                      psi_callback_t pf_psi_callback )
1143 {
1144     u16                 i_pid;
1145     int                 i_dummy;
1146     vlc_bool_t          b_adaptation;         /* Adaptation field is present */
1147     vlc_bool_t          b_payload;                 /* Packet carries payload */
1148     vlc_bool_t          b_unit_start;  /* A PSI or a PES start in the packet */
1149     vlc_bool_t          b_trash = 0;             /* Is the packet unuseful ? */
1150     vlc_bool_t          b_lost = 0;             /* Was there a packet loss ? */
1151     vlc_bool_t          b_psi = 0;                        /* Is this a PSI ? */
1152     vlc_bool_t          b_pcr = 0;                   /* Does it have a PCR ? */
1153     es_descriptor_t *   p_es = NULL;
1154     es_ts_data_t *      p_es_demux = NULL;
1155     pgrm_ts_data_t *    p_pgrm_demux = NULL;
1156
1157 #define p (p_data->p_demux_start)
1158     /* Extract flags values from TS common header. */
1159     i_pid = ((p[1] & 0x1F) << 8) | p[2];
1160     b_unit_start = (p[1] & 0x40);
1161     b_adaptation = (p[3] & 0x20);
1162     b_payload = (p[3] & 0x10);
1163
1164     /* Find out the elementary stream. */
1165     vlc_mutex_lock( &p_input->stream.stream_lock );
1166     
1167     for( i_dummy = 0; i_dummy < p_input->stream.i_pgrm_number; i_dummy ++ )
1168     {
1169         if( (( pgrm_ts_data_t * ) p_input->stream.pp_programs[i_dummy]->
1170                     p_demux_data)->i_pcr_pid == i_pid )
1171         {
1172             b_pcr = 1;
1173             break;
1174         }
1175     }
1176             
1177     p_es= input_FindES( p_input, i_pid );
1178     
1179     if( (p_es != NULL) && (p_es->p_demux_data != NULL) )
1180     {
1181         p_es_demux = (es_ts_data_t *)p_es->p_demux_data;
1182         
1183         if( p_es_demux->b_psi )
1184         {
1185             b_psi = 1;
1186         }
1187         else
1188         {
1189             p_pgrm_demux = (pgrm_ts_data_t *)p_es->p_pgrm->p_demux_data; 
1190         }
1191     }
1192
1193     vlc_mutex_lock( &p_input->stream.control.control_lock );
1194     if( ( p_es == NULL ) || (p_es->i_cat == AUDIO_ES
1195                               && p_input->stream.control.b_mute) )
1196     {
1197         /* Not selected. Just read the adaptation field for a PCR. */
1198         b_trash = 1;
1199     }
1200     else if( p_es->p_decoder_fifo == NULL && !b_psi )
1201     {
1202         b_trash = 1; 
1203     }
1204
1205     vlc_mutex_unlock( &p_input->stream.control.control_lock );
1206     vlc_mutex_unlock( &p_input->stream.stream_lock );
1207
1208
1209     /* Don't change the order of the tests : if b_psi then p_pgrm_demux 
1210      * may still be null. Who said it was ugly ?
1211      * I have written worse. --Meuuh */
1212     if( ( p_es  ) && 
1213         ((p_es->p_decoder_fifo != NULL) || b_psi || b_pcr ) )
1214     {
1215         p_es->c_packets++;
1216
1217         /* Extract adaptation field information if any */
1218
1219         if( !b_adaptation )
1220         {
1221             /* We don't have any adaptation_field, so payload starts
1222              * immediately after the 4 byte TS header */
1223             p_data->p_payload_start += 4;
1224         }
1225         else
1226         {
1227             /* p[4] is adaptation_field_length minus one */
1228             p_data->p_payload_start += 5 + p[4];
1229     
1230             /* The adaptation field can be limited to the
1231              * adaptation_field_length byte, so that there is nothing to do:
1232              * skip this possibility */
1233             if( p[4] )
1234             {
1235                 /* If the packet has both adaptation_field and payload,
1236                  * adaptation_field cannot be more than 182 bytes long; if
1237                  * there is only an adaptation_field, it must fill the next
1238                  * 183 bytes. */
1239                 if( b_payload ? (p[4] > 182) : (p[4] != 183) )
1240                 {
1241                     msg_Warn( p_input, "invalid TS adaptation field (%p)",
1242                               p_data );
1243                     p_data->b_discard_payload = 1;
1244                     p_es->c_invalid_packets++;
1245                 }
1246     
1247                 /* Now we are sure that the byte containing flags is present:
1248                  * read it */
1249                 else
1250                 {
1251                     /* discontinuity_indicator */
1252                     if( p[5] & 0x80 )
1253                     {
1254                         msg_Warn( p_input,
1255                             "discontinuity_indicator encountered by TS demux "
1256                             "(position read: %d, saved: %d)",
1257                             p[5] & 0x80, p_es_demux->i_continuity_counter );
1258     
1259                         /* If the PID carries the PCR, there will be a system
1260                          * time-based discontinuity. We let the PCR decoder
1261                          * handle that. */
1262                         p_es->p_pgrm->i_synchro_state = SYNCHRO_REINIT;
1263     
1264                         /* There also may be a continuity_counter
1265                          * discontinuity: resynchronize our counter with
1266                          * the one of the stream. */
1267                         p_es_demux->i_continuity_counter = (p[3] & 0x0f) - 1;
1268                     }
1269     
1270                 } /* valid TS adaptation field ? */
1271             } /* length > 0 */
1272         } /* has adaptation field */
1273         /* Check the continuity of the stream. */
1274         i_dummy = ((p[3] & 0x0f) - p_es_demux->i_continuity_counter) & 0x0f;
1275         if( i_dummy == 1 )
1276         {
1277             /* Everything is ok, just increase our counter */
1278             (p_es_demux->i_continuity_counter)++;
1279         }
1280         else
1281         {
1282             if( !b_payload && i_dummy == 0 )
1283             {
1284                 /* This is a packet without payload, this is allowed by the
1285                  * draft. As there is nothing interesting in this packet
1286                  * (except PCR that have already been handled), we can trash
1287                  * the packet. */
1288                 b_trash = 1;
1289             }
1290             else if( i_dummy <= 0 )
1291             {
1292                 /* Duplicate packet: mark it as being to be trashed. */
1293                 msg_Warn( p_input,
1294                           "duplicate packet received by TS demux (%d)",
1295                           i_dummy );
1296                 b_trash = 1;
1297             }
1298             else if( p_es_demux->i_continuity_counter == 0xFF )
1299             {
1300                 /* This means that the packet is the first one we receive for
1301                  * this ES since the continuity counter ranges between 0 and
1302                  * 0x0F excepts when it has been initialized by the input:
1303                  * init the counter to the correct value. */
1304                 msg_Warn( p_input, "first packet for PID %d received "
1305                                    "by TS demux", p_es->i_id );
1306                 p_es_demux->i_continuity_counter = (p[3] & 0x0f);
1307             }
1308             else
1309             {
1310                 /* This can indicate that we missed a packet or that the
1311                  * continuity_counter wrapped and we received a dup packet:
1312                  * as we don't know, do as if we missed a packet to be sure
1313                  * to recover from this situation */
1314                 msg_Warn( p_input,
1315                           "packet lost by TS demux: current %d, packet %d",
1316                           p_es_demux->i_continuity_counter & 0x0f,
1317                           p[3] & 0x0f );
1318                 b_lost = 1;
1319                 p_es_demux->i_continuity_counter = p[3] & 0x0f;
1320             } /* not continuous */
1321         } /* continuity */
1322     } /* if selected or PCR */
1323     
1324     /* Handle PCR */
1325     if( b_pcr && b_adaptation && (p[5] & 0x10) && p[4]>=7 )
1326     {
1327         /* Read the PCR. */
1328         mtime_t     pcr_time;
1329         pcr_time = ( (mtime_t)p[6] << 25 ) |
1330                    ( (mtime_t)p[7] << 17 ) |
1331                    ( (mtime_t)p[8] << 9 ) |
1332                    ( (mtime_t)p[9] << 1 ) |
1333                    ( (mtime_t)p[10] >> 7 );
1334         /* Call the pace control. */
1335         for( i_dummy = 0; i_dummy < p_input->stream.i_pgrm_number; 
1336                                 i_dummy ++ )
1337         {
1338             if( ( ( pgrm_ts_data_t * ) p_input->stream.pp_programs[i_dummy]->
1339                         p_demux_data )->i_pcr_pid == i_pid )
1340             {
1341                 input_ClockManageRef( p_input,
1342                     p_input->stream.pp_programs[i_dummy], pcr_time );
1343             }
1344         }
1345
1346     }
1347     
1348     /* Trash the packet if it has no payload or if it isn't selected */
1349     if( b_trash )
1350     {
1351         input_DeletePacket( p_input->p_method_data, p_data );
1352         p_input->stream.c_packets_trashed++;
1353     }
1354     else
1355     {
1356         if( b_psi )
1357         {
1358             /* The payload contains PSI tables */
1359             (* pf_psi_callback) ( p_input, p_data, p_es, b_unit_start );
1360         }
1361         else
1362         {
1363             /* The payload carries a PES stream */
1364             GatherPES( p_input, p_data, p_es, b_unit_start, b_lost ); 
1365         }
1366
1367     }
1368
1369 #undef p
1370
1371 }
1372