]> git.sesse.net Git - vlc/blob - modules/demux/mpeg/system.c
* Stringreview !!!
[vlc] / modules / demux / mpeg / system.c
1 /*****************************************************************************
2  * system.c: helper module for TS, PS and PES management
3  *****************************************************************************
4  * Copyright (C) 1998-2004 VideoLAN
5  * $Id: system.c,v 1.30 2004/01/25 20:05:28 hartman 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  *          Sam 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
33 #include <vlc/vlc.h>
34 #include <vlc/input.h>
35
36 #include "system.h"
37
38 /*****************************************************************************
39  * Local prototypes
40  *****************************************************************************/
41 static int  Activate   ( vlc_object_t * );
42
43 static ssize_t           ReadPS  ( input_thread_t *, data_packet_t ** );
44 static es_descriptor_t * ParsePS ( input_thread_t *, data_packet_t * );
45 static void              DemuxPS ( input_thread_t *, data_packet_t * );
46
47 static ssize_t           ReadTS  ( input_thread_t *, data_packet_t ** );
48 static void              DemuxTS ( input_thread_t *, data_packet_t *,
49                                    psi_callback_t );
50
51 /*****************************************************************************
52  * Module descriptor
53  *****************************************************************************/
54 vlc_module_begin();
55     set_description( _("Generic ISO 13818-1 MPEG demultiplexing") );
56     set_capability( "mpeg-system", 100 );
57     set_callbacks( Activate, NULL );
58 vlc_module_end();
59
60 /*****************************************************************************
61  * Activate: initializes helper functions
62  *****************************************************************************/
63 static int Activate ( vlc_object_t *p_this )
64 {
65     static mpeg_demux_t mpeg_demux =
66                     { NULL, ReadPS, ParsePS, DemuxPS, ReadTS, DemuxTS };
67     mpeg_demux.cur_scr_time = -1;
68     memcpy( p_this->p_private, &mpeg_demux, sizeof( mpeg_demux ) );
69
70     return VLC_SUCCESS;
71 }
72
73 /*
74  * PES Packet management
75  */
76
77 /*****************************************************************************
78  * MoveChunk
79  *****************************************************************************
80  * Small utility function used to parse discontinuous headers safely. Copies
81  * i_buf_len bytes of data to a buffer and returns the size copied.
82  * It also solves some alignment problems on non-IA-32, non-PPC processors.
83  * This is a variation on the theme of input_ext-dec.h:GetChunk().
84  *****************************************************************************/
85 static inline size_t MoveChunk( byte_t * p_dest, data_packet_t ** pp_data_src,
86                                 byte_t ** pp_src, size_t i_buf_len )
87 {
88     size_t i_available;
89
90     i_available = (ptrdiff_t)((*pp_data_src)->p_payload_end - *pp_src);
91     if( i_available >= i_buf_len )
92     {
93         if( p_dest != NULL )
94             memcpy( p_dest, *pp_src, i_buf_len );
95         *pp_src += i_buf_len;
96         return( i_buf_len );
97     }
98     else
99     {
100         size_t i_init_len = i_buf_len;
101
102         do
103         {
104             if( p_dest != NULL )
105                 memcpy( p_dest, *pp_src, i_available );
106             *pp_data_src = (*pp_data_src)->p_next;
107             i_buf_len -= i_available;
108             p_dest += i_available;
109             if( *pp_data_src == NULL )
110             {
111                 *pp_src = NULL;
112                 return( i_init_len - i_buf_len );
113             }
114             *pp_src = (*pp_data_src)->p_payload_start;
115
116             i_available = (ptrdiff_t)((*pp_data_src)->p_payload_end - *pp_src);
117         }
118         while( i_available <= 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_Warn( 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         unsigned 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_header[3] )
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_Warn( 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               || p_es->i_fourcc == VLC_FOURCC('d','t','s','b') )
368         {
369             /* With A/52 or DTS audio, we need to skip the first 4 bytes */
370             i_pes_header_size += 4;
371         }
372
373         if ( p_es->i_fourcc == VLC_FOURCC('l','p','c','b')
374               || p_es->i_fourcc == VLC_FOURCC('s','p','u','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_Warn( 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_Warn( 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_dec != NULL )
418         {
419             input_DecodePES( p_es->p_dec, p_pes );
420         }
421         else if ( p_es->p_dec == NULL &&
422                    ((es_ts_data_t*)p_es->p_demux_data)->b_dvbsub)
423         {
424             es_descriptor_t* p_dvbsub;
425             uint8_t          i_count;
426             uint8_t         i;
427             i_count = ((es_ts_data_t*)p_es->p_demux_data)->i_dvbsub_es_count;
428
429             // If a language is selected, we send the packet to the decoder
430             for(i = 0; i < i_count; i++)
431             {
432                 p_dvbsub = ((es_ts_data_t*)p_es->p_demux_data)->p_dvbsub_es[i];
433                 if(p_dvbsub->p_dec !=NULL)
434                 {
435                     input_DecodePES ( p_dvbsub->p_dec, p_pes );
436                     break;
437                 }
438             }
439             if(i == i_count)
440             {
441                 input_DeletePES( p_input->p_method_data, p_pes );
442             }
443         }
444         else
445         {
446             msg_Err( p_input, "no fifo to receive PES %p "
447                               "(who wrote this damn code ?)", p_pes );
448             input_DeletePES( p_input->p_method_data, p_pes );
449         }
450         p_pes = NULL;
451     }
452 #undef p_pes
453
454 }
455
456 /*****************************************************************************
457  * GatherPES:
458  *****************************************************************************
459  * Gather a PES packet.
460  *****************************************************************************/
461 static void GatherPES( input_thread_t * p_input, data_packet_t * p_data,
462                        es_descriptor_t * p_es,
463                        vlc_bool_t b_unit_start, vlc_bool_t b_packet_lost )
464 {
465 #define p_pes (p_es->p_pes)
466
467     if( b_packet_lost && p_pes != NULL )
468     {
469         p_pes->b_discontinuity = 1;
470     }
471
472     if( b_unit_start && p_pes != NULL )
473     {
474         /* If the data packet contains the begining of a new PES packet, and
475          * if we were reassembling a PES packet, then the PES should be
476          * complete now, so parse its header and give it to the decoders. */
477         ParsePES( p_input, p_es );
478     }
479
480     if( !b_unit_start && p_pes == NULL )
481     {
482         /* Random access... */
483         input_DeletePacket( p_input->p_method_data, p_data );
484     }
485     else
486     {
487         if( b_unit_start )
488         {
489             /* If we are at the beginning of a new PES packet, we must fetch
490              * a new PES buffer to begin with the reassembly of this PES
491              * packet. This is also here that we can synchronize with the
492              * stream if we lost packets or if the decoder has just
493              * started. */
494             if( (p_pes = input_NewPES( p_input->p_method_data ) ) == NULL )
495             {
496                 msg_Err( p_input, "out of memory" );
497                 p_input->b_error = 1;
498                 return;
499             }
500             p_pes->i_rate = p_input->stream.control.i_rate;
501             p_pes->p_first = p_data;
502
503             /* If the PES header fits in the first data packet, we can
504              * already set p_gather->i_pes_real_size. */
505             if( p_data->p_payload_end - p_data->p_payload_start
506                     >= PES_HEADER_SIZE )
507             {
508                 p_es->i_pes_real_size = ((uint16_t)p_data->p_payload_start[4] << 8)
509                                          + p_data->p_payload_start[5];
510                 if ( p_es->i_pes_real_size )
511                 {
512                     p_es->i_pes_real_size += 6;
513                 }
514             }
515             else
516             {
517                 p_es->i_pes_real_size = 0;
518             }
519         }
520         else
521         {
522             /* Update the relations between the data packets */
523             p_pes->p_last->p_next = p_data;
524         }
525
526         p_pes->p_last = p_data;
527         p_pes->i_nb_data++;
528
529         /* Size of the payload carried in the data packet */
530         p_pes->i_pes_size += (p_data->p_payload_end
531                                  - p_data->p_payload_start);
532
533         /* We can check if the packet is finished */
534         if( p_es->i_pes_real_size  && p_pes->i_pes_size >= p_es->i_pes_real_size )
535         {
536             if( p_pes->i_pes_size > p_es->i_pes_real_size )
537             {
538                 msg_Warn( p_input,
539                           "Oversized PES packet for PID %d: expected %d, actual %d",
540                           p_es->i_id, p_es->i_pes_real_size, p_pes->i_pes_size );
541             }
542             /* The packet is finished, parse it */
543             ParsePES( p_input, p_es );
544         }
545     }
546 #undef p_pes
547 }
548
549
550 /*
551  * PS Demultiplexing
552  */
553
554 /*****************************************************************************
555  * GetID: Get the ID of a stream
556  *****************************************************************************/
557 static uint16_t GetID( input_thread_t *p_input, data_packet_t * p_data )
558 {
559     uint16_t i_id;
560
561     i_id = p_data->p_demux_start[3];                            /* stream_id */
562     if( i_id == 0xBD )
563     {
564         mpeg_demux_t *p_mpeg_demux = (mpeg_demux_t *)p_input->p_private;
565
566         /* FIXME : this is not valid if the header is split in multiple
567          * packets */
568         /* stream_private_id */
569         i_id |= p_data->p_demux_start[ 9 + p_data->p_demux_start[8] ] << 8;
570
571         /* FIXME: See note about cur_scr_time above. */
572         p_mpeg_demux->cur_scr_time = -1;
573     }
574     return( i_id );
575 }
576
577 /*****************************************************************************
578  * DecodePSM: Decode the Program Stream Map information
579  *****************************************************************************
580  * FIXME : loads are not aligned in this function
581  *****************************************************************************/
582 static void DecodePSM( input_thread_t * p_input, data_packet_t * p_data )
583 {
584     stream_ps_data_t *  p_demux =
585                  (stream_ps_data_t *)p_input->stream.p_demux_data;
586     byte_t *            p_byte;
587     byte_t *            p_end;
588     unsigned int        i;
589     unsigned int        i_new_es_number = 0;
590
591     if( p_data->p_demux_start + 10 > p_data->p_payload_end )
592     {
593         msg_Err( p_input, "PSM too short, packet corrupt" );
594         return;
595     }
596
597     if( p_demux->b_has_PSM
598         && p_demux->i_PSM_version == (p_data->p_demux_start[6] & 0x1F) )
599     {
600         /* Already got that one. */
601         return;
602     }
603
604     p_demux->b_has_PSM = 1;
605     p_demux->i_PSM_version = p_data->p_demux_start[6] & 0x1F;
606
607     /* Go to elementary_stream_map_length, jumping over
608      * program_stream_info. */
609     p_byte = p_data->p_demux_start + 10
610               + U16_AT(&p_data->p_demux_start[8]);
611     if( p_byte > p_data->p_payload_end )
612     {
613         msg_Err( p_input, "PSM too short, packet corrupt" );
614         return;
615     }
616     /* This is the full size of the elementary_stream_map.
617      * 2 == elementary_stream_map_length
618      * Please note that CRC_32 is not included in the length. */
619     p_end = p_byte + 2 + U16_AT(p_byte);
620     p_byte += 2;
621     if( p_end > p_data->p_payload_end )
622     {
623         msg_Err( p_input, "PSM too short, packet corrupt" );
624         return;
625     }
626
627     vlc_mutex_lock( &p_input->stream.stream_lock );
628
629     /* 4 == minimum useful size of a section */
630     while( p_byte + 4 <= p_end )
631     {
632         es_descriptor_t *   p_es = NULL;
633         uint8_t             i_stream_id = p_byte[1];
634         /* FIXME: there will be a problem with private streams... (same
635          * stream_id) */
636
637         /* Look for the ES in the ES table */
638         for( i = i_new_es_number;
639              i < p_input->stream.pp_programs[0]->i_es_number;
640              i++ )
641         {
642             if( p_input->stream.pp_programs[0]->pp_es[i]->i_stream_id
643                     == i_stream_id )
644             {
645                 p_es = p_input->stream.pp_programs[0]->pp_es[i];
646                 /* FIXME: do something below */
647 #if 0
648                 if( p_es->i_type != p_byte[0] )
649                 {
650                     input_DelES( p_input, p_es );
651                     p_es = NULL;
652                 }
653                 else
654 #endif
655                 {
656                     /* Move the ES to the beginning. */
657                     p_input->stream.pp_programs[0]->pp_es[i]
658                         = p_input->stream.pp_programs[0]->pp_es[ i_new_es_number ];
659                     p_input->stream.pp_programs[0]->pp_es[ i_new_es_number ]
660                         = p_es;
661                     i_new_es_number++;
662                 }
663                 break;
664             }
665         }
666
667         /* The goal is to have all the ES we have just read in the
668          * beginning of the pp_es table, and all the others at the end,
669          * so that we can close them more easily at the end. */
670         if( p_es == NULL )
671         {
672             int i_fourcc, i_cat;
673
674             switch( p_byte[0] )
675             {
676             case MPEG1_VIDEO_ES:
677             case MPEG2_VIDEO_ES:
678             case MPEG2_MOTO_VIDEO_ES:
679                 i_fourcc = VLC_FOURCC('m','p','g','v');
680                 i_cat = VIDEO_ES;
681                 break;
682             case DVD_SPU_ES:
683                 i_fourcc = VLC_FOURCC('s','p','u','b');
684                 i_cat = SPU_ES;
685                 break;
686             case MPEG1_AUDIO_ES:
687             case MPEG2_AUDIO_ES:
688                 i_fourcc = VLC_FOURCC('m','p','g','a');
689                 i_cat = AUDIO_ES;
690                 break;
691             case A52_AUDIO_ES:
692                 i_fourcc = VLC_FOURCC('a','5','2','b');
693                 i_cat = AUDIO_ES;
694                 break;
695             case LPCM_AUDIO_ES:
696                 i_fourcc = VLC_FOURCC('l','p','c','b');
697                 i_cat = AUDIO_ES;
698                 break;
699             default:
700                 i_cat = UNKNOWN_ES;
701                 i_fourcc = 0;
702                 break;
703             }
704
705             p_es = input_AddES( p_input, p_input->stream.pp_programs[0],
706                                 i_stream_id, i_cat, NULL, 0 );
707             p_es->i_fourcc = i_fourcc;
708
709             /* input_AddES has inserted the new element at the end. */
710             p_input->stream.pp_programs[0]->pp_es[
711                 p_input->stream.pp_programs[0]->i_es_number ]
712                 = p_input->stream.pp_programs[0]->pp_es[ i_new_es_number ];
713             p_input->stream.pp_programs[0]->pp_es[ i_new_es_number ] = p_es;
714             i_new_es_number++;
715         }
716         p_byte += 4 + U16_AT(&p_byte[2]);
717     }
718
719     /* Un-select the streams that are no longer parts of the program. */
720     while( i_new_es_number < p_input->stream.pp_programs[0]->i_es_number )
721     {
722         /* We remove pp_es[i_new_es_member] and not pp_es[i] because the
723          * list will be emptied starting from the end */
724         input_DelES( p_input,
725                      p_input->stream.pp_programs[0]->pp_es[i_new_es_number] );
726     }
727
728     msg_Dbg( p_input, "the stream map after the PSM is now:" );
729     input_DumpStream( p_input );
730
731     vlc_mutex_unlock( &p_input->stream.stream_lock );
732 }
733
734 /*****************************************************************************
735  * ReadPS: store a PS packet into a data_buffer_t
736  *****************************************************************************/
737 #define PEEK( SIZE )                                                        \
738     i_error = input_Peek( p_input, &p_peek, SIZE );                         \
739     if( i_error == -1 )                                                     \
740     {                                                                       \
741         return( -1 );                                                       \
742     }                                                                       \
743     else if( (size_t)i_error < SIZE )                                       \
744     {                                                                       \
745         /* EOF */                                                           \
746         return( 0 );                                                        \
747     }
748
749 static ssize_t ReadPS( input_thread_t * p_input, data_packet_t ** pp_data )
750 {
751     byte_t *            p_peek;
752     size_t              i_packet_size;
753     ssize_t             i_error, i_read;
754
755     /* Read what we believe to be a packet header. */
756     PEEK( 4 );
757
758     if( p_peek[0] || p_peek[1] || p_peek[2] != 1 || p_peek[3] < 0xB9 )
759     {
760         if( p_peek[0] || p_peek[1] || p_peek[2] )
761         {
762             /* It is common for MPEG-1 streams to pad with zeros
763              * (although it is forbidden by the recommendation), so
764              * don't bother everybody in this case. */
765             msg_Warn( p_input, "garbage (0x%.2x%.2x%.2x%.2x)",
766                       p_peek[0], p_peek[1], p_peek[2], p_peek[3] );
767         }
768
769         /* This is not the startcode of a packet. Read the stream
770          * until we find one. */
771         while( p_peek[0] || p_peek[1] || p_peek[2] != 1 || p_peek[3] < 0xB9 )
772         {
773             p_input->p_current_data++;
774             PEEK( 4 );
775             if( p_input->b_die ) return( -1 );
776         }
777         /* Packet found. */
778     }
779
780     /* 0x1B9 == SYSTEM_END_CODE, it is only 4 bytes long. */
781     if( p_peek[3] != 0xB9 )
782     {
783         /* The packet is at least 6 bytes long. */
784         PEEK( 6 );
785
786         if( p_peek[3] != 0xBA )
787         {
788             /* That's the case for all packets, except pack header. */
789             i_packet_size = (p_peek[4] << 8) | p_peek[5];
790         }
791         else
792         {
793             /* Pack header. */
794             if( (p_peek[4] & 0xC0) == 0x40 )
795             {
796                 /* MPEG-2 */
797                 i_packet_size = 8;
798             }
799             else if( (p_peek[4] & 0xF0) == 0x20 )
800             {
801                 /* MPEG-1 */
802                 i_packet_size = 6;
803             }
804             else
805             {
806                 msg_Err( p_input, "unable to determine stream type" );
807                 p_input->p_current_data++;
808                 return( -1 );
809             }
810         }
811     }
812     else
813     {
814         /* System End Code */
815         i_packet_size = -2;
816     }
817
818     /* Fetch a packet of the appropriate size. */
819     i_read = input_SplitBuffer( p_input, pp_data, i_packet_size + 6 );
820     if( i_read <= 0 )
821     {
822         return( i_read );
823     }
824
825     /* In MPEG-2 pack headers we still have to read stuffing bytes. */
826     if( ((*pp_data)->p_demux_start[3] == 0xBA) && (i_packet_size == 8) )
827     {
828         size_t i_stuffing = ((*pp_data)->p_demux_start[13] & 0x7);
829         /* Force refill of the input buffer - though we don't care
830          * about p_peek. Please note that this is unoptimized. */
831         PEEK( i_stuffing );
832         p_input->p_current_data += i_stuffing;
833     }
834
835     return( 1 );
836 }
837
838 #undef PEEK
839
840 /*****************************************************************************
841  * ParsePS: read the PS header
842  *****************************************************************************/
843 static es_descriptor_t * ParsePS( input_thread_t * p_input,
844                                   data_packet_t * p_data )
845 {
846     uint32_t            i_code;
847     es_descriptor_t *   p_es = NULL;
848
849     i_code = p_data->p_demux_start[3];
850
851     if( i_code > 0xBC ) /* ES start code */
852     {
853         uint16_t            i_id;
854         unsigned int        i_dummy;
855
856         /* This is a PES packet. Find out if we want it or not. */
857         i_id = GetID( p_input, p_data );
858
859         vlc_mutex_lock( &p_input->stream.stream_lock );
860         if( p_input->stream.pp_programs[0]->b_is_ok )
861         {
862             /* Look only at the selected ES. */
863             for( i_dummy = 0; i_dummy < p_input->stream.i_selected_es_number;
864                  i_dummy++ )
865             {
866                 if( p_input->stream.pp_selected_es[i_dummy] != NULL
867                     && p_input->stream.pp_selected_es[i_dummy]->i_id == i_id )
868                 {
869                     p_es = p_input->stream.pp_selected_es[i_dummy];
870                     break;
871                 }
872             }
873         }
874         else
875         {
876             vlc_bool_t b_auto_spawn = VLC_FALSE;
877             stream_ps_data_t * p_demux =
878               (stream_ps_data_t *)p_input->stream.pp_programs[0]->p_demux_data;
879
880             /* Search all ES ; if not found -> AddES */
881             p_es = input_FindES( p_input, i_id );
882
883             if( p_es == NULL && !p_demux->b_has_PSM )
884             {
885                 int i_fourcc, i_cat;
886
887                 /* Set stream type and auto-spawn. */
888                 if( (i_id & 0xF0) == 0xE0 )
889                 {
890                     /* MPEG video */
891                     i_fourcc = VLC_FOURCC('m','p','g','v');
892                     i_cat = VIDEO_ES;
893 #ifdef AUTO_SPAWN
894                     if( !p_input->stream.b_seekable ) b_auto_spawn = VLC_TRUE;
895 #endif
896                 }
897                 else if( (i_id & 0xE0) == 0xC0 )
898                 {
899                     /* MPEG audio */
900                     i_fourcc = VLC_FOURCC('m','p','g','a');
901                     i_cat = AUDIO_ES;
902 #ifdef AUTO_SPAWN
903                     if( !p_input->stream.b_seekable )
904                     if( config_GetInt( p_input, "audio-channel" )
905                             == (i_id & 0x1F) ||
906                         ( config_GetInt( p_input, "audio-channel" ) < 0
907                           && !(i_id & 0x1F) ) )
908                     switch( config_GetInt( p_input, "audio-type" ) )
909                     {
910                     case -1:
911                     case REQUESTED_MPEG:
912                         b_auto_spawn = VLC_TRUE;
913                     }
914 #endif
915                 }
916                 else if( (i_id & 0xF8FF) == 0x88BD )
917                 {
918                     i_fourcc = VLC_FOURCC('d','t','s','b');
919                     i_cat = AUDIO_ES;
920 #ifdef AUTO_SPAWN
921                     if( !p_input->stream.b_seekable )
922                     if( config_GetInt( p_input, "audio-channel" )
923                             == ((i_id & 0x700) >> 8) ||
924                         ( config_GetInt( p_input, "audio-channel" ) < 0
925                           && !((i_id & 0x700) >> 8)) )
926                     switch( config_GetInt( p_input, "audio-type" ) )
927                     {
928                     case -1:
929                     case REQUESTED_DTS:
930                         b_auto_spawn = VLC_TRUE;
931                     }
932 #endif
933                 }
934                 else if( (i_id & 0xF0FF) == 0x80BD )
935                 {
936                     /* A52 audio (0x80->0x8F) */
937                     i_fourcc = VLC_FOURCC('a','5','2','b');
938                     i_cat = AUDIO_ES;
939 #ifdef AUTO_SPAWN
940                     if( !p_input->stream.b_seekable )
941                     if( config_GetInt( p_input, "audio-channel" )
942                             == ((i_id & 0xF00) >> 8) ||
943                         ( config_GetInt( p_input, "audio-channel" ) < 0
944                           && !((i_id & 0xF00) >> 8)) )
945                     switch( config_GetInt( p_input, "audio-type" ) )
946                     {
947                     case -1:
948                     case REQUESTED_A52:
949                         b_auto_spawn = VLC_TRUE;
950                     }
951 #endif
952                 }
953                 else if( (i_id & 0xE0FF) == 0x20BD )
954                 {
955                     /* Subtitles video (0x20->0x3F) */
956                     i_fourcc = VLC_FOURCC('s','p','u','b');
957                     i_cat = SPU_ES;
958 #ifdef AUTO_SPAWN
959                     if( !p_input->stream.b_seekable )
960                     if( config_GetInt( p_input, "spu-channel" )
961                            == ((i_id & 0x1F00) >> 8) )
962                     {
963                         b_auto_spawn = VLC_TRUE;
964                     }
965 #endif
966                 }
967                 else if( (i_id & 0xF0FF) == 0xA0BD )
968                 {
969                     /* LPCM audio (0xA0->0xAF) */
970                     i_fourcc = VLC_FOURCC('l','p','c','b');
971                     i_cat = AUDIO_ES;
972                 }
973                 else if( (i_id & 0xFFFF) == 0x70BD )
974                 {
975                     /* SVCD OGT subtitles in stream 0x070 */
976                     i_fourcc = VLC_FOURCC('o','g','t', ' ');
977                     i_cat = SPU_ES;
978                     b_auto_spawn = VLC_TRUE;
979                 }
980                 else if( ((i_id >> 8) & 0xFF) <= 0x03 &&
981                          (i_id & 0x00FF) == 0x00BD )
982                 {
983                     /* CVD subtitles (0x00->0x03) */
984                     i_fourcc = VLC_FOURCC('c','v','d', ' ');
985                     i_cat = SPU_ES;
986                     b_auto_spawn = VLC_TRUE;
987                 }
988                 else
989                 {
990                     i_cat = UNKNOWN_ES;
991                     i_fourcc = 0;
992                 }
993
994                 p_es = input_AddES( p_input, p_input->stream.pp_programs[0],
995                                     i_id, i_cat, NULL, 0 );
996
997                 p_es->i_stream_id = p_data->p_demux_start[3];
998                 p_es->i_fourcc = i_fourcc;
999
1000                 if( b_auto_spawn ) input_SelectES( p_input, p_es );
1001
1002                 /* Tell the interface the stream has changed */
1003                 p_input->stream.b_changed = 1;
1004             }
1005         } /* stream.b_is_ok */
1006         vlc_mutex_unlock( &p_input->stream.stream_lock );
1007     } /* i_code > 0xBC */
1008
1009     return( p_es );
1010 }
1011
1012 /*****************************************************************************
1013  * DemuxPS: first step of demultiplexing: the PS header
1014  *****************************************************************************/
1015 static void DemuxPS( input_thread_t * p_input, data_packet_t * p_data )
1016 {
1017     uint32_t i_code;
1018     vlc_bool_t b_trash = 0;
1019     es_descriptor_t * p_es = NULL;
1020     mpeg_demux_t *p_mpeg_demux = (mpeg_demux_t *)p_input->p_private;
1021
1022     i_code = ((uint32_t)p_data->p_demux_start[0] << 24)
1023                 | ((uint32_t)p_data->p_demux_start[1] << 16)
1024                 | ((uint32_t)p_data->p_demux_start[2] << 8)
1025                 | p_data->p_demux_start[3];
1026     if( i_code <= 0x1BC )
1027     {
1028         switch( i_code )
1029         {
1030         case 0x1BA: /* PACK_START_CODE */
1031             {
1032                 /* Read the SCR. */
1033                 mtime_t scr_time;
1034                 uint32_t i_mux_rate;
1035
1036                 if( (p_data->p_demux_start[4] & 0xC0) == 0x40 )
1037                 {
1038                     /* MPEG-2 */
1039                     byte_t      p_header[14];
1040                     byte_t *    p_byte;
1041                     p_byte = p_data->p_demux_start;
1042
1043                     if( MoveChunk( p_header, &p_data, &p_byte, 14 ) != 14 )
1044                     {
1045                         msg_Warn( p_input,
1046                                   "packet too short to have a header" );
1047                         b_trash = 1;
1048                         break;
1049                     }
1050                     scr_time =
1051                          ((mtime_t)(p_header[4] & 0x38) << 27) |
1052                          ((mtime_t)(U32_AT(p_header + 4) & 0x03FFF800)
1053                                         << 4) |
1054                          ((( ((mtime_t)U16_AT(p_header + 6) << 16)
1055                             | (mtime_t)U16_AT(p_header + 8) ) & 0x03FFF800)
1056                                         >> 11);
1057
1058                     /* mux_rate */
1059                     i_mux_rate = ((uint32_t)U16_AT(p_header + 10) << 6)
1060                                    | (p_header[12] >> 2);
1061                     /* FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME
1062                      * This is the biggest kludge ever !
1063                      * I don't know what's wrong with mux_rate calculation
1064                      * but this heuristic works well : */
1065                     i_mux_rate <<= 1;
1066                     i_mux_rate /= 3;
1067                 }
1068                 else
1069                 {
1070                     /* MPEG-1 SCR is like PTS. */
1071                     byte_t      p_header[12];
1072                     byte_t *    p_byte;
1073                     p_byte = p_data->p_demux_start;
1074
1075                     if( MoveChunk( p_header, &p_data, &p_byte, 12 ) != 12 )
1076                     {
1077                         msg_Warn( p_input,
1078                                   "packet too short to have a header" );
1079                         b_trash = 1;
1080                         break;
1081                     }
1082                     scr_time =
1083                          ((mtime_t)(p_header[4] & 0x0E) << 29) |
1084                          (((mtime_t)U32_AT(p_header + 4) & 0xFFFE00) << 6) |
1085                          ((mtime_t)p_header[7] << 7) |
1086                          ((mtime_t)p_header[8] >> 1);
1087
1088                     /* mux_rate */
1089                     i_mux_rate = (U32_AT(p_header + 8) & 0x7FFFFE) >> 1;
1090                 }
1091                 p_mpeg_demux->cur_scr_time   = scr_time;
1092                 p_mpeg_demux->i_cur_mux_rate = i_mux_rate;
1093
1094                 b_trash = 1;
1095             }
1096             break;
1097
1098         case 0x1BB: /* SYSTEM_START_CODE */
1099             b_trash = 1;                              /* Nothing interesting */
1100             break;
1101
1102         case 0x1BC: /* PROGRAM_STREAM_MAP_CODE */
1103             DecodePSM( p_input, p_data );
1104             b_trash = 1;
1105             break;
1106
1107         case 0x1B9: /* PROGRAM_END_CODE */
1108             b_trash = 1;
1109             break;
1110
1111         default:
1112             /* This should not happen */
1113             b_trash = 1;
1114             msg_Warn( p_input, "unwanted packet received "
1115                                "with startcode 0x%.8x", i_code );
1116         }
1117     }
1118     else
1119     {
1120         p_es = ParsePS( p_input, p_data );
1121
1122         /* Call the pace control. 
1123          * FIXME: see hack note about cur_scr_time in system.h. 
1124          */
1125         if( p_mpeg_demux->cur_scr_time != -1 )
1126         {
1127             input_ClockManageRef( p_input,
1128                                   p_input->stream.p_selected_program,
1129                                   p_mpeg_demux->cur_scr_time );
1130           
1131             if( p_mpeg_demux->i_cur_mux_rate != p_input->stream.i_mux_rate
1132                 && p_input->stream.i_mux_rate )
1133             {
1134                 msg_Warn( p_input,
1135                           "mux_rate changed prev: %ud, cur: %ud;"
1136                           " expect cosmetic errors" , 
1137                           (unsigned int) p_input->stream.i_mux_rate, 
1138                           (unsigned int) p_mpeg_demux->i_cur_mux_rate );
1139             }
1140             p_input->stream.i_mux_rate = p_mpeg_demux->i_cur_mux_rate;
1141         }
1142         vlc_mutex_lock( &p_input->stream.control.control_lock );
1143         if( p_es != NULL && p_es->p_dec != NULL
1144              && (p_es->i_cat != AUDIO_ES || !p_input->stream.control.b_mute) )
1145         {
1146             vlc_mutex_unlock( &p_input->stream.control.control_lock );
1147             p_es->c_packets++;
1148             GatherPES( p_input, p_data, p_es, 1, 0 );
1149         }
1150         else
1151         {
1152             vlc_mutex_unlock( &p_input->stream.control.control_lock );
1153             b_trash = 1;
1154         }
1155     }
1156
1157     /* Trash the packet if it has no payload or if it isn't selected */
1158     if( b_trash )
1159     {
1160         input_DeletePacket( p_input->p_method_data, p_data );
1161         p_input->stream.c_packets_trashed++;
1162     }
1163 }
1164
1165
1166 /*
1167  * TS Demultiplexing
1168  */
1169
1170 /*****************************************************************************
1171  * ReadTS: store a TS packet into a data_buffer_t
1172  *****************************************************************************/
1173 #define PEEK( SIZE )                                                        \
1174     i_error = input_Peek( p_input, &p_peek, SIZE );                         \
1175     if( i_error == -1 )                                                     \
1176     {                                                                       \
1177         return( -1 );                                                       \
1178     }                                                                       \
1179     else if( i_error < SIZE )                                               \
1180     {                                                                       \
1181         /* EOF */                                                           \
1182         return( 0 );                                                        \
1183     }
1184
1185 static ssize_t ReadTS( input_thread_t * p_input, data_packet_t ** pp_data )
1186 {
1187     byte_t *            p_peek;
1188     ssize_t             i_error, i_read;
1189
1190     PEEK( 1 );
1191
1192     if( *p_peek != TS_SYNC_CODE )
1193     {
1194         msg_Warn( p_input, "garbage at input (%x)", *p_peek );
1195
1196         if( p_input->i_mtu )
1197         {
1198             while( *p_peek != TS_SYNC_CODE )
1199             {
1200                 /* Try to resync on next packet. */
1201                 PEEK( TS_PACKET_SIZE );
1202                 p_input->p_current_data += TS_PACKET_SIZE;
1203                 PEEK( 1 );
1204             }
1205         }
1206         else
1207         {
1208             /* Move forward until we find 0x47 (and hope it's the good
1209              * one... FIXME) */
1210             while( *p_peek != TS_SYNC_CODE )
1211             {
1212                 p_input->p_current_data++;
1213                 PEEK( 1 );
1214             }
1215         }
1216     }
1217
1218     i_read = input_SplitBuffer( p_input, pp_data, TS_PACKET_SIZE );
1219     if( i_read <= 0 )
1220     {
1221         return( i_read );
1222     }
1223
1224     return( 1 );
1225 }
1226
1227 /*****************************************************************************
1228  * DemuxTS: first step of demultiplexing: the TS header
1229  *****************************************************************************/
1230 static void DemuxTS( input_thread_t * p_input, data_packet_t * p_data,
1231                      psi_callback_t pf_psi_callback )
1232 {
1233     uint16_t            i_pid;
1234     unsigned int        i_dummy;
1235     vlc_bool_t          b_adaptation;         /* Adaptation field is present */
1236     vlc_bool_t          b_payload;                 /* Packet carries payload */
1237     vlc_bool_t          b_unit_start;  /* A PSI or a PES start in the packet */
1238     vlc_bool_t          b_trash = 0;             /* Is the packet unuseful ? */
1239     vlc_bool_t          b_lost = 0;             /* Was there a packet loss ? */
1240     vlc_bool_t          b_psi = 0;                        /* Is this a PSI ? */
1241     vlc_bool_t          b_dvbsub = 0;            /* Is this a dvb subtitle ? */
1242     vlc_bool_t          b_pcr = 0;                   /* Does it have a PCR ? */
1243     es_descriptor_t *   p_es = NULL;
1244     es_ts_data_t *      p_es_demux = NULL;
1245     pgrm_ts_data_t *    p_pgrm_demux = NULL;
1246     stream_ts_data_t *  p_stream_demux =
1247                           (stream_ts_data_t *)p_input->stream.p_demux_data;
1248
1249 #define p (p_data->p_demux_start)
1250     /* Extract flags values from TS common header. */
1251     i_pid = ((p[1] & 0x1F) << 8) | p[2];
1252     b_unit_start = (p[1] & 0x40);
1253     b_adaptation = (p[3] & 0x20);
1254     b_payload = (p[3] & 0x10);
1255
1256     /* Was there a transport error ? */
1257     if ( p[1] & 0x80 )
1258     {
1259         msg_Warn( p_input, "transport_error_indicator set for PID %d counter %x", i_pid, p[3] & 0x0f );
1260     }
1261
1262     /* Find out the elementary stream. */
1263     vlc_mutex_lock( &p_input->stream.stream_lock );
1264
1265     for( i_dummy = 0; i_dummy < p_input->stream.i_pgrm_number; i_dummy ++ )
1266     {
1267         if( (( pgrm_ts_data_t * ) p_input->stream.pp_programs[i_dummy]->
1268                     p_demux_data)->i_pcr_pid == i_pid )
1269         {
1270             b_pcr = 1;
1271             break;
1272         }
1273     }
1274
1275     p_es = input_FindES( p_input, i_pid );
1276
1277     if( (p_es != NULL) && (p_es->p_demux_data != NULL) )
1278     {
1279         p_es_demux = (es_ts_data_t *)p_es->p_demux_data;
1280
1281         if( p_es_demux->b_psi )
1282         {
1283             b_psi = 1;
1284         }
1285         else if ( p_es_demux->b_dvbsub )
1286         {
1287             b_dvbsub = 1;
1288         }
1289         else
1290         {
1291             p_pgrm_demux = (pgrm_ts_data_t *)p_es->p_pgrm->p_demux_data;
1292         }
1293     }
1294
1295     vlc_mutex_lock( &p_input->stream.control.control_lock );
1296     if( ( p_es == NULL ) || (p_es->i_cat == AUDIO_ES
1297                               && p_input->stream.control.b_mute) )
1298     {
1299         /* Not selected. Just read the adaptation field for a PCR. */
1300         b_trash = 1;
1301     }
1302     else if( p_es->p_dec == NULL && !b_psi && !b_dvbsub )
1303     {
1304         b_trash = 1;
1305     }
1306
1307     vlc_mutex_unlock( &p_input->stream.control.control_lock );
1308     vlc_mutex_unlock( &p_input->stream.stream_lock );
1309
1310
1311     /* Don't change the order of the tests : if b_psi then p_pgrm_demux
1312      * may still be null. Who said it was ugly ?
1313      * I have written worse. --Meuuh */
1314     if( ( p_es ) &&
1315         ((p_es->p_dec != NULL) || b_psi || b_pcr || b_dvbsub) )
1316     {
1317         p_es->c_packets++;
1318
1319         /* Extract adaptation field information if any */
1320
1321         if( !b_adaptation )
1322         {
1323             /* We don't have any adaptation_field, so payload starts
1324              * immediately after the 4 byte TS header */
1325             p_data->p_payload_start += 4;
1326         }
1327         else
1328         {
1329             /* p[4] is adaptation_field_length minus one */
1330             p_data->p_payload_start += 5 + p[4];
1331
1332             /* The adaptation field can be limited to the
1333              * adaptation_field_length byte, so that there is nothing to do:
1334              * skip this possibility */
1335             if( p[4] )
1336             {
1337                 /* If the packet has both adaptation_field and payload,
1338                  * adaptation_field cannot be more than 182 bytes long; if
1339                  * there is only an adaptation_field, it must fill the next
1340                  * 183 bytes. */
1341                 if( b_payload ? (p[4] > 182) : (p[4] != 183) )
1342                 {
1343                     msg_Warn( p_input, "invalid TS adaptation field for PID %d (%2x)",
1344                               i_pid, p[4] );
1345                     p_data->b_discard_payload = 1;
1346                     p_es->c_invalid_packets++;
1347
1348                     /* The length was invalid so we shouldn't have added it to
1349                      * p_payload_start above.  Ensure p_payload_start has a
1350                      * valid value by setting it equal to p_payload_end.  This
1351                      * also stops any data being processed from the packet.
1352                      */
1353                     p_data->p_payload_start = p_data->p_payload_end;
1354                 }
1355
1356                 /* Now we are sure that the byte containing flags is present:
1357                  * read it */
1358                 else
1359                 {
1360                     /* discontinuity_indicator */
1361                     if( p[5] & 0x80 )
1362                     {
1363                         msg_Warn( p_input,
1364                             "discontinuity_indicator encountered by TS demux "
1365                             "(PID %d: current %d, packet %d)",
1366                             i_pid,
1367                             ( p_es_demux->i_continuity_counter ) & 0x0f,
1368                             p[3] & 0x0f );
1369
1370                         /* If the PID carries the PCR, there will be a system
1371                          * time-based discontinuity. We let the PCR decoder
1372                          * handle that. */
1373                         p_es->p_pgrm->i_synchro_state = SYNCHRO_REINIT;
1374
1375                         /* Don't resynchronise the counter here - it will
1376                          * be checked later and b_lost will then be set if
1377                          * necessary.
1378                          */
1379                     }
1380
1381                 } /* valid TS adaptation field ? */
1382             } /* length > 0 */
1383         } /* has adaptation field */
1384         /* Check the continuity of the stream. */
1385         i_dummy = ((p[3] & 0x0f) - p_es_demux->i_continuity_counter) & 0x0f;
1386         if( b_payload &&
1387                 ( i_dummy == 1 || (b_psi && p_stream_demux->b_buggy_psi ) ) )
1388         {
1389             /* Everything is ok, just increase our counter */
1390             (p_es_demux->i_continuity_counter)++;
1391         }
1392         else
1393         {
1394             if( !b_payload && i_dummy == 0 )
1395             {
1396                 /* This is a packet without payload, this is allowed by the
1397                  * draft. As there is nothing interesting in this packet
1398                  * (except PCR that have already been handled), we can trash
1399                  * the packet. */
1400                 b_trash = 1;
1401             }
1402             else if( !b_payload )
1403             {
1404                 /* If there is no payload, the counter should be unchanged */
1405                 msg_Warn( p_input, "packet rxd for PID %d with no payload but "
1406                         "wrong counter: current %d, packet %d", i_pid,
1407                         p_es_demux->i_continuity_counter & 0x0f, p[3] & 0x0f );
1408             }
1409             else if( i_dummy <= 0 )
1410             {
1411                 /* Duplicate packet: mark it as being to be trashed. */
1412                 msg_Warn( p_input,
1413                           "duplicate packet received for PID %d (counter %d)",
1414                           p_es->i_id, p[3] & 0x0f );
1415                 b_trash = 1;
1416             }
1417             else if( p_es_demux->i_continuity_counter == 0xFF )
1418             {
1419                 /* This means that the packet is the first one we receive for
1420                  * this ES since the continuity counter ranges between 0 and
1421                  * 0x0F excepts when it has been initialized by the input:
1422                  * init the counter to the correct value. */
1423                 msg_Warn( p_input, "first packet for PID %d received "
1424                                    "by TS demux", p_es->i_id );
1425                 p_es_demux->i_continuity_counter = (p[3] & 0x0f);
1426             }
1427             else
1428             {
1429                 /* This can indicate that we missed a packet or that the
1430                  * continuity_counter wrapped and we received a dup packet:
1431                  * as we don't know, do as if we missed a packet to be sure
1432                  * to recover from this situation */
1433                 msg_Warn( p_input,
1434                           "packet lost by TS demux for PID %d: current %d, packet %d",
1435                           i_pid,
1436                           p_es_demux->i_continuity_counter & 0x0f,
1437                           p[3] & 0x0f );
1438                 b_lost = 1;
1439                 p_es_demux->i_continuity_counter = p[3] & 0x0f;
1440             } /* not continuous */
1441         } /* continuity */
1442     } /* if selected or PCR */
1443
1444     /* Handle PCR */
1445     if( b_pcr && b_adaptation && (p[5] & 0x10) && p[4]>=7 )
1446     {
1447         /* Read the PCR. */
1448         mtime_t     pcr_time;
1449         pcr_time = ( (mtime_t)p[6] << 25 ) |
1450                    ( (mtime_t)p[7] << 17 ) |
1451                    ( (mtime_t)p[8] << 9 ) |
1452                    ( (mtime_t)p[9] << 1 ) |
1453                    ( (mtime_t)p[10] >> 7 );
1454         /* Call the pace control. */
1455         for( i_dummy = 0; i_dummy < p_input->stream.i_pgrm_number;
1456                                 i_dummy ++ )
1457         {
1458             if( ( ( pgrm_ts_data_t * ) p_input->stream.pp_programs[i_dummy]->
1459                         p_demux_data )->i_pcr_pid == i_pid )
1460             {
1461                 input_ClockManageRef( p_input,
1462                     p_input->stream.pp_programs[i_dummy], pcr_time );
1463             }
1464         }
1465
1466     }
1467
1468     /* Trash the packet if it has no payload or if it isn't selected */
1469     if( b_trash )
1470     {
1471         input_DeletePacket( p_input->p_method_data, p_data );
1472         p_input->stream.c_packets_trashed++;
1473     }
1474     else
1475     {
1476         if( b_psi )
1477         {
1478             /* The payload contains PSI tables */
1479             (* pf_psi_callback) ( p_input, p_data, p_es, b_unit_start );
1480         }
1481         else
1482         {
1483             /* The payload carries a PES stream */
1484             GatherPES( p_input, p_data, p_es, b_unit_start, b_lost );
1485         }
1486
1487     }
1488
1489 #undef p
1490
1491 }