X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmux%2Fmpeg%2Fts.c;h=018790081ce96ea20fb5e55ef17b099e60e97d7b;hb=f485214f09dd284cbb85674e937fbbb0a6032a2e;hp=e6c3094cc3e8d64602c7ce5faa1e9769ddb312af;hpb=952caf00279ee9469ebdff5bc8d735c58e446fd3;p=vlc diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c index e6c3094cc3..018790081c 100644 --- a/modules/mux/mpeg/ts.c +++ b/modules/mux/mpeg/ts.c @@ -1,7 +1,7 @@ /***************************************************************************** * 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 @@ -21,7 +21,7 @@ * * 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. *****************************************************************************/ /***************************************************************************** @@ -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,11 +152,12 @@ 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. " \ +/// \bug [String] Extra space +#define CPKT_LONGTEXT N_("Size of the TS packet to encrypt. " \ "The encryption routines subtract the TS-header from the value before " \ "encrypting. " ) @@ -186,6 +199,8 @@ vlc_module_begin(); #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 ); @@ -220,7 +235,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 }; @@ -322,7 +337,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; @@ -359,6 +375,7 @@ struct sout_mux_sys_t 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; @@ -544,28 +561,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; @@ -595,6 +622,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 ) @@ -853,6 +886,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 ) ); @@ -981,6 +1015,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'; @@ -1008,9 +1045,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; @@ -1151,6 +1220,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 ); @@ -1212,6 +1285,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; @@ -1304,7 +1382,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 ); @@ -1575,7 +1653,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 @@ -1604,7 +1682,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; @@ -2448,16 +2526,18 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) 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 ); } } @@ -2475,7 +2555,6 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) { 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 );