/*****************************************************************************
* 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
#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 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();
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 "bmax", 0, NULL, BMAX_TEXT, BMAX_LONGTEXT,
VLC_TRUE );
- add_integer( SOUT_CFG_PREFIX "dts-delay", 200, NULL, DTS_TEXT,
+ 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", "pid-spu", "pid-pmt", "tsid", "program-pmt", "es-id-pid",
- "shaping", "pcr", "bmin", "bmax", "use-key-frames", "dts-delay",
- "csa-ck", "crypt-audio",
+ "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
};
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 )
{
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_pid_video;
int i_pid_audio;
int i_pid_spu;
- int i_pid_free; // first usable pid
+ 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 )
{
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_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_control = Control;
p_mux->pf_addstream = AddStream;
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 );
{
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;
}
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;
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' ):
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;
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;
}
}
-
/* 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 )
block_t *p_next = block_FifoShow( p_input->p_fifo );
p_data->i_length = p_next->i_dts - p_data->i_dts;
}
- else
+ 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 &&
E_(EStoPES)( p_mux->p_sout, &p_spu, p_spu,
p_input->p_fmt,
p_stream->i_stream_id, 1,
- 0, 0 );
+ 0, 0, 0 );
p_data->p_next = p_spu;
}
}
* 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 );
+ 1, b_data_alignment, i_header_size, 0 );
BufferChainAppend( &p_stream->chain_pes, p_data );
/* 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 |= BLOCK_FLAG_SCRAMBLED;
}
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 );
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,
- 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;
+ 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;
}
}
}
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 */
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 )
{
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;
return p_ts;
}
-
static void TSSetPCR( block_t *p_ts, mtime_t i_dts )
{
mtime_t i_pcr = 9 * i_dts / 100;
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_psi_section_t *p_section;
dvbpsi_InitPAT( &pat, p_sys->i_tsid, p_sys->i_pat_version_number,
- 1 ); // b_current_next
+ 1 ); /* b_current_next */
/* add all program (only one) */
dvbpsi_PATAddProgram( &pat,
- p_sys->i_pmt_program_number, // 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 );
int i_stream;
dvbpsi_InitPMT( &pmt,
- p_sys->i_pmt_program_number, // 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_scope
+ /* IOD_label_scope */
bits_write( &bits, 8, 0x11 );
- // IOD_label
+ /* 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, 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 )
+ 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
+ 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
+ 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
+ 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
+ bits_write( &bits, 8, 0x0B ); /* Text Stream */
+ bits_write( &bits, 6, 0x04 ); /* VisualStream */
}
else
{
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, 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++ )
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 */
projects / vlc / blobdiff