1 /*****************************************************************************
2 * mpeg_ts.c : Transport Stream input module for vlc
3 *****************************************************************************
4 * Copyright (C) 2000-2001 VideoLAN
5 * $Id: ts.c,v 1.34 2003/08/14 23:32:51 fenrir 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;
141 /* XXX Unused already done by src/input.c */
142 /* Initialize access plug-in structures. */
143 if( p_input->i_mtu == 0 )
146 msg_Dbg( p_input, "using default mtu (%d) with bufsize (%d)\n",
147 p_input->i_mtu, INPUT_DEFAULT_BUFSIZE );
148 p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
152 /* Have a peep at the show. */
153 if( input_Peek( p_input, &p_peek, 1 ) < 1 )
155 msg_Err( p_input, "cannot peek()" );
159 if( *p_peek != TS_SYNC_CODE )
161 if( *p_input->psz_demux && ( !strncmp( p_input->psz_demux, "ts", 3 )
162 || !strncmp( p_input->psz_demux, "ts_dvbpsi", 10 ) ) )
165 msg_Err( p_input, "this does not look like a TS stream, continuing" );
169 msg_Warn( p_input, "TS module discarded (no sync)" );
174 /* Adapt the bufsize for our only use. */
175 if( p_input->i_mtu != 0 )
177 /* Have minimum granularity to avoid bottlenecks at the input level. */
178 p_input->i_bufsize = (p_input->i_mtu / TS_PACKET_SIZE) * TS_PACKET_SIZE;
181 p_demux = p_input->p_demux_data = malloc( sizeof(demux_sys_t ) );
182 if( p_demux == NULL )
187 p_input->p_private = (void*)&p_demux->mpeg;
188 p_demux->p_module = module_Need( p_input, "mpeg-system", NULL );
189 if( p_demux->p_module == NULL )
191 free( p_input->p_demux_data );
195 vlc_mutex_lock( &p_input->stream.stream_lock );
197 if( input_InitStream( p_input, sizeof( stream_ts_data_t ) ) == -1 )
199 module_Unneed( p_input, p_demux->p_module );
200 free( p_input->p_demux_data );
204 p_stream_data = (stream_ts_data_t *)p_input->stream.p_demux_data;
205 p_stream_data->i_pat_version = PAT_UNINITIALIZED ;
206 p_stream_data->b_buggy_psi = config_GetInt( p_input, "buggy-psi" );
208 #ifdef MODULE_NAME_IS_ts_dvbpsi
209 p_stream_data->p_pat_handle = (dvbpsi_handle *)
210 dvbpsi_AttachPAT( (dvbpsi_pat_callback) &TS_DVBPSI_HandlePAT, p_input );
212 if( p_stream_data->p_pat_handle == NULL )
214 msg_Err( p_input, "could not create PAT decoder" );
215 module_Unneed( p_input, p_demux->p_module );
216 free( p_input->p_demux_data );
221 /* We'll have to catch the PAT in order to continue
222 * Then the input will catch the PMT and then the others ES
223 * The PAT es is indepedent of any program. */
224 p_pat_es = input_AddES( p_input, NULL, 0x00,
225 UNKNOWN_ES, NULL, sizeof( es_ts_data_t ) );
226 p_pat_es->i_fourcc = VLC_FOURCC( 'p', 'a', 't', ' ' );
227 p_demux_data = (es_ts_data_t *)p_pat_es->p_demux_data;
228 p_demux_data->b_psi = 1;
229 p_demux_data->i_psi_type = PSI_IS_PAT;
230 p_demux_data->p_psi_section = malloc(sizeof(psi_section_t));
231 p_demux_data->p_psi_section->b_is_complete = 1;
232 p_demux_data->i_continuity_counter = 0xFF;
234 vlc_mutex_unlock( &p_input->stream.stream_lock );
239 /*****************************************************************************
240 * Deactivate: deinitialize TS structures
241 *****************************************************************************/
242 static void Deactivate( vlc_object_t * p_this )
244 input_thread_t * p_input = (input_thread_t *)p_this;
246 module_Unneed( p_input, p_input->p_demux_data->p_module );
247 free( p_input->p_demux_data );
250 /*****************************************************************************
251 * Demux: reads and demuxes data packets
252 *****************************************************************************
253 * Returns -1 in case of error, 0 in case of EOF, otherwise the number of
255 *****************************************************************************/
256 static int Demux( input_thread_t * p_input )
258 demux_sys_t * p_demux = p_input->p_demux_data;
259 int i_read_once = (p_input->i_mtu ?
260 p_input->i_bufsize / TS_PACKET_SIZE :
264 for( i = 0; i < i_read_once; i++ )
266 data_packet_t * p_data;
269 i_result = p_demux->mpeg.pf_read_ts( p_input, &p_data );
276 p_demux->mpeg.pf_demux_ts( p_input, p_data,
277 (psi_callback_t) &PSI_CALLBACK );
284 #if defined MODULE_NAME_IS_ts
286 * PSI demultiplexing and decoding without libdvbpsi
289 /*****************************************************************************
290 * DemuxPSI : makes up complete PSI data
291 *****************************************************************************/
292 static void TSDemuxPSI( input_thread_t * p_input, data_packet_t * p_data,
293 es_descriptor_t * p_es, vlc_bool_t b_unit_start )
295 es_ts_data_t * p_demux_data;
297 p_demux_data = (es_ts_data_t *)p_es->p_demux_data;
299 #define p_psi (p_demux_data->p_psi_section)
300 #define p (p_data->p_payload_start)
304 /* unit_start set to 1 -> presence of a pointer field
305 * (see ISO/IEC 13818 (2.4.4.2) which should be set to 0x00 */
306 if( (uint8_t)p[0] != 0x00 )
309 "non-zero pointer field found, trying to continue" );
317 /* This is the begining of a new section */
319 if( ((uint8_t)(p[1]) & 0xc0) != 0x80 )
321 msg_Warn( p_input, "invalid PSI packet" );
326 p_psi->i_section_length = ((p[1] & 0xF) << 8) | p[2];
327 p_psi->b_section_complete = 0;
328 p_psi->i_read_in_section = 0;
329 p_psi->i_section_number = (uint8_t)p[6];
331 if( p_psi->b_is_complete || p_psi->i_section_number == 0 )
333 /* This is a new PSI packet */
334 p_psi->b_is_complete = 0;
336 p_psi->i_version_number = ( p[5] >> 1 ) & 0x1f;
337 p_psi->i_last_section_number = (uint8_t)p[7];
339 /* We'll write at the begining of the buffer */
340 p_psi->p_current = p_psi->buffer;
344 if( p_psi->b_section_complete )
346 /* New Section of an already started PSI */
347 p_psi->b_section_complete = 0;
349 if( p_psi->i_version_number != (( p[5] >> 1 ) & 0x1f) )
352 "PSI version differs inside same PAT" );
355 if( p_psi->i_section_number + 1 != (uint8_t)p[6] )
358 "PSI Section discontinuity, packet lost?" );
362 p_psi->i_section_number++;
366 msg_Warn( p_input, "got unexpected new PSI section" );
373 if( !p_psi->b_trash )
376 if( (p_data->p_payload_end - p) >=
377 ( p_psi->i_section_length - p_psi->i_read_in_section ) )
379 /* The end of the section is in this TS packet */
380 memcpy( p_psi->p_current, p,
381 (p_psi->i_section_length - p_psi->i_read_in_section) );
383 p_psi->b_section_complete = 1;
385 (p_psi->i_section_length - p_psi->i_read_in_section);
387 if( p_psi->i_section_number == p_psi->i_last_section_number )
389 /* This was the last section of PSI */
390 p_psi->b_is_complete = 1;
392 switch( p_demux_data->i_psi_type)
395 TSDecodePAT( p_input, p_es );
398 TSDecodePMT( p_input, p_es );
401 msg_Warn( p_input, "received unknown PSI in DemuxPSI" );
407 memcpy( p_psi->buffer, p, p_data->p_payload_end - p );
408 p_psi->i_read_in_section += p_data->p_payload_end - p;
410 p_psi->p_current += p_data->p_payload_end - p;
417 input_DeletePacket( p_input->p_method_data, p_data );
422 /*****************************************************************************
423 * DecodePAT : Decodes Programm association table and deal with it
424 *****************************************************************************/
425 static void TSDecodePAT( input_thread_t * p_input, es_descriptor_t * p_es )
427 stream_ts_data_t * p_stream_data;
428 es_ts_data_t * p_demux_data;
430 pgrm_descriptor_t * p_pgrm;
431 es_descriptor_t * p_current_es;
432 byte_t * p_current_data;
434 int i_section_length, i_program_id, i_pmt_pid;
435 int i_loop, i_current_section;
437 vlc_bool_t b_changed = 0;
439 p_demux_data = (es_ts_data_t *)p_es->p_demux_data;
440 p_stream_data = (stream_ts_data_t *)p_input->stream.p_demux_data;
442 #define p_psi (p_demux_data->p_psi_section)
444 /* Not so fast, Mike ! If the PAT version has changed, we first check
445 * that its content has really changed before doing anything */
446 if( p_stream_data->i_pat_version != p_psi->i_version_number )
448 int i_programs = p_input->stream.i_pgrm_number;
450 p_current_data = p_psi->buffer;
454 i_section_length = ((uint32_t)(p_current_data[1] & 0xF) << 8) |
456 i_current_section = (uint8_t)p_current_data[6];
459 ( i_loop < (i_section_length - 9) / 4 ) && !b_changed;
462 i_program_id = ( (uint32_t)*(p_current_data + i_loop * 4 + 8) << 8 )
463 | *(p_current_data + i_loop * 4 + 9);
464 i_pmt_pid = ( ((uint32_t)*(p_current_data + i_loop * 4 + 10) & 0x1F)
466 | *(p_current_data + i_loop * 4 + 11);
470 if( (p_pgrm = input_FindProgram( p_input, i_program_id ))
471 && (p_current_es = input_FindES( p_input, i_pmt_pid ))
472 && p_current_es->p_pgrm == p_pgrm
473 && p_current_es->i_id == i_pmt_pid
474 && ((es_ts_data_t *)p_current_es->p_demux_data)->b_psi
475 && ((es_ts_data_t *)p_current_es->p_demux_data)
476 ->i_psi_type == PSI_IS_PMT )
487 p_current_data += 3 + i_section_length;
489 } while( ( i_current_section < p_psi->i_last_section_number )
492 /* If we didn't find the expected amount of programs, the PAT has
493 * changed. Otherwise, it only changed if b_changed is already != 0 */
494 b_changed = b_changed || i_programs;
499 /* PAT has changed. We are going to delete all programs and
500 * create new ones. We chose not to only change what was needed
501 * as a PAT change may mean the stream is radically changing and
502 * this is a secure method to avoid crashes */
503 es_ts_data_t * p_es_demux;
504 pgrm_ts_data_t * p_pgrm_demux;
506 p_current_data = p_psi->buffer;
508 /* Delete all programs */
509 while( p_input->stream.i_pgrm_number )
511 input_DelProgram( p_input, p_input->stream.pp_programs[0] );
516 i_section_length = ((uint32_t)(p_current_data[1] & 0xF) << 8) |
518 i_current_section = (uint8_t)p_current_data[6];
520 for( i_loop = 0; i_loop < (i_section_length - 9) / 4 ; i_loop++ )
522 i_program_id = ( (uint32_t)*(p_current_data + i_loop * 4 + 8) << 8 )
523 | *(p_current_data + i_loop * 4 + 9);
524 i_pmt_pid = ( ((uint32_t)*(p_current_data + i_loop * 4 + 10) & 0x1F)
526 | *(p_current_data + i_loop * 4 + 11);
528 /* If program = 0, we're having info about NIT not PMT */
531 /* Add this program */
532 p_pgrm = input_AddProgram( p_input, i_program_id,
533 sizeof( pgrm_ts_data_t ) );
535 /* whatis the PID of the PMT of this program */
536 p_pgrm_demux = (pgrm_ts_data_t *)p_pgrm->p_demux_data;
537 p_pgrm_demux->i_pmt_version = PMT_UNINITIALIZED;
539 /* Add the PMT ES to this program */
540 p_current_es = input_AddES( p_input, p_pgrm,(uint16_t)i_pmt_pid,
541 UNKNOWN_ES, NULL, sizeof( es_ts_data_t) );
542 p_current_es->i_fourcc = VLC_FOURCC( 'p', 'm', 't', ' ' );
543 p_es_demux = (es_ts_data_t *)p_current_es->p_demux_data;
544 p_es_demux->b_psi = 1;
545 p_es_demux->i_psi_type = PSI_IS_PMT;
547 p_es_demux->p_psi_section =
548 malloc( sizeof( psi_section_t ) );
549 p_es_demux->p_psi_section->b_is_complete = 0;
550 p_es_demux->i_continuity_counter = 0xFF;
554 p_current_data += 3 + i_section_length;
556 } while( i_current_section < p_psi->i_last_section_number );
558 /* Go to the beginning of the next section */
559 p_stream_data->i_pat_version = p_psi->i_version_number;
566 /*****************************************************************************
567 * DecodePMT : decode a given Program Stream Map
568 * ***************************************************************************
569 * When the PMT changes, it may mean a deep change in the stream, and it is
570 * careful to delete the ES and add them again. If the PMT doesn't change,
571 * there no need to do anything.
572 *****************************************************************************/
573 static void TSDecodePMT( input_thread_t * p_input, es_descriptor_t * p_es )
576 pgrm_ts_data_t * p_pgrm_data;
577 es_ts_data_t * p_demux_data;
578 vlc_bool_t b_vls_compat = config_GetInt( p_input, "vls-backwards-compat" );
580 p_demux_data = (es_ts_data_t *)p_es->p_demux_data;
581 p_pgrm_data = (pgrm_ts_data_t *)p_es->p_pgrm->p_demux_data;
583 #define p_psi (p_demux_data->p_psi_section)
585 if( p_psi->i_version_number != p_pgrm_data->i_pmt_version )
587 es_descriptor_t * p_new_es;
588 es_ts_data_t * p_es_demux;
589 byte_t * p_current_data, * p_current_section;
590 int i_section_length,i_current_section;
591 int i_prog_info_length, i_loop;
592 int i_es_info_length, i_pid, i_stream_type;
594 p_current_section = p_psi->buffer;
595 p_current_data = p_psi->buffer;
597 p_pgrm_data->i_pcr_pid = ( ((uint32_t)*(p_current_section + 8) & 0x1F) << 8 ) |
598 *(p_current_section + 9);
601 /* Lock stream information */
602 vlc_mutex_lock( &p_input->stream.stream_lock );
604 /* Delete all ES in this program except the PSI. We start from the
605 * end because i_es_number gets decremented after each deletion. */
606 for( i_loop = p_es->p_pgrm->i_es_number ; i_loop ; )
609 p_es_demux = (es_ts_data_t *)
610 p_es->p_pgrm->pp_es[i_loop]->p_demux_data;
611 if ( ! p_es_demux->b_psi )
613 input_DelES( p_input, p_es->p_pgrm->pp_es[i_loop] );
617 /* Then add what we received in this PMT */
620 i_section_length = ( ((uint32_t)*(p_current_data + 1) & 0xF) << 8 ) |
621 *(p_current_data + 2);
622 i_current_section = (uint8_t)p_current_data[6];
623 i_prog_info_length = ( ((uint32_t)*(p_current_data + 10) & 0xF) << 8 ) |
624 *(p_current_data + 11);
626 /* For the moment we ignore program descriptors */
627 p_current_data += 12 + i_prog_info_length;
629 /* The end of the section, before the CRC is at
630 * p_current_section + i_section_length -1 */
631 while( p_current_data < p_current_section + i_section_length -1 )
633 i_stream_type = (int)p_current_data[0];
634 i_pid = ( ((uint32_t)*(p_current_data + 1) & 0x1F) << 8 ) |
635 *(p_current_data + 2);
636 i_es_info_length = ( ((uint32_t)*(p_current_data + 3) & 0xF) << 8 ) |
637 *(p_current_data + 4);
639 /* Tell the interface what kind of stream it is and select
640 * the required ones */
642 int i_fourcc, i_cat, i_stream_id;
644 switch( i_stream_type )
648 case MPEG2_MOTO_VIDEO_ES:
649 /* This isn't real, but we don't actually use
652 i_fourcc = VLC_FOURCC('m','p','g','v');
657 /* This isn't real, but we don't actually use
660 i_fourcc = VLC_FOURCC('m','p','g','a');
665 i_fourcc = VLC_FOURCC('a','5','2',' ');
667 i_fourcc = VLC_FOURCC('a','5','2','b');
672 i_fourcc = VLC_FOURCC('l','p','c','m');
678 i_fourcc = VLC_FOURCC('s','p','u',' ');
680 i_fourcc = VLC_FOURCC('s','p','u','b');
685 i_fourcc = VLC_FOURCC('s','d','d','s');
690 i_fourcc = VLC_FOURCC('d','t','s',' ');
694 /* 'b' stands for 'buggy' */
696 i_fourcc = VLC_FOURCC('a','5','2','b');
701 i_fourcc = VLC_FOURCC('l','p','c','b');
706 i_fourcc = VLC_FOURCC('s','p','u','b');
718 /* Add this ES to the program */
719 p_new_es = input_AddES( p_input, p_es->p_pgrm, (uint16_t)i_pid,
720 i_cat, NULL, sizeof( es_ts_data_t ) );
722 ((es_ts_data_t *)p_new_es->p_demux_data)->i_continuity_counter = 0xFF;
724 p_new_es->i_stream_id = i_stream_id;
725 p_new_es->i_fourcc = i_fourcc;
729 p_current_data += 5 + i_es_info_length;
732 /* Go to the beginning of the next section*/
733 p_current_data += 3 + i_section_length;
737 } while( i_current_section < p_psi->i_last_section_number );
739 p_pgrm_data->i_pmt_version = p_psi->i_version_number;
741 /* if no program is selected :*/
742 if( !p_input->stream.p_selected_program )
744 pgrm_descriptor_t * p_pgrm_to_select;
745 uint16_t i_id = (uint16_t)config_GetInt( p_input, "program" );
747 if( i_id != 0 ) /* if user specified a program */
749 p_pgrm_to_select = input_FindProgram( p_input, i_id );
751 if( p_pgrm_to_select && p_pgrm_to_select == p_es->p_pgrm )
752 p_input->pf_set_program( p_input, p_pgrm_to_select );
755 p_input->pf_set_program( p_input, p_es->p_pgrm );
758 /* if the pmt belongs to the currently selected program, we
759 * reselect it to update its ES */
760 else if( p_es->p_pgrm == p_input->stream.p_selected_program )
762 p_input->pf_set_program( p_input, p_es->p_pgrm );
765 /* inform interface that stream has changed */
766 p_input->stream.b_changed = 1;
768 vlc_mutex_unlock( &p_input->stream.stream_lock );
774 #elif defined MODULE_NAME_IS_ts_dvbpsi
776 * PSI Decoding using libdvbpsi
779 /*****************************************************************************
780 * DemuxPSI : send the PSI to the right libdvbpsi decoder
781 *****************************************************************************/
782 static void TS_DVBPSI_DemuxPSI( input_thread_t * p_input,
783 data_packet_t * p_data,
784 es_descriptor_t * p_es,
785 vlc_bool_t b_unit_start )
787 es_ts_data_t * p_es_demux_data;
788 pgrm_ts_data_t * p_pgrm_demux_data;
789 stream_ts_data_t * p_stream_demux_data;
791 p_es_demux_data = (es_ts_data_t *)p_es->p_demux_data;
792 p_stream_demux_data = (stream_ts_data_t *) p_input->stream.p_demux_data;
794 switch( p_es_demux_data->i_psi_type)
798 (dvbpsi_handle)p_stream_demux_data->p_pat_handle,
799 p_data->p_demux_start );
802 p_pgrm_demux_data = ( pgrm_ts_data_t * )p_es->p_pgrm->p_demux_data;
804 (dvbpsi_handle)p_pgrm_demux_data->p_pmt_handle,
805 p_data->p_demux_start );
808 msg_Warn( p_input, "received unknown PSI in DemuxPSI" );
811 input_DeletePacket( p_input->p_method_data, p_data );
813 /*****************************************************************************
814 * MP4 specific functions
815 *****************************************************************************/
816 static int MP4_DescriptorLength( int *pi_data, uint8_t **pp_data )
819 unsigned int i_len = 0;
825 i_len = ( i_len << 7 ) + ( i_b&0x7f );
831 static int MP4_GetByte( int *pi_data, uint8_t **pp_data )
846 static int MP4_GetWord( int *pi_data, uint8_t **pp_data )
849 i1 = MP4_GetByte( pi_data, pp_data );
850 i2 = MP4_GetByte( pi_data, pp_data );
851 return( ( i1 << 8 ) | i2 );
853 static int MP4_Get3Bytes( int *pi_data, uint8_t **pp_data )
856 i1 = MP4_GetByte( pi_data, pp_data );
857 i2 = MP4_GetByte( pi_data, pp_data );
858 i3 = MP4_GetByte( pi_data, pp_data );
859 return( ( i1 << 16 ) | ( i2 << 8) | i3 );
862 static uint32_t MP4_GetDWord( int *pi_data, uint8_t **pp_data )
865 i1 = MP4_GetWord( pi_data, pp_data );
866 i2 = MP4_GetWord( pi_data, pp_data );
867 return( ( i1 << 16 ) | i2 );
870 static char* MP4_GetURL( int *pi_data, uint8_t **pp_data )
875 i_url_len = MP4_GetByte( pi_data, pp_data );
876 url = malloc( i_url_len + 1 );
877 for( i = 0; i < i_url_len; i++ )
879 url[i] = MP4_GetByte( pi_data, pp_data );
881 url[i_url_len] = '\0';
885 static void MP4_IODParse( iod_descriptor_t *p_iod, int i_data, uint8_t *p_data )
893 fprintf( stderr, "\n************ IOD ************" );
894 for( i = 0; i < 255; i++ )
896 p_iod->es_descr[i].b_ok = 0;
905 p_iod->i_iod_label = MP4_GetByte( &i_data, &p_data );
906 fprintf( stderr, "\n* iod_label:%d", p_iod->i_iod_label );
907 fprintf( stderr, "\n* ===========" );
908 fprintf( stderr, "\n* tag:0x%x", p_data[0] );
910 if( MP4_GetByte( &i_data, &p_data ) != 0x02 )
912 fprintf( stderr, "\n ERR: tag != 0x02" );
916 i_iod_length = MP4_DescriptorLength( &i_data, &p_data );
917 fprintf( stderr, "\n* length:%d", i_iod_length );
918 if( i_iod_length > i_data )
920 i_iod_length = i_data;
923 p_iod->i_od_id = ( MP4_GetByte( &i_data, &p_data ) << 2 );
924 i_flags = MP4_GetByte( &i_data, &p_data );
925 p_iod->i_od_id |= i_flags >> 6;
926 b_url = ( i_flags >> 5 )&0x01;
928 fprintf( stderr, "\n* od_id:%d", p_iod->i_od_id );
929 fprintf( stderr, "\n* url flag:%d", b_url );
930 fprintf( stderr, "\n* includeInlineProfileLevel flag:%d", ( i_flags >> 4 )&0x01 );
934 p_iod->psz_url = MP4_GetURL( &i_data, &p_data );
935 fprintf( stderr, "\n* url string:%s", p_iod->psz_url );
936 fprintf( stderr, "\n*****************************\n" );
941 p_iod->psz_url = NULL;
944 p_iod->i_ODProfileLevelIndication = MP4_GetByte( &i_data, &p_data );
945 p_iod->i_sceneProfileLevelIndication = MP4_GetByte( &i_data, &p_data );
946 p_iod->i_audioProfileLevelIndication = MP4_GetByte( &i_data, &p_data );
947 p_iod->i_visualProfileLevelIndication = MP4_GetByte( &i_data, &p_data );
948 p_iod->i_graphicsProfileLevelIndication = MP4_GetByte( &i_data, &p_data );
950 fprintf( stderr, "\n* ODProfileLevelIndication:%d", p_iod->i_ODProfileLevelIndication );
951 fprintf( stderr, "\n* sceneProfileLevelIndication:%d", p_iod->i_sceneProfileLevelIndication );
952 fprintf( stderr, "\n* audioProfileLevelIndication:%d", p_iod->i_audioProfileLevelIndication );
953 fprintf( stderr, "\n* visualProfileLevelIndication:%d", p_iod->i_visualProfileLevelIndication );
954 fprintf( stderr, "\n* graphicsProfileLevelIndication:%d", p_iod->i_graphicsProfileLevelIndication );
957 while( i_data > 0 && i_es_index < 255)
963 i_tag = MP4_GetByte( &i_data, &p_data );
964 i_length = MP4_DescriptorLength( &i_data, &p_data );
975 #define es_descr p_iod->es_descr[i_es_index]
976 int i_decoderConfigDescr_length;
977 fprintf( stderr, "\n* - ES_Descriptor length:%d", i_length );
980 es_descr.i_es_id = MP4_GetWord( &i_data, &p_data );
981 i_flags = MP4_GetByte( &i_data, &p_data );
982 es_descr.b_streamDependenceFlag = ( i_flags >> 7 )&0x01;
983 b_url = ( i_flags >> 6 )&0x01;
984 es_descr.b_OCRStreamFlag = ( i_flags >> 5 )&0x01;
985 es_descr.i_streamPriority = i_flags & 0x1f;
986 fprintf( stderr, "\n* * streamDependenceFlag:%d", es_descr.b_streamDependenceFlag );
987 fprintf( stderr, "\n* * OCRStreamFlag:%d", es_descr.b_OCRStreamFlag );
988 fprintf( stderr, "\n* * streamPriority:%d", es_descr.i_streamPriority );
990 if( es_descr.b_streamDependenceFlag )
992 es_descr.i_dependOn_es_id = MP4_GetWord( &i_data, &p_data );
993 fprintf( stderr, "\n* * dependOn_es_id:%d", es_descr.i_dependOn_es_id );
998 es_descr.psz_url = MP4_GetURL( &i_data, &p_data );
999 fprintf( stderr, "\n* url string:%s", es_descr.psz_url );
1003 es_descr.psz_url = NULL;
1006 if( es_descr.b_OCRStreamFlag )
1008 es_descr.i_OCR_es_id = MP4_GetWord( &i_data, &p_data );
1009 fprintf( stderr, "\n* * OCR_es_id:%d", es_descr.i_OCR_es_id );
1012 if( MP4_GetByte( &i_data, &p_data ) != 0x04 )
1014 fprintf( stderr, "\n* ERR missing DecoderConfigDescr" );
1018 i_decoderConfigDescr_length = MP4_DescriptorLength( &i_data, &p_data );
1020 fprintf( stderr, "\n* - DecoderConfigDesc length:%d", i_decoderConfigDescr_length );
1021 #define dec_descr es_descr.dec_descr
1022 dec_descr.i_objectTypeIndication = MP4_GetByte( &i_data, &p_data );
1023 i_flags = MP4_GetByte( &i_data, &p_data );
1024 dec_descr.i_streamType = i_flags >> 2;
1025 dec_descr.b_upStream = ( i_flags >> 1 )&0x01;
1026 dec_descr.i_bufferSizeDB = MP4_Get3Bytes( &i_data, &p_data );
1027 dec_descr.i_maxBitrate = MP4_GetDWord( &i_data, &p_data );
1028 dec_descr.i_avgBitrate = MP4_GetDWord( &i_data, &p_data );
1029 fprintf( stderr, "\n* * objectTypeIndication:0x%x", dec_descr.i_objectTypeIndication );
1030 fprintf( stderr, "\n* * streamType:0x%x", dec_descr.i_streamType );
1031 fprintf( stderr, "\n* * upStream:%d", dec_descr.b_upStream );
1032 fprintf( stderr, "\n* * bufferSizeDB:%d", dec_descr.i_bufferSizeDB );
1033 fprintf( stderr, "\n* * maxBitrate:%d", dec_descr.i_maxBitrate );
1034 fprintf( stderr, "\n* * avgBitrate:%d", dec_descr.i_avgBitrate );
1035 if( i_decoderConfigDescr_length > 13 && MP4_GetByte( &i_data, &p_data ) == 0x05 )
1038 dec_descr.i_decoder_specific_info_len =
1039 MP4_DescriptorLength( &i_data, &p_data );
1040 if( dec_descr.i_decoder_specific_info_len > 0 )
1042 dec_descr.p_decoder_specific_info =
1043 malloc( dec_descr.i_decoder_specific_info_len );
1045 for( i = 0; i < dec_descr.i_decoder_specific_info_len; i++ )
1047 dec_descr.p_decoder_specific_info[i] = MP4_GetByte( &i_data, &p_data );
1052 dec_descr.i_decoder_specific_info_len = 0;
1053 dec_descr.p_decoder_specific_info = NULL;
1057 #define sl_descr es_descr.sl_descr
1059 int i_SLConfigDescr_length;
1062 if( MP4_GetByte( &i_data, &p_data ) != 0x06 )
1064 fprintf( stderr, "\n* ERR missing SLConfigDescr" );
1068 i_SLConfigDescr_length = MP4_DescriptorLength( &i_data, &p_data );
1070 fprintf( stderr, "\n* - SLConfigDescr length:%d", i_SLConfigDescr_length );
1071 i_predefined = MP4_GetByte( &i_data, &p_data );
1072 fprintf( stderr, "\n* * i_predefined:0x%x", i_predefined );
1073 switch( i_predefined )
1077 sl_descr.b_useAccessUnitStartFlag = 0;
1078 sl_descr.b_useAccessUnitEndFlag = 0;
1079 sl_descr.b_useRandomAccessPointFlag = 0;
1080 //sl_descr.b_useRandomAccessUnitsOnlyFlag = 0;
1081 sl_descr.b_usePaddingFlag = 0;
1082 sl_descr.b_useTimeStampsFlags = 0;
1083 sl_descr.b_useIdleFlag = 0;
1084 sl_descr.b_durationFlag = 0; // FIXME FIXME
1085 sl_descr.i_timeStampResolution = 1000;
1086 sl_descr.i_OCRResolution = 0; // FIXME FIXME
1087 sl_descr.i_timeStampLength = 32;
1088 sl_descr.i_OCRLength = 0; // FIXME FIXME
1089 sl_descr.i_AU_Length = 0;
1090 sl_descr.i_instantBitrateLength= 0; // FIXME FIXME
1091 sl_descr.i_degradationPriorityLength= 0;
1092 sl_descr.i_AU_seqNumLength = 0;
1093 sl_descr.i_packetSeqNumLength = 0;
1094 if( sl_descr.b_durationFlag )
1096 sl_descr.i_timeScale = 0; // FIXME FIXME
1097 sl_descr.i_accessUnitDuration = 0; // FIXME FIXME
1098 sl_descr.i_compositionUnitDuration= 0; // FIXME FIXME
1100 if( !sl_descr.b_useTimeStampsFlags )
1102 sl_descr.i_startDecodingTimeStamp = 0; // FIXME FIXME
1103 sl_descr.i_startCompositionTimeStamp= 0; // FIXME FIXME
1108 fprintf( stderr, "\n* ERR unsupported SLConfigDescr predefined" );
1117 fprintf( stderr, "\n* - OD tag:0x%x length:%d (Unsupported)", i_tag, i_length );
1121 p_data = p_data_sav + i_length;
1122 i_data = i_data_sav - i_length;
1127 fprintf( stderr, "\n*****************************\n" );
1130 static void MP4_IODClean( iod_descriptor_t *p_iod )
1134 if( p_iod->psz_url )
1136 free( p_iod->psz_url );
1137 p_iod->psz_url = NULL;
1141 for( i = 0; i < 255; i++ )
1143 #define es_descr p_iod->es_descr[i]
1146 if( es_descr.psz_url )
1148 free( es_descr.psz_url );
1149 es_descr.psz_url = NULL;
1153 if( es_descr.dec_descr.p_decoder_specific_info != NULL )
1155 free( es_descr.dec_descr.p_decoder_specific_info );
1156 es_descr.dec_descr.p_decoder_specific_info = NULL;
1157 es_descr.dec_descr.i_decoder_specific_info_len = 0;
1166 /*****************************************************************************
1167 * HandlePAT: will treat a PAT returned by dvbpsi
1168 *****************************************************************************/
1169 static void TS_DVBPSI_HandlePAT( input_thread_t * p_input,
1170 dvbpsi_pat_t * p_new_pat )
1172 dvbpsi_pat_program_t * p_pgrm;
1173 pgrm_descriptor_t * p_new_pgrm;
1174 pgrm_ts_data_t * p_pgrm_demux;
1175 es_descriptor_t * p_current_es;
1176 es_ts_data_t * p_es_demux;
1177 stream_ts_data_t * p_stream_data;
1179 vlc_mutex_lock( &p_input->stream.stream_lock );
1181 p_stream_data = (stream_ts_data_t *)p_input->stream.p_demux_data;
1183 if ( ( p_new_pat->b_current_next && ( p_new_pat->i_version != p_stream_data->i_pat_version ) ) ||
1184 p_stream_data->i_pat_version == PAT_UNINITIALIZED )
1186 /* Delete all programs */
1187 while( p_input->stream.i_pgrm_number )
1189 pgrm_ts_data_t *p_pgrm_demux_old =
1190 (pgrm_ts_data_t *)p_input->stream.pp_programs[0]->p_demux_data;
1192 if( p_pgrm_demux_old->b_mpeg4 )
1194 MP4_IODClean( &p_pgrm_demux_old->iod );
1197 input_DelProgram( p_input, p_input->stream.pp_programs[0] );
1200 /* treat the new programs list */
1201 p_pgrm = p_new_pat->p_first_program;
1205 /* If program = 0, we're having info about NIT not PMT */
1206 if( p_pgrm->i_number )
1208 /* Add this program */
1209 p_new_pgrm = input_AddProgram( p_input, p_pgrm->i_number,
1210 sizeof( pgrm_ts_data_t ) );
1212 p_pgrm_demux = (pgrm_ts_data_t *)p_new_pgrm->p_demux_data;
1213 p_pgrm_demux->i_pmt_version = PMT_UNINITIALIZED;
1215 /* Add the PMT ES to this program */
1216 p_current_es = input_AddES( p_input, p_new_pgrm,
1217 (uint16_t)p_pgrm->i_pid, UNKNOWN_ES,
1218 NULL, sizeof(es_ts_data_t) );
1219 p_current_es->i_fourcc = VLC_FOURCC( 'p', 'm', 't', ' ' );
1220 p_es_demux = (es_ts_data_t *)p_current_es->p_demux_data;
1221 p_es_demux->b_psi = 1;
1222 p_es_demux->i_psi_type = PSI_IS_PMT;
1223 p_es_demux->p_psi_section = NULL;
1224 p_es_demux->i_continuity_counter = 0xFF;
1226 /* Create a PMT decoder */
1227 p_pgrm_demux->p_pmt_handle = (dvbpsi_handle *)
1228 dvbpsi_AttachPMT( p_pgrm->i_number,
1229 (dvbpsi_pmt_callback) &TS_DVBPSI_HandlePMT,
1232 if( p_pgrm_demux->p_pmt_handle == NULL )
1234 msg_Err( p_input, "could not create PMT decoder" );
1235 p_input->b_error = 1;
1240 p_pgrm = p_pgrm->p_next;
1243 p_stream_data->i_pat_version = p_new_pat->i_version;
1245 vlc_mutex_unlock( &p_input->stream.stream_lock );
1249 /*****************************************************************************
1250 * HandlePMT: will treat a PMT returned by dvbpsi
1251 *****************************************************************************/
1252 static void TS_DVBPSI_HandlePMT( input_thread_t * p_input,
1253 dvbpsi_pmt_t * p_new_pmt )
1255 dvbpsi_pmt_es_t * p_es;
1256 pgrm_descriptor_t * p_pgrm;
1257 es_descriptor_t * p_new_es;
1258 pgrm_ts_data_t * p_pgrm_demux;
1259 vlc_bool_t b_vls_compat = config_GetInt( p_input, "vls-backwards-compat" );
1261 vlc_mutex_lock( &p_input->stream.stream_lock );
1263 p_pgrm = input_FindProgram( p_input, p_new_pmt->i_program_number );
1265 if( p_pgrm == NULL )
1267 msg_Warn( p_input, "PMT of unreferenced program found" );
1271 p_pgrm_demux = (pgrm_ts_data_t *)p_pgrm->p_demux_data;
1272 p_pgrm_demux->i_pcr_pid = p_new_pmt->i_pcr_pid;
1274 if( ( p_new_pmt->b_current_next &&
1275 ( p_new_pmt->i_version != p_pgrm_demux->i_pmt_version ) ) ||
1276 p_pgrm_demux->i_pmt_version == PMT_UNINITIALIZED )
1278 dvbpsi_descriptor_t *p_dr = p_new_pmt->p_first_descriptor;
1281 msg_Dbg( p_input, "Processing PMT for program %d version %d",
1282 p_new_pmt->i_program_number, p_new_pmt->i_version );
1284 /* Delete all ES in this program except the PSI. We start from the
1285 * end because i_es_number gets decremented after each deletion. */
1286 for( i_loop = p_pgrm->i_es_number ; i_loop > 0 ; )
1288 es_ts_data_t * p_es_demux;
1291 p_es_demux = (es_ts_data_t *)
1292 p_pgrm->pp_es[i_loop]->p_demux_data;
1293 if ( !p_es_demux->b_psi )
1295 input_DelES( p_input, p_pgrm->pp_es[i_loop] );
1300 while( p_dr && ( p_dr->i_tag != 0x1d ) )
1301 p_dr = p_dr->p_next;
1304 msg_Warn( p_input, "found IOD descriptor" );
1305 MP4_IODParse( &p_pgrm_demux->iod, p_dr->i_length, p_dr->p_data );
1308 p_es = p_new_pmt->p_first_es;
1311 vlc_fourcc_t i_fourcc;
1312 int i_size, i_cat, i_stream_id = 0;
1313 es_ts_data_t demux_data;
1314 BITMAPINFOHEADER *p_bih = NULL;
1315 WAVEFORMATEX *p_wf = NULL;
1318 memset( &demux_data, 0, sizeof(es_ts_data_t) );
1321 switch( p_es->i_type )
1323 case MPEG1_VIDEO_ES:
1324 case MPEG2_VIDEO_ES:
1325 case MPEG2_MOTO_VIDEO_ES:
1326 i_fourcc = VLC_FOURCC('m','p','g','v');
1329 case MPEG1_AUDIO_ES:
1330 case MPEG2_AUDIO_ES:
1331 i_fourcc = VLC_FOURCC('m','p','g','a');
1335 if ( !b_vls_compat )
1336 i_fourcc = VLC_FOURCC('a','5','2',' ');
1338 i_fourcc = VLC_FOURCC('a','5','2','b');
1343 if ( !b_vls_compat )
1344 i_fourcc = VLC_FOURCC('s','p','u',' ');
1346 i_fourcc = VLC_FOURCC('s','p','u','b');
1351 i_fourcc = VLC_FOURCC('l','p','c','m');
1356 i_fourcc = VLC_FOURCC('s','d','d','s');
1361 i_fourcc = VLC_FOURCC('d','t','s',' ');
1366 i_fourcc = VLC_FOURCC('a','5','2','b');
1371 i_fourcc = VLC_FOURCC('s','p','u','b');
1375 case LPCMB_AUDIO_ES:
1376 i_fourcc = VLC_FOURCC('l','p','c','b');
1380 case MPEG4_VIDEO_ES:
1381 i_fourcc = VLC_FOURCC('m','p','4','v');
1385 case MPEG4_AUDIO_ES:
1386 i_fourcc = VLC_FOURCC('m','p','4','a');
1390 case MSCODEC_VIDEO_ES:
1391 i_fourcc = VLC_FOURCC(0,0,0,0); /* fixed later */
1395 case PES_PRIVATE_ES:
1396 /* We need to check a descriptor to find the real codec */
1397 i_fourcc = VLC_FOURCC(0,0,0,0); /* fixed later */
1407 if( p_es->i_type == MPEG4_VIDEO_ES ||
1408 p_es->i_type == MPEG4_AUDIO_ES )
1410 /* mpeg4 stream, search sl_descriptor */
1411 dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;
1413 while( p_dr && ( p_dr->i_tag != 0x1f ) ) p_dr = p_dr->p_next;
1415 if( p_dr && p_dr->i_length == 2 )
1417 int i_es_descr_index;
1419 demux_data.i_es_id =
1420 ( p_dr->p_data[0] << 8 ) | p_dr->p_data[1];
1421 demux_data.p_es_descr = NULL;
1423 msg_Warn( p_input, "found SL_descriptor" );
1424 for( i_es_descr_index = 0; i_es_descr_index < 255;
1425 i_es_descr_index++ )
1427 if( p_pgrm_demux->iod.es_descr[i_es_descr_index].b_ok &&
1428 p_pgrm_demux->iod.es_descr[i_es_descr_index].i_es_id == demux_data.i_es_id )
1430 demux_data.p_es_descr =
1431 &p_pgrm_demux->iod.es_descr[i_es_descr_index];
1437 if( demux_data.p_es_descr != NULL )
1439 #define DESCR demux_data.p_es_descr->dec_descr
1440 demux_data.b_mpeg4 = 1;
1443 switch( DESCR.i_streamType )
1445 case 0x04: /* VisualStream */
1447 switch( DESCR.i_objectTypeIndication )
1450 i_fourcc = VLC_FOURCC('m','p','4','v'); // mpeg4
1458 i_fourcc = VLC_FOURCC( 'm','p','g','v' ); // mpeg2
1461 i_fourcc = VLC_FOURCC( 'm','p','g','v' ); // mpeg1
1464 i_fourcc = VLC_FOURCC( 'j','p','e','g' ); // mpeg1
1471 case 0x05: /* AudioStream */
1473 switch( DESCR.i_objectTypeIndication )
1476 i_fourcc = VLC_FOURCC('m','p','4','a'); // mpeg4
1481 i_fourcc = VLC_FOURCC('m','p','4','a');// mpeg2 aac
1484 i_fourcc = VLC_FOURCC('m','p','g','a'); // mpeg2
1487 i_fourcc = VLC_FOURCC('m','p','g','a'); // mpeg1
1503 i_size = sizeof( BITMAPINFOHEADER ) +
1504 DESCR.i_decoder_specific_info_len;
1505 p_bih = malloc( i_size );
1506 p_bih->biSize = i_size;
1508 p_bih->biHeight = 0;
1509 p_bih->biPlanes = 1;
1510 p_bih->biBitCount = 0;
1511 p_bih->biCompression = 0;
1512 p_bih->biSizeImage = 0;
1513 p_bih->biXPelsPerMeter = 0;
1514 p_bih->biYPelsPerMeter = 0;
1515 p_bih->biClrUsed = 0;
1516 p_bih->biClrImportant = 0;
1518 DESCR.p_decoder_specific_info,
1519 DESCR.i_decoder_specific_info_len );
1522 i_size = sizeof( WAVEFORMATEX ) +
1523 DESCR.i_decoder_specific_info_len;
1524 p_wf = malloc( i_size );
1525 p_wf->wFormatTag = 0xffff;
1526 p_wf->nChannels = 0;
1527 p_wf->nSamplesPerSec = 0;
1528 p_wf->nAvgBytesPerSec = 0;
1529 p_wf->nBlockAlign = 1;
1530 p_wf->wBitsPerSample = 0;
1531 p_wf->cbSize = DESCR.i_decoder_specific_info_len;
1533 DESCR.p_decoder_specific_info,
1534 DESCR.i_decoder_specific_info_len );
1543 "mpeg4 stream without (valid) sl_descriptor" );
1544 demux_data.b_mpeg4 = 0;
1548 else if( p_es->i_type == MSCODEC_VIDEO_ES )
1550 /* crapy ms codec stream, search private descriptor */
1551 dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;
1553 while( p_dr && ( p_dr->i_tag != 0xa0 ) ) p_dr = p_dr->p_next;
1555 if( p_dr && p_dr->i_length >= 8 )
1558 i_fourcc = VLC_FOURCC( p_dr->p_data[0], p_dr->p_data[1],
1559 p_dr->p_data[2], p_dr->p_data[3] );
1561 i_bih_size = (p_dr->p_data[8] << 8) | p_dr->p_data[9];
1562 i_size = sizeof( BITMAPINFOHEADER ) + i_bih_size;
1564 p_bih = malloc( i_size );
1565 p_bih->biSize = i_size;
1566 p_bih->biWidth = ( p_dr->p_data[4] << 8 )|p_dr->p_data[5];
1567 p_bih->biHeight = ( p_dr->p_data[6] << 8 )|p_dr->p_data[7];
1568 p_bih->biPlanes = 1;
1569 p_bih->biBitCount = 0;
1570 p_bih->biCompression = 0;
1571 p_bih->biSizeImage = 0;
1572 p_bih->biXPelsPerMeter = 0;
1573 p_bih->biYPelsPerMeter = 0;
1574 p_bih->biClrUsed = 0;
1575 p_bih->biClrImportant = 0;
1576 memcpy( &p_bih[1], &p_dr->p_data[10], i_bih_size );
1580 msg_Warn( p_input, "private ms-codec stream without bih "
1581 "private sl_descriptor" );
1586 else if( p_es->i_type == PES_PRIVATE_ES )
1588 dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;
1589 /* We have to find a descriptor giving the right codec */
1591 for(p_dr = p_es->p_first_descriptor; p_dr; p_dr = p_dr->p_next)
1593 if( p_dr->i_tag == 0x6a )
1596 i_fourcc = VLC_FOURCC( 'a', '5', '2', ' ' );
1599 else if( p_dr->i_tag == 0x59 )
1602 i_fourcc = VLC_FOURCC( 'd', 'v', 'b', 's' );
1606 if( i_fourcc == VLC_FOURCC(0,0,0,0) )
1609 "Unknown codec/type for Private PES stream" );
1613 if( i_cat == AUDIO_ES || i_cat == SPU_ES )
1615 dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;
1616 while( p_dr && ( p_dr->i_tag != 0x0a ) ) p_dr = p_dr->p_next;
1620 dvbpsi_iso639_dr_t *p_decoded =
1621 dvbpsi_DecodeISO639Dr( p_dr );
1622 if( p_decoded->i_code_count > 0 )
1624 const iso639_lang_t * p_iso;
1625 p_iso = GetLang_2T((char*)p_decoded->i_iso_639_code);
1629 if( p_iso->psz_native_name[0] )
1631 p_iso->psz_native_name, 20 );
1634 p_iso->psz_eng_name, 20 );
1638 strncpy( psz_desc, p_decoded->i_iso_639_code, 3 );
1642 switch( p_es->i_type )
1644 case MPEG1_AUDIO_ES:
1645 case MPEG2_AUDIO_ES:
1646 strcat( psz_desc, " (mpeg)" );
1649 case LPCMB_AUDIO_ES:
1650 strcat( psz_desc, " (lpcm)" );
1654 strcat( psz_desc, " (A52)" );
1656 case MPEG4_AUDIO_ES:
1657 strcat( psz_desc, " (aac)" );
1663 p_new_es = input_AddES( p_input, p_pgrm, (uint16_t)p_es->i_pid,
1664 i_cat, psz_desc, sizeof( es_ts_data_t ) );
1665 if( p_new_es == NULL )
1667 msg_Err( p_input, "could not add ES %d", p_es->i_pid );
1668 p_input->b_error = 1;
1671 p_new_es->i_fourcc = i_fourcc;
1672 p_new_es->i_stream_id = i_stream_id;
1673 p_new_es->p_bitmapinfoheader = (void*)p_bih;
1674 p_new_es->p_waveformatex = (void*)p_wf;
1675 memcpy( p_new_es->p_demux_data, &demux_data,
1676 sizeof(es_ts_data_t) );
1678 ((es_ts_data_t *)p_new_es->p_demux_data)->i_continuity_counter =
1681 p_es = p_es->p_next;
1684 /* if no program is selected :*/
1685 if( !p_input->stream.p_selected_program )
1687 pgrm_descriptor_t * p_pgrm_to_select;
1688 uint16_t i_id = (uint16_t)config_GetInt( p_input, "program" );
1690 if( i_id != 0 ) /* if user specified a program */
1692 p_pgrm_to_select = input_FindProgram( p_input, i_id );
1694 if( p_pgrm_to_select && p_pgrm_to_select == p_pgrm )
1695 p_input->pf_set_program( p_input, p_pgrm_to_select );
1698 p_input->pf_set_program( p_input, p_pgrm );
1700 /* if the pmt belongs to the currently selected program, we
1701 * reselect it to update its ES */
1702 else if( p_pgrm == p_input->stream.p_selected_program )
1704 p_input->pf_set_program( p_input, p_pgrm );
1707 p_pgrm_demux->i_pmt_version = p_new_pmt->i_version;
1708 p_input->stream.b_changed = 1;
1710 vlc_mutex_unlock( &p_input->stream.stream_lock );