1 /*****************************************************************************
2 * mpeg_ts.c : Transport Stream input module for vlc
3 *****************************************************************************
4 * Copyright (C) 2000-2001 VideoLAN
5 * $Id: ts.c,v 1.32 2003/08/04 12:40:22 jpsaman Exp $
7 * Authors: Henri Fallon <henri@via.ecp.fr>
8 * Johan Bilien <jobi@via.ecp.fr>
10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by
12 * the Free Software Foundation; either version 2 of the License, or
13 * (at your option) any later version.
15 * This program is distributed in the hope that it will be useful,
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 * GNU General Public License for more details.
20 * You should have received a copy of the GNU General Public License
21 * along with this program; if not, write to the Free Software
22 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
23 *****************************************************************************/
25 /*****************************************************************************
27 *****************************************************************************/
32 # include <stdint.h> /* uint8_t */
36 #include <vlc/input.h>
40 #if defined MODULE_NAME_IS_ts_dvbpsi
41 # ifdef HAVE_DVBPSI_DR_H
42 # include <dvbpsi/dvbpsi.h>
43 # include <dvbpsi/descriptor.h>
44 # include <dvbpsi/pat.h>
45 # include <dvbpsi/pmt.h>
46 # include <dvbpsi/dr.h>
49 # include "descriptor.h"
50 # include "tables/pat.h"
51 # include "tables/pmt.h"
52 # include "descriptors/dr.h"
59 /*****************************************************************************
61 *****************************************************************************/
62 #define TS_READ_ONCE 200
64 /*****************************************************************************
66 *****************************************************************************/
73 /*****************************************************************************
75 *****************************************************************************/
76 static int Activate ( vlc_object_t * );
77 static void Deactivate ( vlc_object_t * );
78 static int Demux ( input_thread_t * );
80 #if defined MODULE_NAME_IS_ts
81 static void TSDemuxPSI ( input_thread_t *, data_packet_t *,
82 es_descriptor_t *, vlc_bool_t );
83 static void TSDecodePAT( input_thread_t *, es_descriptor_t *);
84 static void TSDecodePMT( input_thread_t *, es_descriptor_t *);
85 #define PSI_CALLBACK TSDemuxPSI
86 #elif defined MODULE_NAME_IS_ts_dvbpsi
87 static void TS_DVBPSI_DemuxPSI ( input_thread_t *, data_packet_t *,
88 es_descriptor_t *, vlc_bool_t );
89 static void TS_DVBPSI_HandlePAT ( input_thread_t *, dvbpsi_pat_t * );
90 static void TS_DVBPSI_HandlePMT ( input_thread_t *, dvbpsi_pmt_t * );
91 #define PSI_CALLBACK TS_DVBPSI_DemuxPSI
94 /*****************************************************************************
96 *****************************************************************************/
97 #define VLS_BACKWARDS_COMPAT_TEXT N_("Compatibility with pre-0.4 VLS")
98 #define VLS_BACKWARDS_COMPAT_LONGTEXT N_( \
99 "The protocol for transmitting A/52 audio streams changed between VLC " \
100 "0.3.x and 0.4. By default VLC assumes you have the latest VLS. In case " \
101 "you're using an old version, select this option.")
103 #define BUGGY_PSI_TEXT N_("Buggy PSI")
104 #define BUGGY_PSI_LONGTEXT N_( \
105 "If you have a stream whose PSI packets do not feature incremented " \
106 "continuity counters, select this option.")
109 #if defined MODULE_NAME_IS_ts
110 set_description( _("ISO 13818-1 MPEG Transport Stream input") );
111 set_capability( "demux", 160 );
112 add_shortcut( "ts" );
113 #elif defined MODULE_NAME_IS_ts_dvbpsi
114 set_description( _("ISO 13818-1 MPEG Transport Stream input (libdvbpsi)") );
115 set_capability( "demux", 170 );
116 add_shortcut( "ts_dvbpsi" );
118 add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE );
119 add_bool( "vls-backwards-compat", 0, NULL,
120 VLS_BACKWARDS_COMPAT_TEXT, VLS_BACKWARDS_COMPAT_LONGTEXT, VLC_TRUE );
121 add_bool( "buggy-psi", 0, NULL, BUGGY_PSI_TEXT, BUGGY_PSI_LONGTEXT, VLC_TRUE );
122 set_callbacks( Activate, Deactivate );
125 /*****************************************************************************
126 * Activate: initialize TS structures
127 *****************************************************************************/
128 static int Activate( vlc_object_t * p_this )
130 input_thread_t * p_input = (input_thread_t *)p_this;
131 demux_sys_t * p_demux;
132 es_descriptor_t * p_pat_es;
133 es_ts_data_t * p_demux_data;
134 stream_ts_data_t * p_stream_data;
137 /* Set the demux function */
138 p_input->pf_demux = Demux;
140 /* Initialize access plug-in structures. */
141 if( p_input->i_mtu == 0 )
144 msg_Err( p_input, "using default mtu (%d) with bufsize (%d)\n",
145 p_input->i_mtu, INPUT_DEFAULT_BUFSIZE );
146 p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
149 /* Have a peep at the show. */
150 if( input_Peek( p_input, &p_peek, 1 ) < 1 )
152 msg_Err( p_input, "cannot peek()" );
156 if( *p_peek != TS_SYNC_CODE )
158 if( *p_input->psz_demux && ( !strncmp( p_input->psz_demux, "ts", 3 )
159 || !strncmp( p_input->psz_demux, "ts_dvbpsi", 10 ) ) )
162 msg_Err( p_input, "this does not look like a TS stream, continuing" );
166 msg_Warn( p_input, "TS module discarded (no sync)" );
171 /* Adapt the bufsize for our only use. */
172 if( p_input->i_mtu != 0 )
174 /* Have minimum granularity to avoid bottlenecks at the input level. */
175 p_input->i_bufsize = (p_input->i_mtu / TS_PACKET_SIZE) * TS_PACKET_SIZE;
178 p_demux = p_input->p_demux_data = malloc( sizeof(demux_sys_t ) );
179 if( p_demux == NULL )
184 p_input->p_private = (void*)&p_demux->mpeg;
185 p_demux->p_module = module_Need( p_input, "mpeg-system", NULL );
186 if( p_demux->p_module == NULL )
188 free( p_input->p_demux_data );
192 vlc_mutex_lock( &p_input->stream.stream_lock );
194 if( input_InitStream( p_input, sizeof( stream_ts_data_t ) ) == -1 )
196 module_Unneed( p_input, p_demux->p_module );
197 free( p_input->p_demux_data );
201 p_stream_data = (stream_ts_data_t *)p_input->stream.p_demux_data;
202 p_stream_data->i_pat_version = PAT_UNINITIALIZED ;
203 p_stream_data->b_buggy_psi = config_GetInt( p_input, "buggy-psi" );
205 #ifdef MODULE_NAME_IS_ts_dvbpsi
206 p_stream_data->p_pat_handle = (dvbpsi_handle *)
207 dvbpsi_AttachPAT( (dvbpsi_pat_callback) &TS_DVBPSI_HandlePAT, p_input );
209 if( p_stream_data->p_pat_handle == NULL )
211 msg_Err( p_input, "could not create PAT decoder" );
212 module_Unneed( p_input, p_demux->p_module );
213 free( p_input->p_demux_data );
218 /* We'll have to catch the PAT in order to continue
219 * Then the input will catch the PMT and then the others ES
220 * The PAT es is indepedent of any program. */
221 p_pat_es = input_AddES( p_input, NULL, 0x00,
222 UNKNOWN_ES, NULL, sizeof( es_ts_data_t ) );
223 p_pat_es->i_fourcc = VLC_FOURCC( 'p', 'a', 't', ' ' );
224 p_demux_data = (es_ts_data_t *)p_pat_es->p_demux_data;
225 p_demux_data->b_psi = 1;
226 p_demux_data->i_psi_type = PSI_IS_PAT;
227 p_demux_data->p_psi_section = malloc(sizeof(psi_section_t));
228 p_demux_data->p_psi_section->b_is_complete = 1;
229 p_demux_data->i_continuity_counter = 0xFF;
231 vlc_mutex_unlock( &p_input->stream.stream_lock );
236 /*****************************************************************************
237 * Deactivate: deinitialize TS structures
238 *****************************************************************************/
239 static void Deactivate( vlc_object_t * p_this )
241 input_thread_t * p_input = (input_thread_t *)p_this;
243 module_Unneed( p_input, p_input->p_demux_data->p_module );
244 free( p_input->p_demux_data );
247 /*****************************************************************************
248 * Demux: reads and demuxes data packets
249 *****************************************************************************
250 * Returns -1 in case of error, 0 in case of EOF, otherwise the number of
252 *****************************************************************************/
253 static int Demux( input_thread_t * p_input )
255 demux_sys_t * p_demux = p_input->p_demux_data;
256 int i_read_once = (p_input->i_mtu ?
257 p_input->i_bufsize / TS_PACKET_SIZE :
261 for( i = 0; i < i_read_once; i++ )
263 data_packet_t * p_data;
266 i_result = p_demux->mpeg.pf_read_ts( p_input, &p_data );
273 p_demux->mpeg.pf_demux_ts( p_input, p_data,
274 (psi_callback_t) &PSI_CALLBACK );
281 #if defined MODULE_NAME_IS_ts
283 * PSI demultiplexing and decoding without libdvbpsi
286 /*****************************************************************************
287 * DemuxPSI : makes up complete PSI data
288 *****************************************************************************/
289 static void TSDemuxPSI( input_thread_t * p_input, data_packet_t * p_data,
290 es_descriptor_t * p_es, vlc_bool_t b_unit_start )
292 es_ts_data_t * p_demux_data;
294 p_demux_data = (es_ts_data_t *)p_es->p_demux_data;
296 #define p_psi (p_demux_data->p_psi_section)
297 #define p (p_data->p_payload_start)
301 /* unit_start set to 1 -> presence of a pointer field
302 * (see ISO/IEC 13818 (2.4.4.2) which should be set to 0x00 */
303 if( (uint8_t)p[0] != 0x00 )
306 "non-zero pointer field found, trying to continue" );
314 /* This is the begining of a new section */
316 if( ((uint8_t)(p[1]) & 0xc0) != 0x80 )
318 msg_Warn( p_input, "invalid PSI packet" );
323 p_psi->i_section_length = ((p[1] & 0xF) << 8) | p[2];
324 p_psi->b_section_complete = 0;
325 p_psi->i_read_in_section = 0;
326 p_psi->i_section_number = (uint8_t)p[6];
328 if( p_psi->b_is_complete || p_psi->i_section_number == 0 )
330 /* This is a new PSI packet */
331 p_psi->b_is_complete = 0;
333 p_psi->i_version_number = ( p[5] >> 1 ) & 0x1f;
334 p_psi->i_last_section_number = (uint8_t)p[7];
336 /* We'll write at the begining of the buffer */
337 p_psi->p_current = p_psi->buffer;
341 if( p_psi->b_section_complete )
343 /* New Section of an already started PSI */
344 p_psi->b_section_complete = 0;
346 if( p_psi->i_version_number != (( p[5] >> 1 ) & 0x1f) )
349 "PSI version differs inside same PAT" );
352 if( p_psi->i_section_number + 1 != (uint8_t)p[6] )
355 "PSI Section discontinuity, packet lost?" );
359 p_psi->i_section_number++;
363 msg_Warn( p_input, "got unexpected new PSI section" );
370 if( !p_psi->b_trash )
373 if( (p_data->p_payload_end - p) >=
374 ( p_psi->i_section_length - p_psi->i_read_in_section ) )
376 /* The end of the section is in this TS packet */
377 memcpy( p_psi->p_current, p,
378 (p_psi->i_section_length - p_psi->i_read_in_section) );
380 p_psi->b_section_complete = 1;
382 (p_psi->i_section_length - p_psi->i_read_in_section);
384 if( p_psi->i_section_number == p_psi->i_last_section_number )
386 /* This was the last section of PSI */
387 p_psi->b_is_complete = 1;
389 switch( p_demux_data->i_psi_type)
392 TSDecodePAT( p_input, p_es );
395 TSDecodePMT( p_input, p_es );
398 msg_Warn( p_input, "received unknown PSI in DemuxPSI" );
404 memcpy( p_psi->buffer, p, p_data->p_payload_end - p );
405 p_psi->i_read_in_section += p_data->p_payload_end - p;
407 p_psi->p_current += p_data->p_payload_end - p;
414 input_DeletePacket( p_input->p_method_data, p_data );
419 /*****************************************************************************
420 * DecodePAT : Decodes Programm association table and deal with it
421 *****************************************************************************/
422 static void TSDecodePAT( input_thread_t * p_input, es_descriptor_t * p_es )
424 stream_ts_data_t * p_stream_data;
425 es_ts_data_t * p_demux_data;
427 pgrm_descriptor_t * p_pgrm;
428 es_descriptor_t * p_current_es;
429 byte_t * p_current_data;
431 int i_section_length, i_program_id, i_pmt_pid;
432 int i_loop, i_current_section;
434 vlc_bool_t b_changed = 0;
436 p_demux_data = (es_ts_data_t *)p_es->p_demux_data;
437 p_stream_data = (stream_ts_data_t *)p_input->stream.p_demux_data;
439 #define p_psi (p_demux_data->p_psi_section)
441 /* Not so fast, Mike ! If the PAT version has changed, we first check
442 * that its content has really changed before doing anything */
443 if( p_stream_data->i_pat_version != p_psi->i_version_number )
445 int i_programs = p_input->stream.i_pgrm_number;
447 p_current_data = p_psi->buffer;
451 i_section_length = ((uint32_t)(p_current_data[1] & 0xF) << 8) |
453 i_current_section = (uint8_t)p_current_data[6];
456 ( i_loop < (i_section_length - 9) / 4 ) && !b_changed;
459 i_program_id = ( (uint32_t)*(p_current_data + i_loop * 4 + 8) << 8 )
460 | *(p_current_data + i_loop * 4 + 9);
461 i_pmt_pid = ( ((uint32_t)*(p_current_data + i_loop * 4 + 10) & 0x1F)
463 | *(p_current_data + i_loop * 4 + 11);
467 if( (p_pgrm = input_FindProgram( p_input, i_program_id ))
468 && (p_current_es = input_FindES( p_input, i_pmt_pid ))
469 && p_current_es->p_pgrm == p_pgrm
470 && p_current_es->i_id == i_pmt_pid
471 && ((es_ts_data_t *)p_current_es->p_demux_data)->b_psi
472 && ((es_ts_data_t *)p_current_es->p_demux_data)
473 ->i_psi_type == PSI_IS_PMT )
484 p_current_data += 3 + i_section_length;
486 } while( ( i_current_section < p_psi->i_last_section_number )
489 /* If we didn't find the expected amount of programs, the PAT has
490 * changed. Otherwise, it only changed if b_changed is already != 0 */
491 b_changed = b_changed || i_programs;
496 /* PAT has changed. We are going to delete all programs and
497 * create new ones. We chose not to only change what was needed
498 * as a PAT change may mean the stream is radically changing and
499 * this is a secure method to avoid crashes */
500 es_ts_data_t * p_es_demux;
501 pgrm_ts_data_t * p_pgrm_demux;
503 p_current_data = p_psi->buffer;
505 /* Delete all programs */
506 while( p_input->stream.i_pgrm_number )
508 input_DelProgram( p_input, p_input->stream.pp_programs[0] );
513 i_section_length = ((uint32_t)(p_current_data[1] & 0xF) << 8) |
515 i_current_section = (uint8_t)p_current_data[6];
517 for( i_loop = 0; i_loop < (i_section_length - 9) / 4 ; i_loop++ )
519 i_program_id = ( (uint32_t)*(p_current_data + i_loop * 4 + 8) << 8 )
520 | *(p_current_data + i_loop * 4 + 9);
521 i_pmt_pid = ( ((uint32_t)*(p_current_data + i_loop * 4 + 10) & 0x1F)
523 | *(p_current_data + i_loop * 4 + 11);
525 /* If program = 0, we're having info about NIT not PMT */
528 /* Add this program */
529 p_pgrm = input_AddProgram( p_input, i_program_id,
530 sizeof( pgrm_ts_data_t ) );
532 /* whatis the PID of the PMT of this program */
533 p_pgrm_demux = (pgrm_ts_data_t *)p_pgrm->p_demux_data;
534 p_pgrm_demux->i_pmt_version = PMT_UNINITIALIZED;
536 /* Add the PMT ES to this program */
537 p_current_es = input_AddES( p_input, p_pgrm,(uint16_t)i_pmt_pid,
538 UNKNOWN_ES, NULL, sizeof( es_ts_data_t) );
539 p_current_es->i_fourcc = VLC_FOURCC( 'p', 'm', 't', ' ' );
540 p_es_demux = (es_ts_data_t *)p_current_es->p_demux_data;
541 p_es_demux->b_psi = 1;
542 p_es_demux->i_psi_type = PSI_IS_PMT;
544 p_es_demux->p_psi_section =
545 malloc( sizeof( psi_section_t ) );
546 p_es_demux->p_psi_section->b_is_complete = 0;
547 p_es_demux->i_continuity_counter = 0xFF;
551 p_current_data += 3 + i_section_length;
553 } while( i_current_section < p_psi->i_last_section_number );
555 /* Go to the beginning of the next section */
556 p_stream_data->i_pat_version = p_psi->i_version_number;
563 /*****************************************************************************
564 * DecodePMT : decode a given Program Stream Map
565 * ***************************************************************************
566 * When the PMT changes, it may mean a deep change in the stream, and it is
567 * careful to delete the ES and add them again. If the PMT doesn't change,
568 * there no need to do anything.
569 *****************************************************************************/
570 static void TSDecodePMT( input_thread_t * p_input, es_descriptor_t * p_es )
573 pgrm_ts_data_t * p_pgrm_data;
574 es_ts_data_t * p_demux_data;
575 vlc_bool_t b_vls_compat = config_GetInt( p_input, "vls-backwards-compat" );
577 p_demux_data = (es_ts_data_t *)p_es->p_demux_data;
578 p_pgrm_data = (pgrm_ts_data_t *)p_es->p_pgrm->p_demux_data;
580 #define p_psi (p_demux_data->p_psi_section)
582 if( p_psi->i_version_number != p_pgrm_data->i_pmt_version )
584 es_descriptor_t * p_new_es;
585 es_ts_data_t * p_es_demux;
586 byte_t * p_current_data, * p_current_section;
587 int i_section_length,i_current_section;
588 int i_prog_info_length, i_loop;
589 int i_es_info_length, i_pid, i_stream_type;
591 p_current_section = p_psi->buffer;
592 p_current_data = p_psi->buffer;
594 p_pgrm_data->i_pcr_pid = ( ((uint32_t)*(p_current_section + 8) & 0x1F) << 8 ) |
595 *(p_current_section + 9);
598 /* Lock stream information */
599 vlc_mutex_lock( &p_input->stream.stream_lock );
601 /* Delete all ES in this program except the PSI. We start from the
602 * end because i_es_number gets decremented after each deletion. */
603 for( i_loop = p_es->p_pgrm->i_es_number ; i_loop ; )
606 p_es_demux = (es_ts_data_t *)
607 p_es->p_pgrm->pp_es[i_loop]->p_demux_data;
608 if ( ! p_es_demux->b_psi )
610 input_DelES( p_input, p_es->p_pgrm->pp_es[i_loop] );
614 /* Then add what we received in this PMT */
617 i_section_length = ( ((uint32_t)*(p_current_data + 1) & 0xF) << 8 ) |
618 *(p_current_data + 2);
619 i_current_section = (uint8_t)p_current_data[6];
620 i_prog_info_length = ( ((uint32_t)*(p_current_data + 10) & 0xF) << 8 ) |
621 *(p_current_data + 11);
623 /* For the moment we ignore program descriptors */
624 p_current_data += 12 + i_prog_info_length;
626 /* The end of the section, before the CRC is at
627 * p_current_section + i_section_length -1 */
628 while( p_current_data < p_current_section + i_section_length -1 )
630 i_stream_type = (int)p_current_data[0];
631 i_pid = ( ((uint32_t)*(p_current_data + 1) & 0x1F) << 8 ) |
632 *(p_current_data + 2);
633 i_es_info_length = ( ((uint32_t)*(p_current_data + 3) & 0xF) << 8 ) |
634 *(p_current_data + 4);
636 /* Tell the interface what kind of stream it is and select
637 * the required ones */
639 int i_fourcc, i_cat, i_stream_id;
641 switch( i_stream_type )
645 case MPEG2_MOTO_VIDEO_ES:
646 /* This isn't real, but we don't actually use
649 i_fourcc = VLC_FOURCC('m','p','g','v');
654 /* This isn't real, but we don't actually use
657 i_fourcc = VLC_FOURCC('m','p','g','a');
662 i_fourcc = VLC_FOURCC('a','5','2',' ');
664 i_fourcc = VLC_FOURCC('a','5','2','b');
669 i_fourcc = VLC_FOURCC('l','p','c','m');
675 i_fourcc = VLC_FOURCC('s','p','u',' ');
677 i_fourcc = VLC_FOURCC('s','p','u','b');
682 i_fourcc = VLC_FOURCC('s','d','d','s');
687 i_fourcc = VLC_FOURCC('d','t','s',' ');
691 /* 'b' stands for 'buggy' */
693 i_fourcc = VLC_FOURCC('a','5','2','b');
698 i_fourcc = VLC_FOURCC('l','p','c','b');
703 i_fourcc = VLC_FOURCC('s','p','u','b');
715 /* Add this ES to the program */
716 p_new_es = input_AddES( p_input, p_es->p_pgrm, (uint16_t)i_pid,
717 i_cat, NULL, sizeof( es_ts_data_t ) );
719 ((es_ts_data_t *)p_new_es->p_demux_data)->i_continuity_counter = 0xFF;
721 p_new_es->i_stream_id = i_stream_id;
722 p_new_es->i_fourcc = i_fourcc;
726 p_current_data += 5 + i_es_info_length;
729 /* Go to the beginning of the next section*/
730 p_current_data += 3 + i_section_length;
734 } while( i_current_section < p_psi->i_last_section_number );
736 p_pgrm_data->i_pmt_version = p_psi->i_version_number;
738 /* if no program is selected :*/
739 if( !p_input->stream.p_selected_program )
741 pgrm_descriptor_t * p_pgrm_to_select;
742 uint16_t i_id = (uint16_t)config_GetInt( p_input, "program" );
744 if( i_id != 0 ) /* if user specified a program */
746 p_pgrm_to_select = input_FindProgram( p_input, i_id );
748 if( p_pgrm_to_select && p_pgrm_to_select == p_es->p_pgrm )
749 p_input->pf_set_program( p_input, p_pgrm_to_select );
752 p_input->pf_set_program( p_input, p_es->p_pgrm );
755 /* if the pmt belongs to the currently selected program, we
756 * reselect it to update its ES */
757 else if( p_es->p_pgrm == p_input->stream.p_selected_program )
759 p_input->pf_set_program( p_input, p_es->p_pgrm );
762 /* inform interface that stream has changed */
763 p_input->stream.b_changed = 1;
765 vlc_mutex_unlock( &p_input->stream.stream_lock );
771 #elif defined MODULE_NAME_IS_ts_dvbpsi
773 * PSI Decoding using libdvbpsi
776 /*****************************************************************************
777 * DemuxPSI : send the PSI to the right libdvbpsi decoder
778 *****************************************************************************/
779 static void TS_DVBPSI_DemuxPSI( input_thread_t * p_input,
780 data_packet_t * p_data,
781 es_descriptor_t * p_es,
782 vlc_bool_t b_unit_start )
784 es_ts_data_t * p_es_demux_data;
785 pgrm_ts_data_t * p_pgrm_demux_data;
786 stream_ts_data_t * p_stream_demux_data;
788 p_es_demux_data = (es_ts_data_t *)p_es->p_demux_data;
789 p_stream_demux_data = (stream_ts_data_t *) p_input->stream.p_demux_data;
791 switch( p_es_demux_data->i_psi_type)
795 (dvbpsi_handle)p_stream_demux_data->p_pat_handle,
796 p_data->p_demux_start );
799 p_pgrm_demux_data = ( pgrm_ts_data_t * )p_es->p_pgrm->p_demux_data;
801 (dvbpsi_handle)p_pgrm_demux_data->p_pmt_handle,
802 p_data->p_demux_start );
805 msg_Warn( p_input, "received unknown PSI in DemuxPSI" );
808 input_DeletePacket( p_input->p_method_data, p_data );
810 /*****************************************************************************
811 * MP4 specific functions
812 *****************************************************************************/
813 static int MP4_DescriptorLength( int *pi_data, uint8_t **pp_data )
816 unsigned int i_len = 0;
822 i_len = ( i_len << 7 ) + ( i_b&0x7f );
828 static int MP4_GetByte( int *pi_data, uint8_t **pp_data )
843 static int MP4_GetWord( int *pi_data, uint8_t **pp_data )
846 i1 = MP4_GetByte( pi_data, pp_data );
847 i2 = MP4_GetByte( pi_data, pp_data );
848 return( ( i1 << 8 ) | i2 );
850 static int MP4_Get3Bytes( int *pi_data, uint8_t **pp_data )
853 i1 = MP4_GetByte( pi_data, pp_data );
854 i2 = MP4_GetByte( pi_data, pp_data );
855 i3 = MP4_GetByte( pi_data, pp_data );
856 return( ( i1 << 16 ) | ( i2 << 8) | i3 );
859 static uint32_t MP4_GetDWord( int *pi_data, uint8_t **pp_data )
862 i1 = MP4_GetWord( pi_data, pp_data );
863 i2 = MP4_GetWord( pi_data, pp_data );
864 return( ( i1 << 16 ) | i2 );
867 static char* MP4_GetURL( int *pi_data, uint8_t **pp_data )
872 i_url_len = MP4_GetByte( pi_data, pp_data );
873 url = malloc( i_url_len + 1 );
874 for( i = 0; i < i_url_len; i++ )
876 url[i] = MP4_GetByte( pi_data, pp_data );
878 url[i_url_len] = '\0';
882 static void MP4_IODParse( iod_descriptor_t *p_iod, int i_data, uint8_t *p_data )
890 fprintf( stderr, "\n************ IOD ************" );
891 for( i = 0; i < 255; i++ )
893 p_iod->es_descr[i].b_ok = 0;
902 p_iod->i_iod_label = MP4_GetByte( &i_data, &p_data );
903 fprintf( stderr, "\n* iod_label:%d", p_iod->i_iod_label );
904 fprintf( stderr, "\n* ===========" );
905 fprintf( stderr, "\n* tag:0x%x", p_data[0] );
907 if( MP4_GetByte( &i_data, &p_data ) != 0x02 )
909 fprintf( stderr, "\n ERR: tag != 0x02" );
913 i_iod_length = MP4_DescriptorLength( &i_data, &p_data );
914 fprintf( stderr, "\n* length:%d", i_iod_length );
915 if( i_iod_length > i_data )
917 i_iod_length = i_data;
920 p_iod->i_od_id = ( MP4_GetByte( &i_data, &p_data ) << 2 );
921 i_flags = MP4_GetByte( &i_data, &p_data );
922 p_iod->i_od_id |= i_flags >> 6;
923 b_url = ( i_flags >> 5 )&0x01;
925 fprintf( stderr, "\n* od_id:%d", p_iod->i_od_id );
926 fprintf( stderr, "\n* url flag:%d", b_url );
927 fprintf( stderr, "\n* includeInlineProfileLevel flag:%d", ( i_flags >> 4 )&0x01 );
931 p_iod->psz_url = MP4_GetURL( &i_data, &p_data );
932 fprintf( stderr, "\n* url string:%s", p_iod->psz_url );
933 fprintf( stderr, "\n*****************************\n" );
938 p_iod->psz_url = NULL;
941 p_iod->i_ODProfileLevelIndication = MP4_GetByte( &i_data, &p_data );
942 p_iod->i_sceneProfileLevelIndication = MP4_GetByte( &i_data, &p_data );
943 p_iod->i_audioProfileLevelIndication = MP4_GetByte( &i_data, &p_data );
944 p_iod->i_visualProfileLevelIndication = MP4_GetByte( &i_data, &p_data );
945 p_iod->i_graphicsProfileLevelIndication = MP4_GetByte( &i_data, &p_data );
947 fprintf( stderr, "\n* ODProfileLevelIndication:%d", p_iod->i_ODProfileLevelIndication );
948 fprintf( stderr, "\n* sceneProfileLevelIndication:%d", p_iod->i_sceneProfileLevelIndication );
949 fprintf( stderr, "\n* audioProfileLevelIndication:%d", p_iod->i_audioProfileLevelIndication );
950 fprintf( stderr, "\n* visualProfileLevelIndication:%d", p_iod->i_visualProfileLevelIndication );
951 fprintf( stderr, "\n* graphicsProfileLevelIndication:%d", p_iod->i_graphicsProfileLevelIndication );
954 while( i_data > 0 && i_es_index < 255)
960 i_tag = MP4_GetByte( &i_data, &p_data );
961 i_length = MP4_DescriptorLength( &i_data, &p_data );
972 #define es_descr p_iod->es_descr[i_es_index]
973 int i_decoderConfigDescr_length;
974 fprintf( stderr, "\n* - ES_Descriptor length:%d", i_length );
977 es_descr.i_es_id = MP4_GetWord( &i_data, &p_data );
978 i_flags = MP4_GetByte( &i_data, &p_data );
979 es_descr.b_streamDependenceFlag = ( i_flags >> 7 )&0x01;
980 b_url = ( i_flags >> 6 )&0x01;
981 es_descr.b_OCRStreamFlag = ( i_flags >> 5 )&0x01;
982 es_descr.i_streamPriority = i_flags & 0x1f;
983 fprintf( stderr, "\n* * streamDependenceFlag:%d", es_descr.b_streamDependenceFlag );
984 fprintf( stderr, "\n* * OCRStreamFlag:%d", es_descr.b_OCRStreamFlag );
985 fprintf( stderr, "\n* * streamPriority:%d", es_descr.i_streamPriority );
987 if( es_descr.b_streamDependenceFlag )
989 es_descr.i_dependOn_es_id = MP4_GetWord( &i_data, &p_data );
990 fprintf( stderr, "\n* * dependOn_es_id:%d", es_descr.i_dependOn_es_id );
995 es_descr.psz_url = MP4_GetURL( &i_data, &p_data );
996 fprintf( stderr, "\n* url string:%s", es_descr.psz_url );
1000 es_descr.psz_url = NULL;
1003 if( es_descr.b_OCRStreamFlag )
1005 es_descr.i_OCR_es_id = MP4_GetWord( &i_data, &p_data );
1006 fprintf( stderr, "\n* * OCR_es_id:%d", es_descr.i_OCR_es_id );
1009 if( MP4_GetByte( &i_data, &p_data ) != 0x04 )
1011 fprintf( stderr, "\n* ERR missing DecoderConfigDescr" );
1015 i_decoderConfigDescr_length = MP4_DescriptorLength( &i_data, &p_data );
1017 fprintf( stderr, "\n* - DecoderConfigDesc length:%d", i_decoderConfigDescr_length );
1018 #define dec_descr es_descr.dec_descr
1019 dec_descr.i_objectTypeIndication = MP4_GetByte( &i_data, &p_data );
1020 i_flags = MP4_GetByte( &i_data, &p_data );
1021 dec_descr.i_streamType = i_flags >> 2;
1022 dec_descr.b_upStream = ( i_flags >> 1 )&0x01;
1023 dec_descr.i_bufferSizeDB = MP4_Get3Bytes( &i_data, &p_data );
1024 dec_descr.i_maxBitrate = MP4_GetDWord( &i_data, &p_data );
1025 dec_descr.i_avgBitrate = MP4_GetDWord( &i_data, &p_data );
1026 fprintf( stderr, "\n* * objectTypeIndication:0x%x", dec_descr.i_objectTypeIndication );
1027 fprintf( stderr, "\n* * streamType:0x%x", dec_descr.i_streamType );
1028 fprintf( stderr, "\n* * upStream:%d", dec_descr.b_upStream );
1029 fprintf( stderr, "\n* * bufferSizeDB:%d", dec_descr.i_bufferSizeDB );
1030 fprintf( stderr, "\n* * maxBitrate:%d", dec_descr.i_maxBitrate );
1031 fprintf( stderr, "\n* * avgBitrate:%d", dec_descr.i_avgBitrate );
1032 if( i_decoderConfigDescr_length > 13 && MP4_GetByte( &i_data, &p_data ) == 0x05 )
1035 dec_descr.i_decoder_specific_info_len =
1036 MP4_DescriptorLength( &i_data, &p_data );
1037 if( dec_descr.i_decoder_specific_info_len > 0 )
1039 dec_descr.p_decoder_specific_info =
1040 malloc( dec_descr.i_decoder_specific_info_len );
1042 for( i = 0; i < dec_descr.i_decoder_specific_info_len; i++ )
1044 dec_descr.p_decoder_specific_info[i] = MP4_GetByte( &i_data, &p_data );
1049 dec_descr.i_decoder_specific_info_len = 0;
1050 dec_descr.p_decoder_specific_info = NULL;
1054 #define sl_descr es_descr.sl_descr
1056 int i_SLConfigDescr_length;
1059 if( MP4_GetByte( &i_data, &p_data ) != 0x06 )
1061 fprintf( stderr, "\n* ERR missing SLConfigDescr" );
1065 i_SLConfigDescr_length = MP4_DescriptorLength( &i_data, &p_data );
1067 fprintf( stderr, "\n* - SLConfigDescr length:%d", i_SLConfigDescr_length );
1068 i_predefined = MP4_GetByte( &i_data, &p_data );
1069 fprintf( stderr, "\n* * i_predefined:0x%x", i_predefined );
1070 switch( i_predefined )
1074 sl_descr.b_useAccessUnitStartFlag = 0;
1075 sl_descr.b_useAccessUnitEndFlag = 0;
1076 sl_descr.b_useRandomAccessPointFlag = 0;
1077 //sl_descr.b_useRandomAccessUnitsOnlyFlag = 0;
1078 sl_descr.b_usePaddingFlag = 0;
1079 sl_descr.b_useTimeStampsFlags = 0;
1080 sl_descr.b_useIdleFlag = 0;
1081 sl_descr.b_durationFlag = 0; // FIXME FIXME
1082 sl_descr.i_timeStampResolution = 1000;
1083 sl_descr.i_OCRResolution = 0; // FIXME FIXME
1084 sl_descr.i_timeStampLength = 32;
1085 sl_descr.i_OCRLength = 0; // FIXME FIXME
1086 sl_descr.i_AU_Length = 0;
1087 sl_descr.i_instantBitrateLength= 0; // FIXME FIXME
1088 sl_descr.i_degradationPriorityLength= 0;
1089 sl_descr.i_AU_seqNumLength = 0;
1090 sl_descr.i_packetSeqNumLength = 0;
1091 if( sl_descr.b_durationFlag )
1093 sl_descr.i_timeScale = 0; // FIXME FIXME
1094 sl_descr.i_accessUnitDuration = 0; // FIXME FIXME
1095 sl_descr.i_compositionUnitDuration= 0; // FIXME FIXME
1097 if( !sl_descr.b_useTimeStampsFlags )
1099 sl_descr.i_startDecodingTimeStamp = 0; // FIXME FIXME
1100 sl_descr.i_startCompositionTimeStamp= 0; // FIXME FIXME
1105 fprintf( stderr, "\n* ERR unsupported SLConfigDescr predefined" );
1114 fprintf( stderr, "\n* - OD tag:0x%x length:%d (Unsupported)", i_tag, i_length );
1118 p_data = p_data_sav + i_length;
1119 i_data = i_data_sav - i_length;
1124 fprintf( stderr, "\n*****************************\n" );
1127 static void MP4_IODClean( iod_descriptor_t *p_iod )
1131 if( p_iod->psz_url )
1133 free( p_iod->psz_url );
1134 p_iod->psz_url = NULL;
1138 for( i = 0; i < 255; i++ )
1140 #define es_descr p_iod->es_descr[i]
1143 if( es_descr.psz_url )
1145 free( es_descr.psz_url );
1146 es_descr.psz_url = NULL;
1150 if( es_descr.dec_descr.p_decoder_specific_info != NULL )
1152 free( es_descr.dec_descr.p_decoder_specific_info );
1153 es_descr.dec_descr.p_decoder_specific_info = NULL;
1154 es_descr.dec_descr.i_decoder_specific_info_len = 0;
1163 /*****************************************************************************
1164 * HandlePAT: will treat a PAT returned by dvbpsi
1165 *****************************************************************************/
1166 static void TS_DVBPSI_HandlePAT( input_thread_t * p_input,
1167 dvbpsi_pat_t * p_new_pat )
1169 dvbpsi_pat_program_t * p_pgrm;
1170 pgrm_descriptor_t * p_new_pgrm;
1171 pgrm_ts_data_t * p_pgrm_demux;
1172 es_descriptor_t * p_current_es;
1173 es_ts_data_t * p_es_demux;
1174 stream_ts_data_t * p_stream_data;
1176 vlc_mutex_lock( &p_input->stream.stream_lock );
1178 p_stream_data = (stream_ts_data_t *)p_input->stream.p_demux_data;
1180 if ( ( p_new_pat->b_current_next && ( p_new_pat->i_version != p_stream_data->i_pat_version ) ) ||
1181 p_stream_data->i_pat_version == PAT_UNINITIALIZED )
1183 /* Delete all programs */
1184 while( p_input->stream.i_pgrm_number )
1186 pgrm_ts_data_t *p_pgrm_demux_old =
1187 (pgrm_ts_data_t *)p_input->stream.pp_programs[0]->p_demux_data;
1189 if( p_pgrm_demux_old->b_mpeg4 )
1191 MP4_IODClean( &p_pgrm_demux_old->iod );
1194 input_DelProgram( p_input, p_input->stream.pp_programs[0] );
1197 /* treat the new programs list */
1198 p_pgrm = p_new_pat->p_first_program;
1202 /* If program = 0, we're having info about NIT not PMT */
1203 if( p_pgrm->i_number )
1205 /* Add this program */
1206 p_new_pgrm = input_AddProgram( p_input, p_pgrm->i_number,
1207 sizeof( pgrm_ts_data_t ) );
1209 p_pgrm_demux = (pgrm_ts_data_t *)p_new_pgrm->p_demux_data;
1210 p_pgrm_demux->i_pmt_version = PMT_UNINITIALIZED;
1212 /* Add the PMT ES to this program */
1213 p_current_es = input_AddES( p_input, p_new_pgrm,
1214 (uint16_t)p_pgrm->i_pid, UNKNOWN_ES,
1215 NULL, sizeof(es_ts_data_t) );
1216 p_current_es->i_fourcc = VLC_FOURCC( 'p', 'm', 't', ' ' );
1217 p_es_demux = (es_ts_data_t *)p_current_es->p_demux_data;
1218 p_es_demux->b_psi = 1;
1219 p_es_demux->i_psi_type = PSI_IS_PMT;
1220 p_es_demux->p_psi_section = NULL;
1221 p_es_demux->i_continuity_counter = 0xFF;
1223 /* Create a PMT decoder */
1224 p_pgrm_demux->p_pmt_handle = (dvbpsi_handle *)
1225 dvbpsi_AttachPMT( p_pgrm->i_number,
1226 (dvbpsi_pmt_callback) &TS_DVBPSI_HandlePMT,
1229 if( p_pgrm_demux->p_pmt_handle == NULL )
1231 msg_Err( p_input, "could not create PMT decoder" );
1232 p_input->b_error = 1;
1237 p_pgrm = p_pgrm->p_next;
1240 p_stream_data->i_pat_version = p_new_pat->i_version;
1242 vlc_mutex_unlock( &p_input->stream.stream_lock );
1246 /*****************************************************************************
1247 * HandlePMT: will treat a PMT returned by dvbpsi
1248 *****************************************************************************/
1249 static void TS_DVBPSI_HandlePMT( input_thread_t * p_input,
1250 dvbpsi_pmt_t * p_new_pmt )
1252 dvbpsi_pmt_es_t * p_es;
1253 pgrm_descriptor_t * p_pgrm;
1254 es_descriptor_t * p_new_es;
1255 pgrm_ts_data_t * p_pgrm_demux;
1256 vlc_bool_t b_vls_compat = config_GetInt( p_input, "vls-backwards-compat" );
1258 vlc_mutex_lock( &p_input->stream.stream_lock );
1260 p_pgrm = input_FindProgram( p_input, p_new_pmt->i_program_number );
1262 if( p_pgrm == NULL )
1264 msg_Warn( p_input, "PMT of unreferenced program found" );
1268 p_pgrm_demux = (pgrm_ts_data_t *)p_pgrm->p_demux_data;
1269 p_pgrm_demux->i_pcr_pid = p_new_pmt->i_pcr_pid;
1271 if( ( p_new_pmt->b_current_next &&
1272 ( p_new_pmt->i_version != p_pgrm_demux->i_pmt_version ) ) ||
1273 p_pgrm_demux->i_pmt_version == PMT_UNINITIALIZED )
1275 dvbpsi_descriptor_t *p_dr = p_new_pmt->p_first_descriptor;
1278 msg_Dbg( p_input, "Processing PMT for program %d version %d",
1279 p_new_pmt->i_program_number, p_new_pmt->i_version );
1281 /* Delete all ES in this program except the PSI. We start from the
1282 * end because i_es_number gets decremented after each deletion. */
1283 for( i_loop = p_pgrm->i_es_number ; i_loop > 0 ; )
1285 es_ts_data_t * p_es_demux;
1288 p_es_demux = (es_ts_data_t *)
1289 p_pgrm->pp_es[i_loop]->p_demux_data;
1290 if ( !p_es_demux->b_psi )
1292 input_DelES( p_input, p_pgrm->pp_es[i_loop] );
1297 while( p_dr && ( p_dr->i_tag != 0x1d ) )
1298 p_dr = p_dr->p_next;
1301 msg_Warn( p_input, "found IOD descriptor" );
1302 MP4_IODParse( &p_pgrm_demux->iod, p_dr->i_length, p_dr->p_data );
1305 p_es = p_new_pmt->p_first_es;
1308 vlc_fourcc_t i_fourcc;
1309 int i_size, i_cat, i_stream_id = 0;
1310 es_ts_data_t demux_data;
1311 BITMAPINFOHEADER *p_bih = NULL;
1312 WAVEFORMATEX *p_wf = NULL;
1315 memset( &demux_data, 0, sizeof(es_ts_data_t) );
1318 switch( p_es->i_type )
1320 case MPEG1_VIDEO_ES:
1321 case MPEG2_VIDEO_ES:
1322 case MPEG2_MOTO_VIDEO_ES:
1323 i_fourcc = VLC_FOURCC('m','p','g','v');
1326 case MPEG1_AUDIO_ES:
1327 case MPEG2_AUDIO_ES:
1328 i_fourcc = VLC_FOURCC('m','p','g','a');
1332 if ( !b_vls_compat )
1333 i_fourcc = VLC_FOURCC('a','5','2',' ');
1335 i_fourcc = VLC_FOURCC('a','5','2','b');
1340 if ( !b_vls_compat )
1341 i_fourcc = VLC_FOURCC('s','p','u',' ');
1343 i_fourcc = VLC_FOURCC('s','p','u','b');
1348 i_fourcc = VLC_FOURCC('l','p','c','m');
1353 i_fourcc = VLC_FOURCC('s','d','d','s');
1358 i_fourcc = VLC_FOURCC('d','t','s',' ');
1363 i_fourcc = VLC_FOURCC('a','5','2','b');
1368 i_fourcc = VLC_FOURCC('s','p','u','b');
1372 case LPCMB_AUDIO_ES:
1373 i_fourcc = VLC_FOURCC('l','p','c','b');
1377 case MPEG4_VIDEO_ES:
1378 i_fourcc = VLC_FOURCC('m','p','4','v');
1382 case MPEG4_AUDIO_ES:
1383 i_fourcc = VLC_FOURCC('m','p','4','a');
1387 case MSCODEC_VIDEO_ES:
1388 i_fourcc = VLC_FOURCC(0,0,0,0); // fixed later
1398 if( p_es->i_type == MPEG4_VIDEO_ES ||
1399 p_es->i_type == MPEG4_AUDIO_ES )
1401 /* mpeg4 stream, search sl_descriptor */
1402 dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;
1404 while( p_dr && ( p_dr->i_tag != 0x1f ) ) p_dr = p_dr->p_next;
1406 if( p_dr && p_dr->i_length == 2 )
1408 int i_es_descr_index;
1410 demux_data.i_es_id =
1411 ( p_dr->p_data[0] << 8 ) | p_dr->p_data[1];
1412 demux_data.p_es_descr = NULL;
1414 msg_Warn( p_input, "found SL_descriptor" );
1415 for( i_es_descr_index = 0; i_es_descr_index < 255;
1416 i_es_descr_index++ )
1418 if( p_pgrm_demux->iod.es_descr[i_es_descr_index].b_ok &&
1419 p_pgrm_demux->iod.es_descr[i_es_descr_index].i_es_id == demux_data.i_es_id )
1421 demux_data.p_es_descr =
1422 &p_pgrm_demux->iod.es_descr[i_es_descr_index];
1428 if( demux_data.p_es_descr != NULL )
1430 #define DESCR demux_data.p_es_descr->dec_descr
1431 demux_data.b_mpeg4 = 1;
1434 switch( DESCR.i_streamType )
1436 case 0x04: /* VisualStream */
1438 switch( DESCR.i_objectTypeIndication )
1441 i_fourcc = VLC_FOURCC('m','p','4','v'); // mpeg4
1449 i_fourcc = VLC_FOURCC( 'm','p','g','v' ); // mpeg2
1452 i_fourcc = VLC_FOURCC( 'm','p','g','v' ); // mpeg1
1455 i_fourcc = VLC_FOURCC( 'j','p','e','g' ); // mpeg1
1462 case 0x05: /* AudioStream */
1464 switch( DESCR.i_objectTypeIndication )
1467 i_fourcc = VLC_FOURCC('m','p','4','a'); // mpeg4
1472 i_fourcc = VLC_FOURCC('m','p','4','a');// mpeg2 aac
1475 i_fourcc = VLC_FOURCC('m','p','g','a'); // mpeg2
1478 i_fourcc = VLC_FOURCC('m','p','g','a'); // mpeg1
1494 i_size = sizeof( BITMAPINFOHEADER ) +
1495 DESCR.i_decoder_specific_info_len;
1496 p_bih = malloc( i_size );
1497 p_bih->biSize = i_size;
1499 p_bih->biHeight = 0;
1500 p_bih->biPlanes = 1;
1501 p_bih->biBitCount = 0;
1502 p_bih->biCompression = 0;
1503 p_bih->biSizeImage = 0;
1504 p_bih->biXPelsPerMeter = 0;
1505 p_bih->biYPelsPerMeter = 0;
1506 p_bih->biClrUsed = 0;
1507 p_bih->biClrImportant = 0;
1509 DESCR.p_decoder_specific_info,
1510 DESCR.i_decoder_specific_info_len );
1513 i_size = sizeof( WAVEFORMATEX ) +
1514 DESCR.i_decoder_specific_info_len;
1515 p_wf = malloc( i_size );
1516 p_wf->wFormatTag = 0xffff;
1517 p_wf->nChannels = 0;
1518 p_wf->nSamplesPerSec = 0;
1519 p_wf->nAvgBytesPerSec = 0;
1520 p_wf->nBlockAlign = 1;
1521 p_wf->wBitsPerSample = 0;
1522 p_wf->cbSize = DESCR.i_decoder_specific_info_len;
1524 DESCR.p_decoder_specific_info,
1525 DESCR.i_decoder_specific_info_len );
1534 "mpeg4 stream without (valid) sl_descriptor" );
1535 demux_data.b_mpeg4 = 0;
1539 else if( p_es->i_type == MSCODEC_VIDEO_ES )
1541 /* crapy ms codec stream, search private descriptor */
1542 dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;
1544 while( p_dr && ( p_dr->i_tag != 0xa0 ) ) p_dr = p_dr->p_next;
1546 if( p_dr && p_dr->i_length >= 8 )
1549 /* i_fourcc = (p_dr->p_data[0] << 24)|(p_dr->p_data[1]<<16)|(p_dr->p_data[2]<<8)|p_dr->p_data[3]; */
1550 i_fourcc = VLC_FOURCC( p_dr->p_data[0], p_dr->p_data[1], p_dr->p_data[2], p_dr->p_data[3] );
1552 i_bih_size = (p_dr->p_data[8] << 8) | p_dr->p_data[9];
1553 i_size = sizeof( BITMAPINFOHEADER ) + i_bih_size;
1555 p_bih = malloc( i_size );
1556 p_bih->biSize = i_size;
1557 p_bih->biWidth = ( p_dr->p_data[4] << 8 )|p_dr->p_data[5];
1558 p_bih->biHeight = ( p_dr->p_data[6] << 8 )|p_dr->p_data[7];
1559 p_bih->biPlanes = 1;
1560 p_bih->biBitCount = 0;
1561 p_bih->biCompression = 0;
1562 p_bih->biSizeImage = 0;
1563 p_bih->biXPelsPerMeter = 0;
1564 p_bih->biYPelsPerMeter = 0;
1565 p_bih->biClrUsed = 0;
1566 p_bih->biClrImportant = 0;
1567 memcpy( &p_bih[1], &p_dr->p_data[10], i_bih_size );
1571 msg_Warn( p_input, "private ms-codec stream without bih "
1572 "private sl_descriptor" );
1578 if( i_cat == AUDIO_ES || i_cat == SPU_ES )
1580 dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;
1581 while( p_dr && ( p_dr->i_tag != 0x0a ) ) p_dr = p_dr->p_next;
1585 dvbpsi_iso639_dr_t *p_decoded =
1586 dvbpsi_DecodeISO639Dr( p_dr );
1587 if( p_decoded->i_code_count > 0 )
1589 const iso639_lang_t * p_iso;
1590 p_iso = GetLang_2T((char*)p_decoded->i_iso_639_code);
1594 if( p_iso->psz_native_name[0] )
1596 p_iso->psz_native_name, 20 );
1599 p_iso->psz_eng_name, 20 );
1603 strncpy( psz_desc, p_decoded->i_iso_639_code, 3 );
1607 switch( p_es->i_type )
1609 case MPEG1_AUDIO_ES:
1610 case MPEG2_AUDIO_ES:
1611 strcat( psz_desc, " (mpeg)" );
1614 case LPCMB_AUDIO_ES:
1615 strcat( psz_desc, " (lpcm)" );
1619 strcat( psz_desc, " (A52)" );
1621 case MPEG4_AUDIO_ES:
1622 strcat( psz_desc, " (aac)" );
1628 p_new_es = input_AddES( p_input, p_pgrm, (uint16_t)p_es->i_pid,
1629 i_cat, psz_desc, sizeof( es_ts_data_t ) );
1630 if( p_new_es == NULL )
1632 msg_Err( p_input, "could not add ES %d", p_es->i_pid );
1633 p_input->b_error = 1;
1636 p_new_es->i_fourcc = i_fourcc;
1637 p_new_es->i_stream_id = i_stream_id;
1638 p_new_es->p_bitmapinfoheader = (void*)p_bih;
1639 p_new_es->p_waveformatex = (void*)p_wf;
1640 memcpy( p_new_es->p_demux_data, &demux_data,
1641 sizeof(es_ts_data_t) );
1643 ((es_ts_data_t *)p_new_es->p_demux_data)->i_continuity_counter =
1646 p_es = p_es->p_next;
1649 /* if no program is selected :*/
1650 if( !p_input->stream.p_selected_program )
1652 pgrm_descriptor_t * p_pgrm_to_select;
1653 uint16_t i_id = (uint16_t)config_GetInt( p_input, "program" );
1655 if( i_id != 0 ) /* if user specified a program */
1657 p_pgrm_to_select = input_FindProgram( p_input, i_id );
1659 if( p_pgrm_to_select && p_pgrm_to_select == p_pgrm )
1660 p_input->pf_set_program( p_input, p_pgrm_to_select );
1663 p_input->pf_set_program( p_input, p_pgrm );
1665 /* if the pmt belongs to the currently selected program, we
1666 * reselect it to update its ES */
1667 else if( p_pgrm == p_input->stream.p_selected_program )
1669 p_input->pf_set_program( p_input, p_pgrm );
1672 p_pgrm_demux->i_pmt_version = p_new_pmt->i_version;
1673 p_input->stream.b_changed = 1;
1675 vlc_mutex_unlock( &p_input->stream.stream_lock );