* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <limits.h>
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_codecs.h>
#include <vlc_block.h>
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
#include "bits.h"
#include "pes.h"
* 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
*****************************************************************************/
#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")
#define CPKT_LONGTEXT N_("Size of the TS packet to encrypt. " \
"The encryption routines subtract the TS-header from the value before " \
#endif
#define MAX_PMT_PID 64 /* Maximum pids in each pmt. FIXME: I just chose an arbitary number. Where is the maximum in the spec? */
-vlc_module_begin();
- set_description( _("TS muxer (libdvbpsi)") );
- set_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 );
+ PMTPROG_LONGTEXT, 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 );
+ 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
};
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;
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;
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;
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;
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;
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 */
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,
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 * );
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;
psz = NULL;
}
}
- if( val.psz_string != NULL) free( val.psz_string );
+ free( val.psz_string );
p_sys->i_pat_version_number = rand() % 32;
p_sys->pat.i_pid = 0;
p_sys->pat.i_continuity_counter = 0;
- p_sys->pat.b_discontinuity = VLC_FALSE;
+ p_sys->pat.b_discontinuity = false;
var_Get( p_mux, SOUT_CFG_PREFIX "tsid", &val );
if ( val.i_int )
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 )
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 );
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 )
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;
}
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;
}
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->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 %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 );
}
+ 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;
sout_mux_sys_t *p_sys = p_mux->p_sys;
int i;
+ vlc_mutex_lock( &p_sys->csa_lock );
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 );
+ p_sys->csa = NULL;
}
+ vlc_mutex_unlock( &p_sys->csa_lock );
+
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;
- }
+ }
}
/*****************************************************************************
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 )
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;
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_FOURCC( 'd', 'r', 'a', 'c' ):
+ /* 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;
switch( p_input->p_fmt->i_codec )
{
case VLC_FOURCC( 'm', 'p','g', 'a' ):
+ case VLC_FOURCC( 'm', 'p', '3', ' ' ):
p_stream->i_stream_type =
p_input->p_fmt->audio.i_rate >= 32000 ? 0x03 : 0x04;
p_stream->i_stream_id = 0xc0;
p_stream->i_stream_id = 0xbd;
break;
case VLC_FOURCC( 'm', 'p','4', 'a' ):
- p_stream->i_stream_type = 0x11;
+ /* XXX: make that configurable in some way when LOAS
+ * is implemented for AAC in TS */
+ //p_stream->i_stream_type = 0x11; /* LOAS/LATM */
+ p_stream->i_stream_type = 0x0f; /* ADTS */
p_stream->i_stream_id = 0xfa;
p_sys->i_mpeg4_streams++;
p_stream->i_es_id = p_stream->i_pid;
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] =
{
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 );
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' ) )
{
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 */
}
/* 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 )
/* 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) */
p_spu->i_dts - p_pcr_stream->i_pes_dts;
if( ( i_spu_delay > i_shaping_delay ) &&
- ( i_spu_delay < I64C(100000000) ) )
+ ( i_spu_delay < INT64_C(100000000) ) )
continue;
- if ( ( i_spu_delay >= I64C(100000000) ) ||
- ( i_spu_delay < I64C(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;
}
}
}
- 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') )
+ {
p_data = block_FifoGet( p_input->p_fifo );
+
+ if( p_input->p_fmt->i_codec ==
+ VLC_FOURCC('m', 'p', '4', 'a' ) )
+ p_data = Add_ADTS( p_data, p_input->p_fmt );
+ }
else
p_data = FixPES( p_mux, p_input->p_fifo );
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;
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 )
{
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 );
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_FOURCC('d','r','a','c') )
+ {
+ 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 );
for( ;; )
{
- int i_stream;
- mtime_t i_dts;
- ts_stream_t *p_stream;
+ int i_stream;
+ mtime_t i_dts;
+ ts_stream_t *p_stream;
sout_input_t *p_input;
- block_t *p_ts;
- vlc_bool_t b_pcr;
+ block_t *p_ts;
+ bool b_pcr;
/* Select stream (lowest dts) */
for( i = 0, i_stream = -1, i_dts = 0; i < p_mux->i_nb_inputs; i++ )
p_input = p_mux->pp_inputs[i_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;
}
static block_t *FixPES( sout_mux_t *p_mux, block_fifo_t *p_fifo )
{
block_t *p_data;
- int i_size;
+ size_t i_size;
p_data = block_FifoShow( p_fifo );
i_size = p_data->i_buffer;
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
}
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;
}
}
+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 )
{
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 )
/ (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);
}
}
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 */
}
static block_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream,
- vlc_bool_t b_pcr )
+ bool b_pcr )
{
block_t *p_pes = p_stream->chain_pes.p_first;
block_t *p_ts;
- vlc_bool_t b_new_pes = VLC_FALSE;
- vlc_bool_t b_adaptation_field = VLC_FALSE;
+ bool b_new_pes = false;
+ bool b_adaptation_field = false;
- int i_payload_max = 184 - ( b_pcr ? 8 : 0 );
- int i_payload;
+ int i_payload_max = 184 - ( b_pcr ? 8 : 0 );
+ int i_payload;
if( p_stream->i_pes_used <= 0 )
{
- b_new_pes = VLC_TRUE;
+ b_new_pes = true;
}
i_payload = __MIN( (int)p_pes->i_buffer - p_stream->i_pes_used,
i_payload_max );
if( b_pcr || i_payload < i_payload_max )
{
- b_adaptation_field = VLC_TRUE;
+ b_adaptation_field = true;
}
p_ts = block_New( p_mux, 188 );
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;
i_size = p_pes->i_buffer;
p_data = p_pes->p_buffer;
- b_new_pes = VLC_TRUE;
+ b_new_pes = true;
for( ;; )
{
*/
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 )|
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 )
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++ )
{
{
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;
#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 );
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 */
/* "registration" descriptor : "AC-3" */
dvbpsi_PMTESAddDescriptor( p_es, 0x05, 4, format );
}
+ else if( p_stream->i_codec == VLC_FOURCC('d','r','a','c') )
+ {
+ /* 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_FOURCC('d','t','s',' ') )
{
/* DTS registration descriptor (ETSI TS 101 154 Annex F) */
projects / vlc / blobdiff