X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmux%2Fmpeg%2Fts.c;h=80e8d47589b12aed23d319a4360b1763c852d552;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=9379a7e464bc4e24b99d195bd1cf4868a15a162d;hpb=771b5e8ce9958ed7fe9976a68ac9b784c8a595ef;p=vlc diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c index 9379a7e464..80e8d47589 100644 --- a/modules/mux/mpeg/ts.c +++ b/modules/mux/mpeg/ts.c @@ -1,12 +1,12 @@ /***************************************************************************** * ts.c: MPEG-II TS Muxer ***************************************************************************** - * Copyright (C) 2001-2005 VideoLAN (Centrale Réseaux) and its contributors + * Copyright (C) 2001-2005 the VideoLAN team * $Id$ * * Authors: Laurent Aimar * Eric Petit - * Jean-Paul Saman + * Jean-Paul Saman * Wallace Wadge * * This program is free software; you can redistribute it and/or modify @@ -21,17 +21,17 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include #include -#include -#include +#include +#include +#include #include "iso_lang.h" @@ -81,34 +81,46 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); #define VPID_TEXT N_("Video PID") -#define VPID_LONGTEXT N_("Assigns a fixed PID to the video stream. The PCR " \ +#define VPID_LONGTEXT N_("Assign a fixed PID to the video stream. The PCR " \ "PID will automatically be the video.") #define APID_TEXT N_("Audio PID") -#define APID_LONGTEXT N_("Assigns a fixed PID to the audio stream.") +#define APID_LONGTEXT N_("Assign a fixed PID to the audio stream.") #define SPUPID_TEXT N_("SPU PID") -#define SPUPID_LONGTEXT N_("Assigns a fixed PID to the SPU.") +#define SPUPID_LONGTEXT N_("Assign a fixed PID to the SPU.") #define PMTPID_TEXT N_("PMT PID") -#define PMTPID_LONGTEXT N_("Assigns a fixed PID to the PMT") +#define PMTPID_LONGTEXT N_("Assign a fixed PID to the PMT") #define TSID_TEXT N_("TS ID") -#define TSID_LONGTEXT N_("Assigns a fixed Transport Stream ID.") +#define TSID_LONGTEXT N_("Assign a fixed Transport Stream ID.") #define NETID_TEXT N_("NET ID") -#define NETID_LONGTEXT N_("Assigns a fixed Network ID (for SDT table)") -#define PMTPROG_TEXT N_("PMT Program numbers (requires --sout-ts-es-id-pid)") -#define PMTPROG_LONGTEXT N_("Assigns a program number to each PMT") +#define NETID_LONGTEXT N_("Assign a fixed Network ID (for SDT table)") + +#define PMTPROG_TEXT N_("PMT Program numbers") +#define PMTPROG_LONGTEXT N_("Assign a program number to each PMT. This " \ + "requires \"Set PID to ID of ES\" to be enabled." ) + #define MUXPMT_TEXT N_("Mux PMT (requires --sout-ts-es-id-pid)") -#define MUXPMT_LONGTEXT N_("Defines the pids to add to each pmt." ) +#define MUXPMT_LONGTEXT N_("Define the pids to add to each pmt. This " \ + "requires \"Set PID to ID of ES\" to be enabled." ) #define SDTDESC_TEXT N_("SDT Descriptors (requires --sout-ts-es-id-pid)") -#define SDTDESC_LONGTEXT N_("Defines the descriptors of each SDT" ) +#define SDTDESC_LONGTEXT N_("Defines the descriptors of each SDT. This" \ + "requires \"Set PID to ID of ES\" to be enabled." ) + +#define PID_TEXT N_("Set PID to ID of ES") +#define PID_LONGTEXT N_("Sets PID to the ID if the incoming ES. This is for " \ + "use with --ts-es-id-pid, and allows to have the same PIDs in the input " \ + "and output streams.") -#define PID_TEXT N_("Set PID to id of ES") -#define PID_LONGTEXT N_("set PID to id of es") +#define ALIGNMENT_TEXT N_("Data alignment") +#define ALIGNMENT_LONGTEXT N_("Enforces alignment of all access units on " \ + "PES boundaries. Disabling this might save some bandwidth but introduce incompatibilities.") #define SHAPING_TEXT N_("Shaping delay (ms)") -#define SHAPING_LONGTEXT N_("If enabled, the TS muxer will cut the " \ +#define SHAPING_LONGTEXT N_("Cut the " \ "stream in slices of the given duration, and ensure a constant bitrate " \ - "between the two boundaries. This avoids having huge bitrate peaks for " \ - "reference frames, in particular.") + "between the two boundaries. This avoids having huge bitrate peaks, " \ + "especially for reference frames." ) + #define KEYF_TEXT N_("Use keyframes") #define KEYF_LONGTEXT N_("If enabled, and shaping is specified, " \ "the TS muxer will place the boundaries at the end of I pictures. In " \ @@ -118,9 +130,9 @@ static void Close ( vlc_object_t * ); "frames in the stream.") #define PCR_TEXT N_("PCR delay (ms)") -#define PCR_LONGTEXT N_("This option allows you to set at which interval " \ - "PCRs (Program Clock Reference) will be sent. " \ - "This value should be below 100ms. (default is 70)") +#define PCR_LONGTEXT N_("Set at which interval " \ + "PCRs (Program Clock Reference) will be sent (in milliseconds). " \ + "This value should be below 100ms. (default is 70ms).") #define BMIN_TEXT N_( "Minimum B (deprecated)") #define BMIN_LONGTEXT N_( "This setting is deprecated and not used anymore" ) @@ -129,7 +141,7 @@ static void Close ( vlc_object_t * ); #define BMAX_LONGTEXT N_( "This setting is deprecated and not used anymore") #define DTS_TEXT N_("DTS delay (ms)") -#define DTS_LONGTEXT N_("This option will delay the DTS (decoding time " \ +#define DTS_LONGTEXT N_("Delay the DTS (decoding time " \ "stamps) and PTS (presentation timestamps) of the data in the " \ "stream, compared to the PCRs. This allows for some buffering inside " \ "the client decoder.") @@ -140,13 +152,13 @@ static void Close ( vlc_object_t * ); #define VCRYPT_LONGTEXT N_("Crypt video using CSA") #define CK_TEXT N_("CSA Key") -#define CK_LONGTEXT N_("Defines the CSA encryption key. This must be a " \ +#define CK_LONGTEXT N_("CSA encryption key. This must be a " \ "16 char string (8 hexadecimal bytes).") #define CPKT_TEXT N_("Packet size in bytes to encrypt") -#define CPKT_LONGTEXT N_("Specify the size of the TS packet to encrypt. " \ +#define CPKT_LONGTEXT N_("Size of the TS packet to encrypt. " \ "The encryption routines subtract the TS-header from the value before " \ - "encrypting. " ) + "encrypting." ) #define SOUT_CFG_PREFIX "sout-ts-" #ifdef HAVE_BSEARCH @@ -174,14 +186,20 @@ vlc_module_begin(); PMTPID_LONGTEXT, VLC_TRUE ); add_integer( SOUT_CFG_PREFIX "tsid", 0, NULL, TSID_TEXT, TSID_LONGTEXT, VLC_TRUE ); +#ifdef HAVE_DVBPSI_SDT add_integer( SOUT_CFG_PREFIX "netid", 0, NULL, NETID_TEXT, NETID_LONGTEXT, VLC_TRUE ); +#endif add_string( SOUT_CFG_PREFIX "program-pmt", NULL, NULL, PMTPROG_TEXT, PMTPROG_LONGTEXT, VLC_TRUE ); add_bool( SOUT_CFG_PREFIX "es-id-pid", 0, NULL, PID_TEXT, PID_LONGTEXT, VLC_TRUE ); add_string( SOUT_CFG_PREFIX "muxpmt", NULL, NULL, MUXPMT_TEXT, MUXPMT_LONGTEXT, VLC_TRUE ); +#ifdef HAVE_DVBPSI_SDT add_string( SOUT_CFG_PREFIX "sdtdesc", NULL, NULL, SDTDESC_TEXT, SDTDESC_LONGTEXT, VLC_TRUE ); +#endif + add_bool( SOUT_CFG_PREFIX "alignment", VLC_TRUE, NULL, ALIGNMENT_TEXT, + ALIGNMENT_LONGTEXT, VLC_TRUE ); add_integer( SOUT_CFG_PREFIX "shaping", 200, NULL,SHAPING_TEXT, SHAPING_LONGTEXT, VLC_TRUE ); @@ -216,7 +234,7 @@ static const char *ppsz_sout_options[] = { "pid-video", "pid-audio", "pid-spu", "pid-pmt", "tsid", "netid", "es-id-pid", "shaping", "pcr", "bmin", "bmax", "use-key-frames", "dts-delay", "csa-ck", "csa-pkt", "crypt-audio", "crypt-video", - "muxpmt", "sdtdesc", "program-pmt", + "muxpmt", "sdtdesc", "program-pmt", "alignment", NULL }; @@ -228,7 +246,7 @@ typedef struct pmt_map_t /* Holds the mapping between the pmt-pid/pmt table */ typedef struct sdt_desc_t { - char *psz_provider; + char *psz_provider; char *psz_service_name; /* name of program */ } sdt_desc_t; @@ -318,7 +336,8 @@ typedef struct ts_stream_t uint8_t *p_decoder_specific_info; /* language is iso639-2T */ - uint8_t lang[3]; + int i_langs; + uint8_t *lang; sout_buffer_chain_t chain_pes; mtime_t i_pes_dts; @@ -351,15 +370,16 @@ struct sout_mux_sys_t ts_stream_t pat; int i_pmt_version_number; - ts_stream_t pmt[MAX_PMT]; + ts_stream_t pmt[MAX_PMT]; pmt_map_t pmtmap[MAX_PMT_PID]; int i_pmt_program_number[MAX_PMT]; sdt_desc_t sdt_descriptors[MAX_PMT]; + vlc_bool_t b_data_alignment; int i_mpeg4_streams; int i_null_continuity_counter; /* Needed ? */ - ts_stream_t sdt; + ts_stream_t sdt; dvbpsi_pmt_t *dvbpmt; /* for TS building */ @@ -458,7 +478,7 @@ static int Open( vlc_object_t *p_this ) vlc_value_t val; int i; - sout_CfgParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg ); + config_ChainParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg ); p_sys = malloc( sizeof( sout_mux_sys_t ) ); if( !p_sys ) @@ -487,7 +507,7 @@ static int Open( vlc_object_t *p_this ) p_sys->b_es_id_pid = val.b_bool; var_Get( p_mux, SOUT_CFG_PREFIX "muxpmt", &val ); - /* + /* fetch string of pmts. Here's a sample: --sout-ts-muxpmt="0x451,0x200,0x28a,0x240,,0x450,0x201,0x28b,0x241,,0x452,0x202,0x28c,0x242" This would mean 0x451, 0x200, 0x28a, 0x240 would fall under one pmt (program), 0x450,0x201,0x28b,0x241 would fall under another */ @@ -501,11 +521,11 @@ static int Open( vlc_object_t *p_this ) while( psz != NULL ) { i_pid = strtoul( psz, &psz_next, 0 ); - + if ( strlen(psz_next) > 0 ) psz = &psz_next[1]; if ( i_pid == 0 ) - { + { p_sys->i_num_pmt++; if ( p_sys->i_num_pmt > MAX_PMT ) { @@ -514,7 +534,7 @@ static int Open( vlc_object_t *p_this ) p_sys->i_num_pmt = MAX_PMT; } } - else + else { p_sys->pmtmap[p_sys->i_pmtslots].i_pid = i_pid; p_sys->pmtmap[p_sys->i_pmtslots].i_prog = p_sys->i_num_pmt - 1; @@ -527,11 +547,11 @@ static int Open( vlc_object_t *p_this ) p_sys->i_pmtslots = MAX_PMT_PID; } } - + /* Now sort according to pids for fast search later on */ qsort( (void *)p_sys->pmtmap, p_sys->i_pmtslots, sizeof(pmt_map_t), &pmtcompare ); - if ( !*psz_next ) + if ( !*psz_next ) psz = NULL; } } @@ -540,28 +560,38 @@ static int Open( vlc_object_t *p_this ) p_sys->i_pat_version_number = rand() % 32; p_sys->pat.i_pid = 0; p_sys->pat.i_continuity_counter = 0; + p_sys->pat.b_discontinuity = VLC_FALSE; var_Get( p_mux, SOUT_CFG_PREFIX "tsid", &val ); if ( val.i_int ) p_sys->i_tsid = val.i_int; else p_sys->i_tsid = rand() % 65536; + + p_sys->i_netid = rand() % 65536; +#ifdef HAVE_DVBPSI_SDT var_Get( p_mux, SOUT_CFG_PREFIX "netid", &val ); if ( val.i_int ) p_sys->i_netid = val.i_int; - else - p_sys->i_netid = rand() % 65536; - p_sys->i_pmt_version_number = rand() % 32; - p_sys->sdt.i_continuity_counter = 0; +#endif + p_sys->i_pmt_version_number = rand() % 32; for( i = 0; i < p_sys->i_num_pmt; i++ ) + { p_sys->pmt[i].i_continuity_counter = 0; + p_sys->pmt[i].b_discontinuity = VLC_FALSE; + } + + p_sys->sdt.i_pid = 0x11; + p_sys->sdt.i_continuity_counter = 0; + p_sys->sdt.b_discontinuity = VLC_FALSE; +#ifdef HAVE_DVBPSI_SDT var_Get( p_mux, SOUT_CFG_PREFIX "sdtdesc", &val ); p_sys->b_sdt = val.psz_string && *val.psz_string ? VLC_TRUE : VLC_FALSE; - + /* Syntax is provider_sdt1,service_name_sdt1,provider_sdt2,service_name_sdt2... */ - if( val.psz_string != NULL && *val.psz_string ) + if( p_sys->b_sdt ) { char *psz = val.psz_string; @@ -583,7 +613,7 @@ static int Open( vlc_object_t *p_this ) else { p_sys->sdt_descriptors[i/2].psz_service_name - = strdup(psz_sdttoken); + = strdup(psz_sdttoken); } i++; @@ -591,6 +621,12 @@ static int Open( vlc_object_t *p_this ) } } if( val.psz_string != NULL ) free( val.psz_string ); +#else + p_sys->b_sdt = VLC_FALSE; +#endif + + var_Get( p_mux, SOUT_CFG_PREFIX "alignment", &val ); + p_sys->b_data_alignment = val.b_bool; var_Get( p_mux, SOUT_CFG_PREFIX "program-pmt", &val ); if( val.psz_string && *val.psz_string ) @@ -608,9 +644,9 @@ static int Open( vlc_object_t *p_this ) psz = &psz_next[1]; else psz = NULL; - + if( i_pid == 0 ) - { + { if( i > MAX_PMT ) msg_Err( p_mux, "Number of PMTs > maximum (%d)", MAX_PMT ); @@ -639,7 +675,7 @@ static int Open( vlc_object_t *p_this ) else { for( i = 0; i < p_sys->i_num_pmt; i++ ) - p_sys->pmt[i].i_pid = 0x42 + i; + p_sys->pmt[i].i_pid = 0x42 + i; } p_sys->i_pid_free = p_sys->pmt[p_sys->i_num_pmt - 1].i_pid + 1; @@ -759,9 +795,9 @@ static int Open( vlc_object_t *p_this ) if( p_sys->csa ) { vlc_value_t pkt_val; - - csa_SetCW( p_sys->csa, ck, ck ); - + + csa_SetCW( p_sys->csa, ck, ck ); + var_Get( p_mux, SOUT_CFG_PREFIX "csa-pkt", &pkt_val ); if( pkt_val.i_int < 12 || pkt_val.i_int > 188 ) { @@ -771,7 +807,7 @@ static int Open( vlc_object_t *p_this ) } else p_sys->i_csa_pkt_size = pkt_val.i_int; msg_Dbg( p_mux, "encrypting %d bytes of packet", p_sys->i_csa_pkt_size ); - } + } } } if( val.psz_string ) free( val.psz_string ); @@ -849,6 +885,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) { sout_mux_sys_t *p_sys = p_mux->p_sys; ts_stream_t *p_stream; + int i; p_input->p_sys = p_stream = malloc( sizeof( ts_stream_t ) ); @@ -977,6 +1014,9 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) return VLC_EGENERIC; } + p_stream->i_langs = 1+p_input->p_fmt->i_extra_languages; + p_stream->lang = malloc(p_stream->i_langs*3); + i = 1; p_stream->lang[0] = p_stream->lang[1] = p_stream->lang[2] = '\0'; @@ -1004,9 +1044,41 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) p_stream->lang[2] = pl->psz_iso639_2T[2]; msg_Dbg( p_mux, " - lang=%c%c%c", - p_stream->lang[0], p_stream->lang[1], p_stream->lang[2] ); + p_stream->lang[0], p_stream->lang[1], + p_stream->lang[2] ); } } + while( i < p_stream->i_langs ) { + if( p_input->p_fmt->p_extra_languages[i-1].psz_language ) + { + char *psz = p_input->p_fmt->p_extra_languages[i-1].psz_language; + const iso639_lang_t *pl = NULL; + + if( strlen( psz ) == 2 ) + { + pl = GetLang_1( psz ); + } + else if( strlen( psz ) == 3 ) + { + pl = GetLang_2B( psz ); + if( !strcmp( pl->psz_iso639_1, "??" ) ) + { + pl = GetLang_2T( psz ); + } + } + if( pl && strcmp( pl->psz_iso639_1, "??" ) ) + { + p_stream->lang[i*3+0] = pl->psz_iso639_2T[0]; + p_stream->lang[i*3+1] = pl->psz_iso639_2T[1]; + p_stream->lang[i*3+2] = pl->psz_iso639_2T[2]; + + msg_Dbg( p_mux, " - lang=%c%c%c", + p_stream->lang[i*3+0], p_stream->lang[i*3+1], + p_stream->lang[i*3+2] ); + } + } + i++; + } /* Copy extra data (VOL for MPEG-4 and extra BitMapInfoHeader for VFW */ p_stream->i_decoder_specific_info = p_input->p_fmt->i_extra; @@ -1147,6 +1219,10 @@ static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input ) /* Empty all data in chain_pes */ BufferChainClean( p_mux->p_sout, &p_stream->chain_pes ); + if( p_stream->lang ) + { + free(p_stream->lang); + } if( p_stream->p_decoder_specific_info ) { free( p_stream->p_decoder_specific_info ); @@ -1208,6 +1284,11 @@ static int Mux( sout_mux_t *p_mux ) if( p_sys->i_pcr_pid == 0x1fff ) { + int i; + for( i = 0; i < p_mux->i_nb_inputs; i++ ) + { + block_FifoEmpty( p_mux->pp_inputs[i]->p_fifo ); + } msg_Dbg( p_mux, "waiting for PCR streams" ); msleep( 1000 ); return VLC_SUCCESS; @@ -1300,7 +1381,7 @@ static int Mux( sout_mux_t *p_mux ) } b_ok = VLC_FALSE; - if( p_stream == p_pcr_stream + if( p_stream == p_pcr_stream || p_sys->b_data_alignment || p_input->p_fmt->i_codec != VLC_FOURCC('m', 'p', 'g', 'a') ) p_data = block_FifoGet( p_input->p_fifo ); @@ -1399,6 +1480,12 @@ static int Mux( sout_mux_t *p_mux ) i_header_size = 0x24; b_data_alignment = 1; } + else if( p_input->p_fmt->i_codec == + VLC_FOURCC('d','v','b','s') ) + { + /* EN 300 743 */ + b_data_alignment = 1; + } } else if( p_data->i_length < 0 || p_data->i_length > 2000000 ) @@ -1418,7 +1505,7 @@ static int Mux( sout_mux_t *p_mux ) if( p_stream->i_stream_id == 0xa0 && p_data->i_pts <= 0 ) { - /* XXX yes I know, it's awfull, but it's needed, + /* XXX yes I know, it's awful, but it's needed, * so don't remove it ... */ p_data->i_pts = p_data->i_dts; } @@ -1504,7 +1591,6 @@ static int Mux( sout_mux_t *p_mux ) /* Select stream (lowest dts) */ for( i = 0, i_stream = -1, i_dts = 0; i < p_mux->i_nb_inputs; i++ ) { - p_input = p_mux->pp_inputs[i]; p_stream = (ts_stream_t*)p_mux->pp_inputs[i]->p_sys; if( p_stream->i_pes_dts == 0 ) @@ -1524,6 +1610,7 @@ static int Mux( sout_mux_t *p_mux ) break; } p_stream = (ts_stream_t*)p_mux->pp_inputs[i_stream]->p_sys; + p_input = p_mux->pp_inputs[i_stream]; /* do we need to issue pcr */ b_pcr = VLC_FALSE; @@ -1571,7 +1658,7 @@ static block_t *FixPES( sout_mux_t *p_mux, block_fifo_t *p_fifo ) else if( i_size > STD_PES_PAYLOAD ) { block_t *p_new = block_New( p_mux, STD_PES_PAYLOAD ); - p_mux->p_vlc->pf_memcpy( p_new->p_buffer, p_data->p_buffer, STD_PES_PAYLOAD ); + p_mux->p_libvlc->pf_memcpy( p_new->p_buffer, p_data->p_buffer, STD_PES_PAYLOAD ); p_new->i_pts = p_data->i_pts; p_new->i_dts = p_data->i_dts; p_new->i_length = p_data->i_length * STD_PES_PAYLOAD @@ -1600,7 +1687,7 @@ static block_t *FixPES( sout_mux_t *p_mux, block_fifo_t *p_fifo ) } i_copy = __MIN( STD_PES_PAYLOAD - i_size, p_next->i_buffer ); - p_mux->p_vlc->pf_memcpy( &p_data->p_buffer[i_size], p_next->p_buffer, + p_mux->p_libvlc->pf_memcpy( &p_data->p_buffer[i_size], p_next->p_buffer, i_copy ); p_next->i_pts += p_next->i_length * i_copy / p_next->i_buffer; p_next->i_dts += p_next->i_length * i_copy / p_next->i_buffer; @@ -1793,7 +1880,7 @@ static block_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, { p_ts->p_buffer[5] |= 0x80; /* flag TS dicontinuity */ p_stream->b_discontinuity = VLC_FALSE; - } + } p_ts->p_buffer[6] = ( 0 )&0xff; p_ts->p_buffer[7] = ( 0 )&0xff; p_ts->p_buffer[8] = ( 0 )&0xff; @@ -2096,7 +2183,7 @@ static void GetPAT( sout_mux_t *p_mux, for ( i = 0; i < p_sys->i_num_pmt; i++ ) dvbpsi_PATAddProgram( &pat, p_sys->i_pmt_program_number[i], - p_sys->pmt[i].i_pid ); + p_sys->pmt[i].i_pid ); p_section = dvbpsi_GenPATSections( &pat, 0 ); /* max program per section */ @@ -2138,9 +2225,11 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) int *p_usepid = NULL; if( p_sys->dvbpmt == NULL ) - p_sys->dvbpmt = malloc( p_sys->i_num_pmt * sizeof(dvbpsi_pmt_t) ); + p_sys->dvbpmt = malloc( p_sys->i_num_pmt * sizeof(dvbpsi_pmt_t) ); +#ifdef HAVE_DVBPSI_SDT if( p_sys->b_sdt ) - dvbpsi_InitSDT( &sdt, p_sys->i_tsid, 1, 1, p_sys->i_netid ); + dvbpsi_InitSDT( &sdt, p_sys->i_tsid, 1, 1, p_sys->i_netid ); +#endif for( i = 0; i < p_sys->i_num_pmt; i++ ) { @@ -2150,9 +2239,10 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) 1, /* b_current_next */ p_sys->i_pcr_pid ); +#ifdef HAVE_DVBPSI_SDT if( p_sys->b_sdt ) { - p_service = dvbpsi_SDTAddService( &sdt, + p_service = dvbpsi_SDTAddService( &sdt, p_sys->i_pmt_program_number[i], /* service id */ 0, /* eit schedule */ 0, /* eit present */ @@ -2170,23 +2260,24 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) psz_sdt_desc[0] = 0x01; /* digital television service */ /* service provider name length */ - psz_sdt_desc[1] = (char)strlen(psz_sdtprov); + psz_sdt_desc[1] = (char)strlen(psz_sdtprov); memcpy( &psz_sdt_desc[2], psz_sdtprov, strlen(psz_sdtprov) ); /* service name length */ psz_sdt_desc[ 2 + strlen(psz_sdtprov) ] - = (char)strlen(psz_sdtserv); + = (char)strlen(psz_sdtserv); memcpy( &psz_sdt_desc[3+strlen(psz_sdtprov)], psz_sdtserv, strlen(psz_sdtserv) ); dvbpsi_SDTServiceAddDescriptor( p_service, 0x48, 3 + strlen(psz_sdtprov) + strlen(psz_sdtserv), - psz_sdt_desc ); + psz_sdt_desc ); free( psz_sdt_desc ); } #undef psz_sdtprov #undef psz_sdtserv } +#endif } if( p_sys->i_mpeg4_streams > 0 ) @@ -2236,7 +2327,7 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) bits_fix_ESDescr = bits; bits_write( &bits, 24, GetDescriptorLength24b( 0 ) ); /* variable size */ - bits_write( &bits, 16, p_stream->i_es_id ); + bits_write( &bits, 16, p_stream->i_es_id ); bits_write( &bits, 1, 0x00 ); /* streamDependency */ bits_write( &bits, 1, 0x00 ); /* URL Flag */ bits_write( &bits, 1, 0x00 ); /* OCRStreamFlag */ @@ -2327,9 +2418,9 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) #if 0//def HAVE_BSEARCH /* FIXME!!! This can't possibly work */ i_pidinput = p_mux->pp_inputs[i]->p_fmt->i_id; p_usepid = bsearch( &i_pidinput, p_sys->pmtmap, p_sys->i_pmtslots, - sizeof(pmt_map_t), intcompare ); + sizeof(pmt_map_t), intcompare ); p_usepid = bsearch( &p_usepid, p_sys->pmtmap, p_sys->i_num_pmt, - sizeof(pmt_map_t), pmtcompare ); + sizeof(pmt_map_t), pmtcompare ); if( p_usepid != NULL ) dvbpsi_PMTAddDescriptor( &p_sys->dvbpmt[((pmt_map_t *)p_usepid)->i_prog], 0x1d, @@ -2351,7 +2442,7 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) #ifdef HAVE_BSEARCH i_pidinput = p_mux->pp_inputs[i_stream]->p_fmt->i_id; p_usepid = bsearch( &i_pidinput, p_sys->pmtmap, p_sys->i_pmtslots, - sizeof(pmt_map_t), intcompare ); + sizeof(pmt_map_t), intcompare ); if( p_usepid != NULL ) p_es = dvbpsi_PMTAddES( @@ -2410,46 +2501,63 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) } else if( p_stream->i_codec == VLC_FOURCC('t','e','l','x') ) { - dvbpsi_PMTESAddDescriptor( p_es, 0x56, - p_stream->i_decoder_specific_info, - p_stream->p_decoder_specific_info ); + if( p_stream->i_decoder_specific_info ) + { + dvbpsi_PMTESAddDescriptor( p_es, 0x56, + p_stream->i_decoder_specific_info, + p_stream->p_decoder_specific_info ); + } + continue; } -#ifdef _DVBPSI_DR_59_H_ else if( p_stream->i_codec == VLC_FOURCC('d','v','b','s') ) { /* DVB subtitles */ - dvbpsi_subtitling_dr_t descr; - dvbpsi_subtitle_t sub; - dvbpsi_descriptor_t *p_descr; - - memcpy( sub.i_iso6392_language_code, p_stream->lang, 3 ); - sub.i_subtitling_type = 0x10; /* no aspect-ratio criticality */ - sub.i_composition_page_id = p_stream->i_es_id & 0xFF; - sub.i_ancillary_page_id = p_stream->i_es_id >> 16; - - descr.i_subtitles_number = 1; - descr.p_subtitle[0] = sub; - - p_descr = dvbpsi_GenSubtitlingDr( &descr, 0 ); - /* Work around bug in old libdvbpsi */ p_descr->i_length = 8; - dvbpsi_PMTESAddDescriptor( p_es, p_descr->i_tag, - p_descr->i_length, p_descr->p_data ); + if( p_stream->i_decoder_specific_info ) + { + /* pass-through from the TS demux */ + dvbpsi_PMTESAddDescriptor( p_es, 0x59, + p_stream->i_decoder_specific_info, + p_stream->p_decoder_specific_info ); + } +#ifdef _DVBPSI_DR_59_H_ + else + { + /* from the dvbsub transcoder */ + dvbpsi_subtitling_dr_t descr; + dvbpsi_subtitle_t sub; + dvbpsi_descriptor_t *p_descr; + + memcpy( sub.i_iso6392_language_code, p_stream->lang, 3 ); + sub.i_subtitling_type = 0x10; /* no aspect-ratio criticality */ + sub.i_composition_page_id = p_stream->i_es_id & 0xFF; + sub.i_ancillary_page_id = p_stream->i_es_id >> 16; + + descr.i_subtitles_number = 1; + descr.p_subtitle[0] = sub; + + p_descr = dvbpsi_GenSubtitlingDr( &descr, 0 ); + /* Work around bug in old libdvbpsi */ p_descr->i_length = 8; + dvbpsi_PMTESAddDescriptor( p_es, p_descr->i_tag, + p_descr->i_length, p_descr->p_data ); + } +#endif /* _DVBPSI_DR_59_H_ */ continue; } -#endif /* _DVBPSI_DR_59_H_ */ if( p_stream->lang[0] != 0 ) { - uint8_t data[4]; + uint8_t data[4*p_stream->i_langs]; /* I construct the content myself, way faster than looking at * over complicated/mind broken libdvbpsi way */ - data[0] = p_stream->lang[0]; - data[1] = p_stream->lang[1]; - data[2] = p_stream->lang[2]; - data[3] = 0x00; /* audio type: 0x00 undefined */ - - dvbpsi_PMTESAddDescriptor( p_es, 0x0a, 4, data ); + for(i = 0; i < p_stream->i_langs; i++ ) + { + data[i*4+0] = p_stream->lang[i*3+0]; + data[i*4+1] = p_stream->lang[i*3+1]; + data[i*4+2] = p_stream->lang[i*3+2]; + data[i*4+3] = 0x00; /* audio type: 0x00 undefined */ + } + dvbpsi_PMTESAddDescriptor( p_es, 0x0a, 4*p_stream->i_langs, data ); } } @@ -2462,13 +2570,14 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) dvbpsi_EmptyPMT( &p_sys->dvbpmt[i] ); } +#ifdef HAVE_DVBPSI_SDT if( p_sys->b_sdt ) { - p_section2 = dvbpsi_GenSDTSections( &sdt ); + p_section2 = dvbpsi_GenSDTSections( &sdt ); p_sdt = WritePSISection( p_mux->p_sout, p_section2 ); - p_sys->sdt.i_pid = 0x11; PEStoTS( p_mux->p_sout, c, p_sdt, &p_sys->sdt ); dvbpsi_DeletePSISections( p_section2 ); dvbpsi_EmptySDT( &sdt ); } +#endif }