X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fmux%2Fmpeg%2Fts.c;h=bd4b70b68bec65c2d635732075e88982158aa3ab;hb=562773d60e1775780f5fb301670b8d515f0612d3;hp=66bb7a534f927c238a192940ed194af5be17a1ff;hpb=32b36df2f343d8cf76baaae8a7f117b7b301e9f1;p=vlc diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c index 66bb7a534f..bd4b70b68b 100644 --- a/modules/mux/mpeg/ts.c +++ b/modules/mux/mpeg/ts.c @@ -1,12 +1,13 @@ /***************************************************************************** * ts.c: MPEG-II TS Muxer ***************************************************************************** - * Copyright (C) 2001, 2002 the VideoLAN team + * 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 * it under the terms of the GNU General Public License as published by @@ -20,19 +21,24 @@ * * 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 + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include -#include -#include +#include +#include +#include +#include -#include "iso_lang.h" +#include #include "bits.h" #include "pes.h" @@ -40,16 +46,20 @@ #ifdef HAVE_DVBPSI_DR_H # include +# include # include # include # include +# include # include # include #else # include "dvbpsi.h" +# include "demux.h" # include "descriptor.h" # include "tables/pat.h" # include "tables/pmt.h" +# include "tables/sdt.h" # include "descriptors/dr.h" # include "psi.h" #endif @@ -76,27 +86,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 PMTPROG_TEXT N_("PMT Program number") -#define PMTPROG_LONGTEXT N_("Assigns a program number to the PMT.") +#define TSID_LONGTEXT N_("Assign a fixed Transport Stream ID.") +#define NETID_TEXT N_("NET ID") +#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_("Define the pids to add to each pmt. 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_("set PID to id of es") +#define SDTDESC_TEXT N_("SDT Descriptors (requires --sout-ts-es-id-pid)") +#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 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 " \ @@ -106,9 +135,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" ) @@ -117,7 +146,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.") @@ -128,18 +157,24 @@ 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 +# define MAX_PMT 64 /* Maximum number of programs. FIXME: I just chose an arbitary number. Where is the maximum in the spec? */ +#else +# define MAX_PMT 1 +#endif +#define MAX_PMT_PID 64 /* Maximum pids in each pmt. FIXME: I just chose an arbitary number. Where is the maximum in the spec? */ vlc_module_begin(); - set_description( _("TS muxer (libdvbpsi)") ); + set_description( N_("TS muxer (libdvbpsi)") ); set_shortname( "MPEG-TS"); set_category( CAT_SOUT ); set_subcategory( SUBCAT_SOUT_MUX ); @@ -147,42 +182,52 @@ vlc_module_begin(); add_shortcut( "ts" ); add_integer( SOUT_CFG_PREFIX "pid-video", 0, NULL,VPID_TEXT, VPID_LONGTEXT, - VLC_TRUE ); + true ); add_integer( SOUT_CFG_PREFIX "pid-audio", 0, NULL, APID_TEXT, - APID_LONGTEXT, VLC_TRUE ); + APID_LONGTEXT, true ); add_integer( SOUT_CFG_PREFIX "pid-spu", 0, NULL, SPUPID_TEXT, - SPUPID_LONGTEXT, VLC_TRUE ); + SPUPID_LONGTEXT, true ); add_integer( SOUT_CFG_PREFIX "pid-pmt", 0, NULL, PMTPID_TEXT, - PMTPID_LONGTEXT, VLC_TRUE ); + PMTPID_LONGTEXT, true ); add_integer( SOUT_CFG_PREFIX "tsid", 0, NULL, TSID_TEXT, - TSID_LONGTEXT, VLC_TRUE ); - add_integer( SOUT_CFG_PREFIX "program-pmt", 1, NULL, PMTPROG_TEXT, - PMTPROG_LONGTEXT, VLC_TRUE ); + TSID_LONGTEXT, true ); +#ifdef HAVE_DVBPSI_SDT + add_integer( SOUT_CFG_PREFIX "netid", 0, NULL, NETID_TEXT, + NETID_LONGTEXT, true ); +#endif + add_string( SOUT_CFG_PREFIX "program-pmt", NULL, NULL, PMTPROG_TEXT, + PMTPROG_LONGTEXT, true ); add_bool( SOUT_CFG_PREFIX "es-id-pid", 0, NULL, PID_TEXT, PID_LONGTEXT, - VLC_TRUE ); + true ); + add_string( SOUT_CFG_PREFIX "muxpmt", NULL, NULL, MUXPMT_TEXT, MUXPMT_LONGTEXT, true ); +#ifdef HAVE_DVBPSI_SDT + add_string( SOUT_CFG_PREFIX "sdtdesc", NULL, NULL, SDTDESC_TEXT, SDTDESC_LONGTEXT, true ); +#endif + add_bool( SOUT_CFG_PREFIX "alignment", true, NULL, ALIGNMENT_TEXT, + ALIGNMENT_LONGTEXT, true ); - add_integer( SOUT_CFG_PREFIX "shaping", 200, NULL,SHAPING_TEXT, - SHAPING_LONGTEXT, VLC_TRUE ); - add_bool( SOUT_CFG_PREFIX "use-key-frames", VLC_FALSE, NULL, KEYF_TEXT, - KEYF_LONGTEXT, VLC_TRUE ); + add_integer( SOUT_CFG_PREFIX "shaping", 200, NULL, SHAPING_TEXT, + SHAPING_LONGTEXT, true ); + add_bool( SOUT_CFG_PREFIX "use-key-frames", false, NULL, KEYF_TEXT, + KEYF_LONGTEXT, true ); add_integer( SOUT_CFG_PREFIX "pcr", 70, NULL, PCR_TEXT, PCR_LONGTEXT, - VLC_TRUE ); + true ); add_integer( SOUT_CFG_PREFIX "bmin", 0, NULL, BMIN_TEXT, BMIN_LONGTEXT, - VLC_TRUE ); + true ); add_integer( SOUT_CFG_PREFIX "bmax", 0, NULL, BMAX_TEXT, BMAX_LONGTEXT, - VLC_TRUE ); + true ); add_integer( SOUT_CFG_PREFIX "dts-delay", 400, NULL, DTS_TEXT, - DTS_LONGTEXT, VLC_TRUE ); + DTS_LONGTEXT, true ); - add_bool( SOUT_CFG_PREFIX "crypt-audio", VLC_TRUE, NULL, ACRYPT_TEXT, - ACRYPT_LONGTEXT, VLC_TRUE ); - add_bool( SOUT_CFG_PREFIX "crypt-video", VLC_TRUE, NULL, VCRYPT_TEXT, - VCRYPT_LONGTEXT, VLC_TRUE ); + add_bool( SOUT_CFG_PREFIX "crypt-audio", true, NULL, ACRYPT_TEXT, + ACRYPT_LONGTEXT, true ); + add_bool( SOUT_CFG_PREFIX "crypt-video", true, NULL, VCRYPT_TEXT, + VCRYPT_LONGTEXT, true ); add_string( SOUT_CFG_PREFIX "csa-ck", NULL, NULL, CK_TEXT, CK_LONGTEXT, - VLC_TRUE ); - add_integer( SOUT_CFG_PREFIX "csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, VLC_TRUE ); + true ); + add_integer( SOUT_CFG_PREFIX "csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, true ); set_callbacks( Open, Close ); vlc_module_end(); @@ -191,12 +236,25 @@ vlc_module_end(); * Local data structures *****************************************************************************/ static const char *ppsz_sout_options[] = { - "pid-video", "pid-audio", "pid-spu", "pid-pmt", "tsid", "program-pmt", + "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", "alignment", NULL }; +typedef struct pmt_map_t /* Holds the mapping between the pmt-pid/pmt table */ +{ + int i_pid; + unsigned long i_prog; +} pmt_map_t; + +typedef struct sdt_desc_t +{ + char *psz_provider; + char *psz_service_name; /* name of program */ +} sdt_desc_t; + typedef struct { int i_depth; @@ -250,8 +308,7 @@ static inline block_t *BufferChainPeek( sout_buffer_chain_t *c ) return b; } -static inline void BufferChainClean( sout_instance_t *p_sout, - sout_buffer_chain_t *c ) +static inline void BufferChainClean( sout_buffer_chain_t *c ) { block_t *b; @@ -270,6 +327,7 @@ typedef struct ts_stream_t int i_stream_type; int i_stream_id; int i_continuity_counter; + bool b_discontinuity; /* to be used for carriege of DIV3 */ vlc_fourcc_t i_bih_codec; @@ -282,13 +340,14 @@ 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; mtime_t i_pes_length; int i_pes_used; - vlc_bool_t b_key_frame; + bool b_key_frame; } ts_stream_t; @@ -300,41 +359,50 @@ struct sout_mux_sys_t int i_audio_bound; int i_video_bound; - vlc_bool_t b_es_id_pid; + bool b_es_id_pid; + bool b_sdt; int i_pid_video; int i_pid_audio; int i_pid_spu; int i_pid_free; /* first usable pid */ int i_tsid; + int i_netid; + int i_num_pmt; + int i_pmtslots; int i_pat_version_number; ts_stream_t pat; int i_pmt_version_number; - ts_stream_t pmt; /* Up to now only one program */ - int i_pmt_program_number; + 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]; + bool b_data_alignment; int i_mpeg4_streams; int i_null_continuity_counter; /* Needed ? */ + ts_stream_t sdt; + dvbpsi_pmt_t *dvbpmt; /* for TS building */ - int64_t i_bitrate_min; - int64_t i_bitrate_max; + int64_t i_bitrate_min; + int64_t i_bitrate_max; - int64_t i_shaping_delay; - int64_t i_pcr_delay; + int64_t i_shaping_delay; + int64_t i_pcr_delay; - int64_t i_dts_delay; + int64_t i_dts_delay; - vlc_bool_t b_use_key_frames; + bool b_use_key_frames; - mtime_t i_pcr; /* last PCR emited */ + mtime_t i_pcr; /* last PCR emited */ - csa_t *csa; - int i_csa_pkt_size; - vlc_bool_t b_crypt_audio; - vlc_bool_t b_crypt_video; + csa_t *csa; + int i_csa_pkt_size; + bool b_crypt_audio; + bool b_crypt_video; }; /* Reserve a pid and return it */ @@ -363,6 +431,26 @@ static int AllocatePID( sout_mux_sys_t *p_sys, int i_cat ) return i_pid; } +static int pmtcompare( const void *pa, const void *pb ) +{ + if ( ((pmt_map_t *)pa)->i_pid < ((pmt_map_t *)pb)->i_pid ) + return -1; + else if ( ((pmt_map_t *)pa)->i_pid > ((pmt_map_t *)pb)->i_pid ) + return 1; + else + return 0; +} + +static int intcompare( const void *pa, const void *pb ) +{ + if ( *(int *)pa < *(int *)pb ) + return -1; + else if ( *(int *)pa > *(int *)pb ) + return 1; + else + return 0; +} + /***************************************************************************** * Local prototypes *****************************************************************************/ @@ -372,6 +460,7 @@ static int DelStream( sout_mux_t *, sout_input_t * ); static int Mux ( sout_mux_t * ); static block_t *FixPES( sout_mux_t *p_mux, block_fifo_t *p_fifo ); +static block_t *Add_ADTS( block_t *, es_format_t * ); static void TSSchedule ( sout_mux_t *p_mux, sout_buffer_chain_t *p_chain_ts, mtime_t i_pcr_length, mtime_t i_pcr_dts ); static void TSDate ( sout_mux_t *p_mux, sout_buffer_chain_t *p_chain_ts, @@ -379,7 +468,7 @@ static void TSDate ( sout_mux_t *p_mux, sout_buffer_chain_t *p_chain_ts, static void GetPAT( sout_mux_t *p_mux, sout_buffer_chain_t *c ); static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ); -static block_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, vlc_bool_t b_pcr ); +static block_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, bool b_pcr ); static void TSSetPCR( block_t *p_ts, mtime_t i_dts ); static void PEStoTS ( sout_instance_t *, sout_buffer_chain_t *, block_t *, ts_stream_t * ); @@ -392,13 +481,17 @@ static int Open( vlc_object_t *p_this ) sout_mux_t *p_mux =(sout_mux_t*)p_this; sout_mux_sys_t *p_sys = NULL; vlc_value_t val; + int i; - msg_Dbg( p_mux, "Open" ); - 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 ) return VLC_ENOMEM; + p_sys->i_pmtslots = p_sys->b_sdt = 0; + p_sys->i_num_pmt = 1; + p_sys->dvbpmt = NULL; + memset( &p_sys->pmtmap, 0, sizeof(p_sys->pmtmap) ); p_mux->pf_control = Control; p_mux->pf_addstream = AddStream; @@ -407,46 +500,190 @@ static int Open( vlc_object_t *p_this ) p_mux->p_sys = p_sys; srand( (uint32_t)mdate() ); + for ( i = 0; i < MAX_PMT; i++ ) + p_sys->sdt_descriptors[i].psz_service_name + = p_sys->sdt_descriptors[i].psz_provider = NULL; + memset( p_sys->sdt_descriptors, 0, sizeof(sdt_desc_t) ); p_sys->i_audio_bound = 0; p_sys->i_video_bound = 0; + var_Get( p_mux, SOUT_CFG_PREFIX "es-id-pid", &val ); + 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 + */ + if( val.psz_string != NULL && *val.psz_string ) + { + char *psz_next; + char *psz = val.psz_string; + uint16_t i_pid; + psz_next = psz; + + 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 ) + { + msg_Err( p_mux, + "Number of PMTs greater than compiled maximum (%d)", MAX_PMT ); + p_sys->i_num_pmt = MAX_PMT; + } + } + 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; + p_sys->i_pmtslots++; + if ( p_sys->i_pmtslots > MAX_PMT_PID ) + { + msg_Err( p_mux, + "Number of pids in PMT greater than compiled maximum (%d)", + MAX_PMT_PID ); + 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 ) + psz = NULL; + } + } + free( val.psz_string ); + 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 = 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; +#endif + p_sys->i_pmt_version_number = rand() % 32; - p_sys->pmt.i_continuity_counter = 0; + for( i = 0; i < p_sys->i_num_pmt; i++ ) + { + p_sys->pmt[i].i_continuity_counter = 0; + p_sys->pmt[i].b_discontinuity = false; + } + + p_sys->sdt.i_pid = 0x11; + p_sys->sdt.i_continuity_counter = 0; + p_sys->sdt.b_discontinuity = false; + +#ifdef HAVE_DVBPSI_SDT + var_Get( p_mux, SOUT_CFG_PREFIX "sdtdesc", &val ); + p_sys->b_sdt = val.psz_string && *val.psz_string ? true : false; + + /* Syntax is provider_sdt1,service_name_sdt1,provider_sdt2,service_name_sdt2... */ + if( p_sys->b_sdt ) + { + + char *psz = val.psz_string; + char *psz_sdttoken = psz; + + i = 0; + while ( psz_sdttoken != NULL ) + { + char *psz_end = strchr( psz_sdttoken, ',' ); + if( psz_end != NULL ) + { + *psz_end++ = '\0'; + } + if ( !(i % 2) ) + { + p_sys->sdt_descriptors[i/2].psz_provider + = strdup(psz_sdttoken); + } + else + { + p_sys->sdt_descriptors[i/2].psz_service_name + = strdup(psz_sdttoken); + } + + i++; + psz_sdttoken = psz_end; + } + } + free( val.psz_string ); +#else + p_sys->b_sdt = 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.i_int ) + if( val.psz_string && *val.psz_string ) { - p_sys->i_pmt_program_number = val.i_int; + char *psz_next; + char *psz = val.psz_string; + uint16_t i_pid; + + psz_next = psz; + i = 0; + while ( psz != NULL ) + { + i_pid = strtoul( psz, &psz_next, 0 ); + if( strlen(psz_next) > 0 ) + 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 ); + } + else + { + p_sys->i_pmt_program_number[i] = i_pid; + i++; + } + } } else { - p_sys->i_pmt_program_number = 1; + /* Option not specified, use 1, 2, 3... */ + for( i = 0; i < p_sys->i_num_pmt; i++ ) + p_sys->i_pmt_program_number[i] = i + 1; } + free( val.psz_string ); var_Get( p_mux, SOUT_CFG_PREFIX "pid-pmt", &val ); - if (val.i_int ) + if( val.i_int ) { - p_sys->pmt.i_pid = val.i_int; + for( i = 0; i < p_sys->i_num_pmt; i++ ) + p_sys->pmt[i].i_pid = val.i_int + i; /* Does this make any sense? */ } else { - p_sys->pmt.i_pid = 0x42; + for( i = 0; i < p_sys->i_num_pmt; i++ ) + p_sys->pmt[i].i_pid = 0x42 + i; } - p_sys->i_pid_free = p_sys->pmt.i_pid + 1; - - var_Get( p_mux, SOUT_CFG_PREFIX "es-id-pid", &val ); - p_sys->b_es_id_pid = val.b_bool; + p_sys->i_pid_free = p_sys->pmt[p_sys->i_num_pmt - 1].i_pid + 1; var_Get( p_mux, SOUT_CFG_PREFIX "pid-video", &val ); p_sys->i_pid_video = val.i_int; @@ -502,7 +739,7 @@ static int Open( vlc_object_t *p_this ) if( p_sys->i_shaping_delay <= 0 ) { msg_Err( p_mux, - "invalid shaping ("I64Fd"ms) resetting to 200ms", + "invalid shaping (%"PRId64"ms) resetting to 200ms", p_sys->i_shaping_delay / 1000 ); p_sys->i_shaping_delay = 200000; } @@ -513,7 +750,7 @@ static int Open( vlc_object_t *p_this ) p_sys->i_pcr_delay >= p_sys->i_shaping_delay ) { msg_Err( p_mux, - "invalid pcr delay ("I64Fd"ms) resetting to 70ms", + "invalid pcr delay (%"PRId64"ms) resetting to 70ms", p_sys->i_pcr_delay / 1000 ); p_sys->i_pcr_delay = 70000; } @@ -521,7 +758,7 @@ static int Open( vlc_object_t *p_this ) var_Get( p_mux, SOUT_CFG_PREFIX "dts-delay", &val ); p_sys->i_dts_delay = (int64_t)val.i_int * 1000; - msg_Dbg( p_mux, "shaping="I64Fd" pcr="I64Fd" dts_delay="I64Fd, + msg_Dbg( p_mux, "shaping=%"PRId64" pcr=%"PRId64" dts_delay=%"PRId64, p_sys->i_shaping_delay, p_sys->i_pcr_delay, p_sys->i_dts_delay ); var_Get( p_mux, SOUT_CFG_PREFIX "use-key-frames", &val ); @@ -563,9 +800,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 ) { @@ -575,10 +812,10 @@ 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 ); + free( val.psz_string ); var_Get( p_mux, SOUT_CFG_PREFIX "crypt-audio", &val ); p_sys->b_crypt_audio = val.b_bool; @@ -596,13 +833,19 @@ static void Close( vlc_object_t * p_this ) { sout_mux_t *p_mux = (sout_mux_t*)p_this; sout_mux_sys_t *p_sys = p_mux->p_sys; + int i; - msg_Dbg( p_mux, "Close" ); if( p_sys->csa ) { csa_Delete( p_sys->csa ); } + for( i = 0; i < MAX_PMT; i++ ) + { + free( p_sys->sdt_descriptors[i].psz_service_name ); + free( p_sys->sdt_descriptors[i].psz_provider ); + } + free( p_sys->dvbpmt ); free( p_sys ); } @@ -611,29 +854,30 @@ static void Close( vlc_object_t * p_this ) *****************************************************************************/ static int Control( sout_mux_t *p_mux, int i_query, va_list args ) { - vlc_bool_t *pb_bool; + VLC_UNUSED(p_mux); + bool *pb_bool; char **ppsz; - switch( i_query ) - { - case MUX_CAN_ADD_STREAM_WHILE_MUXING: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); - *pb_bool = VLC_TRUE; - return VLC_SUCCESS; + switch( i_query ) + { + case MUX_CAN_ADD_STREAM_WHILE_MUXING: + pb_bool = (bool*)va_arg( args, bool * ); + *pb_bool = true; + return VLC_SUCCESS; - case MUX_GET_ADD_STREAM_WAIT: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); - *pb_bool = VLC_FALSE; - return VLC_SUCCESS; + case MUX_GET_ADD_STREAM_WAIT: + pb_bool = (bool*)va_arg( args, bool * ); + *pb_bool = false; + return VLC_SUCCESS; - case MUX_GET_MIME: - ppsz = (char**)va_arg( args, char ** ); - *ppsz = strdup( "video/mpeg" ); /* FIXME not sure */ - return VLC_SUCCESS; + case MUX_GET_MIME: + ppsz = (char**)va_arg( args, char ** ); + *ppsz = strdup( "video/mpeg" ); /* FIXME not sure */ + return VLC_SUCCESS; default: return VLC_EGENERIC; - } + } } /***************************************************************************** @@ -643,8 +887,11 @@ 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 ) ); + if( !p_input->p_sys ) + return VLC_ENOMEM; /* Init this new stream */ if ( p_sys->b_es_id_pid ) @@ -653,6 +900,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) p_stream->i_pid = AllocatePID( p_sys, p_input->p_fmt->i_cat ); p_stream->i_codec = p_input->p_fmt->i_codec; p_stream->i_continuity_counter = 0; + p_stream->b_discontinuity = false; p_stream->i_decoder_specific_info = 0; p_stream->p_decoder_specific_info = NULL; @@ -708,6 +956,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) switch( p_input->p_fmt->i_codec ) { case VLC_FOURCC( 'm', 'p','g', 'a' ): + case VLC_FOURCC( 'm', 'p', '3', ' ' ): p_stream->i_stream_type = p_input->p_fmt->audio.i_rate >= 32000 ? 0x03 : 0x04; p_stream->i_stream_id = 0xc0; @@ -725,7 +974,10 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) p_stream->i_stream_id = 0xbd; break; case VLC_FOURCC( 'm', 'p','4', 'a' ): - p_stream->i_stream_type = 0x11; + /* XXX: make that configurable in some way when LOAS + * is implemented for AAC in TS */ + //p_stream->i_stream_type = 0x11; /* LOAS/LATM */ + p_stream->i_stream_type = 0x0f; /* ADTS */ p_stream->i_stream_id = 0xfa; p_sys->i_mpeg4_streams++; p_stream->i_es_id = p_stream->i_pid; @@ -770,6 +1022,15 @@ 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); + if( !p_stream->lang ) + { + p_stream->i_langs = 0; + free( p_stream ); + return VLC_ENOMEM; + } + i = 1; p_stream->lang[0] = p_stream->lang[1] = p_stream->lang[2] = '\0'; @@ -797,19 +1058,40 @@ 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; - /* Copy extra data (VOL for MPEG-4 and extra BitMapInfoHeader for VFW */ - p_stream->i_decoder_specific_info = p_input->p_fmt->i_extra; - if( p_stream->i_decoder_specific_info > 0 ) - { - p_stream->p_decoder_specific_info = - malloc( p_stream->i_decoder_specific_info ); - memcpy( p_stream->p_decoder_specific_info, - p_input->p_fmt->p_extra, - p_input->p_fmt->i_extra ); + 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++; } /* Create decoder specific info for subt */ @@ -820,44 +1102,64 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) p_stream->i_decoder_specific_info = 55; p_stream->p_decoder_specific_info = p = malloc( p_stream->i_decoder_specific_info ); - - p[0] = 0x10; /* textFormat, 0x10 for 3GPP TS 26.245 */ - p[1] = 0x00; /* flags: 1b: associated video info flag - 3b: reserved - 1b: duration flag - 3b: reserved */ - p[2] = 52; /* remaining size */ - - p += 3; - - p[0] = p[1] = p[2] = p[3] = 0; p+=4; /* display flags */ - *p++ = 0; /* horizontal justification (-1: left, 0 center, 1 right) */ - *p++ = 1; /* vertical justification (-1: top, 0 center, 1 bottom) */ - - p[0] = p[1] = p[2] = 0x00; p+=3;/* background rgb */ - *p++ = 0xff; /* background a */ - - p[0] = p[1] = 0; p += 2; /* text box top */ - p[0] = p[1] = 0; p += 2; /* text box left */ - p[0] = p[1] = 0; p += 2; /* text box bottom */ - p[0] = p[1] = 0; p += 2; /* text box right */ - - p[0] = p[1] = 0; p += 2; /* start char */ - p[0] = p[1] = 0; p += 2; /* end char */ - p[0] = p[1] = 0; p += 2; /* default font id */ - - *p++ = 0; /* font style flags */ - *p++ = 12; /* font size */ - - p[0] = p[1] = p[2] = 0x00; p+=3;/* foreground rgb */ - *p++ = 0x00; /* foreground a */ - - p[0] = p[1] = p[2] = 0; p[3] = 22; p += 4; - memcpy( p, "ftab", 4 ); p += 4; - *p++ = 0; *p++ = 1; /* entry count */ - p[0] = p[1] = 0; p += 2; /* font id */ - *p++ = 9; /* font name length */ - memcpy( p, "Helvetica", 9 ); /* font name */ + if( p ) + { + p[0] = 0x10; /* textFormat, 0x10 for 3GPP TS 26.245 */ + p[1] = 0x00; /* flags: 1b: associated video info flag + 3b: reserved + 1b: duration flag + 3b: reserved */ + p[2] = 52; /* remaining size */ + + p += 3; + + p[0] = p[1] = p[2] = p[3] = 0; p+=4; /* display flags */ + *p++ = 0; /* horizontal justification (-1: left, 0 center, 1 right) */ + *p++ = 1; /* vertical justification (-1: top, 0 center, 1 bottom) */ + + p[0] = p[1] = p[2] = 0x00; p+=3;/* background rgb */ + *p++ = 0xff; /* background a */ + + p[0] = p[1] = 0; p += 2; /* text box top */ + p[0] = p[1] = 0; p += 2; /* text box left */ + p[0] = p[1] = 0; p += 2; /* text box bottom */ + p[0] = p[1] = 0; p += 2; /* text box right */ + + p[0] = p[1] = 0; p += 2; /* start char */ + p[0] = p[1] = 0; p += 2; /* end char */ + p[0] = p[1] = 0; p += 2; /* default font id */ + + *p++ = 0; /* font style flags */ + *p++ = 12; /* font size */ + + p[0] = p[1] = p[2] = 0x00; p+=3;/* foreground rgb */ + *p++ = 0x00; /* foreground a */ + + p[0] = p[1] = p[2] = 0; p[3] = 22; p += 4; + memcpy( p, "ftab", 4 ); p += 4; + *p++ = 0; *p++ = 1; /* entry count */ + p[0] = p[1] = 0; p += 2; /* font id */ + *p++ = 9; /* font name length */ + memcpy( p, "Helvetica", 9 ); /* font name */ + } + else p_stream->i_decoder_specific_info = 0; + } + else + { + /* Copy extra data (VOL for MPEG-4 and extra BitMapInfoHeader for VFW */ + p_stream->i_decoder_specific_info = p_input->p_fmt->i_extra; + if( p_stream->i_decoder_specific_info > 0 ) + { + p_stream->p_decoder_specific_info = + malloc( p_stream->i_decoder_specific_info ); + if( p_stream->p_decoder_specific_info ) + { + memcpy( p_stream->p_decoder_specific_info, + p_input->p_fmt->p_extra, + p_input->p_fmt->i_extra ); + } + else p_stream->i_decoder_specific_info = 0; + } } /* Init pes chain */ @@ -938,12 +1240,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 ); + BufferChainClean( &p_stream->chain_pes ); - if( p_stream->p_decoder_specific_info ) - { - free( p_stream->p_decoder_specific_info ); - } + free(p_stream->lang); + free( p_stream->p_decoder_specific_info ); if( p_stream->i_stream_id == 0xfa || p_stream->i_stream_id == 0xfb || p_stream->i_stream_id == 0xfe ) @@ -1001,6 +1301,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; @@ -1029,7 +1334,7 @@ static int Mux( sout_mux_t *p_mux ) /* 1: get enough PES packet for all input */ for( ;; ) { - vlc_bool_t b_ok = VLC_TRUE; + bool b_ok = true; block_t *p_data; /* Accumulate enough data in the pcr stream (>i_shaping_delay) */ @@ -1048,26 +1353,26 @@ static int Mux( sout_mux_t *p_mux ) p_input = p_mux->pp_inputs[i]; p_stream = (ts_stream_t*)p_input->p_sys; - if( ( p_stream == p_pcr_stream && - p_stream->i_pes_length < i_shaping_delay ) || - p_stream->i_pes_dts + p_stream->i_pes_length < - p_pcr_stream->i_pes_dts + p_pcr_stream->i_pes_length ) + if( ( ( p_stream == p_pcr_stream ) && + ( p_stream->i_pes_length < i_shaping_delay ) ) || + ( p_stream->i_pes_dts + p_stream->i_pes_length < + p_pcr_stream->i_pes_dts + p_pcr_stream->i_pes_length ) ) { /* Need more data */ - if( p_input->p_fifo->i_depth <= 1 ) + if( block_FifoCount( p_input->p_fifo ) <= 1 ) { - if( p_input->p_fmt->i_cat == AUDIO_ES || - p_input->p_fmt->i_cat == VIDEO_ES ) + if( ( p_input->p_fmt->i_cat == AUDIO_ES ) || + ( p_input->p_fmt->i_cat == VIDEO_ES ) ) { /* We need more data */ return VLC_SUCCESS; } - else if( p_input->p_fifo->i_depth <= 0 ) + else if( block_FifoCount( p_input->p_fifo ) <= 0 ) { /* spu, only one packet is needed */ continue; } - else + else if( p_input->p_fmt->i_cat == SPU_ES ) { /* Don't mux the SPU yet if it is too early */ block_t *p_spu = block_FifoShow( p_input->p_fifo ); @@ -1075,15 +1380,14 @@ static int Mux( sout_mux_t *p_mux ) i_spu_delay = p_spu->i_dts - p_pcr_stream->i_pes_dts; - if( i_spu_delay > i_shaping_delay && - i_spu_delay < I64C(100000000) ) + if( ( i_spu_delay > i_shaping_delay ) && + ( i_spu_delay < INT64_C(100000000) ) ) continue; - if ( i_spu_delay >= I64C(100000000) - || i_spu_delay < 10000 ) + if ( ( i_spu_delay >= INT64_C(100000000) ) || + ( i_spu_delay < INT64_C(10000) ) ) { - BufferChainClean( p_mux->p_sout, - &p_stream->chain_pes ); + BufferChainClean( &p_stream->chain_pes ); p_stream->i_pes_dts = 0; p_stream->i_pes_used = 0; p_stream->i_pes_length = 0; @@ -1091,16 +1395,22 @@ static int Mux( sout_mux_t *p_mux ) } } } - b_ok = VLC_FALSE; + b_ok = 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 ); + + if( p_input->p_fmt->i_codec == + VLC_FOURCC('m', 'p', '4', 'a' ) ) + p_data = Add_ADTS( p_data, p_input->p_fmt ); + } else p_data = FixPES( p_mux, p_input->p_fifo ); - if( p_input->p_fifo->i_depth > 0 && + if( block_FifoCount( p_input->p_fifo ) > 0 && p_input->p_fmt->i_cat != SPU_ES ) { block_t *p_next = block_FifoShow( p_input->p_fifo ); @@ -1120,21 +1430,19 @@ static int Mux( sout_mux_t *p_mux ) p_stream->i_pes_length ) ) { msg_Warn( p_mux, "packet with too strange dts " - "(dts="I64Fd",old="I64Fd",pcr="I64Fd")", + "(dts=%"PRId64",old=%"PRId64",pcr=%"PRId64")", p_data->i_dts, p_stream->i_pes_dts, p_pcr_stream->i_pes_dts ); block_Release( p_data ); - BufferChainClean( p_mux->p_sout, - &p_stream->chain_pes ); + BufferChainClean( &p_stream->chain_pes ); p_stream->i_pes_dts = 0; p_stream->i_pes_used = 0; p_stream->i_pes_length = 0; if( p_input->p_fmt->i_cat != SPU_ES ) { - BufferChainClean( p_mux->p_sout, - &p_pcr_stream->chain_pes ); + BufferChainClean( &p_pcr_stream->chain_pes ); p_pcr_stream->i_pes_dts = 0; p_pcr_stream->i_pes_used = 0; p_pcr_stream->i_pes_length = 0; @@ -1178,7 +1486,7 @@ static int Mux( sout_mux_t *p_mux ) p_spu->p_buffer[1] = 1; p_spu->p_buffer[2] = ' '; - E_(EStoPES)( p_mux->p_sout, &p_spu, p_spu, + EStoPES( p_mux->p_sout, &p_spu, p_spu, p_input->p_fmt, p_stream->i_stream_id, 1, 0, 0, 0 ); @@ -1192,6 +1500,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 ) @@ -1211,12 +1525,12 @@ 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; } - E_( EStoPES )( p_mux->p_sout, &p_data, p_data, + EStoPES ( p_mux->p_sout, &p_data, p_data, p_input->p_fmt, p_stream->i_stream_id, 1, b_data_alignment, i_header_size, 0 ); @@ -1287,17 +1601,16 @@ static int Mux( sout_mux_t *p_mux ) for( ;; ) { - int i_stream; - mtime_t i_dts; - ts_stream_t *p_stream; + int i_stream; + mtime_t i_dts; + ts_stream_t *p_stream; sout_input_t *p_input; - block_t *p_ts; - vlc_bool_t b_pcr; + block_t *p_ts; + bool b_pcr; /* 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 ) @@ -1317,14 +1630,15 @@ 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; + b_pcr = false; if( p_stream == p_pcr_stream && i_pcr_dts + i_packet_pos * i_pcr_length / i_packet_count >= p_sys->i_pcr + p_sys->i_pcr_delay ) { - b_pcr = VLC_TRUE; + b_pcr = true; p_sys->i_pcr = i_pcr_dts + i_packet_pos * i_pcr_length / i_packet_count; } @@ -1352,7 +1666,7 @@ static int Mux( sout_mux_t *p_mux ) static block_t *FixPES( sout_mux_t *p_mux, block_fifo_t *p_fifo ) { block_t *p_data; - int i_size; + size_t i_size; p_data = block_FifoShow( p_fifo ); i_size = p_data->i_buffer; @@ -1364,7 +1678,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 ); + vlc_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 @@ -1393,8 +1707,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, - i_copy ); + vlc_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; p_next->i_length -= p_next->i_length * i_copy / p_next->i_buffer; @@ -1411,6 +1724,58 @@ static block_t *FixPES( sout_mux_t *p_mux, block_fifo_t *p_fifo ) } } +static block_t *Add_ADTS( block_t *p_data, es_format_t *p_fmt ) +{ + uint8_t *p_extra = p_fmt->p_extra; + + if( !p_data || p_fmt->i_extra < 2 || !p_extra ) + return p_data; /* no data to construct the headers */ + + int i_index = ( (p_extra[0] << 1) | (p_extra[1] >> 7) ) & 0x0f; + int i_profile = (p_extra[0] >> 3) - 1; /* i_profile < 4 */ + + if( i_index == 0x0f && p_fmt->i_extra < 5 ) + return p_data; /* not enough data */ + + int i_channels = (p_extra[i_index == 0x0f ? 4 : 1] >> 3) & 0x0f; + +#define ADTS_HEADER_SIZE 7 /* CRC needs 2 more bytes */ + + + /* keep a copy in case block_Realloc() fails */ + block_t *p_bak_block = block_Duplicate( p_data ); + if( !p_bak_block ) /* OOM, block_Realloc() is likely to lose our block */ + return p_data; /* the frame isn't correct but that's the best we have */ + + block_t *p_new_block = block_Realloc( p_data, ADTS_HEADER_SIZE, + p_data->i_buffer ); + if( !p_new_block ) + return p_bak_block; /* OOM, send the (incorrect) original frame */ + + block_Release( p_bak_block ); /* we don't need the copy anymore */ + + + uint8_t *p_buffer = p_new_block->p_buffer; + + /* fixed header */ + p_buffer[0] = 0xff; + p_buffer[1] = 0xf1; /* 0xf0 | 0x00 | 0x00 | 0x01 */ + p_buffer[2] = (i_profile << 6) | ((i_index & 0x0f) << 2) | ((i_channels >> 2) & 0x01) ; + p_buffer[3] = (i_channels << 6) | ((p_data->i_buffer >> 11) & 0x03); + + /* variable header (starts at last 2 bits of 4th byte) */ + + int i_fullness = 0x7ff; /* 0x7ff means VBR */ + /* XXX: We should check if it's CBR or VBR, but no known implementation + * do that, and it's a pain to calculate this field */ + + p_buffer[4] = p_data->i_buffer >> 3; + p_buffer[5] = ((p_data->i_buffer & 0x07) << 5) | ((i_fullness >> 6) & 0x1f); + p_buffer[6] = ((i_fullness & 0x3f) << 2) /* | 0xfc */; + + return p_new_block; +} + static void TSSchedule( sout_mux_t *p_mux, sout_buffer_chain_t *p_chain_ts, mtime_t i_pcr_length, mtime_t i_pcr_dts ) { @@ -1453,7 +1818,7 @@ static void TSSchedule( sout_mux_t *p_mux, sout_buffer_chain_t *p_chain_ts, i++; i_new_dts = i_pcr_dts + i_pcr_length * i / i_packet_count; } - msg_Dbg( p_mux, "adjusting rate at "I64Fd"/"I64Fd" (%d/%d)", + msg_Dbg( p_mux, "adjusting rate at %"PRId64"/%"PRId64" (%d/%d)", i_cut_dts - i_pcr_dts, i_pcr_length, new_chain.i_depth, p_chain_ts->i_depth ); if ( new_chain.i_depth ) @@ -1485,16 +1850,16 @@ static void TSDate( sout_mux_t *p_mux, sout_buffer_chain_t *p_chain_ts, / (uint64_t)(i_pcr_length / 1000); if ( p_sys->i_bitrate_max && p_sys->i_bitrate_max < i_bitrate ) { - msg_Warn( p_mux, "max bitrate exceeded at "I64Fd - " (%d bi/s for %d pkt in "I64Fd" us)", + msg_Warn( p_mux, "max bitrate exceeded at %"PRId64 + " (%d bi/s for %d pkt in %"PRId64" us)", i_pcr_dts + p_sys->i_shaping_delay * 3 / 2 - mdate(), i_bitrate, i_packet_count, i_pcr_length); } #if 0 else { - msg_Dbg( p_mux, "starting at "I64Fd - " (%d bi/s for %d packets in "I64Fd" us)", + msg_Dbg( p_mux, "starting at %"PRId64 + " (%d bi/s for %d packets in %"PRId64" us)", i_pcr_dts + p_sys->i_shaping_delay * 3 / 2 - mdate(), i_bitrate, i_packet_count, i_pcr_length); } @@ -1534,27 +1899,27 @@ static void TSDate( sout_mux_t *p_mux, sout_buffer_chain_t *p_chain_ts, } static block_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, - vlc_bool_t b_pcr ) + bool b_pcr ) { block_t *p_pes = p_stream->chain_pes.p_first; block_t *p_ts; - vlc_bool_t b_new_pes = VLC_FALSE; - vlc_bool_t b_adaptation_field = VLC_FALSE; + bool b_new_pes = false; + bool b_adaptation_field = false; - int i_payload_max = 184 - ( b_pcr ? 8 : 0 ); - int i_payload; + int i_payload_max = 184 - ( b_pcr ? 8 : 0 ); + int i_payload; if( p_stream->i_pes_used <= 0 ) { - b_new_pes = VLC_TRUE; + b_new_pes = true; } i_payload = __MIN( (int)p_pes->i_buffer - p_stream->i_pes_used, i_payload_max ); if( b_pcr || i_payload < i_payload_max ) { - b_adaptation_field = VLC_TRUE; + b_adaptation_field = true; } p_ts = block_New( p_mux, 188 ); @@ -1568,6 +1933,7 @@ static block_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, p_stream->i_continuity_counter; p_stream->i_continuity_counter = (p_stream->i_continuity_counter+1)%16; + p_stream->b_discontinuity = (p_pes->i_flags & BLOCK_FLAG_DISCONTINUITY); if( b_adaptation_field ) { @@ -1581,6 +1947,11 @@ static block_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, p_ts->p_buffer[4] = 7 + i_stuffing; p_ts->p_buffer[5] = 0x10; /* flags */ + if( p_stream->b_discontinuity ) + { + p_ts->p_buffer[5] |= 0x80; /* flag TS dicontinuity */ + p_stream->b_discontinuity = false; + } p_ts->p_buffer[6] = ( 0 )&0xff; p_ts->p_buffer[7] = ( 0 )&0xff; p_ts->p_buffer[8] = ( 0 )&0xff; @@ -1646,7 +2017,6 @@ static block_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, return p_ts; } - static void TSSetPCR( block_t *p_ts, mtime_t i_dts ) { mtime_t i_pcr = 9 * i_dts / 100; @@ -1758,7 +2128,7 @@ static void PEStoTS( sout_instance_t *p_sout, i_size = p_pes->i_buffer; p_data = p_pes->p_buffer; - b_new_pes = VLC_TRUE; + b_new_pes = true; for( ;; ) { @@ -1779,7 +2149,7 @@ static void PEStoTS( sout_instance_t *p_sout, */ i_copy = __MIN( i_size, 184 ); - b_adaptation_field = i_size < 184 ? VLC_TRUE : VLC_FALSE; + b_adaptation_field = i_size < 184 ? true : false; p_ts->p_buffer[0] = 0x47; p_ts->p_buffer[1] = ( b_new_pes ? 0x40 : 0x00 )| @@ -1788,7 +2158,7 @@ static void PEStoTS( sout_instance_t *p_sout, p_ts->p_buffer[3] = ( b_adaptation_field ? 0x30 : 0x10 )| p_stream->i_continuity_counter; - b_new_pes = VLC_FALSE; + b_new_pes = false; p_stream->i_continuity_counter = (p_stream->i_continuity_counter+1)%16; if( b_adaptation_field ) @@ -1800,6 +2170,11 @@ static void PEStoTS( sout_instance_t *p_sout, if( i_stuffing > 1 ) { p_ts->p_buffer[5] = 0x00; + if( p_stream->b_discontinuity ) + { + p_ts->p_buffer[5] |= 0x80; + p_stream->b_discontinuity = false; + } for( i = 6; i < 6 + i_stuffing - 2; i++ ) { p_ts->p_buffer[i] = 0xff; @@ -1823,7 +2198,7 @@ static void PEStoTS( sout_instance_t *p_sout, { break; } - b_new_pes = VLC_TRUE; + b_new_pes = true; p_pes = p_next; i_size = p_pes->i_buffer; p_data = p_pes->p_buffer; @@ -1868,16 +2243,18 @@ static void GetPAT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) { sout_mux_sys_t *p_sys = p_mux->p_sys; - block_t *p_pat; + block_t *p_pat; dvbpsi_pat_t pat; dvbpsi_psi_section_t *p_section; + int i; dvbpsi_InitPAT( &pat, p_sys->i_tsid, p_sys->i_pat_version_number, 1 ); /* b_current_next */ - /* add all program (only one) */ - dvbpsi_PATAddProgram( &pat, - p_sys->i_pmt_program_number, /* i_number */ - p_sys->pmt.i_pid ); /* i_pid */ + /* add all programs */ + 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_section = dvbpsi_GenPATSections( &pat, 0 ); /* max program per section */ @@ -1901,23 +2278,94 @@ static uint32_t GetDescriptorLength24b( int i_length ) return( 0x808000 | ( i_l3 << 16 ) | ( i_l2 << 8 ) | i_l1 ); } -static void GetPMT( sout_mux_t *p_mux, - sout_buffer_chain_t *c ) +static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) { sout_mux_sys_t *p_sys = p_mux->p_sys; - block_t *p_pmt; + block_t *p_pmt[MAX_PMT]; - dvbpsi_pmt_t pmt; dvbpsi_pmt_es_t *p_es; - dvbpsi_psi_section_t *p_section; + dvbpsi_psi_section_t *p_section[MAX_PMT]; + + int i_pidinput; + int i_stream; + int i; + int *p_usepid = NULL; + +#ifdef HAVE_DVBPSI_SDT + block_t *p_sdt; + dvbpsi_sdt_t sdt; - int i_stream; + dvbpsi_psi_section_t* p_section2; + dvbpsi_sdt_service_t *p_service; + + uint8_t *psz_sdt_desc; +#endif + + if( p_sys->dvbpmt == NULL ) + { + p_sys->dvbpmt = malloc( p_sys->i_num_pmt * sizeof(dvbpsi_pmt_t) ); + if( !p_sys->dvbpmt ) + { + return; + } + } +#ifdef HAVE_DVBPSI_SDT + if( p_sys->b_sdt ) + dvbpsi_InitSDT( &sdt, p_sys->i_tsid, 1, 1, p_sys->i_netid ); +#endif - dvbpsi_InitPMT( &pmt, - p_sys->i_pmt_program_number, /* program number */ - p_sys->i_pmt_version_number, - 1, /* b_current_next */ - p_sys->i_pcr_pid ); + for( i = 0; i < p_sys->i_num_pmt; i++ ) + { + dvbpsi_InitPMT( &p_sys->dvbpmt[i], + p_sys->i_pmt_program_number[i], /* program number */ + p_sys->i_pmt_version_number, + 1, /* b_current_next */ + p_sys->i_pcr_pid ); + +#ifdef HAVE_DVBPSI_SDT + if( p_sys->b_sdt ) + { + p_service = dvbpsi_SDTAddService( &sdt, + p_sys->i_pmt_program_number[i], /* service id */ + 0, /* eit schedule */ + 0, /* eit present */ + 4, /* running status ("4=RUNNING") */ + 0 ); /* free ca */ + +#define psz_sdtprov p_sys->sdt_descriptors[i].psz_provider +#define psz_sdtserv p_sys->sdt_descriptors[i].psz_service_name + + /* FIXME: Ineffecient malloc's & ugly code...... */ + if( ( psz_sdtprov != NULL ) && ( psz_sdtserv != NULL ) ) + { + psz_sdt_desc = malloc( 3 + strlen(psz_sdtprov) + + strlen(psz_sdtserv) ); + if( psz_sdt_desc ) + { + psz_sdt_desc[0] = 0x01; /* digital television service */ + + /* service provider name length */ + 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); + 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), + (uint8_t *)psz_sdt_desc ); + free( psz_sdt_desc ); + psz_sdt_desc = NULL; + } + } +#undef psz_sdtprov +#undef psz_sdtserv + } +#endif + } if( p_sys->i_mpeg4_streams > 0 ) { @@ -1966,7 +2414,7 @@ static void GetPMT( sout_mux_t *p_mux, 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 */ @@ -2053,17 +2501,46 @@ static void GetPMT( sout_mux_t *p_mux, bits_write( &bits_fix_IOD, 24, GetDescriptorLength24b( bits.i_data - bits_fix_IOD.i_data - 3 ) ); - dvbpsi_PMTAddDescriptor( &pmt, 0x1d, bits.i_data, bits.p_data ); + +#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 ); + p_usepid = bsearch( &p_usepid, p_sys->pmtmap, p_sys->i_num_pmt, + sizeof(pmt_map_t), pmtcompare ); + if( p_usepid != NULL ) + dvbpsi_PMTAddDescriptor( + &p_sys->dvbpmt[((pmt_map_t *)p_usepid)->i_prog], 0x1d, + bits.i_data, bits.p_data ); + else + msg_Err( p_mux, "Received an unmapped PID" ); +#else + dvbpsi_PMTAddDescriptor( &p_sys->dvbpmt[0], 0x1d, bits.i_data, + bits.p_data ); +#endif } for( i_stream = 0; i_stream < p_mux->i_nb_inputs; i_stream++ ) { ts_stream_t *p_stream; - p_stream = (ts_stream_t*)p_mux->pp_inputs[i_stream]->p_sys; + p_stream = (ts_stream_t *)p_mux->pp_inputs[i_stream]->p_sys; + +#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 ); + + if( p_usepid != NULL ) + p_es = dvbpsi_PMTAddES( + &p_sys->dvbpmt[((pmt_map_t *)p_usepid)->i_prog], + p_stream->i_stream_type, p_stream->i_pid ); + else + /* If there's an error somewhere, dump it to the first pmt */ +#endif + p_es = dvbpsi_PMTAddES( &p_sys->dvbpmt[0], p_stream->i_stream_type, + p_stream->i_pid ); - p_es = dvbpsi_PMTAddES( &pmt, p_stream->i_stream_type, - p_stream->i_pid ); if( p_stream->i_stream_id == 0xfa || p_stream->i_stream_id == 0xfb ) { uint8_t es_id[2]; @@ -2111,55 +2588,83 @@ static void GetPMT( sout_mux_t *p_mux, } 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 ); } } - p_section = dvbpsi_GenPMTSections( &pmt ); - - p_pmt = WritePSISection( p_mux->p_sout, p_section ); - - PEStoTS( p_mux->p_sout, c, p_pmt, &p_sys->pmt ); + for( i = 0; i < p_sys->i_num_pmt; i++ ) + { + p_section[i] = dvbpsi_GenPMTSections( &p_sys->dvbpmt[i] ); + p_pmt[i] = WritePSISection( p_mux->p_sout, p_section[i] ); + PEStoTS( p_mux->p_sout, c, p_pmt[i], &p_sys->pmt[i] ); + dvbpsi_DeletePSISections( p_section[i] ); + dvbpsi_EmptyPMT( &p_sys->dvbpmt[i] ); + } - dvbpsi_DeletePSISections( p_section ); - dvbpsi_EmptyPMT( &pmt ); +#ifdef HAVE_DVBPSI_SDT + if( p_sys->b_sdt ) + { + p_section2 = dvbpsi_GenSDTSections( &sdt ); + p_sdt = WritePSISection( p_mux->p_sout, p_section2 ); + PEStoTS( p_mux->p_sout, c, p_sdt, &p_sys->sdt ); + dvbpsi_DeletePSISections( p_section2 ); + dvbpsi_EmptySDT( &sdt ); + } +#endif }