X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmux%2Fmpeg%2Fts.c;h=abe62c4fa86711263faade1fcd0c954e4d090ed0;hb=cf45f5073677d2e7bfe57066c426340703198107;hp=109caeab02c995f09aa18f747469b5084b071928;hpb=4f679c9f7abd996ca0fb9124bcee210f5d9ebc87;p=vlc diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c index 109caeab02..abe62c4fa8 100644 --- a/modules/mux/mpeg/ts.c +++ b/modules/mux/mpeg/ts.c @@ -27,13 +27,20 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#include +#include +#include +#include +#include -#include "iso_lang.h" +#include #include "bits.h" #include "pes.h" @@ -74,6 +81,13 @@ * if they arrive a bit late * (We cannot rely on the fact that the fifo should be full) */ + +/***************************************************************************** + * Callback prototypes + *****************************************************************************/ +static int ChangeKeyCallback ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); +static int ActiveKeyCallback ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); + /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -129,7 +143,7 @@ static void Close ( vlc_object_t * ); "of the shaping algorithm, since I frames are usually the biggest " \ "frames in the stream.") -#define PCR_TEXT N_("PCR delay (ms)") +#define PCR_TEXT N_("PCR interval (ms)") #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).") @@ -155,86 +169,93 @@ static void Close ( vlc_object_t * ); #define CK_LONGTEXT N_("CSA encryption key. This must be a " \ "16 char string (8 hexadecimal bytes).") +#define CK2_TEXT N_("Second CSA Key") +#define CK2_LONGTEXT N_("The even CSA encryption key. This must be a " \ + "16 char string (8 hexadecimal bytes).") + +#define CU_TEXT N_("CSA Key in use") +#define CU_LONGTEXT N_("CSA encryption key used. It can be the odd/first/1 " \ + "(default) or the even/second/2 one.") + #define CPKT_TEXT N_("Packet size in bytes 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. " ) + "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 64 /* Maximum number of programs. FIXME: I just chose an arbitary number. Where is the maximum in the spec? */ #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_shortname( "MPEG-TS"); - set_category( CAT_SOUT ); - set_subcategory( SUBCAT_SOUT_MUX ); - set_capability( "sout mux", 120 ); - add_shortcut( "ts" ); +vlc_module_begin () + set_description( N_("TS muxer (libdvbpsi)") ) + set_shortname( "MPEG-TS") + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_MUX ) + set_capability( "sout mux", 120 ) + 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 ); + TSID_LONGTEXT, true ) #ifdef HAVE_DVBPSI_SDT add_integer( SOUT_CFG_PREFIX "netid", 0, NULL, NETID_TEXT, - NETID_LONGTEXT, VLC_TRUE ); + NETID_LONGTEXT, 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 ); + PMTPROG_LONGTEXT, true ) + add_bool( SOUT_CFG_PREFIX "es-id-pid", false, NULL, PID_TEXT, PID_LONGTEXT, + 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, VLC_TRUE ); + add_string( SOUT_CFG_PREFIX "sdtdesc", NULL, NULL, SDTDESC_TEXT, SDTDESC_LONGTEXT, true ) #endif - add_bool( SOUT_CFG_PREFIX "alignment", VLC_TRUE, NULL, ALIGNMENT_TEXT, - ALIGNMENT_LONGTEXT, VLC_TRUE ); + 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_string( SOUT_CFG_PREFIX "csa2-ck", NULL, NULL, CK2_TEXT, CK2_LONGTEXT, + true ) + add_string( SOUT_CFG_PREFIX "csa-use", "1", NULL, CU_TEXT, CU_LONGTEXT, + true ) + add_integer( SOUT_CFG_PREFIX "csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, true ) - set_callbacks( Open, Close ); -vlc_module_end(); + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local data structures *****************************************************************************/ -static const char *ppsz_sout_options[] = { +static const char *const 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", + "dts-delay", "csa-ck", "csa2-ck", "csa-use", "csa-pkt", "crypt-audio", "crypt-video", "muxpmt", "sdtdesc", "program-pmt", "alignment", NULL }; @@ -304,8 +325,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; @@ -324,7 +344,7 @@ typedef struct ts_stream_t int i_stream_type; int i_stream_id; int i_continuity_counter; - vlc_bool_t b_discontinuity; + bool b_discontinuity; /* to be used for carriege of DIV3 */ vlc_fourcc_t i_bih_codec; @@ -344,7 +364,7 @@ typedef struct ts_stream_t 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; @@ -353,11 +373,13 @@ struct sout_mux_sys_t int i_pcr_pid; sout_input_t *p_pcr_input; + vlc_mutex_t csa_lock; + int i_audio_bound; int i_video_bound; - vlc_bool_t b_es_id_pid; - vlc_bool_t b_sdt; + bool b_es_id_pid; + bool b_sdt; int i_pid_video; int i_pid_audio; int i_pid_spu; @@ -375,7 +397,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; + bool b_data_alignment; int i_mpeg4_streams; @@ -384,22 +406,22 @@ struct sout_mux_sys_t 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 */ @@ -457,6 +479,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, @@ -464,7 +487,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 * ); @@ -489,13 +512,14 @@ static int Open( vlc_object_t *p_this ) p_sys->dvbpmt = NULL; memset( &p_sys->pmtmap, 0, sizeof(p_sys->pmtmap) ); + vlc_mutex_init( &p_sys->csa_lock ); + p_mux->pf_control = Control; p_mux->pf_addstream = AddStream; p_mux->pf_delstream = DelStream; p_mux->pf_mux = Mux; 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; @@ -504,8 +528,7 @@ static int Open( vlc_object_t *p_this ) 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; + p_sys->b_es_id_pid = var_GetBool( p_mux, SOUT_CFG_PREFIX "es-id-pid" ); var_Get( p_mux, SOUT_CFG_PREFIX "muxpmt", &val ); /* @@ -556,40 +579,42 @@ static int Open( vlc_object_t *p_this ) psz = NULL; } } - if( val.psz_string != NULL) free( val.psz_string ); + free( val.psz_string ); - p_sys->i_pat_version_number = rand() % 32; + unsigned short subi[3]; + vlc_rand_bytes(subi, sizeof(subi)); + p_sys->i_pat_version_number = nrand48(subi) & 0x1f; p_sys->pat.i_pid = 0; p_sys->pat.i_continuity_counter = 0; - p_sys->pat.b_discontinuity = VLC_FALSE; + 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_tsid = nrand48(subi) & 0xffff; - p_sys->i_netid = rand() % 65536; + p_sys->i_netid = nrand48(subi) & 0xffff; #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->i_pmt_version_number = nrand48(subi) & 0x1f; 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->pmt[i].b_discontinuity = false; } p_sys->sdt.i_pid = 0x11; p_sys->sdt.i_continuity_counter = 0; - p_sys->sdt.b_discontinuity = VLC_FALSE; + 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 ? VLC_TRUE : VLC_FALSE; + 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 ) @@ -621,13 +646,12 @@ static int Open( vlc_object_t *p_this ) psz_sdttoken = psz_end; } } - if( val.psz_string != NULL ) free( val.psz_string ); + free( val.psz_string ); #else - p_sys->b_sdt = VLC_FALSE; + p_sys->b_sdt = false; #endif - var_Get( p_mux, SOUT_CFG_PREFIX "alignment", &val ); - p_sys->b_data_alignment = val.b_bool; + p_sys->b_data_alignment = var_GetBool( p_mux, SOUT_CFG_PREFIX "alignment" ); var_Get( p_mux, SOUT_CFG_PREFIX "program-pmt", &val ); if( val.psz_string && *val.psz_string ) @@ -665,7 +689,7 @@ static int Open( vlc_object_t *p_this ) for( i = 0; i < p_sys->i_num_pmt; i++ ) p_sys->i_pmt_program_number[i] = i + 1; } - if( val.psz_string != NULL ) free( val.psz_string ); + free( val.psz_string ); var_Get( p_mux, SOUT_CFG_PREFIX "pid-pmt", &val ); if( val.i_int ) @@ -681,22 +705,19 @@ static int Open( vlc_object_t *p_this ) 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; + p_sys->i_pid_video = var_GetInteger( p_mux, SOUT_CFG_PREFIX "pid-video" ); if ( p_sys->i_pid_video > p_sys->i_pid_free ) { p_sys->i_pid_free = p_sys->i_pid_video + 1; } - var_Get( p_mux, SOUT_CFG_PREFIX "pid-audio", &val ); - p_sys->i_pid_audio = val.i_int; + p_sys->i_pid_audio = var_GetInteger( p_mux, SOUT_CFG_PREFIX "pid-audio" ); if ( p_sys->i_pid_audio > p_sys->i_pid_free ) { p_sys->i_pid_free = p_sys->i_pid_audio + 1; } - var_Get( p_mux, SOUT_CFG_PREFIX "pid-spu", &val ); - p_sys->i_pid_spu = val.i_int; + p_sys->i_pid_spu = var_GetInteger( p_mux, SOUT_CFG_PREFIX "pid-spu" ); if ( p_sys->i_pid_spu > p_sys->i_pid_free ) { p_sys->i_pid_free = p_sys->i_pid_spu + 1; @@ -710,11 +731,9 @@ static int Open( vlc_object_t *p_this ) p_sys->i_null_continuity_counter = 0; /* Allow to create constrained stream */ - var_Get( p_mux, SOUT_CFG_PREFIX "bmin", &val ); - p_sys->i_bitrate_min = val.i_int; + p_sys->i_bitrate_min = var_GetInteger( p_mux, SOUT_CFG_PREFIX "bmin" ); - var_Get( p_mux, SOUT_CFG_PREFIX "bmax", &val ); - p_sys->i_bitrate_max = val.i_int; + p_sys->i_bitrate_max = var_GetInteger( p_mux, SOUT_CFG_PREFIX "bmax" ); if( p_sys->i_bitrate_min > 0 && p_sys->i_bitrate_max > 0 && p_sys->i_bitrate_min > p_sys->i_bitrate_max ) @@ -735,7 +754,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; } @@ -746,7 +765,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; } @@ -754,70 +773,78 @@ 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 ); - p_sys->b_use_key_frames = val.b_bool; + p_sys->b_use_key_frames = var_GetBool( p_mux, SOUT_CFG_PREFIX "use-key-frames" ); /* for TS generation */ p_sys->i_pcr = 0; p_sys->csa = NULL; + var_Create( p_mux, SOUT_CFG_PREFIX "csa-ck", VLC_VAR_STRING | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND ); var_Get( p_mux, SOUT_CFG_PREFIX "csa-ck", &val ); if( val.psz_string && *val.psz_string ) { - char *psz = val.psz_string; + int i_res; + vlc_value_t csa2; + + p_sys->csa = csa_New(); - /* skip 0x */ - if( psz[0] == '0' && ( psz[1] == 'x' || psz[1] == 'X' ) ) + var_Create( p_mux, SOUT_CFG_PREFIX "csa2-ck", VLC_VAR_STRING | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND ); + var_Get( p_mux, SOUT_CFG_PREFIX "csa2-ck", &csa2 ); + i_res = csa_SetCW( (vlc_object_t*)p_mux, p_sys->csa, val.psz_string, true ); + if( i_res == VLC_SUCCESS && csa2.psz_string && *csa2.psz_string ) { - psz += 2; + if( csa_SetCW( (vlc_object_t*)p_mux, p_sys->csa, csa2.psz_string, false ) != VLC_SUCCESS ) + { + csa_SetCW( (vlc_object_t*)p_mux, p_sys->csa, val.psz_string, false ); + } } - if( strlen( psz ) != 16 ) + else if( i_res == VLC_SUCCESS ) { - msg_Dbg( p_mux, "invalid csa ck (it must be 16 chars long)" ); + csa_SetCW( (vlc_object_t*)p_mux, p_sys->csa, val.psz_string, false ); } else { - uint64_t i_ck = strtoull( psz, NULL, 16 ); - uint8_t ck[8]; - int i; + csa_Delete( p_sys->csa ); + p_sys->csa = NULL; + } + + if( p_sys->csa ) + { + vlc_value_t use_val, pkt_val; - for( i = 0; i < 8; i++ ) + var_Create( p_mux, SOUT_CFG_PREFIX "csa-use", VLC_VAR_STRING | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND ); + var_Get( p_mux, SOUT_CFG_PREFIX "csa-use", &use_val ); + var_AddCallback( p_mux, SOUT_CFG_PREFIX "csa-use", ActiveKeyCallback, NULL ); + var_AddCallback( p_mux, SOUT_CFG_PREFIX "csa-ck", ChangeKeyCallback, (void *)1 ); + var_AddCallback( p_mux, SOUT_CFG_PREFIX "csa2-ck", ChangeKeyCallback, NULL ); + + if ( var_Set( p_mux, SOUT_CFG_PREFIX "csa-use", use_val ) != VLC_SUCCESS ) { - ck[i] = ( i_ck >> ( 56 - 8*i) )&0xff; + var_SetString( p_mux, SOUT_CFG_PREFIX "csa-use", "odd" ); } -#ifndef TS_NO_CSA_CK_MSG - msg_Dbg( p_mux, "using CSA scrambling with ck=%x:%x:%x:%x:%x:%x:%x:%x", - ck[0], ck[1], ck[2], ck[3], ck[4], ck[5], ck[6], ck[7] ); -#endif - p_sys->csa = csa_New(); - if( p_sys->csa ) - { - vlc_value_t pkt_val; - - csa_SetCW( p_sys->csa, ck, ck ); + free( use_val.psz_string ); - var_Get( p_mux, SOUT_CFG_PREFIX "csa-pkt", &pkt_val ); - if( pkt_val.i_int < 12 || pkt_val.i_int > 188 ) - { - msg_Err( p_mux, "wrong packet size %d specified.", pkt_val.i_int ); - msg_Warn( p_mux, "using default packet size of 188 bytes" ); - p_sys->i_csa_pkt_size = 188; - } - 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 ); + var_Get( p_mux, SOUT_CFG_PREFIX "csa-pkt", &pkt_val ); + if( pkt_val.i_int < 12 || pkt_val.i_int > 188 ) + { + msg_Err( p_mux, "wrong packet size %"PRId64" specified.", + pkt_val.i_int ); + msg_Warn( p_mux, "using default packet size of 188 bytes" ); + p_sys->i_csa_pkt_size = 188; } + 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 ); } + free( csa2.psz_string ); } - 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; + p_sys->b_crypt_audio = var_GetBool( p_mux, SOUT_CFG_PREFIX "crypt-audio" ); - var_Get( p_mux, SOUT_CFG_PREFIX "crypt-video", &val ); - p_sys->b_crypt_video = val.b_bool; + p_sys->b_crypt_video = var_GetBool( p_mux, SOUT_CFG_PREFIX "crypt-video" ); return VLC_SUCCESS; } @@ -833,50 +860,98 @@ static void Close( vlc_object_t * p_this ) if( p_sys->csa ) { + var_DelCallback( p_mux, SOUT_CFG_PREFIX "csa-ck", ChangeKeyCallback, NULL ); + var_DelCallback( p_mux, SOUT_CFG_PREFIX "csa2-ck", ChangeKeyCallback, NULL ); + var_DelCallback( p_mux, SOUT_CFG_PREFIX "csa-use", ActiveKeyCallback, NULL ); csa_Delete( p_sys->csa ); } + for( i = 0; i < MAX_PMT; i++ ) { - if( p_sys->sdt_descriptors[i].psz_service_name != NULL ) - free( p_sys->sdt_descriptors[i].psz_service_name ); - if( p_sys->sdt_descriptors[i].psz_provider != NULL ) - free( p_sys->sdt_descriptors[i].psz_provider ); + free( p_sys->sdt_descriptors[i].psz_service_name ); + free( p_sys->sdt_descriptors[i].psz_provider ); } - if( p_sys->dvbpmt != NULL ) /* safety */ - free ( p_sys->dvbpmt ); - + vlc_mutex_destroy( &p_sys->csa_lock ); + free( p_sys->dvbpmt ); free( p_sys ); } +/***************************************************************************** + * ChangeKeyCallback: called when changing the odd encryption key on the fly. + *****************************************************************************/ +static int ChangeKeyCallback( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, + void *p_data ) +{ + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); + sout_mux_t *p_mux = (sout_mux_t*)p_this; + sout_mux_sys_t *p_sys = p_mux->p_sys; + int ret; + + vlc_mutex_lock( &p_sys->csa_lock ); + ret = csa_SetCW( p_this, p_sys->csa, newval.psz_string, + !!(intptr_t)p_data ); + vlc_mutex_unlock( &p_sys->csa_lock ); + + return ret; +} + +/***************************************************************************** + * ActiveKeyCallback: called when changing the active (in use) encryption key on the fly. + *****************************************************************************/ +static int ActiveKeyCallback( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, + void *p_data ) +{ + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data); + sout_mux_t *p_mux = (sout_mux_t*)p_this; + sout_mux_sys_t *p_sys = p_mux->p_sys; + int i_res = VLC_EBADVAR; + + vlc_mutex_lock( &p_sys->csa_lock ); + if( !strcmp(newval.psz_string, "odd" ) || !strcmp(newval.psz_string, "first" ) || !strcmp(newval.psz_string, "1" ) ) + { + i_res = csa_UseKey( (vlc_object_t*)p_mux, p_sys->csa, 1 ); + } + else if( !strcmp(newval.psz_string, "even" ) || !strcmp(newval.psz_string, "second" ) || !strcmp(newval.psz_string, "2" ) ) + { + i_res = csa_UseKey( (vlc_object_t*)p_mux, p_sys->csa, 0 ); + } + vlc_mutex_unlock( &p_sys->csa_lock ); + + return i_res; +} + /***************************************************************************** * Control: *****************************************************************************/ 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; - } + } } /***************************************************************************** @@ -889,6 +964,8 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) 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 ) @@ -897,7 +974,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 = VLC_FALSE; + p_stream->b_discontinuity = false; p_stream->i_decoder_specific_info = 0; p_stream->p_decoder_specific_info = NULL; @@ -910,38 +987,43 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) case VIDEO_ES: switch( p_input->p_fmt->i_codec ) { - case VLC_FOURCC( 'm', 'p','g', 'v' ): + case VLC_CODEC_MPGV: /* TODO: do we need to check MPEG-I/II ? */ p_stream->i_stream_type = 0x02; p_stream->i_stream_id = 0xe0; break; - case VLC_FOURCC( 'm', 'p','4', 'v' ): + case VLC_CODEC_MP4V: p_stream->i_stream_type = 0x10; p_stream->i_stream_id = 0xe0; p_stream->i_es_id = p_stream->i_pid; break; - case VLC_FOURCC( 'h', '2','6', '4' ): + case VLC_CODEC_H264: p_stream->i_stream_type = 0x1b; p_stream->i_stream_id = 0xe0; break; /* XXX dirty dirty but somebody want that: * using crapy MS-codec XXX */ /* I didn't want to do that :P */ - case VLC_FOURCC( 'H', '2', '6', '3' ): - case VLC_FOURCC( 'I', '2', '6', '3' ): - case VLC_FOURCC( 'W', 'M', 'V', '3' ): - case VLC_FOURCC( 'W', 'M', 'V', '2' ): - case VLC_FOURCC( 'W', 'M', 'V', '1' ): - case VLC_FOURCC( 'D', 'I', 'V', '3' ): - case VLC_FOURCC( 'D', 'I', 'V', '2' ): - case VLC_FOURCC( 'D', 'I', 'V', '1' ): - case VLC_FOURCC( 'M', 'J', 'P', 'G' ): + case VLC_CODEC_H263I: + case VLC_CODEC_H263: + case VLC_CODEC_WMV3: + case VLC_CODEC_WMV2: + case VLC_CODEC_WMV1: + case VLC_CODEC_DIV3: + case VLC_CODEC_DIV2: + case VLC_CODEC_DIV1: + case VLC_CODEC_MJPG: p_stream->i_stream_type = 0xa0; /* private */ p_stream->i_stream_id = 0xa0; /* beurk */ p_stream->i_bih_codec = p_input->p_fmt->i_codec; p_stream->i_bih_width = p_input->p_fmt->video.i_width; p_stream->i_bih_height = p_input->p_fmt->video.i_height; break; + case VLC_CODEC_DIRAC: + /* stream_id makes use of stream_id_extension */ + p_stream->i_stream_id = (PES_EXTENDED_STREAM_ID << 8) | 0x60; + p_stream->i_stream_type = 0xd1; + break; default: free( p_stream ); return VLC_EGENERIC; @@ -952,26 +1034,33 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) case AUDIO_ES: switch( p_input->p_fmt->i_codec ) { - case VLC_FOURCC( 'm', 'p','g', 'a' ): + case VLC_CODEC_MPGA: p_stream->i_stream_type = p_input->p_fmt->audio.i_rate >= 32000 ? 0x03 : 0x04; p_stream->i_stream_id = 0xc0; break; - case VLC_FOURCC( 'a', '5','2', ' ' ): + case VLC_CODEC_A52: p_stream->i_stream_type = 0x81; p_stream->i_stream_id = 0xbd; break; - case VLC_FOURCC( 'l', 'p','c', 'm' ): + case VLC_CODEC_EAC3: + p_stream->i_stream_type = 0x06; + p_stream->i_stream_id = 0xbd; + break; + case VLC_CODEC_DVD_LPCM: p_stream->i_stream_type = 0x83; p_stream->i_stream_id = 0xbd; break; - case VLC_FOURCC( 'd', 't','s', ' ' ): + case VLC_CODEC_DTS: p_stream->i_stream_type = 0x06; p_stream->i_stream_id = 0xbd; break; - case VLC_FOURCC( 'm', 'p','4', 'a' ): - p_stream->i_stream_type = 0x11; - p_stream->i_stream_id = 0xfa; + case VLC_CODEC_MP4A: + /* 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 = 0xc0; p_sys->i_mpeg4_streams++; p_stream->i_es_id = p_stream->i_pid; break; @@ -985,22 +1074,22 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) case SPU_ES: switch( p_input->p_fmt->i_codec ) { - case VLC_FOURCC( 's', 'p','u', ' ' ): + case VLC_CODEC_SPU: p_stream->i_stream_type = 0x82; p_stream->i_stream_id = 0xbd; break; - case VLC_FOURCC( 's', 'u','b', 't' ): + case VLC_CODEC_SUBT: p_stream->i_stream_type = 0x12; p_stream->i_stream_id = 0xfa; p_sys->i_mpeg4_streams++; p_stream->i_es_id = p_stream->i_pid; break; - case VLC_FOURCC('d','v','b','s'): + case VLC_CODEC_DVBS: p_stream->i_stream_type = 0x06; p_stream->i_es_id = p_input->p_fmt->subs.dvb.i_id; p_stream->i_stream_id = 0xbd; break; - case VLC_FOURCC('t','e','l','x'): + case VLC_CODEC_TELETEXT: p_stream->i_stream_type = 0x06; p_stream->i_stream_id = 0xbd; /* FIXME */ break; @@ -1017,6 +1106,12 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) 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] = @@ -1054,7 +1149,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) { 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 ); @@ -1072,7 +1167,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) 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] ); @@ -1081,63 +1176,72 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) 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; - 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 ); - } - /* Create decoder specific info for subt */ - if( p_stream->i_codec == VLC_FOURCC( 's', 'u','b', 't' ) ) + if( p_stream->i_codec == VLC_CODEC_SUBT ) { uint8_t *p; 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 */ @@ -1218,16 +1322,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->lang ) - { - free(p_stream->lang); - } - 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 ) @@ -1291,7 +1389,6 @@ static int Mux( sout_mux_t *p_mux ) block_FifoEmpty( p_mux->pp_inputs[i]->p_fifo ); } msg_Dbg( p_mux, "waiting for PCR streams" ); - msleep( 1000 ); return VLC_SUCCESS; } p_pcr_stream = (ts_stream_t*)p_sys->p_pcr_input->p_sys; @@ -1318,7 +1415,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) */ @@ -1337,26 +1434,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 ); @@ -1364,15 +1461,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; @@ -1380,23 +1476,29 @@ static int Mux( sout_mux_t *p_mux ) } } } - b_ok = VLC_FALSE; + b_ok = false; if( p_stream == p_pcr_stream || p_sys->b_data_alignment || p_input->p_fmt->i_codec != - VLC_FOURCC('m', 'p', 'g', 'a') ) + VLC_CODEC_MPGA ) + { p_data = block_FifoGet( p_input->p_fifo ); + + if( p_input->p_fmt->i_codec == + VLC_CODEC_MP4A ) + 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 ); p_data->i_length = p_next->i_dts - p_data->i_dts; } else if( p_input->p_fmt->i_codec != - VLC_FOURCC('s', 'u', 'b', 't' ) ) + VLC_CODEC_SUBT ) p_data->i_length = 1000; if( ( p_pcr_stream->i_pes_dts > 0 && @@ -1409,21 +1511,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; @@ -1432,11 +1532,12 @@ static int Mux( sout_mux_t *p_mux ) else { int i_header_size = 0; + int i_max_pes_size = 0; int b_data_alignment = 0; if( p_input->p_fmt->i_cat == SPU_ES ) { if( p_input->p_fmt->i_codec == - VLC_FOURCC('s','u','b','t') ) + VLC_CODEC_SUBT ) { /* Prepend header */ p_data = block_Realloc( p_data, 2, @@ -1467,7 +1568,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 ); @@ -1475,12 +1576,18 @@ static int Mux( sout_mux_t *p_mux ) } } else if( p_input->p_fmt->i_codec == - VLC_FOURCC('t','e','l','x') ) + VLC_CODEC_TELETEXT ) { /* EN 300 472 */ i_header_size = 0x24; b_data_alignment = 1; } + else if( p_input->p_fmt->i_codec == + VLC_CODEC_DVBS ) + { + /* EN 300 743 */ + b_data_alignment = 1; + } } else if( p_data->i_length < 0 || p_data->i_length > 2000000 ) @@ -1497,7 +1604,8 @@ static int Mux( sout_mux_t *p_mux ) } /* Convert to pes */ - if( p_stream->i_stream_id == 0xa0 && + if( (p_stream->i_stream_id == 0xa0 || + p_stream->i_stream_type == 0x1b ) && /*Workaroud for bug #3306 */ p_data->i_pts <= 0 ) { /* XXX yes I know, it's awful, but it's needed, @@ -1505,9 +1613,19 @@ static int Mux( sout_mux_t *p_mux ) p_data->i_pts = p_data->i_dts; } - E_( EStoPES )( p_mux->p_sout, &p_data, p_data, + if( p_input->p_fmt->i_codec == + VLC_CODEC_DIRAC ) + { + b_data_alignment = 1; + /* dirac pes packets should be unbounded in + * length, specify a suitibly large max size */ + i_max_pes_size = INT_MAX; + } + + 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 ); + 1, b_data_alignment, i_header_size, + i_max_pes_size ); BufferChainAppend( &p_stream->chain_pes, p_data ); @@ -1576,12 +1694,12 @@ 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++ ) @@ -1608,12 +1726,12 @@ static int Mux( sout_mux_t *p_mux ) 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; } @@ -1640,8 +1758,9 @@ static int Mux( sout_mux_t *p_mux ) #define STD_PES_PAYLOAD 170 static block_t *FixPES( sout_mux_t *p_mux, block_fifo_t *p_fifo ) { + VLC_UNUSED(p_mux); block_t *p_data; - int i_size; + size_t i_size; p_data = block_FifoShow( p_fifo ); i_size = p_data->i_buffer; @@ -1653,7 +1772,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_libvlc->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 @@ -1682,8 +1801,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_libvlc->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; @@ -1700,6 +1818,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 ) { @@ -1742,7 +1912,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 ) @@ -1774,16 +1944,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); } @@ -1812,7 +1982,9 @@ static void TSDate( sout_mux_t *p_mux, sout_buffer_chain_t *p_chain_ts, } if( p_ts->i_flags & BLOCK_FLAG_SCRAMBLED ) { - csa_Encrypt( p_sys->csa, p_ts->p_buffer, p_sys->i_csa_pkt_size, 0 ); + vlc_mutex_lock( &p_sys->csa_lock ); + csa_Encrypt( p_sys->csa, p_ts->p_buffer, p_sys->i_csa_pkt_size ); + vlc_mutex_unlock( &p_sys->csa_lock ); } /* latency */ @@ -1823,30 +1995,37 @@ 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 ) { + VLC_UNUSED(p_mux); 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 ); + + if (b_new_pes && !(p_pes->i_flags & BLOCK_FLAG_NO_KEYFRAME) && p_pes->i_flags & BLOCK_FLAG_TYPE_I) + { + p_ts->i_flags |= BLOCK_FLAG_TYPE_I; + } + p_ts->i_dts = p_pes->i_dts; p_ts->p_buffer[0] = 0x47; @@ -1874,7 +2053,7 @@ static block_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, if( p_stream->b_discontinuity ) { p_ts->p_buffer[5] |= 0x80; /* flag TS dicontinuity */ - p_stream->b_discontinuity = VLC_FALSE; + p_stream->b_discontinuity = false; } p_ts->p_buffer[6] = ( 0 )&0xff; p_ts->p_buffer[7] = ( 0 )&0xff; @@ -2044,6 +2223,7 @@ static void PEStoTS( sout_instance_t *p_sout, sout_buffer_chain_t *c, block_t *p_pes, ts_stream_t *p_stream ) { + VLC_UNUSED(p_sout); uint8_t *p_data; int i_size; int b_new_pes; @@ -2052,7 +2232,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( ;; ) { @@ -2073,7 +2253,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 )| @@ -2082,7 +2262,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 ) @@ -2097,7 +2277,7 @@ static void PEStoTS( sout_instance_t *p_sout, if( p_stream->b_discontinuity ) { p_ts->p_buffer[5] |= 0x80; - p_stream->b_discontinuity = VLC_FALSE; + p_stream->b_discontinuity = false; } for( i = 6; i < 6 + i_stuffing - 2; i++ ) { @@ -2122,7 +2302,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; @@ -2135,6 +2315,7 @@ static void PEStoTS( sout_instance_t *p_sout, static block_t *WritePSISection( sout_instance_t *p_sout, dvbpsi_psi_section_t* p_section ) { + VLC_UNUSED(p_sout); block_t *p_psi, *p_first = NULL; while( p_section ) @@ -2206,21 +2387,33 @@ 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[MAX_PMT]; - block_t *p_sdt; - dvbpsi_sdt_t sdt; dvbpsi_pmt_es_t *p_es; - dvbpsi_psi_section_t *p_section[MAX_PMT], *p_section2; - dvbpsi_sdt_service_t *p_service; - char *psz_sdt_desc; - int i_pidinput; + 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; + + 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 ); @@ -2248,26 +2441,30 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) #define psz_sdtserv p_sys->sdt_descriptors[i].psz_service_name /* FIXME: Ineffecient malloc's & ugly code...... */ - if( psz_sdtprov != NULL && psz_sdtserv != NULL ) + if( ( psz_sdtprov != NULL ) && ( psz_sdtserv != NULL ) ) { psz_sdt_desc = malloc( 3 + strlen(psz_sdtprov) + strlen(psz_sdtserv) ); - 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), - psz_sdt_desc ); - free( psz_sdt_desc ); + 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 @@ -2343,13 +2540,14 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) bits_write( &bits, 8, 0x21 ); /* Visual 14496-2 */ bits_write( &bits, 6, 0x04 ); /* VisualStream */ } - else if( p_stream->i_stream_type == 0x11 || p_stream->i_stream_type == 0x0f ) + else if( p_stream->i_stream_type == 0x11 || + p_stream->i_stream_type == 0x0f ) { bits_write( &bits, 8, 0x40 ); /* Audio 14496-3 */ bits_write( &bits, 6, 0x05 ); /* AudioStream */ } else if( p_stream->i_stream_type == 0x12 && - p_stream->i_codec == VLC_FOURCC('s','u','b','t') ) + p_stream->i_codec == VLC_CODEC_SUBT ) { bits_write( &bits, 8, 0x0B ); /* Text Stream */ bits_write( &bits, 6, 0x04 ); /* VisualStream */ @@ -2410,7 +2608,7 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) GetDescriptorLength24b( bits.i_data - bits_fix_IOD.i_data - 3 ) ); -#if 0//def HAVE_BSEARCH /* FIXME!!! This can't possibly work */ +#if 0 /* 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 ); @@ -2434,7 +2632,6 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) 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 ); @@ -2445,7 +2642,6 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) 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 ); @@ -2486,7 +2682,14 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) /* "registration" descriptor : "AC-3" */ dvbpsi_PMTESAddDescriptor( p_es, 0x05, 4, format ); } - else if( p_stream->i_codec == VLC_FOURCC('d','t','s',' ') ) + else if( p_stream->i_codec == VLC_CODEC_DIRAC ) + { + /* Dirac registration descriptor */ + + uint8_t data[4] = { 'd', 'r', 'a', 'c' }; + dvbpsi_PMTESAddDescriptor( p_es, 0x05, 4, data ); + } + else if( p_stream->i_codec == VLC_CODEC_DTS ) { /* DTS registration descriptor (ETSI TS 101 154 Annex F) */ @@ -2494,35 +2697,55 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) uint8_t data[4] = { 0x44, 0x54, 0x53, 0x32 }; dvbpsi_PMTESAddDescriptor( p_es, 0x05, 4, data ); } - else if( p_stream->i_codec == VLC_FOURCC('t','e','l','x') ) + else if( p_stream->i_codec == VLC_CODEC_EAC3 ) { - dvbpsi_PMTESAddDescriptor( p_es, 0x56, - p_stream->i_decoder_specific_info, - p_stream->p_decoder_specific_info ); + uint8_t data[1] = { 0x00 }; + dvbpsi_PMTESAddDescriptor( p_es, 0x7a, 1, data ); } -#ifdef _DVBPSI_DR_59_H_ - else if( p_stream->i_codec == VLC_FOURCC('d','v','b','s') ) + else if( p_stream->i_codec == VLC_CODEC_TELETEXT ) { - /* 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 ) + { + dvbpsi_PMTESAddDescriptor( p_es, 0x56, + p_stream->i_decoder_specific_info, + p_stream->p_decoder_specific_info ); + } continue; } + else if( p_stream->i_codec == VLC_CODEC_DVBS ) + { + /* DVB subtitles */ + 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; + } if( p_stream->lang[0] != 0 ) {