X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmux%2Fmpeg%2Fts.c;h=1c2234777ea77e9a91e87a52a14e7e80b291f45f;hb=22ec91db9f385ed13353459506d8e54f699374f0;hp=4bb4368b1d493bd9f4077b2d2dc898b3c10903c4;hpb=2cb472dba008f7d877ffe6bae9c5575253365282;p=vlc diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c index 4bb4368b1d..1c2234777e 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 @@ -27,11 +27,11 @@ /***************************************************************************** * 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 @@ -186,6 +198,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 +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 }; @@ -322,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; @@ -359,6 +374,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; @@ -462,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 ) @@ -609,6 +625,9 @@ static int Open( vlc_object_t *p_this ) 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 ) { @@ -866,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 ) ); @@ -994,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'; @@ -1021,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; @@ -1164,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 ); @@ -1225,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; @@ -1278,7 +1342,7 @@ static int Mux( sout_mux_t *p_mux ) 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 ) @@ -1286,7 +1350,7 @@ static int Mux( sout_mux_t *p_mux ) /* 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; @@ -1304,7 +1368,7 @@ static int Mux( sout_mux_t *p_mux ) continue; if ( i_spu_delay >= I64C(100000000) - || i_spu_delay < 10000 ) + || i_spu_delay < I64C(10000) ) { BufferChainClean( p_mux->p_sout, &p_stream->chain_pes ); @@ -1317,14 +1381,14 @@ 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 ); 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 ); @@ -1416,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 ) @@ -1435,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; } @@ -1521,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 ) @@ -1541,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; @@ -1588,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 @@ -1617,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; @@ -2431,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 ); } }