/*****************************************************************************
* ts.c: MPEG-II TS Muxer
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
+ * Copyright (C) 2001-2005 VideoLAN (Centrale Réseaux) and its contributors
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
+ * Jean-Paul Saman <jpsaman #_at_# m2x.nl>
*
* 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
"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 " \
#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)")
+ "This value should be below 100ms. (default is 70)")
+
+#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 " \
#define ACRYPT_TEXT N_("Crypt audio")
#define ACRYPT_LONGTEXT N_("Crypt audio using CSA")
+#define VCRYPT_TEXT N_("Crypt video")
+#define VCRYPT_LONGTEXT N_("Crypt video using CSA")
#define CK_TEXT N_("CSA Key")
#define CK_LONGTEXT N_("Defines the CSA encryption key. This must be a " \
"16 char string (8 hexadecimal bytes).")
+#define CPKT_TEXT N_("Packet size in bytes to encrypt")
+#define CPKT_LONGTEXT N_("Specify the size of the TS packet to encrypt. " \
+ "The encryption routines subtract the TS-header from the value before " \
+ "encrypting. " )
+
#define SOUT_CFG_PREFIX "sout-ts-"
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_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,
+ add_integer( SOUT_CFG_PREFIX "pcr", 70, 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 "dts-delay", 200, NULL, DTS_TEXT,
+ add_integer( SOUT_CFG_PREFIX "bmax", 0, NULL, BMAX_TEXT, BMAX_LONGTEXT,
+ VLC_TRUE );
+ add_integer( SOUT_CFG_PREFIX "dts-delay", 400, NULL, DTS_TEXT,
DTS_LONGTEXT, VLC_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_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 );
set_callbacks( Open, Close );
vlc_module_end();
* Local data structures
*****************************************************************************/
static const char *ppsz_sout_options[] = {
- "pid-video", "pid-audio", "shaping", "pcr",
- "use-key-frames", "dts-delay", "csa-ck", "crypt-audio", NULL
+ "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", "csa-pkt", "crypt-audio", "crypt-video",
+ NULL
};
-#define SOUT_BUFFER_FLAGS_PRIVATE_PCR ( 1 << BLOCK_FLAG_PRIVATE_SHIFT )
-#define SOUT_BUFFER_FLAGS_PRIVATE_CSA ( 2 << BLOCK_FLAG_PRIVATE_SHIFT )
typedef struct
{
int i_depth;
c->p_first = NULL;
c->pp_last = &c->p_first;
}
+
static inline void BufferChainAppend( sout_buffer_chain_t *c, block_t *b )
{
*c->pp_last = b;
}
c->pp_last = &b->p_next;
}
+
static inline block_t *BufferChainGet( sout_buffer_chain_t *c )
{
block_t *b = c->p_first;
}
return b;
}
+
static inline block_t *BufferChainPeek( sout_buffer_chain_t *c )
{
block_t *b = c->p_first;
return b;
}
-static inline void BufferChainClean( sout_instance_t *p_sout, sout_buffer_chain_t *c )
+
+static inline void BufferChainClean( sout_instance_t *p_sout,
+ 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;
/* to be used for carriege of DIV3 */
vlc_fourcc_t i_bih_codec;
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_free; // first usable pid
+ 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
+ ts_stream_t pmt; /* Up to now only one program */
+ int i_pmt_program_number;
int i_mpeg4_streams;
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;
};
-
/* Reserve a pid and return it */
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;
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-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 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,
static int Open( vlc_object_t *p_this )
{
sout_mux_t *p_mux =(sout_mux_t*)p_this;
- sout_mux_sys_t *p_sys;
+ sout_mux_sys_t *p_sys = NULL;
vlc_value_t val;
msg_Dbg( p_mux, "Open" );
- sout_ParseCfg( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg );
+ sout_CfgParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg );
p_sys = malloc( sizeof( sout_mux_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
- 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_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;
+ }
+
+ var_Get( p_mux, SOUT_CFG_PREFIX "pid-pmt", &val );
+ if (val.i_int )
+ {
+ p_sys->pmt.i_pid = val.i_int;
+ }
+ else
+ {
+ p_sys->pmt.i_pid = 0x42;
+ }
+
+ 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;
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;
p_sys->p_pcr_input = NULL;
/* Allow to create constrained stream */
var_Get( p_mux, SOUT_CFG_PREFIX "bmin", &val );
- p_sys->i_bitrate_min = 0;/*val.i_int;*/
+ p_sys->i_bitrate_min = val.i_int;
var_Get( p_mux, SOUT_CFG_PREFIX "bmax", &val );
- p_sys->i_bitrate_max = 0;/*val.i_int;*/
+ 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 )
}
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)" );
}
var_Get( p_mux, SOUT_CFG_PREFIX "shaping", &val );
p_sys->i_pcr_delay >= p_sys->i_shaping_delay )
{
msg_Err( p_mux,
- "invalid pcr delay ("I64Fd"ms) resetting to 30ms",
+ "invalid pcr delay ("I64Fd"ms) resetting to 70ms",
p_sys->i_pcr_delay / 1000 );
- p_sys->i_pcr_delay = 30000;
+ p_sys->i_pcr_delay = 70000;
}
var_Get( p_mux, SOUT_CFG_PREFIX "dts-delay", &val );
p_sys->csa = NULL;
var_Get( p_mux, SOUT_CFG_PREFIX "csa-ck", &val );
- if( val.psz_string )
+ if( val.psz_string && *val.psz_string )
{
char *psz = val.psz_string;
}
else
{
- uint64_t i_ck = strtoll( psz, NULL, 16 );
+ uint64_t i_ck = strtoull( psz, NULL, 16 );
uint8_t ck[8];
int i;
{
ck[i] = ( i_ck >> ( 56 - 8*i) )&0xff;
}
-
+#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();
- csa_SetCW( p_sys->csa, ck, ck );
+ if( p_sys->csa )
+ {
+ vlc_value_t pkt_val;
+
+ csa_SetCW( p_sys->csa, ck, ck );
+
+ 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 );
+ }
}
}
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;
+ var_Get( p_mux, SOUT_CFG_PREFIX "crypt-video", &val );
+ p_sys->b_crypt_video = val.b_bool;
+
return VLC_SUCCESS;
}
}
/*****************************************************************************
- * 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;
}
}
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->b_discontinuity = VLC_FALSE;
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 )
break;
case VLC_FOURCC( 'm', 'p','4', 'v' ):
p_stream->i_stream_type = 0x10;
- p_stream->i_stream_id = 0xfa;
- p_sys->i_mpeg4_streams++;
+ p_stream->i_stream_id = 0xe0;
p_stream->i_es_id = p_stream->i_pid;
break;
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 */
+ /* XXX dirty dirty but somebody want that:
+ * using crapy MS-codec XXX */
/* I didn't want to do that :P */
case VLC_FOURCC( 'H', '2', '6', '3' ):
case VLC_FOURCC( 'I', '2', '6', '3' ):
+ case VLC_FOURCC( 'W', 'M', 'V', '3' ):
case VLC_FOURCC( 'W', 'M', 'V', '2' ):
case VLC_FOURCC( 'W', 'M', 'V', '1' ):
case VLC_FOURCC( 'D', 'I', 'V', '3' ):
case VLC_FOURCC( 'D', 'I', 'V', '2' ):
case VLC_FOURCC( 'D', 'I', 'V', '1' ):
case VLC_FOURCC( 'M', 'J', 'P', 'G' ):
- p_stream->i_stream_type = 0xa0; // private
- p_stream->i_stream_id = 0xa0; // beurk
+ p_stream->i_stream_type = 0xa0; /* private */
+ p_stream->i_stream_id = 0xa0; /* beurk */
p_stream->i_bih_codec = p_input->p_fmt->i_codec;
p_stream->i_bih_width = p_input->p_fmt->video.i_width;
p_stream->i_bih_height = p_input->p_fmt->video.i_height;
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', ' ' ):
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;
-
case VLC_FOURCC( 'm', 'p','4', 'a' ):
p_stream->i_stream_type = 0x11;
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;
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] );
}
}
-
/* 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 )
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_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
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; /* 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 */
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) */
block_t *p_data;
/* Accumulate enough data in the pcr stream (>i_shaping_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 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;
- int64_t i_spu_length = 0;
- int64_t i_spu_dts = 0;
+ sout_input_t *p_input;
+ ts_stream_t *p_stream;
+ int64_t i_spu_delay = 0;
+ 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 )
+ 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 <= 50 )
+ if( p_input->p_fifo->i_depth <= 1 )
{
if( p_input->p_fmt->i_cat == AUDIO_ES ||
p_input->p_fmt->i_cat == VIDEO_ES )
/* 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 = block_FifoGet( p_input->p_fifo );
- if( p_input->p_fmt->i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) )
- {
- i_spu_length = p_data->i_length; /* save info for SPU */
- i_spu_dts = p_data->i_dts;
- }
- if( p_input->p_fifo->i_depth > 0 )
+ 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 if( p_input->p_fmt->i_codec !=
+ VLC_FOURCC('s', 'u', 'b', 't' ) )
+ 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_input->p_fmt->i_cat != SPU_ES && 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 );
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
{
+ int i_header_size = 0;
+ int b_data_alignment = 0;
if( p_input->p_fmt->i_cat == SPU_ES )
{
- /* Arbitrary */
- p_data->i_length = 1000;
- if( p_input->p_fmt->i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) )
+ 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;
+ 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' )
+ 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 )
+ 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 */
+ /* FIXME choose a better value, but anyway we
+ * should never have to do that */
p_data->i_length = 1000;
}
}
/* Convert to pes */
- if( p_stream->i_stream_id == 0xa0 && p_data->i_pts <= 0 )
+ 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 ... */
+ /* 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_stream->i_stream_id, 1 );
+
+ 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_stream->i_pes_length > 300000) )
+ && (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;
}
-
- /* Append a empty sub (sub text only) */
- if( i_spu_length > 0 )
- {
- block_t *p_spu = block_New( p_mux, 3 );
-
- p_spu->i_dts = p_spu->i_pts = i_spu_dts + i_spu_length;
- p_spu->i_length = 1000;
-
- p_spu->p_buffer[0] = 0;
- p_spu->p_buffer[1] = 1;
- p_spu->p_buffer[2] = ' ';
-
- p_stream->i_pes_length += p_spu->i_length;
- E_( EStoPES )( p_mux->p_sout, &p_spu, p_spu, p_stream->i_stream_id, 1 );
- BufferChainAppend( &p_stream->chain_pes, p_spu );
- }
}
}
}
block_t *p_pes;
/* 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 )
+ for( p_pes = p_stream->chain_pes.p_first; p_pes != NULL;
+ p_pes = p_pes->p_next )
{
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 )
+ 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 */
}
}
/* 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;
/* 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 != NULL &&
- (p_input->p_fmt->i_cat != AUDIO_ES || p_sys->b_crypt_audio) )
+ (p_input->p_fmt->i_cat != AUDIO_ES || p_sys->b_crypt_audio) &&
+ (p_input->p_fmt->i_cat != VIDEO_ES || p_sys->b_crypt_video) )
{
- p_ts->i_flags |= SOUT_BUFFER_FLAGS_PRIVATE_CSA;
+ p_ts->i_flags |= BLOCK_FLAG_SCRAMBLED;
}
i_packet_pos++;
}
}
+#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;
+ int i_copy;
+
+ 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 )
+ {
+ p_data->i_flags &= ~BLOCK_FLAG_NO_KEYFRAME;
+ p_data->i_pts = p_next->i_pts;
+ p_data->i_dts = p_next->i_dts;
+ }
+ i_copy = __MIN( STD_PES_PAYLOAD - i_size, p_next->i_buffer );
+
+ p_mux->p_vlc->pf_memcpy( &p_data->p_buffer[i_size], p_next->p_buffer,
+ 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;
+ p_next->i_buffer -= i_copy;
+ p_next->p_buffer += i_copy;
+ p_next->i_flags |= BLOCK_FLAG_NO_KEYFRAME;
+
+ if( !p_next->i_buffer )
+ {
+ p_next = block_FifoGet( p_fifo );
+ block_Release( p_next );
+ }
+ return p_data;
+ }
+}
+
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 )
{
/ (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 %lld (%d bi/s for %d pkt in %lld us)",
- i_pcr_dts + p_sys->i_shaping_delay * 3 / 2 - mdate(),
- i_bitrate, i_packet_count, i_pcr_length);
+ 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 %lld (%d bi/s for %d packets in %lld us)",
- i_pcr_dts + p_sys->i_shaping_delay * 3 / 2 - mdate(),
- i_bitrate, i_packet_count, i_pcr_length);
+ 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
}
p_ts->i_dts = i_new_dts;
p_ts->i_length = i_pcr_length / i_packet_count;
- if( p_ts->i_flags & SOUT_BUFFER_FLAGS_PRIVATE_PCR )
+ 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 & SOUT_BUFFER_FLAGS_PRIVATE_CSA )
+ if( p_ts->i_flags & BLOCK_FLAG_SCRAMBLED )
{
- csa_Encrypt( p_sys->csa, p_ts->p_buffer, 0 );
+ csa_Encrypt( p_sys->csa, p_ts->p_buffer, p_sys->i_csa_pkt_size, 0 );
}
/* latency */
}
}
-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,
+ vlc_bool_t b_pcr )
{
block_t *p_pes = p_stream->chain_pes.p_first;
block_t *p_ts;
{
b_new_pes = VLC_TRUE;
}
- i_payload = __MIN( (int)p_pes->i_buffer - 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 )
{
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;
+ p_stream->b_discontinuity = (p_pes->i_flags & BLOCK_FLAG_DISCONTINUITY);
if( b_adaptation_field )
{
{
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 */
+ if( p_stream->b_discontinuity )
+ {
+ p_ts->p_buffer[5] |= 0x80; /* flag TS dicontinuity */
+ p_stream->b_discontinuity = VLC_FALSE;
+ }
p_ts->p_buffer[6] = ( 0 )&0xff;
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++ )
}
/* 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_buffer;
- p_stream->i_pes_length -= p_pes->i_length * i_payload / p_pes->i_buffer;
+ 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_buffer )
{
return p_ts;
}
-
static void TSSetPCR( block_t *p_ts, mtime_t i_dts )
{
mtime_t i_pcr = 9 * i_dts / 100;
}
#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;
if( i_stuffing > 1 )
{
p_ts->p_buffer[5] = 0x00;
+ if( p_stream->b_discontinuity )
+ {
+ p_ts->p_buffer[5] |= 0x80;
+ p_stream->b_discontinuity = VLC_FALSE;
+ }
for( i = 6; i < 6 + i_stuffing - 2; i++ )
{
p_ts->p_buffer[i] = 0xff;
{
block_t *p_psi, *p_first = NULL;
-
while( p_section )
{
int i_size;
p_psi->i_length = 0;
p_psi->i_buffer = i_size + 1;
- p_psi->p_buffer[0] = 0; // pointer
+ p_psi->p_buffer[0] = 0; /* pointer */
memcpy( p_psi->p_buffer + 1,
p_section->p_data,
i_size );
dvbpsi_pat_t pat;
dvbpsi_psi_section_t *p_section;
- dvbpsi_InitPAT( &pat,
- 0x01, // i_ts_id
- p_sys->i_pat_version_number,
- 1 ); // b_current_next
+ 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->pmt.i_pid ); // i_pid
+ p_sys->i_pmt_program_number, /* i_number */
+ p_sys->pmt.i_pid ); /* i_pid */
p_section = dvbpsi_GenPATSections( &pat,
- 0 ); // max program per section
+ 0 ); /* max program per section */
p_pat = WritePSISection( p_mux->p_sout, p_section );
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;
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
+ 1, /* b_current_next */
p_sys->i_pcr_pid );
if( p_sys->i_mpeg4_streams > 0 )
memset( iod, 0, 4096 );
bits_initwrite( &bits, 4096, iod );
- // IOD_label
+ /* IOD_label_scope */
+ bits_write( &bits, 8, 0x11 );
+ /* IOD_label */
bits_write( &bits, 8, 0x01 );
- // InitialObjectDescriptor
+ /* 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, 10, 0x01 ); // ObjectDescriptorID
- bits_write( &bits, 1, 0x00 ); // URL Flag
- bits_write( &bits, 1, 0x00 ); // includeInlineProfileLevelFlag
- bits_write( &bits, 4, 0x0f ); // reserved
- bits_write( &bits, 8, 0xff ); // ODProfile (no ODcapability )
- bits_write( &bits, 8, 0xff ); // sceneProfile
- bits_write( &bits, 8, 0xfe ); // audioProfile (unspecified)
- bits_write( &bits, 8, 0xfe ); // visualProfile( // )
- bits_write( &bits, 8, 0xff ); // graphicProfile (no )
+ 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, 10, 0x01 ); /* ObjectDescriptorID */
+ bits_write( &bits, 1, 0x00 ); /* URL Flag */
+ bits_write( &bits, 1, 0x00 ); /* includeInlineProfileLevelFlag */
+ bits_write( &bits, 4, 0x0f ); /* reserved */
+ bits_write( &bits, 8, 0xff ); /* ODProfile (no ODcapability ) */
+ bits_write( &bits, 8, 0xff ); /* sceneProfile */
+ bits_write( &bits, 8, 0xfe ); /* audioProfile (unspecified) */
+ bits_write( &bits, 8, 0xfe ); /* visualProfile( // ) */
+ bits_write( &bits, 8, 0xff ); /* graphicProfile (no ) */
for( i_stream = 0; i_stream < p_mux->i_nb_inputs; i_stream++ )
{
ts_stream_t *p_stream;
bits_buffer_t bits_fix_ESDescr, bits_fix_Decoder;
/* ES descriptor */
bits_align( &bits );
- bits_write( &bits, 8, 0x03 ); // ES_DescrTag
+ bits_write( &bits, 8, 0x03 ); /* ES_DescrTag */
bits_fix_ESDescr = bits;
- 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
+ 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 */
bits_align( &bits );
- bits_write( &bits, 8, 0x04 ); // DecoderConfigDescrTag
+ bits_write( &bits, 8, 0x04 ); /* DecoderConfigDescrTag */
bits_fix_Decoder = bits;
bits_write( &bits, 24, GetDescriptorLength24b( 0 ) );
if( p_stream->i_stream_type == 0x10 )
{
- bits_write( &bits, 8, 0x20 ); // Visual 14496-2
- bits_write( &bits, 6, 0x04 ); // VisualStream
+ bits_write( &bits, 8, 0x20 ); /* Visual 14496-2 */
+ bits_write( &bits, 6, 0x04 ); /* VisualStream */
+ }
+ 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 )
+ 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
+ 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' ) )
+ 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
+ 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
- bits_write( &bits, 24, 1024 * 1024 ); // bufferSizeDB
- bits_write( &bits, 32, 0x7fffffff ); // maxBitrate
- bits_write( &bits, 32, 0 ); // avgBitrate
+ bits_write( &bits, 1, 0x00 ); /* UpStream */
+ bits_write( &bits, 1, 0x01 ); /* reserved */
+ bits_write( &bits, 24, 1024 * 1024 ); /* bufferSizeDB */
+ bits_write( &bits, 32, 0x7fffffff ); /* maxBitrate */
+ bits_write( &bits, 32, 0 ); /* avgBitrate */
if( p_stream->i_decoder_specific_info > 0 )
{
int i;
- // DecoderSpecificInfo
+ /* DecoderSpecificInfo */
bits_align( &bits );
- bits_write( &bits, 8, 0x05 ); // tag
- bits_write( &bits, 24,
- GetDescriptorLength24b( p_stream->i_decoder_specific_info ) );
+ bits_write( &bits, 8, 0x05 ); /* tag */
+ 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) */
+ /* SLConfigDescriptor : predefined (0x01) */
bits_align( &bits );
- bits_write( &bits, 8, 0x06 ); // tag
+ bits_write( &bits, 8, 0x06 ); /* tag */
bits_write( &bits, 24, GetDescriptorLength24b( 8 ) );
- bits_write( &bits, 8, 0x01 ); // predefined
- bits_write( &bits, 1, 0 ); // durationFlag
- bits_write( &bits, 32, 0 ); // OCRResolution
- bits_write( &bits, 8, 0 ); // OCRLength
- bits_write( &bits, 8, 0 ); // InstantBitrateLength
+ bits_write( &bits, 8, 0x01 );/* predefined */
+ bits_write( &bits, 1, 0 ); /* durationFlag */
+ bits_write( &bits, 32, 0 ); /* OCRResolution */
+ bits_write( &bits, 8, 0 ); /* OCRLength */
+ bits_write( &bits, 8, 0 ); /* InstantBitrateLength */
bits_align( &bits );
/* 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++ )
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 )
{
}
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 );
}
/* 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 )
{
/* "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 )
{
projects / vlc / blobdiff