X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmux%2Fmpeg%2Fts.c;h=fe47e991984117d03ee88459514a7007b68e62fe;hb=393c3c577aa8676456d741b669b715f8b285612e;hp=da65c8dd084ae31183168c6a6d9363415b1d2368;hpb=ff7206faf317fbeed77f4239998a79a59980d776;p=vlc diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c index da65c8dd08..fe47e99198 100644 --- a/modules/mux/mpeg/ts.c +++ b/modules/mux/mpeg/ts.c @@ -2,12 +2,11 @@ * ts.c: MPEG-II TS Muxer ***************************************************************************** * Copyright (C) 2001, 2002 VideoLAN - * $Id: ts.c,v 1.44 2004/02/17 13:13:31 gbazin Exp $ + * $Id$ * * Authors: Laurent Aimar * Eric Petit * - * * 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 * the Free Software Foundation; either version 2 of the License, or @@ -38,22 +37,20 @@ #include "pes.h" #include "csa.h" -#if defined MODULE_NAME_IS_mux_ts_dvbpsi -# ifdef HAVE_DVBPSI_DR_H -# include -# include -# include -# include -# include -# include -# else -# include "dvbpsi.h" -# include "descriptor.h" -# include "tables/pat.h" -# include "tables/pmt.h" -# include "descriptors/dr.h" -# include "psi.h" -# endif +#ifdef HAVE_DVBPSI_DR_H +# include +# include +# include +# include +# include +# include +#else +# include "dvbpsi.h" +# include "descriptor.h" +# include "tables/pat.h" +# include "tables/pmt.h" +# include "descriptors/dr.h" +# include "psi.h" #endif /* @@ -77,39 +74,123 @@ 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 " \ + "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 SPUPID_TEXT N_("SPU PID") +#define SPUPID_LONGTEXT N_("Assigns a fixed PID to the SPU.") +#define PMTPID_TEXT N_("PMT PID") +#define PMTPID_LONGTEXT N_("Assigns 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 PID_TEXT N_("Set PID to id of ES") +#define PID_LONGTEXT N_("set PID to id of es") + +#define SHAPING_TEXT N_("Shaping delay (ms)") +#define SHAPING_LONGTEXT N_("If enabled, the TS muxer will 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.") +#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 " \ + "that case, the shaping duration given by the user is a worse case " \ + "used when no reference frame is available. This enhances the efficiency " \ + "of the shaping algorithm, since I frames are usually the biggest " \ + "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 30)") + +#define BMIN_TEXT N_( "Minimum B (deprecated)") +#define BMIN_LONGTEXT N_( "This setting is deprecated and not used anymore" ) + +#define BMAX_TEXT N_( "Maximum B (deprecated)") +#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 " \ + "stamps) and PTS (presentation timestamps) of the data in the " \ + "stream, compared to the PCRs. This allows for some buffering inside " \ + "the client decoder.") + +#define ACRYPT_TEXT N_("Crypt audio") +#define ACRYPT_LONGTEXT N_("Crypt audio using CSA") + +#define CK_TEXT N_("CSA Key") +#define CK_LONGTEXT N_("Defines the CSA encryption key. This must be a " \ + "16 char string (8 hexadecimal bytes).") + +#define SOUT_CFG_PREFIX "sout-ts-" + vlc_module_begin(); -#if defined MODULE_NAME_IS_mux_ts - set_description( _("TS muxer") ); - set_capability( "sout mux", 100 ); - add_shortcut( "ts" ); - add_shortcut( "ts_nodvbpsi" ); -#elif defined MODULE_NAME_IS_mux_ts_dvbpsi 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" ); - add_shortcut( "ts_dvbpsi" ); -#endif + + add_integer( SOUT_CFG_PREFIX "pid-video", 0, NULL,VPID_TEXT, VPID_LONGTEXT, + VLC_TRUE ); + add_integer( SOUT_CFG_PREFIX "pid-audio", 0, NULL, APID_TEXT, + APID_LONGTEXT, VLC_TRUE ); + add_integer( SOUT_CFG_PREFIX "pid-spu", 0, NULL, SPUPID_TEXT, + SPUPID_LONGTEXT, VLC_TRUE ); + add_integer( SOUT_CFG_PREFIX "pid-pmt", 0, NULL, PMTPID_TEXT, + PMTPID_LONGTEXT, VLC_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 ); + add_bool( SOUT_CFG_PREFIX "es-id-pid", 0, NULL, PID_TEXT, PID_LONGTEXT, + VLC_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 "pcr", 30, NULL, PCR_TEXT, PCR_LONGTEXT, + VLC_TRUE ); + add_integer( SOUT_CFG_PREFIX "bmin", 0, NULL, BMIN_TEXT, BMIN_LONGTEXT, + VLC_TRUE ); + add_integer( SOUT_CFG_PREFIX "bmax", 0, NULL, BMAX_TEXT, BMAX_LONGTEXT, + VLC_TRUE ); + add_integer( SOUT_CFG_PREFIX "dts-delay", 200, NULL, DTS_TEXT, + DTS_LONGTEXT, VLC_TRUE ); + + add_bool( SOUT_CFG_PREFIX "crypt-audio", VLC_TRUE, NULL, ACRYPT_TEXT, + ACRYPT_LONGTEXT, VLC_TRUE ); + + add_string( SOUT_CFG_PREFIX "csa-ck", NULL, NULL, CK_TEXT, CK_LONGTEXT, + VLC_TRUE ); + set_callbacks( Open, Close ); vlc_module_end(); /***************************************************************************** - * Exported prototypes + * Local data structures *****************************************************************************/ -static int Capability(sout_mux_t *, int, void *, void * ); -static int AddStream( sout_mux_t *, sout_input_t * ); -static int DelStream( sout_mux_t *, sout_input_t * ); -static int Mux ( sout_mux_t * ); +static const char *ppsz_sout_options[] = { + "pid-video", "pid-audio", "pid-spu", "pid-pmt", "tsid", "program-pmt", "es-id-pid", + "shaping", "pcr", "bmin", "bmax", "use-key-frames", "dts-delay", + "csa-ck", "crypt-audio", + NULL +}; -/***************************************************************************** - * Local prototypes - *****************************************************************************/ -#define SOUT_BUFFER_FLAGS_PRIVATE_PCR ( 1 << SOUT_BUFFER_FLAGS_PRIVATE_SHIFT ) -#define SOUT_BUFFER_FLAGS_PRIVATE_CSA ( 2 << SOUT_BUFFER_FLAGS_PRIVATE_SHIFT ) typedef struct { - int i_depth; - sout_buffer_t *p_first; - sout_buffer_t **pp_last; + int i_depth; + block_t *p_first; + block_t **pp_last; } sout_buffer_chain_t; static inline void BufferChainInit ( sout_buffer_chain_t *c ) @@ -118,7 +199,7 @@ static inline void BufferChainInit ( sout_buffer_chain_t *c ) c->p_first = NULL; c->pp_last = &c->p_first; } -static inline void BufferChainAppend( sout_buffer_chain_t *c, sout_buffer_t *b ) +static inline void BufferChainAppend( sout_buffer_chain_t *c, block_t *b ) { *c->pp_last = b; c->i_depth++; @@ -130,9 +211,9 @@ static inline void BufferChainAppend( sout_buffer_chain_t *c, sout_buffer_t *b ) } c->pp_last = &b->p_next; } -static inline sout_buffer_t *BufferChainGet( sout_buffer_chain_t *c ) +static inline block_t *BufferChainGet( sout_buffer_chain_t *c ) { - sout_buffer_t *b = c->p_first; + block_t *b = c->p_first; if( b ) { @@ -148,20 +229,29 @@ static inline sout_buffer_t *BufferChainGet( sout_buffer_chain_t *c ) } return b; } -static inline void BufferChainClean( sout_instance_t *p_sout, sout_buffer_chain_t *c ) +static inline block_t *BufferChainPeek( sout_buffer_chain_t *c ) { - sout_buffer_t *b; + block_t *b = c->p_first; + + return b; +} +static inline void BufferChainClean( sout_instance_t *p_sout, + sout_buffer_chain_t *c ) +{ + block_t *b; while( ( b = BufferChainGet( c ) ) ) { - sout_BufferDelete( p_sout, b ); + block_Release( b ); } BufferChainInit( c ); } -typedef struct ts_stream_s +typedef struct ts_stream_t { int i_pid; + vlc_fourcc_t i_codec; + int i_stream_type; int i_stream_id; int i_continuity_counter; @@ -183,6 +273,7 @@ typedef struct ts_stream_s mtime_t i_pes_dts; mtime_t i_pes_length; int i_pes_used; + vlc_bool_t b_key_frame; } ts_stream_t; @@ -194,15 +285,19 @@ struct sout_mux_sys_t int i_audio_bound; int i_video_bound; + vlc_bool_t b_es_id_pid; int i_pid_video; int i_pid_audio; + int i_pid_spu; int i_pid_free; // first usable pid + int i_tsid; 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; int i_mpeg4_streams; @@ -212,14 +307,17 @@ struct sout_mux_sys_t int64_t i_bitrate_min; int64_t i_bitrate_max; - int64_t i_caching_delay; + int64_t i_shaping_delay; int64_t i_pcr_delay; int64_t i_dts_delay; + vlc_bool_t b_use_key_frames; + mtime_t i_pcr; /* last PCR emited */ csa_t *csa; + vlc_bool_t b_crypt_audio; }; @@ -237,6 +335,11 @@ static int AllocatePID( sout_mux_sys_t *p_sys, int i_cat ) i_pid = p_sys->i_pid_audio; p_sys->i_pid_audio = 0; } + else if ( i_cat == SPU_ES && p_sys->i_pid_spu ) + { + i_pid = p_sys->i_pid_spu; + p_sys->i_pid_spu = 0; + } else { i_pid = ++p_sys->i_pid_free; @@ -244,13 +347,26 @@ static int AllocatePID( sout_mux_sys_t *p_sys, int i_cat ) return i_pid; } +/***************************************************************************** + * Local prototypes + *****************************************************************************/ +static int Control ( sout_mux_t *, int, va_list ); +static int AddStream( sout_mux_t *, sout_input_t * ); +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 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, + mtime_t i_pcr_length, mtime_t i_pcr_dts ); 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 sout_buffer_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, vlc_bool_t b_pcr ); -static void TSSetPCR( sout_buffer_t *p_ts, mtime_t i_dts ); +static block_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, vlc_bool_t b_pcr ); +static void TSSetPCR( block_t *p_ts, mtime_t i_dts ); -static void PEStoTS ( sout_instance_t *, sout_buffer_chain_t *, sout_buffer_t *, ts_stream_t * ); +static void PEStoTS ( sout_instance_t *, sout_buffer_chain_t *, block_t *, ts_stream_t * ); /***************************************************************************** * Open: @@ -259,18 +375,18 @@ static int Open( vlc_object_t *p_this ) { sout_mux_t *p_mux =(sout_mux_t*)p_this; sout_mux_sys_t *p_sys; - char *val; + vlc_value_t val; msg_Dbg( p_mux, "Open" ); + sout_CfgParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg ); p_sys = malloc( sizeof( sout_mux_sys_t ) ); - p_mux->pf_capacity = Capability; + 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; - p_mux->i_preheader = 30; // really enough for a pes header srand( (uint32_t)mdate() ); @@ -281,29 +397,58 @@ static int Open( vlc_object_t *p_this ) p_sys->pat.i_pid = 0; p_sys->pat.i_continuity_counter = 0; + 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_pmt_version_number = rand() % 32; - p_sys->pmt.i_pid = 0x42; p_sys->pmt.i_continuity_counter = 0; - p_sys->i_pid_free = 0x43; + var_Get( p_mux, SOUT_CFG_PREFIX "program-pmt", &val ); + if (val.i_int ) + { + p_sys->i_pmt_program_number = val.i_int; + } + else + { + p_sys->i_pmt_program_number = 1; + } - p_sys->i_pid_video = 0; - if( ( val = sout_cfg_find_value( p_mux->p_cfg, "pid-video" ) ) ) + var_Get( p_mux, SOUT_CFG_PREFIX "pid-pmt", &val ); + if (val.i_int ) { - p_sys->i_pid_video = strtol( val, NULL, 0 ); - if ( p_sys->i_pid_video > p_sys->i_pid_free ) - { - p_sys->i_pid_free = p_sys->i_pid_video + 1; - } + p_sys->pmt.i_pid = val.i_int; + } + else + { + p_sys->pmt.i_pid = 0x42; } - p_sys->i_pid_audio = 0; - if( ( val = sout_cfg_find_value( p_mux->p_cfg, "pid-audio" ) ) ) + + 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; + + var_Get( p_mux, SOUT_CFG_PREFIX "pid-video", &val ); + p_sys->i_pid_video = val.i_int; + if ( p_sys->i_pid_video > p_sys->i_pid_free ) { - p_sys->i_pid_audio = strtol( val, NULL, 0 ); - if ( p_sys->i_pid_audio > p_sys->i_pid_free ) - { - p_sys->i_pid_free = p_sys->i_pid_audio + 1; - } + 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; + 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; + if ( p_sys->i_pid_spu > p_sys->i_pid_free ) + { + p_sys->i_pid_free = p_sys->i_pid_spu + 1; } p_sys->i_pcr_pid = 0x1fff; @@ -314,16 +459,12 @@ static int Open( vlc_object_t *p_this ) p_sys->i_null_continuity_counter = 0; /* Allow to create constrained stream */ - p_sys->i_bitrate_min = 0; - p_sys->i_bitrate_max = 0; - if( ( val = sout_cfg_find_value( p_mux->p_cfg, "bmin" ) ) ) - { - p_sys->i_bitrate_min = atoll( val ); - } - if( ( val = sout_cfg_find_value( p_mux->p_cfg, "bmax" ) ) ) - { - p_sys->i_bitrate_max = atoll( val ); - } + var_Get( p_mux, SOUT_CFG_PREFIX "bmin", &val ); + p_sys->i_bitrate_min = val.i_int; + + var_Get( p_mux, SOUT_CFG_PREFIX "bmax", &val ); + p_sys->i_bitrate_max = val.i_int; + if( p_sys->i_bitrate_min > 0 && p_sys->i_bitrate_max > 0 && p_sys->i_bitrate_min > p_sys->i_bitrate_max ) { @@ -334,71 +475,64 @@ static int Open( vlc_object_t *p_this ) } if( p_sys->i_bitrate_min > 0 || p_sys->i_bitrate_max > 0 ) { - msg_Err( p_mux, "bmin and bmax no more supported (if you need them report it)" ); + msg_Err( p_mux, "bmin and bmax no more supported " + "(if you need them report it)" ); } - p_sys->i_caching_delay = 200000; - if( ( val = sout_cfg_find_value( p_mux->p_cfg, "caching" ) ) ) + var_Get( p_mux, SOUT_CFG_PREFIX "shaping", &val ); + p_sys->i_shaping_delay = (int64_t)val.i_int * 1000; + if( p_sys->i_shaping_delay <= 0 ) { - p_sys->i_caching_delay = (int64_t)atoi( val ) * 1000; - if( p_sys->i_caching_delay <= 0 ) - { - msg_Err( p_mux, - "invalid caching ("I64Fd"ms) reseting to 200ms", - p_sys->i_caching_delay / 1000 ); - p_sys->i_caching_delay = 200000; - } + msg_Err( p_mux, + "invalid shaping ("I64Fd"ms) resetting to 200ms", + p_sys->i_shaping_delay / 1000 ); + p_sys->i_shaping_delay = 200000; } - p_sys->i_pcr_delay = 30000; - if( ( val = sout_cfg_find_value( p_mux->p_cfg, "pcr" ) ) ) + + var_Get( p_mux, SOUT_CFG_PREFIX "pcr", &val ); + p_sys->i_pcr_delay = (int64_t)val.i_int * 1000; + if( p_sys->i_pcr_delay <= 0 || + p_sys->i_pcr_delay >= p_sys->i_shaping_delay ) { - p_sys->i_pcr_delay = (int64_t)atoi( val ) * 1000; - if( p_sys->i_pcr_delay <= 0 || - p_sys->i_pcr_delay >= p_sys->i_caching_delay ) - { - msg_Err( p_mux, - "invalid pcr delay ("I64Fd"ms) reseting to 30ms", - p_sys->i_pcr_delay / 1000 ); - p_sys->i_pcr_delay = 30000; - } + msg_Err( p_mux, + "invalid pcr delay ("I64Fd"ms) resetting to 30ms", + p_sys->i_pcr_delay / 1000 ); + p_sys->i_pcr_delay = 30000; } - msg_Dbg( p_mux, "caching="I64Fd" pcr="I64Fd, - p_sys->i_caching_delay, p_sys->i_pcr_delay ); + var_Get( p_mux, SOUT_CFG_PREFIX "dts-delay", &val ); + p_sys->i_dts_delay = (int64_t)val.i_int * 1000; - p_sys->i_dts_delay = 200000; - if( ( val = sout_cfg_find_value( p_mux->p_cfg, "dts-delay" ) ) ) - { - p_sys->i_dts_delay = (int64_t)atoi( val ) * 1000; - } + msg_Dbg( p_mux, "shaping="I64Fd" pcr="I64Fd" dts_delay="I64Fd, + 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; /* for TS generation */ p_sys->i_pcr = 0; p_sys->csa = NULL; - if( ( val = sout_cfg_find_value( p_mux->p_cfg, "csa-ck" ) ) ) + var_Get( p_mux, SOUT_CFG_PREFIX "csa-ck", &val ); + if( val.psz_string && *val.psz_string ) { + char *psz = val.psz_string; + /* skip 0x */ - if( val[0] == '0' && ( val[1] == 'x' || val[1] == 'X' ) ) + if( psz[0] == '0' && ( psz[1] == 'x' || psz[1] == 'X' ) ) { - val += 2; + psz += 2; } - if( strlen( val ) != 16 ) + if( strlen( psz ) != 16 ) { msg_Dbg( p_mux, "invalid csa ck (it must be 16 chars long)" ); } else { - /* Avoid using strtoll */ - uint64_t i_ck; + uint64_t i_ck = strtoull( psz, NULL, 16 ); uint8_t ck[8]; int i; - ck[0] = val[8]; - val[8] = 0; - i_ck = strtol( val, NULL, 16 ) << 32; - val[8] = ck[0]; - i_ck += strtol( &val[8], NULL, 16 ); for( i = 0; i < 8; i++ ) { ck[i] = ( i_ck >> ( 56 - 8*i) )&0xff; @@ -411,6 +545,11 @@ static int Open( vlc_object_t *p_this ) csa_SetCW( p_sys->csa, ck, ck ); } } + if( 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; + return VLC_SUCCESS; } @@ -432,17 +571,32 @@ static void Close( vlc_object_t * p_this ) } /***************************************************************************** - * Capability: + * Control: *****************************************************************************/ -static int Capability( sout_mux_t *p_mux, int i_query, void *p_args, void *p_answer ) +static int Control( sout_mux_t *p_mux, int i_query, va_list args ) { + vlc_bool_t *pb_bool; + char **ppsz; + switch( i_query ) { - case SOUT_MUX_CAP_GET_ADD_STREAM_ANY_TIME: - *(vlc_bool_t*)p_answer = VLC_TRUE; - return( SOUT_MUX_CAP_ERR_OK ); + 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; + + 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_MIME: + ppsz = (char**)va_arg( args, char ** ); + *ppsz = strdup( "video/mpeg" ); /* FIXME not sure */ + return VLC_SUCCESS; + default: - return( SOUT_MUX_CAP_ERR_UNIMPLEMENTED ); + return VLC_EGENERIC; } } @@ -454,15 +608,20 @@ 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; - p_input->p_sys = (void*)p_stream = malloc( sizeof( ts_stream_t ) ); + p_input->p_sys = p_stream = malloc( sizeof( ts_stream_t ) ); /* Init this new stream */ - p_stream->i_pid = AllocatePID( p_sys, p_input->p_fmt->i_cat ); + if ( p_sys->b_es_id_pid ) + p_stream->i_pid = p_input->p_fmt->i_id & 0x1fff; + else + 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->i_decoder_specific_info = 0; p_stream->p_decoder_specific_info = NULL; - msg_Dbg( p_mux, "adding input codec=%4.4s pid=%d", (char*)&p_input->p_fmt->i_codec, p_stream->i_pid ); + msg_Dbg( p_mux, "adding input codec=%4.4s pid=%d", + (char*)&p_input->p_fmt->i_codec, p_stream->i_pid ); /* All others fields depand on codec */ switch( p_input->p_fmt->i_cat ) @@ -481,10 +640,16 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) p_sys->i_mpeg4_streams++; p_stream->i_es_id = p_stream->i_pid; break; - /* XXX dirty dirty but somebody want that : using crapy MS-codec XXX */ + case VLC_FOURCC( 'h', '2','6', '4' ): + 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' ): @@ -508,7 +673,8 @@ 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' ): - p_stream->i_stream_type = p_input->p_fmt->audio.i_rate >= 32000 ? 0x03 : 0x04; + 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', ' ' ): @@ -520,7 +686,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) p_stream->i_stream_id = 0xbd; break; case VLC_FOURCC( 'd', 't','s', ' ' ): - p_stream->i_stream_type = 0x85; + p_stream->i_stream_type = 0x06; p_stream->i_stream_id = 0xbd; break; @@ -544,6 +710,21 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) p_stream->i_stream_type = 0x82; p_stream->i_stream_id = 0xbd; break; + case VLC_FOURCC( 's', 'u','b', 't' ): + 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'): + 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'): + p_stream->i_stream_type = 0x06; + p_stream->i_stream_id = 0xbd; /* FIXME */ + break; default: free( p_stream ); return VLC_EGENERIC; @@ -582,9 +763,7 @@ 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] ); } } @@ -600,11 +779,60 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) p_input->p_fmt->i_extra ); } + /* Create decoder specific info for subt */ + if( p_stream->i_codec == VLC_FOURCC( 's', 'u','b', 't' ) ) + { + 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 */ + } + /* Init pes chain */ BufferChainInit( &p_stream->chain_pes ); p_stream->i_pes_dts = 0; p_stream->i_pes_length = 0; p_stream->i_pes_used = 0; + p_stream->b_key_frame = 0; /* We only change PMT version (PAT isn't changed) */ p_sys->i_pmt_version_number = ( p_sys->i_pmt_version_number + 1 )%32; @@ -634,7 +862,7 @@ static int DelStream( 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; - char *val; + vlc_value_t val; p_stream = (ts_stream_t*)p_input->p_sys; msg_Dbg( p_mux, "removing input pid=%d", p_stream->i_pid ); @@ -683,28 +911,43 @@ static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input ) { free( p_stream->p_decoder_specific_info ); } - if( p_stream->i_stream_id == 0xfa || p_stream->i_stream_id == 0xfb ) + if( p_stream->i_stream_id == 0xfa || + p_stream->i_stream_id == 0xfb || + p_stream->i_stream_id == 0xfe ) { p_sys->i_mpeg4_streams--; } - if( ( val = sout_cfg_find_value( p_mux->p_cfg, "pid-video" ) ) ) + + var_Get( p_mux, SOUT_CFG_PREFIX "pid-video", &val ); + if( val.i_int > 0 ) { - int i_pid_video = strtol( val, NULL, 0 ); + int i_pid_video = val.i_int; if ( i_pid_video == p_stream->i_pid ) { p_sys->i_pid_video = i_pid_video; msg_Dbg( p_mux, "freeing video PID %d", i_pid_video ); } } - if( ( val = sout_cfg_find_value( p_mux->p_cfg, "pid-audio" ) ) ) + var_Get( p_mux, SOUT_CFG_PREFIX "pid-audio", &val ); + if( val.i_int > 0 ) { - int i_pid_audio = strtol( val, NULL, 0 ); + int i_pid_audio = val.i_int; if ( i_pid_audio == p_stream->i_pid ) { p_sys->i_pid_audio = i_pid_audio; msg_Dbg( p_mux, "freeing audio PID %d", i_pid_audio ); } } + var_Get( p_mux, SOUT_CFG_PREFIX "pid-spu", &val ); + if( val.i_int > 0 ) + { + int i_pid_spu = val.i_int; + if ( i_pid_spu == p_stream->i_pid ) + { + p_sys->i_pid_spu = i_pid_spu; + msg_Dbg( p_mux, "freeing spu PID %d", i_pid_spu ); + } + } free( p_stream ); /* We only change PMT version (PAT isn't changed) */ @@ -725,7 +968,7 @@ static int Mux( sout_mux_t *p_mux ) if( p_sys->i_pcr_pid == 0x1fff ) { - msg_Dbg( p_mux, "waiting PCR streams" ); + msg_Dbg( p_mux, "waiting for PCR streams" ); msleep( 1000 ); return VLC_SUCCESS; } @@ -738,23 +981,44 @@ static int Mux( sout_mux_t *p_mux ) int i_packet_pos; mtime_t i_pcr_dts; mtime_t i_pcr_length; + mtime_t i_shaping_delay; int i; + if( p_pcr_stream->b_key_frame ) + { + i_shaping_delay = p_pcr_stream->i_pes_length; + } + else + { + i_shaping_delay = p_sys->i_shaping_delay; + } + /* 1: get enough PES packet for all input */ for( ;; ) { vlc_bool_t b_ok = VLC_TRUE; - sout_buffer_t *p_data; + block_t *p_data; - /* Accumulate enough data in the pcr stream (>i_caching_delay) */ - /* Accumulate enough data in all other stream ( >= length of pcr) */ - for( i = 0; i < p_mux->i_nb_inputs; i++ ) + /* Accumulate enough data in the pcr stream (>i_shaping_delay) */ + /* Accumulate enough data in all other stream ( >= length of pcr)*/ + for( i = -1; i < p_mux->i_nb_inputs; i++ ) { - sout_input_t *p_input = p_mux->pp_inputs[i]; - ts_stream_t *p_stream = (ts_stream_t*)p_input->p_sys; + sout_input_t *p_input; + ts_stream_t *p_stream; + int64_t i_spu_delay = 0; - if( ( p_stream == p_pcr_stream && p_stream->i_pes_length <= p_sys->i_caching_delay ) || - p_stream->i_pes_dts + p_stream->i_pes_length < p_pcr_stream->i_pes_dts + p_pcr_stream->i_pes_length ) + if( i == -1 ) + p_input = p_sys->p_pcr_input; + else if( p_mux->pp_inputs[i]->p_sys == p_pcr_stream ) + continue; + else + 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 ) { /* Need more data */ if( p_input->p_fifo->i_depth <= 1 ) @@ -770,46 +1034,139 @@ static int Mux( sout_mux_t *p_mux ) /* spu, only one packet is needed */ continue; } + else + { + /* Don't mux the SPU yet if it is too early */ + block_t *p_spu = block_FifoShow( p_input->p_fifo ); + + 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) ) + continue; + + if ( i_spu_delay >= I64C(100000000) + || i_spu_delay < 10000 ) + { + BufferChainClean( p_mux->p_sout, + &p_stream->chain_pes ); + p_stream->i_pes_dts = 0; + p_stream->i_pes_used = 0; + p_stream->i_pes_length = 0; + continue; + } + } } b_ok = VLC_FALSE; - p_data = sout_FifoGet( p_input->p_fifo ); - if( p_input->p_fifo->i_depth > 0 ) - { - sout_buffer_t *p_next = sout_FifoShow( p_input->p_fifo ); + if( p_stream == p_pcr_stream + || 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 && + 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 + p_data->i_length = 1000; - if( ( p_pcr_stream->i_pes_dts > 0 && p_data->i_dts - 2000000 > p_pcr_stream->i_pes_dts + p_pcr_stream->i_pes_length ) || + if( ( p_pcr_stream->i_pes_dts > 0 && + p_data->i_dts - 10000000 > p_pcr_stream->i_pes_dts + + p_pcr_stream->i_pes_length ) || p_data->i_dts < p_stream->i_pes_dts || - ( p_stream->i_pes_dts > 0 && p_data->i_dts - 2000000 > p_stream->i_pes_dts + p_stream->i_pes_length ) ) + ( p_stream->i_pes_dts > 0 && + p_input->p_fmt->i_cat != SPU_ES && + p_data->i_dts - 10000000 > p_stream->i_pes_dts + + p_stream->i_pes_length ) ) { - msg_Warn( p_mux, "packet with too strange dts (dts=%lld,old=%lld,pcr=%lld)", - p_data->i_dts, - p_stream->i_pes_dts, + msg_Warn( p_mux, "packet with too strange dts " + "(dts="I64Fd",old="I64Fd",pcr="I64Fd")", + p_data->i_dts, p_stream->i_pes_dts, p_pcr_stream->i_pes_dts ); - sout_BufferDelete( p_mux->p_sout, p_data ); + block_Release( p_data ); - BufferChainClean( p_mux->p_sout, &p_stream->chain_pes ); + BufferChainClean( p_mux->p_sout, + &p_stream->chain_pes ); p_stream->i_pes_dts = 0; p_stream->i_pes_used = 0; p_stream->i_pes_length = 0; - BufferChainClean( p_mux->p_sout, &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; - + if( p_input->p_fmt->i_cat != SPU_ES ) + { + BufferChainClean( p_mux->p_sout, + &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; + } } else { - if( p_data->i_length < 0 || p_data->i_length > 2000000 ) + int i_header_size = 0; + int b_data_alignment = 0; + if( p_input->p_fmt->i_cat == SPU_ES ) { - /* FIXME choose a better value, but anyway we should never - * have to do that */ + if( p_input->p_fmt->i_codec == + VLC_FOURCC('s','u','b','t') ) + { + /* Prepend header */ + p_data = block_Realloc( p_data, 2, + p_data->i_buffer ); + p_data->p_buffer[0] = + ( (p_data->i_buffer - 2) >> 8) & 0xff; + p_data->p_buffer[1] = + ( (p_data->i_buffer - 2) ) & 0xff; + + /* remove trailling \0 if any */ + if( p_data->i_buffer > 2 && + p_data->p_buffer[p_data->i_buffer -1] == + '\0' ) + p_data->i_buffer--; + + /* Append a empty sub (sub text only) */ + if( p_data->i_length > 0 && + !( p_data->i_buffer == 1 && + *p_data->p_buffer == ' ' ) ) + { + block_t *p_spu = block_New( p_mux, 3 ); + + p_spu->i_dts = p_spu->i_pts = + p_data->i_dts + p_data->i_length; + p_spu->i_length = 1000; + + p_spu->p_buffer[0] = 0; + p_spu->p_buffer[1] = 1; + p_spu->p_buffer[2] = ' '; + + E_(EStoPES)( p_mux->p_sout, &p_spu, p_spu, + p_input->p_fmt, + p_stream->i_stream_id, 1, + 0, 0, 0 ); + p_data->p_next = p_spu; + } + } + else if( p_input->p_fmt->i_codec == + VLC_FOURCC('t','e','l','x') ) + { + /* EN 300 472 */ + i_header_size = 0x24; + b_data_alignment = 1; + } + } + else if( p_data->i_length < 0 || + p_data->i_length > 2000000 ) + { + /* FIXME choose a better value, but anyway we + * should never have to do that */ p_data->i_length = 1000; } + p_stream->i_pes_length += p_data->i_length; if( p_stream->i_pes_dts == 0 ) { @@ -817,9 +1174,27 @@ static int Mux( sout_mux_t *p_mux ) } /* Convert to pes */ - E_( EStoPES )( p_mux->p_sout, &p_data, p_data, p_stream->i_stream_id, 1 ); + if( p_stream->i_stream_id == 0xa0 && + p_data->i_pts <= 0 ) + { + /* XXX yes I know, it's awfull, 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, + p_input->p_fmt, p_stream->i_stream_id, + 1, b_data_alignment, i_header_size, 0 ); BufferChainAppend( &p_stream->chain_pes, p_data ); + + if( p_sys->b_use_key_frames && p_stream == p_pcr_stream + && (p_data->i_flags & BLOCK_FLAG_TYPE_I) + && !(p_data->i_flags & BLOCK_FLAG_NO_KEYFRAME) + && (p_stream->i_pes_length > 400000) ) + { + i_shaping_delay = p_stream->i_pes_length; + p_stream->b_key_frame = 1; + } } } } @@ -833,6 +1208,7 @@ static int Mux( sout_mux_t *p_mux ) /* save */ i_pcr_dts = p_pcr_stream->i_pes_dts; i_pcr_length = p_pcr_stream->i_pes_length; + p_pcr_stream->b_key_frame = 0; /* msg_Dbg( p_mux, "starting muxing %lldms", i_pcr_length / 1000 ); */ /* 2: calculate non accurate total size of muxed ts */ @@ -840,33 +1216,35 @@ static int Mux( sout_mux_t *p_mux ) for( i = 0; i < p_mux->i_nb_inputs; i++ ) { ts_stream_t *p_stream = (ts_stream_t*)p_mux->pp_inputs[i]->p_sys; - sout_buffer_t *p_pes; + block_t *p_pes; - /* False for pcr stream but it will be eough to do PCR algo */ - for( p_pes = p_stream->chain_pes.p_first; p_pes != NULL; p_pes = p_pes->p_next ) + /* False for pcr stream but it will be enough to do PCR algo */ + for( p_pes = p_stream->chain_pes.p_first; p_pes != NULL; + p_pes = p_pes->p_next ) { - int i_size = p_pes->i_size; - if( p_pes->i_dts + p_pes->i_length > p_pcr_stream->i_pes_dts + p_pcr_stream->i_pes_length ) + int i_size = p_pes->i_buffer; + if( p_pes->i_dts + p_pes->i_length > + p_pcr_stream->i_pes_dts + p_pcr_stream->i_pes_length ) { - mtime_t i_frag = p_pcr_stream->i_pes_dts + p_pcr_stream->i_pes_length - p_pes->i_dts; + mtime_t i_frag = p_pcr_stream->i_pes_dts + + p_pcr_stream->i_pes_length - p_pes->i_dts; if( i_frag < 0 ) { /* Next stream */ break; } - i_size = p_pes->i_size * i_frag / p_pes->i_length; + i_size = p_pes->i_buffer * i_frag / p_pes->i_length; } i_packet_count += ( i_size + 183 ) / 184; } } /* add overhead for PCR (not really exact) */ - i_packet_count += ( 8 * i_pcr_length / p_sys->i_pcr_delay + 175 ) / 176; - + i_packet_count += (8 * i_pcr_length / p_sys->i_pcr_delay + 175) / 176; /* 3: mux PES into TS */ BufferChainInit( &chain_ts ); /* append PAT/PMT -> FIXME with big pcr delay it won't have enough pat/pmt */ - GetPAT( p_mux, &chain_ts); + GetPAT( p_mux, &chain_ts ); GetPMT( p_mux, &chain_ts ); i_packet_pos = 0; i_packet_count += chain_ts.i_depth; @@ -877,12 +1255,14 @@ static int Mux( sout_mux_t *p_mux ) int i_stream; mtime_t i_dts; ts_stream_t *p_stream; - sout_buffer_t *p_ts; + sout_input_t *p_input; + block_t *p_ts; vlc_bool_t b_pcr; - /* Select stream (lowest dts)*/ + /* 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 ) @@ -897,7 +1277,7 @@ static int Mux( sout_mux_t *p_mux ) i_dts = p_stream->i_pes_dts; } } - if( i_stream == -1 ) + if( i_stream == -1 || i_dts > i_pcr_dts + i_pcr_length ) { break; } @@ -906,17 +1286,20 @@ static int Mux( sout_mux_t *p_mux ) /* do we need to issue pcr */ b_pcr = VLC_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 ) + 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; - p_sys->i_pcr = i_pcr_dts + i_packet_pos * i_pcr_length / i_packet_count; + p_sys->i_pcr = i_pcr_dts + i_packet_pos * + i_pcr_length / i_packet_count; } /* Build the TS packet */ p_ts = TSNew( p_mux, p_stream, b_pcr ); - if( p_sys->csa ) + if( p_sys->csa != NULL && + (p_input->p_fmt->i_cat != AUDIO_ES || p_sys->b_crypt_audio) ) { - p_ts->i_flags |= SOUT_BUFFER_FLAGS_PRIVATE_CSA; + p_ts->i_flags |= BLOCK_FLAG_SCRAMBLED; } i_packet_pos++; @@ -925,37 +1308,193 @@ static int Mux( sout_mux_t *p_mux ) } /* 4: date and send */ - i_packet_count = chain_ts.i_depth; - /* msg_Dbg( p_mux, "real pck=%d", i_packet_count ); */ - for( i = 0; i < i_packet_count; i++ ) + TSSchedule( p_mux, &chain_ts, i_pcr_length, i_pcr_dts ); + } +} + +#define STD_PES_PAYLOAD 170 +static block_t *FixPES( sout_mux_t *p_mux, block_fifo_t *p_fifo ) +{ + block_t *p_data; + int i_size; + + p_data = block_FifoShow( p_fifo ); + i_size = p_data->i_buffer; + + if( i_size == STD_PES_PAYLOAD ) + { + return block_FifoGet( 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_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 + / p_data->i_buffer; + p_data->i_buffer -= STD_PES_PAYLOAD; + p_data->p_buffer += STD_PES_PAYLOAD; + p_data->i_pts += p_new->i_length; + p_data->i_dts += p_new->i_length; + p_data->i_length -= p_new->i_length; + p_data->i_flags |= BLOCK_FLAG_NO_KEYFRAME; + return p_new; + } + else + { + block_t *p_next; + p_data = block_FifoGet( p_fifo ); + p_data = block_Realloc( p_data, 0, STD_PES_PAYLOAD ); + p_next = block_FifoShow( p_fifo ); + if ( p_data->i_flags & BLOCK_FLAG_NO_KEYFRAME ) { - sout_buffer_t *p_ts = BufferChainGet( &chain_ts ); + p_data->i_flags &= ~BLOCK_FLAG_NO_KEYFRAME; + p_data->i_pts = p_next->i_pts; + p_data->i_dts = p_next->i_dts; + } + p_mux->p_vlc->pf_memcpy( &p_data->p_buffer[i_size], p_next->p_buffer, + STD_PES_PAYLOAD - i_size ); + p_next->i_pts += p_next->i_length * (STD_PES_PAYLOAD - i_size) + / p_next->i_buffer; + p_next->i_dts += p_next->i_length * (STD_PES_PAYLOAD - i_size) + / p_next->i_buffer; + p_next->i_length -= p_next->i_length * (STD_PES_PAYLOAD - i_size) + / p_next->i_buffer; + p_next->i_buffer -= STD_PES_PAYLOAD - i_size; + p_next->p_buffer += STD_PES_PAYLOAD - i_size; + p_next->i_flags |= BLOCK_FLAG_NO_KEYFRAME; + return p_data; + } +} - p_ts->i_dts = i_pcr_dts + i_pcr_length * i / i_packet_count; - p_ts->i_length = i_pcr_length / i_packet_count; +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 ) +{ + sout_mux_sys_t *p_sys = p_mux->p_sys; + sout_buffer_chain_t new_chain; + int i_packet_count = p_chain_ts->i_depth; + int i; - if( p_ts->i_flags&SOUT_BUFFER_FLAGS_PRIVATE_PCR ) - { - /* msg_Dbg( p_mux, "pcr=%lld ms", p_ts->i_dts / 1000 ); */ - TSSetPCR( p_ts, p_ts->i_dts - p_sys->i_dts_delay ); - } - if( p_ts->i_flags&SOUT_BUFFER_FLAGS_PRIVATE_CSA ) + BufferChainInit( &new_chain ); + + if ( i_pcr_length <= 0 ) + { + i_pcr_length = i_packet_count; + } + + for( i = 0; i < i_packet_count; i++ ) + { + block_t *p_ts = BufferChainGet( p_chain_ts ); + mtime_t i_new_dts = i_pcr_dts + i_pcr_length * i / i_packet_count; + + BufferChainAppend( &new_chain, p_ts ); + + if( p_ts->i_dts && + p_ts->i_dts + p_sys->i_dts_delay * 2/3 < i_new_dts ) + { + mtime_t i_max_diff = i_new_dts - p_ts->i_dts; + mtime_t i_cut_dts = p_ts->i_dts; + + p_ts = BufferChainPeek( p_chain_ts ); + i++; + i_new_dts = i_pcr_dts + i_pcr_length * i / i_packet_count; + while ( p_ts != NULL && i_new_dts - p_ts->i_dts >= i_max_diff ) { - csa_Encrypt( p_sys->csa, p_ts->p_buffer, 0 ); + p_ts = BufferChainGet( p_chain_ts ); + i_max_diff = i_new_dts - p_ts->i_dts; + i_cut_dts = p_ts->i_dts; + BufferChainAppend( &new_chain, p_ts ); + + p_ts = BufferChainPeek( 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)", + i_cut_dts - i_pcr_dts, i_pcr_length, new_chain.i_depth, + p_chain_ts->i_depth ); + if ( new_chain.i_depth ) + TSDate( p_mux, &new_chain, + i_cut_dts - i_pcr_dts, + i_pcr_dts ); + if ( p_chain_ts->i_depth ) + TSSchedule( p_mux, + p_chain_ts, i_pcr_dts + i_pcr_length - i_cut_dts, + i_cut_dts ); + return; + } + } + + if ( new_chain.i_depth ) + TSDate( p_mux, &new_chain, i_pcr_length, i_pcr_dts ); +} + +static void TSDate( sout_mux_t *p_mux, sout_buffer_chain_t *p_chain_ts, + mtime_t i_pcr_length, mtime_t i_pcr_dts ) +{ + sout_mux_sys_t *p_sys = p_mux->p_sys; + int i_packet_count = p_chain_ts->i_depth; + int i; + + if ( i_pcr_length / 1000 > 0 ) + { + int i_bitrate = ((uint64_t)i_packet_count * 188 * 8000) + / (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)", + 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)", + i_pcr_dts + p_sys->i_shaping_delay * 3 / 2 - mdate(), + i_bitrate, i_packet_count, i_pcr_length); + } +#endif + } + else + { + /* This shouldn't happen, but happens in some rare heavy load + * and packet losses conditions. */ + i_pcr_length = i_packet_count; + } - /* latency */ - p_ts->i_dts += 3*p_sys->i_caching_delay/2; + /* msg_Dbg( p_mux, "real pck=%d", i_packet_count ); */ + for( i = 0; i < i_packet_count; i++ ) + { + block_t *p_ts = BufferChainGet( p_chain_ts ); + mtime_t i_new_dts = i_pcr_dts + i_pcr_length * i / i_packet_count; + + p_ts->i_dts = i_new_dts; + p_ts->i_length = i_pcr_length / i_packet_count; - sout_AccessOutWrite( p_mux->p_access, p_ts ); + if( p_ts->i_flags & BLOCK_FLAG_CLOCK ) + { + /* msg_Dbg( p_mux, "pcr=%lld ms", p_ts->i_dts / 1000 ); */ + TSSetPCR( p_ts, p_ts->i_dts - p_sys->i_dts_delay ); } + if( p_ts->i_flags & BLOCK_FLAG_SCRAMBLED ) + { + csa_Encrypt( p_sys->csa, p_ts->p_buffer, 0 ); + } + + /* latency */ + p_ts->i_dts += p_sys->i_shaping_delay * 3 / 2; + + sout_AccessOutWrite( p_mux->p_access, p_ts ); } } -static sout_buffer_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, + vlc_bool_t b_pcr ) { - sout_buffer_t *p_pes = p_stream->chain_pes.p_first; - sout_buffer_t *p_ts; + 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; @@ -967,19 +1506,23 @@ static sout_buffer_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, vlc_bool_ { b_new_pes = VLC_TRUE; } - i_payload = __MIN( (int)p_pes->i_size - p_stream->i_pes_used, i_payload_max ); + 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; } - p_ts = sout_BufferNew( p_mux->p_sout, 188 ); + p_ts = block_New( p_mux, 188 ); + p_ts->i_dts = p_pes->i_dts; p_ts->p_buffer[0] = 0x47; - p_ts->p_buffer[1] = ( b_new_pes ? 0x40 : 0x00 )|( ( p_stream->i_pid >> 8 )&0x1f ); + p_ts->p_buffer[1] = ( b_new_pes ? 0x40 : 0x00 ) | + ( ( p_stream->i_pid >> 8 )&0x1f ); p_ts->p_buffer[2] = p_stream->i_pid & 0xff; - p_ts->p_buffer[3] = ( b_adaptation_field ? 0x30 : 0x10 )|p_stream->i_continuity_counter; + p_ts->p_buffer[3] = ( b_adaptation_field ? 0x30 : 0x10 ) | + p_stream->i_continuity_counter; p_stream->i_continuity_counter = (p_stream->i_continuity_counter+1)%16; @@ -991,7 +1534,7 @@ static sout_buffer_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, vlc_bool_ { int i_stuffing = i_payload_max - i_payload; - p_ts->i_flags |= SOUT_BUFFER_FLAGS_PRIVATE_PCR; + p_ts->i_flags |= BLOCK_FLAG_CLOCK; p_ts->p_buffer[4] = 7 + i_stuffing; p_ts->p_buffer[5] = 0x10; /* flags */ @@ -999,7 +1542,7 @@ static sout_buffer_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, vlc_bool_ p_ts->p_buffer[7] = ( 0 )&0xff; p_ts->p_buffer[8] = ( 0 )&0xff; p_ts->p_buffer[9] = ( 0 )&0xff; - p_ts->p_buffer[10]= ( 0 )&0x80; + p_ts->p_buffer[10]= ( ( 0 )&0x80 ) | 0x7e; p_ts->p_buffer[11]= 0; for( i = 12; i < 12 + i_stuffing; i++ ) @@ -1024,16 +1567,18 @@ static sout_buffer_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, vlc_bool_ } /* copy payload */ - memcpy( &p_ts->p_buffer[188 - i_payload], &p_pes->p_buffer[p_stream->i_pes_used], i_payload ); + memcpy( &p_ts->p_buffer[188 - i_payload], + &p_pes->p_buffer[p_stream->i_pes_used], i_payload ); p_stream->i_pes_used += i_payload; - p_stream->i_pes_dts = p_pes->i_dts + p_pes->i_length * p_stream->i_pes_used / p_pes->i_size; - p_stream->i_pes_length -= p_pes->i_length * i_payload / p_pes->i_size; + p_stream->i_pes_dts = p_pes->i_dts + p_pes->i_length * + p_stream->i_pes_used / p_pes->i_buffer; + p_stream->i_pes_length -= p_pes->i_length * i_payload / p_pes->i_buffer; - if( p_stream->i_pes_used >= (int)p_pes->i_size ) + if( p_stream->i_pes_used >= (int)p_pes->i_buffer ) { p_pes = BufferChainGet( &p_stream->chain_pes ); - sout_BufferDelete( p_mux->p_sout, p_pes ); + block_Release( p_pes ); p_pes = p_stream->chain_pes.p_first; if( p_pes ) @@ -1059,7 +1604,7 @@ static sout_buffer_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, vlc_bool_ } -static void TSSetPCR( sout_buffer_t *p_ts, mtime_t i_dts ) +static void TSSetPCR( block_t *p_ts, mtime_t i_dts ) { mtime_t i_pcr = 9 * i_dts / 100; @@ -1071,7 +1616,9 @@ static void TSSetPCR( sout_buffer_t *p_ts, mtime_t i_dts ) } #if 0 -static void TSSetConstraints( sout_mux_t *p_mux, sout_buffer_chain_t *c, mtime_t i_length, int i_bitrate_min, int i_bitrate_max ) +static void TSSetConstraints( sout_mux_t *p_mux, sout_buffer_chain_t *c, + mtime_t i_length, int i_bitrate_min, + int i_bitrate_max ) { sout_mux_sys_t *p_sys = p_mux->p_sys; sout_buffer_chain_t s = *c; @@ -1091,7 +1638,7 @@ static void TSSetConstraints( sout_mux_t *p_mux, sout_buffer_chain_t *c, mtime_t if( i_packets < i_packets_min && i_packets_min > 0 ) { - sout_buffer_t *p_pk; + block_t *p_pk; int i_div = ( i_packets_min - i_packets ) / i_packets; int i_mod = ( i_packets_min - i_packets ) % i_packets; int i_rest = 0; @@ -1113,7 +1660,7 @@ static void TSSetConstraints( sout_mux_t *p_mux, sout_buffer_chain_t *c, mtime_t for( i = 0; i < i_null; i++ ) { - sout_buffer_t *p_null; + block_t *p_null; p_null = sout_BufferNew( p_mux->p_sout, 188 ); p_null->p_buffer[0] = 0x47; @@ -1132,7 +1679,7 @@ static void TSSetConstraints( sout_mux_t *p_mux, sout_buffer_chain_t *c, mtime_t } else if( i_packets > i_packets_max && i_packets_max > 0 ) { - sout_buffer_t *p_pk; + block_t *p_pk; int i; /* Arg, we need to drop packets, I don't do something clever (like @@ -1157,7 +1704,7 @@ static void TSSetConstraints( sout_mux_t *p_mux, sout_buffer_chain_t *c, mtime_t #endif static void PEStoTS( sout_instance_t *p_sout, - sout_buffer_chain_t *c, sout_buffer_t *p_pes, + sout_buffer_chain_t *c, block_t *p_pes, ts_stream_t *p_stream ) { uint8_t *p_data; @@ -1165,7 +1712,7 @@ static void PEStoTS( sout_instance_t *p_sout, int b_new_pes; /* get PES total size */ - i_size = p_pes->i_size; + i_size = p_pes->i_buffer; p_data = p_pes->p_buffer; b_new_pes = VLC_TRUE; @@ -1174,9 +1721,9 @@ static void PEStoTS( sout_instance_t *p_sout, { int b_adaptation_field; int i_copy; - sout_buffer_t *p_ts; + block_t *p_ts; - p_ts = sout_BufferNew( p_sout, 188 ); + p_ts = block_New( p_sout, 188 ); /* write header * 8b 0x47 sync byte * 1b transport_error_indicator @@ -1225,17 +1772,17 @@ static void PEStoTS( sout_instance_t *p_sout, if( i_size <= 0 ) { - sout_buffer_t *p_next = p_pes->p_next; + block_t *p_next = p_pes->p_next; p_pes->p_next = NULL; - sout_BufferDelete( p_sout, p_pes ); + block_Release( p_pes ); if( p_next == NULL ) { break; } b_new_pes = VLC_TRUE; p_pes = p_next; - i_size = p_pes->i_size; + i_size = p_pes->i_buffer; p_data = p_pes->p_buffer; } } @@ -1243,190 +1790,10 @@ static void PEStoTS( sout_instance_t *p_sout, return; } -#if defined MODULE_NAME_IS_mux_ts -static uint32_t CalculateCRC( uint8_t *p_begin, int i_count ) -{ - static uint32_t CRC32[256] = - { - 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, - 0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005, - 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61, - 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, - 0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9, - 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75, - 0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, - 0x791d4014, 0x7ddc5da3, 0x709f7b7a, 0x745e66cd, - 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039, - 0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, - 0xbe2b5b58, 0xbaea46ef, 0xb7a96036, 0xb3687d81, - 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d, - 0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, - 0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95, - 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, - 0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, - 0x34867077, 0x30476dc0, 0x3d044b19, 0x39c556ae, - 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072, - 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, - 0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca, - 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde, - 0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, - 0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1, 0x53dc6066, - 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba, - 0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, - 0xbfa1b04b, 0xbb60adfc, 0xb6238b25, 0xb2e29692, - 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6, - 0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, - 0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e, - 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, - 0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, - 0xd5b88683, 0xd1799b34, 0xdc3abded, 0xd8fba05a, - 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637, - 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, - 0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f, - 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53, - 0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, - 0x36194d42, 0x32d850f5, 0x3f9b762c, 0x3b5a6b9b, - 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff, - 0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, - 0xf12f560e, 0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7, - 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b, - 0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, - 0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3, - 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, - 0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, - 0x9b3660c6, 0x9ff77d71, 0x92b45ba8, 0x9675461f, - 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3, - 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, - 0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c, - 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8, - 0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, - 0x119b4be9, 0x155a565e, 0x18197087, 0x1cd86d30, - 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec, - 0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, - 0x2497d08d, 0x2056cd3a, 0x2d15ebe3, 0x29d4f654, - 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0, - 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, - 0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18, - 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, - 0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, - 0x9abc8bd5, 0x9e7d9662, 0x933eb0bb, 0x97ffad0c, - 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668, - 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4 - }; - - uint32_t i_crc = 0xffffffff; - - /* Calculate the CRC */ - while( i_count > 0 ) - { - i_crc = (i_crc<<8) ^ CRC32[ (i_crc>>24) ^ ((uint32_t)*p_begin) ]; - p_begin++; - i_count--; - } - - return( i_crc ); -} - -static void GetPAT( sout_mux_t *p_mux, - sout_buffer_chain_t *c ) -{ - sout_mux_sys_t *p_sys = p_mux->p_sys; - sout_buffer_t *p_pat; - bits_buffer_t bits; - - p_pat = sout_BufferNew( p_mux->p_sout, 1024 ); - - p_pat->i_pts = 0; - p_pat->i_dts = 0; - p_pat->i_length = 0; - - bits_initwrite( &bits, 1024, p_pat->p_buffer ); - - bits_write( &bits, 8, 0 ); // pointer - bits_write( &bits, 8, 0x00 ); // table id - bits_write( &bits, 1, 1 ); // section_syntax_indicator - bits_write( &bits, 1, 0 ); // 0 - bits_write( &bits, 2, 0x03 ); // reserved FIXME - bits_write( &bits, 12, 13 ); // XXX for one program only XXX - bits_write( &bits, 16, 0x01 ); // FIXME stream id - bits_write( &bits, 2, 0x03 ); // FIXME - bits_write( &bits, 5, p_sys->i_pat_version_number ); - bits_write( &bits, 1, 1 ); // current_next_indicator - bits_write( &bits, 8, 0 ); // section number - bits_write( &bits, 8, 0 ); // last section number - - bits_write( &bits, 16, 1 ); // program number - bits_write( &bits, 3, 0x07 ); // reserved - bits_write( &bits, 13, p_sys->pmt.i_pid ); // program map pid - - bits_write( &bits, 32, CalculateCRC( bits.p_data + 1, bits.i_data - 1) ); - - p_pat->i_size = bits.i_data; - - PEStoTS( p_mux->p_sout, c, p_pat, &p_sys->pat ); -} - -static void GetPMT( sout_mux_t *p_mux, - sout_buffer_chain_t *c ) -{ - sout_mux_sys_t *p_sys = p_mux->p_sys; - sout_buffer_t *p_pmt; - bits_buffer_t bits; - int i_stream; - - p_pmt = sout_BufferNew( p_mux->p_sout, 1024 ); - - p_pmt->i_pts = 0; - p_pmt->i_dts = 0; - p_pmt->i_length = 0; - - bits_initwrite( &bits, 1024, p_pmt->p_buffer ); - - bits_write( &bits, 8, 0 ); // pointer - bits_write( &bits, 8, 0x02 ); // table id - bits_write( &bits, 1, 1 ); // section_syntax_indicator - bits_write( &bits, 1, 0 ); // 0 - bits_write( &bits, 2, 0 ); // reserved FIXME - bits_write( &bits, 12, 13 + 5 * p_mux->i_nb_inputs ); - bits_write( &bits, 16, 1 ); // FIXME program number - bits_write( &bits, 2, 0 ); // FIXME - bits_write( &bits, 5, p_sys->i_pmt_version_number ); - bits_write( &bits, 1, 1 ); // current_next_indicator - bits_write( &bits, 8, 0 ); // section number - bits_write( &bits, 8, 0 ); // last section number - - bits_write( &bits, 3, 0 ); // reserved - - bits_write( &bits, 13, p_sys->i_pcr_pid ); // FIXME FXIME PCR_PID FIXME - bits_write( &bits, 4, 0 ); // reserved FIXME - - bits_write( &bits, 12, 0 ); // program info len FIXME - - 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; - - bits_write( &bits, 8, p_stream->i_stream_type ); // stream_type - bits_write( &bits, 3, 0 ); // reserved - bits_write( &bits, 13, p_stream->i_pid ); // es pid - bits_write( &bits, 4, 0 ); //reserved - bits_write( &bits, 12, 0 ); // es info len FIXME - } - - bits_write( &bits, 32, CalculateCRC( bits.p_data + 1, bits.i_data - 1) ); - - p_pmt->i_size = bits.i_data; - - PEStoTS( p_mux->p_sout, c, p_pmt, &p_sys->pmt ); -} -#elif defined MODULE_NAME_IS_mux_ts_dvbpsi - -static sout_buffer_t *WritePSISection( sout_instance_t *p_sout, +static block_t *WritePSISection( sout_instance_t *p_sout, dvbpsi_psi_section_t* p_section ) { - sout_buffer_t *p_psi, *p_first = NULL; + block_t *p_psi, *p_first = NULL; while( p_section ) @@ -1436,18 +1803,18 @@ static sout_buffer_t *WritePSISection( sout_instance_t *p_sout, i_size = (uint32_t)( p_section->p_payload_end - p_section->p_data )+ ( p_section->b_syntax_indicator ? 4 : 0 ); - p_psi = sout_BufferNew( p_sout, i_size + 1 ); + p_psi = block_New( p_sout, i_size + 1 ); p_psi->i_pts = 0; p_psi->i_dts = 0; p_psi->i_length = 0; - p_psi->i_size = i_size + 1; + p_psi->i_buffer = i_size + 1; p_psi->p_buffer[0] = 0; // pointer memcpy( p_psi->p_buffer + 1, p_section->p_data, i_size ); - sout_BufferChain( &p_first, p_psi ); + block_ChainAppend( &p_first, p_psi ); p_section = p_section->p_next; } @@ -1459,17 +1826,15 @@ static void GetPAT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) { sout_mux_sys_t *p_sys = p_mux->p_sys; - sout_buffer_t *p_pat; + block_t *p_pat; dvbpsi_pat_t pat; dvbpsi_psi_section_t *p_section; - dvbpsi_InitPAT( &pat, - 0x01, // i_ts_id - p_sys->i_pat_version_number, + 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, - 1, // i_number + p_sys->i_pmt_program_number, // i_number p_sys->pmt.i_pid ); // i_pid p_section = dvbpsi_GenPATSections( &pat, @@ -1485,7 +1850,7 @@ static void GetPAT( sout_mux_t *p_mux, static uint32_t GetDescriptorLength24b( int i_length ) { - uint32_t i_l1, i_l2, i_l3; + uint32_t i_l1, i_l2, i_l3; i_l1 = i_length&0x7f; i_l2 = ( i_length >> 7 )&0x7f; @@ -1498,7 +1863,7 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) { sout_mux_sys_t *p_sys = p_mux->p_sys; - sout_buffer_t *p_pmt; + block_t *p_pmt; dvbpsi_pmt_t pmt; dvbpsi_pmt_es_t *p_es; @@ -1507,7 +1872,7 @@ static void GetPMT( sout_mux_t *p_mux, int i_stream; dvbpsi_InitPMT( &pmt, - 0x01, // program number + p_sys->i_pmt_program_number, // program number p_sys->i_pmt_version_number, 1, // b_current_next p_sys->i_pcr_pid ); @@ -1524,13 +1889,16 @@ static void GetPMT( sout_mux_t *p_mux, memset( iod, 0, 4096 ); bits_initwrite( &bits, 4096, iod ); + // IOD_label_scope + bits_write( &bits, 8, 0x11 ); // IOD_label bits_write( &bits, 8, 0x01 ); // InitialObjectDescriptor bits_align( &bits ); bits_write( &bits, 8, 0x02 ); // tag bits_fix_IOD = bits; // save states to fix length later - bits_write( &bits, 24, GetDescriptorLength24b( 0 ) ); // variable length (fixed later) + bits_write( &bits, 24, + GetDescriptorLength24b( 0 ) ); // variable length (fixed later) bits_write( &bits, 10, 0x01 ); // ObjectDescriptorID bits_write( &bits, 1, 0x00 ); // URL Flag bits_write( &bits, 1, 0x00 ); // includeInlineProfileLevelFlag @@ -1545,21 +1913,24 @@ static void GetPMT( sout_mux_t *p_mux, ts_stream_t *p_stream; p_stream = (ts_stream_t*)p_mux->pp_inputs[i_stream]->p_sys; - if( p_stream->i_stream_id == 0xfa || p_stream->i_stream_id == 0xfb ) + if( p_stream->i_stream_id == 0xfa || + p_stream->i_stream_id == 0xfb || + p_stream->i_stream_id == 0xfe ) { bits_buffer_t bits_fix_ESDescr, bits_fix_Decoder; /* ES descriptor */ bits_align( &bits ); bits_write( &bits, 8, 0x03 ); // ES_DescrTag bits_fix_ESDescr = bits; - bits_write( &bits, 24, GetDescriptorLength24b( 0 ) ); // variable size + bits_write( &bits, 24, + GetDescriptorLength24b( 0 ) ); // variable size 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 bits_write( &bits, 5, 0x1f ); // streamPriority - // DecoderConfigDesciptor + // DecoderConfigDesciptor bits_align( &bits ); bits_write( &bits, 8, 0x04 ); // DecoderConfigDescrTag bits_fix_Decoder = bits; @@ -1569,17 +1940,29 @@ static void GetPMT( sout_mux_t *p_mux, bits_write( &bits, 8, 0x20 ); // Visual 14496-2 bits_write( &bits, 6, 0x04 ); // VisualStream } - else if( p_stream->i_stream_type == 0x11 ) + else if( p_stream->i_stream_type == 0x1b ) + { + 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 ) { 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') ) + { + bits_write( &bits, 8, 0x0B ); // Text Stream + bits_write( &bits, 6, 0x04 ); // VisualStream + } else { bits_write( &bits, 8, 0x00 ); bits_write( &bits, 6, 0x00 ); - msg_Err( p_mux->p_sout,"Unsupported stream_type => broken IOD"); + msg_Err( p_mux->p_sout,"Unsupported stream_type => " + "broken IOD" ); } bits_write( &bits, 1, 0x00 ); // UpStream bits_write( &bits, 1, 0x01 ); // reserved @@ -1593,16 +1976,18 @@ static void GetPMT( sout_mux_t *p_mux, // DecoderSpecificInfo bits_align( &bits ); bits_write( &bits, 8, 0x05 ); // tag - bits_write( &bits, 24, - GetDescriptorLength24b( p_stream->i_decoder_specific_info ) ); + bits_write( &bits, 24, GetDescriptorLength24b( + p_stream->i_decoder_specific_info ) ); for( i = 0; i < p_stream->i_decoder_specific_info; i++ ) { - bits_write( &bits, 8, ((uint8_t*)p_stream->p_decoder_specific_info)[i] ); + bits_write( &bits, 8, + ((uint8_t*)p_stream->p_decoder_specific_info)[i] ); } } /* fix Decoder length */ bits_write( &bits_fix_Decoder, 24, - GetDescriptorLength24b( bits.i_data - bits_fix_Decoder.i_data - 3 ) ); + GetDescriptorLength24b( bits.i_data - + bits_fix_Decoder.i_data - 3 ) ); /* SLConfigDescriptor : predifined (0x01) */ bits_align( &bits ); @@ -1617,17 +2002,16 @@ static void GetPMT( sout_mux_t *p_mux, /* fix ESDescr length */ bits_write( &bits_fix_ESDescr, 24, - GetDescriptorLength24b( bits.i_data - bits_fix_ESDescr.i_data - 3 ) ); + GetDescriptorLength24b( bits.i_data - + bits_fix_ESDescr.i_data - 3 ) ); } } bits_align( &bits ); /* fix IOD length */ 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 ); + GetDescriptorLength24b( bits.i_data - + bits_fix_IOD.i_data - 3 ) ); + dvbpsi_PMTAddDescriptor( &pmt, 0x1d, bits.i_data, bits.p_data ); } for( i_stream = 0; i_stream < p_mux->i_nb_inputs; i_stream++ ) @@ -1636,8 +2020,7 @@ static void GetPMT( sout_mux_t *p_mux, p_stream = (ts_stream_t*)p_mux->pp_inputs[i_stream]->p_sys; - p_es = dvbpsi_PMTAddES( &pmt, - p_stream->i_stream_type, + 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 ) { @@ -1650,9 +2033,8 @@ static void GetPMT( sout_mux_t *p_mux, } else if( p_stream->i_stream_type == 0xa0 ) { - uint8_t data[512]; - int i_extra = __MIN( p_stream->i_decoder_specific_info, - 502 ); + uint8_t data[512]; + int i_extra = __MIN( p_stream->i_decoder_specific_info, 502 ); /* private DIV3 descripor */ memcpy( &data[0], &p_stream->i_bih_codec, 4 ); @@ -1668,7 +2050,7 @@ static void GetPMT( sout_mux_t *p_mux, } /* 0xa0 is private */ - dvbpsi_PMTESAddDescriptor( p_es, 0xa0, i_extra + 10, data ); + dvbpsi_PMTESAddDescriptor( p_es, 0xa0, i_extra + 10, data ); } else if( p_stream->i_stream_type == 0x81 ) { @@ -1677,6 +2059,43 @@ static void GetPMT( sout_mux_t *p_mux, /* "registration" descriptor : "AC-3" */ dvbpsi_PMTESAddDescriptor( p_es, 0x05, 4, format ); } + else if( p_stream->i_codec == VLC_FOURCC('d','t','s',' ') ) + { + /* DTS registration descriptor (ETSI TS 101 154 Annex F) */ + + /* DTS format identifier, frame size 1024 - FIXME */ + 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') ) + { + dvbpsi_PMTESAddDescriptor( p_es, 0x56, + p_stream->i_decoder_specific_info, + p_stream->p_decoder_specific_info ); + } +#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 ); + continue; + } +#endif /* _DVBPSI_DR_59_H_ */ if( p_stream->lang[0] != 0 ) { @@ -1702,6 +2121,3 @@ static void GetPMT( sout_mux_t *p_mux, dvbpsi_DeletePSISections( p_section ); dvbpsi_EmptyPMT( &pmt ); } - -#endif -