static inline int PESHeader( uint8_t *p_hdr, mtime_t i_pts, mtime_t i_dts,
int i_es_size, int i_stream_id, int i_private_id,
- vlc_bool_t b_mpeg2 )
+ vlc_bool_t b_mpeg2, vlc_bool_t b_data_alignment,
+ int i_header_size )
{
bits_buffer_t bits;
int i_extra = 0;
}
- bits_initwrite( &bits, 30, p_hdr );
+ bits_initwrite( &bits, 50, p_hdr );
/* add start code */
bits_write( &bits, 24, 0x01 );
{
int i_pts_dts;
- if( i_pts > 0 && i_dts > 0 )
+ if( i_pts > 0 && i_dts > 0 && i_pts != i_dts )
{
- bits_write( &bits, 16, i_es_size + i_extra+ 13 );
i_pts_dts = 0x03;
+ if ( !i_header_size ) i_header_size = 0xa;
}
else if( i_pts > 0 )
{
- bits_write( &bits, 16, i_es_size + i_extra + 8 );
i_pts_dts = 0x02;
+ if ( !i_header_size ) i_header_size = 0x5;
}
else
{
- bits_write( &bits, 16, i_es_size + i_extra + 3 );
i_pts_dts = 0x00;
+ if ( !i_header_size ) i_header_size = 0x0;
}
+ bits_write( &bits, 16, i_es_size + i_extra + 3
+ + i_header_size ); // size
bits_write( &bits, 2, 0x02 ); // mpeg2 id
bits_write( &bits, 2, 0x00 ); // pes scrambling control
bits_write( &bits, 1, 0x00 ); // pes priority
- bits_write( &bits, 1, 0x00 ); // data alignement indicator
+ bits_write( &bits, 1, b_data_alignment ); // data alignement indicator
bits_write( &bits, 1, 0x00 ); // copyright
bits_write( &bits, 1, 0x00 ); // original or copy
bits_write( &bits, 1, 0x00 ); // additional copy info flag
bits_write( &bits, 1, 0x00 ); // pes crc flag
bits_write( &bits, 1, 0x00 ); // pes extention flags
- if( i_pts_dts == 0x03 )
- {
- bits_write( &bits, 8, 0x0a ); // header size -> pts and dts
- }
- else if( i_pts_dts == 0x02 )
- {
- bits_write( &bits, 8, 0x05 ); // header size -> pts
- }
- else
- {
- bits_write( &bits, 8, 0x00 ); // header size -> 0
- }
+ bits_write( &bits, 8, i_header_size ); // header size -> pts and dts
/* write pts */
if( i_pts_dts & 0x02 )
bits_write( &bits, 1, 0x01 ); // marker
bits_write( &bits, 15, i_pts );
bits_write( &bits, 1, 0x01 ); // marker
+ i_header_size -= 0x5;
}
/* write i_dts */
if( i_pts_dts & 0x01 )
bits_write( &bits, 1, 0x01 ); // marker
bits_write( &bits, 15, i_dts );
bits_write( &bits, 1, 0x01 ); // marker
+ i_header_size -= 0x5;
+ }
+ while ( i_header_size )
+ {
+ bits_write( &bits, 8, 0xff );
+ i_header_size--;
}
}
else /* MPEG1 */
{
int i_pts_dts;
- if( i_pts > 0 && i_dts > 0 )
+ if( i_pts > 0 && i_dts > 0 && i_pts != i_dts )
{
bits_write( &bits, 16, i_es_size + i_extra + 10 /* + stuffing */ );
i_pts_dts = 0x03;
block_t **pp_pes,
block_t *p_es,
int i_stream_id,
- int b_mpeg2 )
+ int b_mpeg2, int b_data_alignment, int i_header_size )
{
block_t *p_pes;
mtime_t i_pts, i_dts, i_length;
int i_private_id = -1;
- uint8_t header[30]; // PES header + extra < 30 (more like 17)
+ uint8_t header[50]; // PES header + extra < 50 (more like 17)
int i_pes_payload;
int i_pes_header;
{
i_pes_payload = __MIN( i_size, PES_PAYLOAD_SIZE_MAX );
i_pes_header = PESHeader( header, i_pts, i_dts, i_pes_payload,
- i_stream_id, i_private_id, b_mpeg2 );
+ i_stream_id, i_private_id, b_mpeg2,
+ b_data_alignment, i_header_size );
i_dts = 0; // only first PES has a dts/pts
i_pts = 0;
"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_("Assings a fixed PID to the PMT")
+#define TSID_TEXT N_("TS ID")
+#define TSID_LONGTEXT N_("Assigns a fixed Transport Stream ID.")
#define SHAPING_TEXT N_("Shaping delay (ms)")
#define SHAPING_LONGTEXT N_("If enabled, the TS muxer will cut the " \
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 "shaping", 200, NULL,SHAPING_TEXT,
SHAPING_LONGTEXT, VLC_TRUE );
add_integer( SOUT_CFG_PREFIX "pcr", 30, NULL, PCR_TEXT, PCR_LONGTEXT,
VLC_TRUE );
+ add_integer( SOUT_CFG_PREFIX "bmin", 0, NULL, PCR_TEXT, PCR_LONGTEXT,
+ VLC_TRUE );
+ add_integer( SOUT_CFG_PREFIX "bmax", 0, NULL, PCR_TEXT, PCR_LONGTEXT,
+ VLC_TRUE );
add_integer( SOUT_CFG_PREFIX "dts-delay", 200, NULL, DTS_TEXT,
DTS_LONGTEXT, VLC_TRUE );
* Local data structures
*****************************************************************************/
static const char *ppsz_sout_options[] = {
- "pid-video", "pid-audio", "pid-pmt", "shaping", "pcr",
- "use-key-frames", "dts-delay", "csa-ck", "crypt-audio", NULL
+ "pid-video", "pid-audio", "pid-spu", "pid-pmt", "tsid", "shaping", "pcr",
+ "bmin", "bmax", "use-key-frames", "dts-delay", "csa-ck", "crypt-audio",
+ NULL
};
#define SOUT_BUFFER_FLAGS_PRIVATE_PCR ( 1 << BLOCK_FLAG_PRIVATE_SHIFT )
int i_pid_video;
int i_pid_audio;
+ int i_pid_spu;
int i_pid_free; // first usable pid
+ int i_tsid;
int i_pat_version_number;
ts_stream_t pat;
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;
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_continuity_counter = 0;
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 )
}
else
{
- uint64_t i_ck = strtoll( psz, NULL, 16 );
+ uint64_t i_ck = strtoull( psz, NULL, 16 );
uint8_t ck[8];
int i;
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;
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) */
i_spu_delay =
p_spu->i_dts - p_pcr_stream->i_pes_dts;
- if( i_spu_delay > 100000 &&
- i_spu_delay < I64C(100000000) ) continue;
+ 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;
block_t *p_next = block_FifoShow( p_input->p_fifo );
p_data->i_length = p_next->i_dts - p_data->i_dts;
}
+ else
+ p_data->i_length = 1000;
if( ( p_pcr_stream->i_pes_dts > 0 &&
- p_data->i_dts - 2000000 > p_pcr_stream->i_pes_dts +
+ p_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_data->i_dts - 10000000 > p_stream->i_pes_dts +
p_stream->i_pes_length ) )
{
msg_Warn( p_mux, "packet with too strange dts "
}
else
{
+ int i_header_size = 0;
+ int b_data_alignment = 0;
if( p_input->p_fmt->i_cat == SPU_ES )
{
if( p_input->p_fmt->i_codec ==
p_spu->p_buffer[2] = ' ';
E_(EStoPES)( p_mux->p_sout, &p_spu, p_spu,
- p_stream->i_stream_id, 1 );
+ p_stream->i_stream_id, 1,
+ 0, 0 );
p_data->p_next = p_spu;
}
}
-
- p_data->i_length = i_spu_delay;
+ 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 )
p_data->i_pts = p_data->i_dts;
}
E_( EStoPES )( p_mux->p_sout, &p_data, p_data,
- p_stream->i_stream_id, 1 );
+ p_stream->i_stream_id, 1,
+ b_data_alignment, i_header_size );
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;
/* add overhead for PCR (not really exact) */
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 */
dvbpsi_pat_t pat;
dvbpsi_psi_section_t *p_section;
- dvbpsi_InitPAT( &pat,
- 0x01, // i_ts_id
- p_sys->i_pat_version_number,
+ dvbpsi_InitPAT( &pat, p_sys->i_tsid, p_sys->i_pat_version_number,
1 ); // b_current_next
/* add all program (only one) */
dvbpsi_PATAddProgram( &pat,
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') )
{