/*****************************************************************************
- * ts.c
+ * ts.c: MPEG-II TS Muxer
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: ts.c,v 1.19 2003/05/31 00:10:11 fenrir Exp $
+ * $Id: ts.c,v 1.41 2003/11/27 22:44:50 massiot Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
* Preamble
*****************************************************************************/
#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
#include <vlc/vlc.h>
#include <vlc/input.h>
#include <vlc/sout.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
#include "codecs.h"
#include "bits.h"
#include "pes.h"
# endif
#endif
+/*
+ * TODO:
+ * - check PCR frequency requirement
+ * - check PAT/PMT " "
+ * - check PCR/PCR "soft"
+ * - check if "registration" descriptor : "AC-3" should be a program
+ * descriptor or an es one. (xine want an es one)
+ *
+ * - remove creation of PAT/PMT without dvbpsi
+ * - ?
+ * FIXME:
+ * - subtitle support is far from perfect. I expect some subtitles drop
+ * if they arrive a bit late
+ * (We cannot rely on the fact that the fifo should be full)
+ */
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+static int Open ( vlc_object_t * );
+static void Close ( vlc_object_t * );
+
+vlc_module_begin();
+#if defined MODULE_NAME_IS_mux_ts
+ set_description( _("TS muxer") );
+ set_capability( "sout mux", 100 );
+ add_shortcut( "ts" );
+ add_shortcut( "ts_nodvbpsi" );
+#elif defined MODULE_NAME_IS_mux_ts_dvbpsi
+ set_description( _("TS muxer (libdvbpsi)") );
+ set_capability( "sout mux", 120 );
+ add_shortcut( "ts" );
+ add_shortcut( "ts_dvbpsi" );
+#endif
+ set_callbacks( Open, Close );
+vlc_module_end();
+
+/*****************************************************************************
+ * Exported 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 * );
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+#define SOUT_BUFFER_FLAGS_PRIVATE_PCR ( 1 << SOUT_BUFFER_FLAGS_PRIVATE_SHIFT )
+typedef struct
+{
+ int i_depth;
+ sout_buffer_t *p_first;
+ sout_buffer_t **pp_last;
+} sout_buffer_chain_t;
+
+static inline void BufferChainInit ( sout_buffer_chain_t *c )
+{
+ c->i_depth = 0;
+ c->p_first = NULL;
+ c->pp_last = &c->p_first;
+}
+static inline void BufferChainAppend( sout_buffer_chain_t *c, sout_buffer_t *b )
+{
+ *c->pp_last = b;
+ c->i_depth++;
+
+ while( b->p_next )
+ {
+ b = b->p_next;
+ c->i_depth++;
+ }
+ c->pp_last = &b->p_next;
+}
+static inline sout_buffer_t *BufferChainGet( sout_buffer_chain_t *c )
+{
+ sout_buffer_t *b = c->p_first;
+
+ if( b )
+ {
+ c->i_depth--;
+ c->p_first = b->p_next;
+
+ if( c->p_first == NULL )
+ {
+ c->pp_last = &c->p_first;
+ }
+
+ b->p_next = NULL;
+ }
+ return b;
+}
+static inline void BufferChainClean( sout_instance_t *p_sout, sout_buffer_chain_t *c )
+{
+ sout_buffer_t *b;
+
+ while( ( b = BufferChainGet( c ) ) )
+ {
+ sout_BufferDelete( p_sout, b );
+ }
+ BufferChainInit( c );
+}
+
typedef struct ts_stream_s
{
int i_pid;
/* Specific to mpeg4 in mpeg2ts */
int i_es_id;
- int i_sl_predefined;
- int i_decoder_specific_info_len;
+ int i_decoder_specific_info;
uint8_t *p_decoder_specific_info;
+
+ sout_buffer_chain_t chain_pes;
+ mtime_t i_pes_dts;
+ mtime_t i_pes_length;
+ int i_pes_used;
+
} ts_stream_t;
struct sout_mux_sys_t
{
int i_pcr_pid;
- int i_stream_id_mpga;
- int i_stream_id_mpgv;
- int i_stream_id_a52;
+ sout_input_t *p_pcr_input;
int i_audio_bound;
int i_video_bound;
+ int i_pid_video;
+ int i_pid_audio;
int i_pid_free; // first usable pid
int i_pat_version_number;
int i_pmt_version_number;
ts_stream_t pmt; // Up to now only one program
- int i_ts_packet;// To known when to put pat/mpt
-
int i_mpeg4_streams;
-};
+ int i_null_continuity_counter; /* Needed ? */
+ /* for TS building */
+ int64_t i_bitrate_min;
+ int64_t i_bitrate_max;
-/*****************************************************************************
- * Exported prototypes
- *****************************************************************************/
-static int Open ( vlc_object_t * );
-static void Close ( vlc_object_t * );
-
+ int64_t i_caching_delay;
+ int64_t i_pcr_delay;
-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 * );
+ int64_t i_dts_delay;
+ mtime_t i_pcr; /* last PCR emited */
+};
/* Reserve a pid and return it */
-static int AllocatePID( sout_mux_sys_t *p_sys )
+static int AllocatePID( sout_mux_sys_t *p_sys, int i_cat )
{
- return( ++p_sys->i_pid_free );
+ int i_pid;
+ if ( i_cat == VIDEO_ES && p_sys->i_pid_video )
+ {
+ i_pid = p_sys->i_pid_video;
+ p_sys->i_pid_video = 0;
+ }
+ else if ( i_cat == AUDIO_ES && p_sys->i_pid_audio )
+ {
+ i_pid = p_sys->i_pid_audio;
+ p_sys->i_pid_audio = 0;
+ }
+ else
+ {
+ i_pid = ++p_sys->i_pid_free;
+ }
+ return i_pid;
}
-static int GetPAT( sout_mux_t *p_mux, sout_buffer_t **pp_ts );
-static int GetPMT( sout_mux_t *p_mux, sout_buffer_t **pp_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 );
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-vlc_module_begin();
-#if defined MODULE_NAME_IS_mux_ts
- set_description( _("TS muxer") );
- set_capability( "sout mux", 100 );
- add_shortcut( "ts" );
- add_shortcut( "ts_nodvbpsi" );
-#elif defined MODULE_NAME_IS_mux_ts_dvbpsi
- set_description( _("TS muxer (libdvbpsi)") );
- set_capability( "sout mux", 120 );
- add_shortcut( "ts" );
- add_shortcut( "ts_dvbpsi" );
-#endif
- set_callbacks( Open, Close );
-vlc_module_end();
+static sout_buffer_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, vlc_bool_t b_pcr );
+static void TSSetPCR( sout_buffer_t *p_ts, mtime_t i_dts );
+
+static void PEStoTS ( sout_instance_t *, sout_buffer_chain_t *, sout_buffer_t *, ts_stream_t * );
/*****************************************************************************
* Open:
{
sout_mux_t *p_mux =(sout_mux_t*)p_this;
sout_mux_sys_t *p_sys;
+ char *val;
- msg_Info( p_mux, "Open" );
+ msg_Dbg( p_mux, "Open" );
p_sys = malloc( sizeof( sout_mux_sys_t ) );
srand( (uint32_t)mdate() );
- p_sys->i_stream_id_mpga = 0xc0;
- p_sys->i_stream_id_a52 = 0x80;
- p_sys->i_stream_id_mpgv = 0xe0;
-
p_sys->i_audio_bound = 0;
p_sys->i_video_bound = 0;
p_sys->pmt.i_continuity_counter = 0;
p_sys->i_pid_free = 0x43;
+
+ p_sys->i_pid_video = 0;
+ if( ( val = sout_cfg_find_value( p_mux->p_cfg, "pid-video" ) ) )
+ {
+ p_sys->i_pid_video = strtol( val, NULL, 0 );
+ if ( p_sys->i_pid_video > p_sys->i_pid_free )
+ {
+ p_sys->i_pid_free = p_sys->i_pid_video + 1;
+ }
+ }
+ p_sys->i_pid_audio = 0;
+ if( ( val = sout_cfg_find_value( p_mux->p_cfg, "pid-audio" ) ) )
+ {
+ p_sys->i_pid_audio = strtol( val, NULL, 0 );
+ if ( p_sys->i_pid_audio > p_sys->i_pid_free )
+ {
+ p_sys->i_pid_free = p_sys->i_pid_audio + 1;
+ }
+ }
+
p_sys->i_pcr_pid = 0x1fff;
+ p_sys->p_pcr_input = NULL;
p_sys->i_mpeg4_streams = 0;
+ p_sys->i_null_continuity_counter = 0;
+
+ /* Allow to create constrained stream */
+ p_sys->i_bitrate_min = 0;
+ p_sys->i_bitrate_max = 0;
+ if( ( val = sout_cfg_find_value( p_mux->p_cfg, "bmin" ) ) )
+ {
+ p_sys->i_bitrate_min = atoll( val );
+ }
+ if( ( val = sout_cfg_find_value( p_mux->p_cfg, "bmax" ) ) )
+ {
+ p_sys->i_bitrate_max = atoll( val );
+ }
+ if( p_sys->i_bitrate_min > 0 && p_sys->i_bitrate_max > 0 &&
+ p_sys->i_bitrate_min > p_sys->i_bitrate_max )
+ {
+ msg_Err( p_mux, "incompatible minimum and maximum bitrate, "
+ "disabling bitrate control" );
+ p_sys->i_bitrate_min = 0;
+ p_sys->i_bitrate_max = 0;
+ }
+ 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)" );
+ }
+
+ p_sys->i_caching_delay = 200000;
+ if( ( val = sout_cfg_find_value( p_mux->p_cfg, "caching" ) ) )
+ {
+ p_sys->i_caching_delay = (int64_t)atoi( val ) * 1000;
+ if( p_sys->i_caching_delay <= 0 )
+ {
+ msg_Err( p_mux,
+ "invalid caching ("I64Fd"ms) reseting to 200ms",
+ p_sys->i_caching_delay / 1000 );
+ p_sys->i_caching_delay = 200000;
+ }
+ }
+ p_sys->i_pcr_delay = 30000;
+ if( ( val = sout_cfg_find_value( p_mux->p_cfg, "pcr" ) ) )
+ {
+ p_sys->i_pcr_delay = (int64_t)atoi( val ) * 1000;
+ if( p_sys->i_pcr_delay <= 0 ||
+ p_sys->i_pcr_delay >= p_sys->i_caching_delay )
+ {
+ msg_Err( p_mux,
+ "invalid pcr delay ("I64Fd"ms) reseting to 30ms",
+ p_sys->i_pcr_delay / 1000 );
+ p_sys->i_pcr_delay = 30000;
+ }
+ }
+
+ msg_Dbg( p_mux, "caching="I64Fd" pcr="I64Fd,
+ p_sys->i_caching_delay, p_sys->i_pcr_delay );
+
+ p_sys->i_dts_delay = 200000;
+ if( ( val = sout_cfg_find_value( p_mux->p_cfg, "dts-delay" ) ) )
+ {
+ p_sys->i_dts_delay = (int64_t)atoi( val ) * 1000;
+ }
+
+ /* for TS generation */
+ p_sys->i_pcr = 0;
return VLC_SUCCESS;
}
/*****************************************************************************
* Close:
*****************************************************************************/
-
static void Close( vlc_object_t * p_this )
{
sout_mux_t *p_mux = (sout_mux_t*)p_this;
sout_mux_sys_t *p_sys = p_mux->p_sys;
- msg_Info( p_mux, "Close" );
+ msg_Dbg( p_mux, "Close" );
free( p_sys );
- p_mux->p_sys = NULL;
}
+/*****************************************************************************
+ * Capability:
+ *****************************************************************************/
static int Capability( sout_mux_t *p_mux, int i_query, void *p_args, void *p_answer )
{
switch( i_query )
}
}
+/*****************************************************************************
+ * AddStream: called for each stream addition
+ *****************************************************************************/
static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
{
sout_mux_sys_t *p_sys = p_mux->p_sys;
ts_stream_t *p_stream;
- msg_Dbg( p_mux, "adding input" );
p_input->p_sys = (void*)p_stream = malloc( sizeof( ts_stream_t ) );
- p_stream->i_pid = AllocatePID( p_sys );
- if( p_sys->i_pcr_pid == 0x1fff )
- {
- p_sys->i_pcr_pid = p_stream->i_pid;
- }
- p_stream->i_continuity_counter = 0;
+ /* Init this new stream */
+ p_stream->i_pid = AllocatePID( p_sys, p_input->p_fmt->i_cat );
+ p_stream->i_continuity_counter = 0;
+ p_stream->i_decoder_specific_info = 0;
+ p_stream->p_decoder_specific_info = NULL;
+
+ msg_Dbg( p_mux, "adding input codec=%4.4s pid=%d", (char*)&p_input->p_fmt->i_codec, p_stream->i_pid );
+ /* All others fields depand on codec */
switch( p_input->p_fmt->i_cat )
{
case VIDEO_ES:
- switch( p_input->p_fmt->i_fourcc )
+ switch( p_input->p_fmt->i_codec )
{
case VLC_FOURCC( 'm', 'p','g', 'v' ):
+ /* TODO: do we need to check MPEG-I/II ? */
p_stream->i_stream_type = 0x02;
- p_stream->i_stream_id = p_sys->i_stream_id_mpgv;
- p_sys->i_stream_id_mpgv++;
+ p_stream->i_stream_id = 0xe0;
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_es_id = p_stream->i_pid;
- p_stream->i_sl_predefined = 0x01; // NULL SL header
break;
/* XXX dirty dirty but somebody want that : using crapy MS-codec XXX */
/* I didn't want to do that :P */
- case VLC_FOURCC( 'W', 'M', 'V', '2' ):
case VLC_FOURCC( 'H', '2', '6', '3' ):
case VLC_FOURCC( 'I', '2', '6', '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( 'M', 'J', 'P', 'G' ):
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;
break;
default:
- return( -1 );
+ free( p_stream );
+ return VLC_EGENERIC;
}
p_sys->i_video_bound++;
-
- p_stream->i_bih_codec = p_input->p_fmt->i_fourcc;
- p_stream->i_bih_width = p_input->p_fmt->i_width;
- p_stream->i_bih_height = p_input->p_fmt->i_height;
-
- p_stream->i_decoder_specific_info_len = p_input->p_fmt->i_extra_data;
- if( p_stream->i_decoder_specific_info_len > 0 )
- {
- p_stream->p_decoder_specific_info =
- malloc( p_stream->i_decoder_specific_info_len );
- memcpy( p_stream->p_decoder_specific_info,
- p_input->p_fmt->p_extra_data,
- p_input->p_fmt->i_extra_data );
- }
- else
- {
- p_stream->p_decoder_specific_info = NULL;
- }
break;
case AUDIO_ES:
- switch( p_input->p_fmt->i_fourcc )
+ 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_id = 0xc0;
+ break;
case VLC_FOURCC( 'a', '5','2', ' ' ):
- case VLC_FOURCC( 'a', '5','2', 'b' ):
p_stream->i_stream_type = 0x81;
- p_stream->i_stream_id = p_sys->i_stream_id_a52;
- p_sys->i_stream_id_a52++;
+ p_stream->i_stream_id = 0xbd;
+ break;
+ case VLC_FOURCC( 'l', 'p','c', 'm' ):
+ p_stream->i_stream_type = 0x83;
+ p_stream->i_stream_id = 0xbd;
break;
+ case VLC_FOURCC( 'd', 't','s', ' ' ):
+ p_stream->i_stream_type = 0x85;
+ 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;
- p_stream->i_sl_predefined = 0x01; // NULL SL header
- break;
- case VLC_FOURCC( 'm', 'p','g', 'a' ):
- p_stream->i_stream_type = 0x04;
- p_stream->i_stream_id = p_sys->i_stream_id_mpga;
- p_sys->i_stream_id_mpga++;
break;
default:
- return( -1 );
+ free( p_stream );
+ return VLC_EGENERIC;
}
p_sys->i_audio_bound++;
+ break;
- p_stream->i_decoder_specific_info_len = p_input->p_fmt->i_extra_data;
- if( p_stream->i_decoder_specific_info_len > 0 )
+ case SPU_ES:
+ switch( p_input->p_fmt->i_codec )
{
- p_stream->p_decoder_specific_info =
- malloc( p_stream->i_decoder_specific_info_len );
- memcpy( p_stream->p_decoder_specific_info,
- p_input->p_fmt->p_extra_data,
- p_input->p_fmt->i_extra_data );
- }
- else
- {
- p_stream->p_decoder_specific_info = NULL;
+ case VLC_FOURCC( 's', 'p','u', ' ' ):
+ p_stream->i_stream_type = 0x82;
+ p_stream->i_stream_id = 0xbd;
+ break;
+ default:
+ free( p_stream );
+ return VLC_EGENERIC;
}
break;
+
default:
- return( -1 );
+ free( p_stream );
+ return VLC_EGENERIC;
}
- p_sys->i_ts_packet = 0; // force pat/pmt recreation
- p_sys->i_pat_version_number++; p_sys->i_pat_version_number %= 32;
- p_sys->i_pmt_version_number++; p_sys->i_pmt_version_number %= 32;
+ /* 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 );
+ }
+
+ /* Init pes chain */
+ BufferChainInit( &p_stream->chain_pes );
+ p_stream->i_pes_dts = 0;
+ p_stream->i_pes_length = 0;
+ p_stream->i_pes_used = 0;
+
+ /* We only change PMT version (PAT isn't changed) */
+ p_sys->i_pmt_version_number = ( p_sys->i_pmt_version_number + 1 )%32;
+
+ /* Update pcr_pid */
+ if( p_input->p_fmt->i_cat != SPU_ES &&
+ ( p_sys->i_pcr_pid == 0x1fff || p_input->p_fmt->i_cat == VIDEO_ES ) )
+ {
+ if( p_sys->p_pcr_input )
+ {
+ /* There was already a PCR stream, so clean context */
+ /* FIXME */
+ }
+ p_sys->i_pcr_pid = p_stream->i_pid;
+ p_sys->p_pcr_input = p_input;
+
+ msg_Dbg( p_mux, "new PCR PID is %d", p_sys->i_pcr_pid );
+ }
- return( 0 );
+ return VLC_SUCCESS;
}
+/*****************************************************************************
+ * DelStream: called before a stream deletion
+ *****************************************************************************/
static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input )
{
sout_mux_sys_t *p_sys = p_mux->p_sys;
ts_stream_t *p_stream;
+ char *val;
- msg_Dbg( p_mux, "removing input" );
p_stream = (ts_stream_t*)p_input->p_sys;
+ msg_Dbg( p_mux, "removing input pid=%d", p_stream->i_pid );
+
+ if( p_sys->i_pcr_pid == p_stream->i_pid )
+ {
+ int i;
+
+ /* Find a new pcr stream (Prefer Video Stream) */
+ p_sys->i_pcr_pid = 0x1fff;
+ p_sys->p_pcr_input = NULL;
+ for( i = 0; i < p_mux->i_nb_inputs; i++ )
+ {
+ if( p_mux->pp_inputs[i] == p_input )
+ {
+ continue;
+ }
+
+ if( p_mux->pp_inputs[i]->p_fmt->i_cat == VIDEO_ES )
+ {
+ p_sys->i_pcr_pid =
+ ((ts_stream_t*)p_mux->pp_inputs[i]->p_sys)->i_pid;
+ p_sys->p_pcr_input= p_mux->pp_inputs[i];
+ break;
+ }
+ else if( p_mux->pp_inputs[i]->p_fmt->i_cat != SPU_ES &&
+ p_sys->i_pcr_pid == 0x1fff )
+ {
+ p_sys->i_pcr_pid =
+ ((ts_stream_t*)p_mux->pp_inputs[i]->p_sys)->i_pid;
+ p_sys->p_pcr_input= p_mux->pp_inputs[i];
+ }
+ }
+ if( p_sys->p_pcr_input )
+ {
+ /* Empty TS buffer */
+ /* FIXME */
+ }
+ msg_Dbg( p_mux, "new PCR PID is %d", p_sys->i_pcr_pid );
+ }
+
+ /* Empty all data in chain_pes */
+ BufferChainClean( p_mux->p_sout, &p_stream->chain_pes );
if( p_stream->p_decoder_specific_info )
{
{
p_sys->i_mpeg4_streams--;
}
+ if( ( val = sout_cfg_find_value( p_mux->p_cfg, "pid-video" ) ) )
+ {
+ int i_pid_video = strtol( val, NULL, 0 );
+ if ( i_pid_video == p_stream->i_pid )
+ {
+ p_sys->i_pid_video = i_pid_video;
+ msg_Dbg( p_mux, "freeing video PID %d", i_pid_video );
+ }
+ }
+ if( ( val = sout_cfg_find_value( p_mux->p_cfg, "pid-audio" ) ) )
+ {
+ int i_pid_audio = strtol( val, NULL, 0 );
+ if ( i_pid_audio == p_stream->i_pid )
+ {
+ p_sys->i_pid_audio = i_pid_audio;
+ msg_Dbg( p_mux, "freeing audio PID %d", i_pid_audio );
+ }
+ }
free( p_stream );
- p_sys->i_ts_packet = 0; // force pat/pmt recreation
- p_sys->i_pat_version_number++; p_sys->i_pat_version_number %= 32;
+ /* We only change PMT version (PAT isn't changed) */
p_sys->i_pmt_version_number++; p_sys->i_pmt_version_number %= 32;
- return( 0 );
+ return VLC_SUCCESS;
}
-
-
-static int MuxGetStream( sout_mux_t *p_mux,
- int *pi_stream,
- mtime_t *pi_dts )
+/*****************************************************************************
+ * Mux: Call each time there is new data for at least one stream
+ *****************************************************************************
+ *
+ *****************************************************************************/
+static int Mux( sout_mux_t *p_mux )
{
- mtime_t i_dts;
- int i_stream;
- int i;
+ sout_mux_sys_t *p_sys = p_mux->p_sys;
+ ts_stream_t *p_pcr_stream;
- for( i = 0, i_dts = 0, i_stream = -1; i < p_mux->i_nb_inputs; i++ )
+ if( p_sys->i_pcr_pid == 0x1fff )
{
- sout_fifo_t *p_fifo;
+ msg_Dbg( p_mux, "waiting PCR streams" );
+ msleep( 1000 );
+ return VLC_SUCCESS;
+ }
+ p_pcr_stream = (ts_stream_t*)p_sys->p_pcr_input->p_sys;
+
+ for( ;; )
+ {
+ sout_buffer_chain_t chain_ts;
+ int i_packet_count;
+ int i_packet_pos;
+ mtime_t i_pcr_dts;
+ mtime_t i_pcr_length;
+ int i;
+
+ /* 1: get enough PES packet for all input */
+ for( ;; )
+ {
+ vlc_bool_t b_ok = VLC_TRUE;
+ sout_buffer_t *p_data;
+
+ /* Accumulate enough data in the pcr stream (>i_caching_delay) */
+ /* Accumulate enough data in all other stream ( >= length of pcr) */
+ for( i = 0; i < p_mux->i_nb_inputs; i++ )
+ {
+ sout_input_t *p_input = p_mux->pp_inputs[i];
+ ts_stream_t *p_stream = (ts_stream_t*)p_input->p_sys;
+
+ if( ( p_stream == p_pcr_stream && p_stream->i_pes_length <= p_sys->i_caching_delay ) ||
+ p_stream->i_pes_dts + p_stream->i_pes_length < p_pcr_stream->i_pes_dts + p_pcr_stream->i_pes_length )
+ {
+ /* Need more data */
+ 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 )
+ {
+ /* We need more data */
+ return VLC_SUCCESS;
+ }
+ else if( p_input->p_fifo->i_depth <= 0 )
+ {
+ /* spu, only one packet is needed */
+ continue;
+ }
+ }
+ b_ok = VLC_FALSE;
+
+ p_data = sout_FifoGet( p_input->p_fifo );
+ if( p_input->p_fifo->i_depth > 0 )
+ {
+ sout_buffer_t *p_next = sout_FifoShow( p_input->p_fifo );
+
+ p_data->i_length = p_next->i_dts - p_data->i_dts;
+ }
- p_fifo = p_mux->pp_inputs[i]->p_fifo;
+ 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 ) ||
+ p_data->i_dts < p_stream->i_pes_dts ||
+ ( p_stream->i_pes_dts > 0 && p_data->i_dts - 2000000 > p_stream->i_pes_dts + p_stream->i_pes_length ) )
+ {
+ msg_Warn( p_mux, "packet with too strange dts (dts=%lld,old=%lld,pcr=%lld)",
+ p_data->i_dts,
+ p_stream->i_pes_dts,
+ p_pcr_stream->i_pes_dts );
+ sout_BufferDelete( p_mux->p_sout, p_data );
+
+ 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_fifo->i_depth > 1 )
+ }
+ else
+ {
+ p_stream->i_pes_length += p_data->i_length;
+ if( p_stream->i_pes_dts == 0 )
+ {
+ p_stream->i_pes_dts = p_data->i_dts;
+ }
+
+ /* Convert to pes */
+ E_( EStoPES )( p_mux->p_sout, &p_data, p_data, p_stream->i_stream_id, 1 );
+
+ BufferChainAppend( &p_stream->chain_pes, p_data );
+ }
+ }
+ }
+
+ if( b_ok )
+ {
+ break;
+ }
+ }
+
+ /* save */
+ i_pcr_dts = p_pcr_stream->i_pes_dts;
+ i_pcr_length = p_pcr_stream->i_pes_length;
+
+ /* msg_Dbg( p_mux, "starting muxing %lldms", i_pcr_length / 1000 ); */
+ /* 2: calculate non accurate total size of muxed ts */
+ i_packet_count = 0;
+ for( i = 0; i < p_mux->i_nb_inputs; i++ )
{
- sout_buffer_t *p_buf;
+ ts_stream_t *p_stream = (ts_stream_t*)p_mux->pp_inputs[i]->p_sys;
+ sout_buffer_t *p_pes;
- p_buf = sout_FifoShow( p_fifo );
- if( i_stream < 0 || p_buf->i_dts < i_dts )
+ /* False for pcr stream but it will be eough to do PCR algo */
+ for( p_pes = p_stream->chain_pes.p_first; p_pes != NULL; p_pes = p_pes->p_next )
{
- i_dts = p_buf->i_dts;
- i_stream = i;
+ int i_size = p_pes->i_size;
+ if( p_pes->i_dts + p_pes->i_length > p_pcr_stream->i_pes_dts + p_pcr_stream->i_pes_length )
+ {
+ mtime_t i_frag = p_pcr_stream->i_pes_dts + p_pcr_stream->i_pes_length - p_pes->i_dts;
+ if( i_frag < 0 )
+ {
+ /* Next stream */
+ break;
+ }
+ i_size = p_pes->i_size * i_frag / p_pes->i_length;
+ }
+ i_packet_count += ( i_size + 183 ) / 184;
}
}
- else
+ /* 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 */
+ GetPAT( p_mux, &chain_ts);
+ GetPMT( p_mux, &chain_ts );
+ i_packet_pos = 0;
+ i_packet_count += chain_ts.i_depth;
+ /* msg_Dbg( p_mux, "estimated pck=%d", i_packet_count ); */
+
+ for( ;; )
{
- return( -1 ); // wait that all fifo have at least 2 packets
+ int i_stream;
+ mtime_t i_dts;
+ ts_stream_t *p_stream;
+ sout_buffer_t *p_ts;
+ vlc_bool_t b_pcr;
+
+ /* Select stream (lowest dts)*/
+ for( i = 0, i_stream = -1, i_dts = 0; i < p_mux->i_nb_inputs; i++ )
+ {
+ p_stream = (ts_stream_t*)p_mux->pp_inputs[i]->p_sys;
+
+ if( p_stream->i_pes_dts == 0 )
+ {
+ continue;
+ }
+
+ if( i_stream == -1 ||
+ p_stream->i_pes_dts < i_dts )
+ {
+ i_stream = i;
+ i_dts = p_stream->i_pes_dts;
+ }
+ }
+ if( i_stream == -1 )
+ {
+ break;
+ }
+ p_stream = (ts_stream_t*)p_mux->pp_inputs[i_stream]->p_sys;
+
+ /* 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 )
+ {
+ b_pcr = VLC_TRUE;
+ 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 );
+ i_packet_pos++;
+
+ /* */
+ BufferChainAppend( &chain_ts, p_ts );
}
- }
- if( pi_stream )
- {
- *pi_stream = i_stream;
- }
- if( pi_dts )
- {
- *pi_dts = i_dts;
- }
+ /* 4: date and send */
+ i_packet_count = chain_ts.i_depth;
+ /* msg_Dbg( p_mux, "real pck=%d", i_packet_count ); */
+ for( i = 0; i < i_packet_count; i++ )
+ {
+ sout_buffer_t *p_ts = BufferChainGet( &chain_ts );
- return( i_stream );
+ p_ts->i_dts = i_pcr_dts + i_pcr_length * i / i_packet_count;
+ p_ts->i_length = i_pcr_length / i_packet_count;
+
+ if( p_ts->i_flags&SOUT_BUFFER_FLAGS_PRIVATE_PCR )
+ {
+ /* msg_Dbg( p_mux, "pcr=%lld ms", p_ts->i_dts / 1000 ); */
+ TSSetPCR( p_ts, p_ts->i_dts - p_sys->i_dts_delay );
+ }
+
+ /* latency */
+ p_ts->i_dts += 3*p_sys->i_caching_delay/2;
+
+ sout_AccessOutWrite( p_mux->p_access, p_ts );
+ }
+ }
}
-static int PEStoTS( sout_instance_t *p_sout,
- sout_buffer_t **pp_ts, sout_buffer_t *p_pes,
- ts_stream_t *p_stream )
+static sout_buffer_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, vlc_bool_t b_pcr )
{
- int i_size;
- uint8_t *p_data;
- int i_first;
- mtime_t i_dts;
- int b_new_pes;
+ sout_buffer_t *p_pes = p_stream->chain_pes.p_first;
+ sout_buffer_t *p_ts;
- *pp_ts = NULL;
+ vlc_bool_t b_new_pes = VLC_FALSE;
+ vlc_bool_t b_adaptation_field = VLC_FALSE;
- /* get PES total size */
- i_size = p_pes->i_size;
- p_data = p_pes->p_buffer;
+ int i_payload_max = 184 - ( b_pcr ? 8 : 0 );
+ int i_payload;
- if( p_pes->i_dts == 0 && p_pes->i_length > 0 )
- {
- i_dts = 1; // XXX <french> kludge immonde </french>
- }
- else
+ if( p_stream->i_pes_used <= 0 )
{
- i_dts = p_pes->i_dts;
+ b_new_pes = VLC_TRUE;
}
+ i_payload = __MIN( (int)p_pes->i_size - p_stream->i_pes_used, i_payload_max );
- for( i_first = 1, b_new_pes = 1; p_pes != NULL; )
+ if( b_pcr || i_payload < i_payload_max )
{
- int i_adaptation_field;
- int i_payload;
- int i_copy;
- bits_buffer_t bits;
- sout_buffer_t *p_ts;
+ b_adaptation_field = VLC_TRUE;
+ }
- p_ts = sout_BufferNew( p_sout, 188 );
+ p_ts = sout_BufferNew( p_mux->p_sout, 188 );
- p_ts->i_pts = 0;
- p_ts->i_dts = 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[2] = p_stream->i_pid & 0xff;
+ 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;
- i_payload = 184 - ( i_first && i_dts > 0 ? 8 : 0 );
- i_copy = __MIN( i_size, i_payload );
+ if( b_adaptation_field )
+ {
+ int i;
- i_adaptation_field = ( ( i_first && i_dts > 0 ) ||
- i_size < i_payload ) ? 1 : 0;
+ if( b_pcr )
+ {
+ int i_stuffing = i_payload_max - i_payload;
- /* write headers */
- bits_initwrite( &bits, 188, p_ts->p_buffer );
- bits_write( &bits, 8, 0x47 ); /* sync byte */
- bits_write( &bits, 1, 0 ); /* transport_error_indicator */
- bits_write( &bits, 1, b_new_pes ? 1 : 0 ); /* payload_unit_start */
- b_new_pes = 0;
- bits_write( &bits, 1, 0 ); /* transport_priority */
- bits_write( &bits, 13, p_stream->i_pid );
- bits_write( &bits, 2, 0 ); /* transport_scrambling_control */
- bits_write( &bits, 2, ( i_adaptation_field ? 0x03 : 0x01 ) );
+ p_ts->i_flags |= SOUT_BUFFER_FLAGS_PRIVATE_PCR;
- bits_write( &bits, 4, /* continuity_counter */
- p_stream->i_continuity_counter );
- p_stream->i_continuity_counter++;
- p_stream->i_continuity_counter %= 16;
- if( i_adaptation_field )
- {
- int i;
- int i_stuffing;
+ p_ts->p_buffer[4] = 7 + i_stuffing;
+ p_ts->p_buffer[5] = 0x10; /* flags */
+ 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[11]= 0;
- if( i_first && i_dts > 0 )
+ for( i = 12; i < 12 + i_stuffing; i++ )
{
- i_stuffing = i_payload - i_copy;
- bits_write( &bits, 8, 7 + i_stuffing );
- bits_write( &bits, 8, 0x10 ); /* various flags */
- bits_write( &bits, 33, i_dts * 9 / 100);
- bits_write( &bits, 6, 0 );
- bits_write( &bits, 9, 0 );
- i_dts = 0; /* XXX set dts only for first ts packet */
+ p_ts->p_buffer[i] = 0xff;
}
- else
+ }
+ else
+ {
+ int i_stuffing = i_payload_max - i_payload;
+
+ p_ts->p_buffer[4] = i_stuffing - 1;
+ if( i_stuffing > 1 )
{
- i_stuffing = i_payload - i_copy;
- bits_write( &bits, 8, i_stuffing - 1);
- if( i_stuffing - 1 > 0 )
+ p_ts->p_buffer[5] = 0x00;
+ for( i = 6; i < 6 + i_stuffing - 2; i++ )
{
- bits_write( &bits, 8, 0 );
+ p_ts->p_buffer[i] = 0xff;
}
- i_stuffing -= 2;
- }
-
- /* put stuffing */
- for( i = 0; i < i_stuffing; i++ )
- {
- bits_write( &bits, 8, 0xff );
}
}
- /* copy payload */
- memcpy( p_ts->p_buffer + bits.i_data,
- p_data,
- i_copy );
- p_data += i_copy;
- i_size -= i_copy;
+ }
- sout_BufferChain( pp_ts, p_ts );
+ /* copy payload */
+ memcpy( &p_ts->p_buffer[188 - i_payload], &p_pes->p_buffer[p_stream->i_pes_used], i_payload );
- i_first = 0;
+ p_stream->i_pes_used += i_payload;
+ p_stream->i_pes_dts = p_pes->i_dts + p_pes->i_length * p_stream->i_pes_used / p_pes->i_size;
+ p_stream->i_pes_length -= p_pes->i_length * i_payload / p_pes->i_size;
- if( i_size <= 0 )
- {
- sout_buffer_t *p_next;
+ if( p_stream->i_pes_used >= (int)p_pes->i_size )
+ {
+ p_pes = BufferChainGet( &p_stream->chain_pes );
+ sout_BufferDelete( p_mux->p_sout, p_pes );
- p_next = p_pes->p_next;
- p_pes->p_next = NULL;
- sout_BufferDelete( p_sout, p_pes );
- p_pes = p_next;
- b_new_pes = 1;
- if( p_pes )
- {
- i_size = p_pes->i_size;
- p_data = p_pes->p_buffer;
- }
- else
+ p_pes = p_stream->chain_pes.p_first;
+ if( p_pes )
+ {
+ p_stream->i_pes_dts = p_pes->i_dts;
+ p_stream->i_pes_length = 0;
+ while( p_pes )
{
- break;
+ p_stream->i_pes_length += p_pes->i_length;
+
+ p_pes = p_pes->p_next;
}
}
+ else
+ {
+ p_stream->i_pes_dts = 0;
+ p_stream->i_pes_length = 0;
+ }
+ p_stream->i_pes_used = 0;
}
- return 0;
+ return p_ts;
+}
+
+
+static void TSSetPCR( sout_buffer_t *p_ts, mtime_t i_dts )
+{
+ mtime_t i_pcr = 9 * i_dts / 100;
+
+ p_ts->p_buffer[6] = ( i_pcr >> 25 )&0xff;
+ p_ts->p_buffer[7] = ( i_pcr >> 17 )&0xff;
+ p_ts->p_buffer[8] = ( i_pcr >> 9 )&0xff;
+ p_ts->p_buffer[9] = ( i_pcr >> 1 )&0xff;
+ p_ts->p_buffer[10]|= ( i_pcr << 7 )&0x80;
}
-static void SetTSDate( sout_buffer_t *p_ts, mtime_t i_dts, mtime_t i_length )
+#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 )
{
- int i_count;
- sout_buffer_t *p_tmp;
- mtime_t i_delta;
+ sout_mux_sys_t *p_sys = p_mux->p_sys;
+ sout_buffer_chain_t s = *c;
+
+ int i_packets = 0;
+ int i_packets_min = 0;
+ int i_packets_max = 0;
- for( p_tmp = p_ts, i_count = 0; p_tmp != NULL; p_tmp = p_tmp->p_next )
+ if( i_length <= 0 )
{
- i_count++;
+ return;
}
- i_delta = i_length / i_count;
- for( p_tmp = p_ts; p_tmp != NULL; p_tmp = p_tmp->p_next )
+ i_packets = c->i_depth;
+ i_packets_min = ( (int64_t)i_bitrate_min * i_length / 8 / 1000000 + 187 ) / 188;
+ i_packets_max = ( (int64_t)i_bitrate_max * i_length / 8 / 1000000 + 187 ) / 188;
+
+ if( i_packets < i_packets_min && i_packets_min > 0 )
{
- p_tmp->i_dts = i_dts;
- p_tmp->i_length = i_delta;
+ sout_buffer_t *p_pk;
+ int i_div = ( i_packets_min - i_packets ) / i_packets;
+ int i_mod = ( i_packets_min - i_packets ) % i_packets;
+ int i_rest = 0;
+
+ /* We need to pad with null packets (pid=0x1fff)
+ * We try to melt null packets with true packets */
+ msg_Dbg( p_mux,
+ "packets=%d but min=%d -> adding %d packets of padding",
+ i_packets, i_packets_min, i_packets_min - i_packets );
+
+ BufferChainInit( c );
+ while( ( p_pk = BufferChainGet( &s ) ) )
+ {
+ int i, i_null;
- i_dts += i_delta;
- }
-}
+ BufferChainAppend( c, p_pk );
-static int Mux( sout_mux_t *p_mux )
-{
- sout_mux_sys_t *p_sys = p_mux->p_sys;
- int i_stream;
+ i_null = i_div + ( i_rest + i_mod ) / i_packets;
- sout_buffer_t *p_pat, *p_pmt, *p_ts;
+ for( i = 0; i < i_null; i++ )
+ {
+ sout_buffer_t *p_null;
+
+ p_null = sout_BufferNew( p_mux->p_sout, 188 );
+ p_null->p_buffer[0] = 0x47;
+ p_null->p_buffer[1] = 0x1f;
+ p_null->p_buffer[2] = 0xff;
+ p_null->p_buffer[3] = 0x10 | p_sys->i_null_continuity_counter;
+ memset( &p_null->p_buffer[4], 0, 184 );
+ p_sys->i_null_continuity_counter =
+ ( p_sys->i_null_continuity_counter + 1 ) % 16;
+
+ BufferChainAppend( c, p_null );
+ }
- for( ;; )
+ i_rest = ( i_rest + i_mod ) % i_packets;
+ }
+ }
+ else if( i_packets > i_packets_max && i_packets_max > 0 )
{
- mtime_t i_dts, i_length;
-
- sout_input_t *p_input;
- ts_stream_t *p_stream;
- sout_fifo_t *p_fifo;
- sout_buffer_t *p_data;
+ sout_buffer_t *p_pk;
+ int i;
+
+ /* Arg, we need to drop packets, I don't do something clever (like
+ * dropping complete pid, b frames, ... ), I just get the right amount
+ * of packets and discard the others */
+ msg_Warn( p_mux,
+ "packets=%d but max=%d -> removing %d packets -> stream broken",
+ i_packets, i_packets_max, i_packets - i_packets_max );
+
+ BufferChainInit( c );
+ for( i = 0; i < i_packets_max; i++ )
+ {
+ BufferChainAppend( c, BufferChainGet( &s ) );
+ }
- if( MuxGetStream( p_mux, &i_stream, &i_dts ) < 0 )
+ while( ( p_pk = BufferChainGet( &s ) ) )
{
- return( 0 );
+ sout_BufferDelete( p_mux->p_sout, p_pk );
}
+ }
+}
+#endif
- p_input = p_mux->pp_inputs[i_stream];
- p_fifo = p_input->p_fifo;
- p_stream = (ts_stream_t*)p_input->p_sys;
+static void PEStoTS( sout_instance_t *p_sout,
+ sout_buffer_chain_t *c, sout_buffer_t *p_pes,
+ ts_stream_t *p_stream )
+{
+ uint8_t *p_data;
+ int i_size;
+ int b_new_pes;
- p_data = sout_FifoGet( p_fifo );
- i_dts = p_data->i_dts;
- i_length = p_data->i_length;
+ /* get PES total size */
+ i_size = p_pes->i_size;
+ p_data = p_pes->p_buffer;
- E_( EStoPES )( p_mux->p_sout, &p_data, p_data, p_stream->i_stream_id, 1);
- PEStoTS( p_mux->p_sout, &p_data, p_data, p_stream );
+ b_new_pes = VLC_TRUE;
- if( p_sys->i_ts_packet % 30 == 0 )
- {
- /* create pat/pmt */
- GetPAT( p_mux, &p_pat );
- GetPMT( p_mux, &p_pmt );
+ for( ;; )
+ {
+ int b_adaptation_field;
+ int i_copy;
+ sout_buffer_t *p_ts;
- p_ts = p_pat;
- sout_BufferChain( &p_ts, p_pmt );
- sout_BufferChain( &p_ts, p_data );
- }
- else
+ p_ts = sout_BufferNew( p_sout, 188 );
+ /* write header
+ * 8b 0x47 sync byte
+ * 1b transport_error_indicator
+ * 1b payload_unit_start
+ * 1b transport_priority
+ * 13b pid
+ * 2b transport_scrambling_control
+ * 2b if adaptation_field 0x03 else 0x01
+ * 4b continuity_counter
+ */
+
+ i_copy = __MIN( i_size, 184 );
+ b_adaptation_field = i_size < 184 ? VLC_TRUE : VLC_FALSE;
+
+ 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[2] = p_stream->i_pid & 0xff;
+ p_ts->p_buffer[3] = ( b_adaptation_field ? 0x30 : 0x10 )|
+ p_stream->i_continuity_counter;
+
+ b_new_pes = VLC_FALSE;
+ p_stream->i_continuity_counter = (p_stream->i_continuity_counter+1)%16;
+
+ if( b_adaptation_field )
{
- p_ts = p_data;
+ int i_stuffing = 184 - i_copy;
+ int i;
+
+ p_ts->p_buffer[4] = i_stuffing - 1;
+ if( i_stuffing > 1 )
+ {
+ p_ts->p_buffer[5] = 0x00;
+ for( i = 6; i < 6 + i_stuffing - 2; i++ )
+ {
+ p_ts->p_buffer[i] = 0xff;
+ }
+ }
}
+ /* copy payload */
+ memcpy( &p_ts->p_buffer[188 - i_copy], p_data, i_copy );
+ p_data += i_copy;
+ i_size -= i_copy;
+
+ BufferChainAppend( c, p_ts );
- p_sys->i_ts_packet++;
- SetTSDate( p_ts, i_dts, i_length );
+ if( i_size <= 0 )
+ {
+ sout_buffer_t *p_next = p_pes->p_next;
- sout_AccessOutWrite( p_mux->p_access, p_ts );
+ p_pes->p_next = NULL;
+ sout_BufferDelete( p_sout, p_pes );
+ if( p_next == NULL )
+ {
+ break;
+ }
+ b_new_pes = VLC_TRUE;
+ p_pes = p_next;
+ i_size = p_pes->i_size;
+ p_data = p_pes->p_buffer;
+ }
}
- return( 0 );
+ return;
}
-
+#if defined MODULE_NAME_IS_mux_ts
static uint32_t CalculateCRC( uint8_t *p_begin, int i_count )
{
static uint32_t CRC32[256] =
return( i_crc );
}
-#if defined MODULE_NAME_IS_mux_ts
-static int GetPAT( sout_mux_t *p_mux,
- sout_buffer_t **pp_ts )
+static void GetPAT( sout_mux_t *p_mux,
+ sout_buffer_chain_t *c )
{
sout_mux_sys_t *p_sys = p_mux->p_sys;
sout_buffer_t *p_pat;
p_pat->i_size = bits.i_data;
- return( PEStoTS( p_mux->p_sout, pp_ts, p_pat, &p_sys->pat ) );
+ PEStoTS( p_mux->p_sout, c, p_pat, &p_sys->pat );
}
-static int GetPMT( sout_mux_t *p_mux,
- sout_buffer_t **pp_ts )
+static void GetPMT( sout_mux_t *p_mux,
+ sout_buffer_chain_t *c )
{
sout_mux_sys_t *p_sys = p_mux->p_sys;
sout_buffer_t *p_pmt;
bits_write( &bits, 16, 1 ); // FIXME program number
bits_write( &bits, 2, 0 ); // FIXME
bits_write( &bits, 5, p_sys->i_pmt_version_number );
- bits_write( &bits, 1, 0 ); // current_next_indicator
+ bits_write( &bits, 1, 1 ); // current_next_indicator
bits_write( &bits, 8, 0 ); // section number
bits_write( &bits, 8, 0 ); // last section number
p_pmt->i_size = bits.i_data;
- return( PEStoTS( p_mux->p_sout, pp_ts, p_pmt, &p_sys->pmt ) );
-
+ PEStoTS( p_mux->p_sout, c, p_pmt, &p_sys->pmt );
}
#elif defined MODULE_NAME_IS_mux_ts_dvbpsi
return( p_first );
}
-static int GetPAT( sout_mux_t *p_mux,
- sout_buffer_t **pp_ts )
+static void GetPAT( sout_mux_t *p_mux,
+ sout_buffer_chain_t *c )
{
sout_mux_sys_t *p_sys = p_mux->p_sys;
sout_buffer_t *p_pat;
dvbpsi_InitPAT( &pat,
0x01, // i_ts_id
p_sys->i_pat_version_number,
- 0); // b_current_next
+ 1 ); // b_current_next
/* add all program (only one) */
dvbpsi_PATAddProgram( &pat,
1, // i_number
p_pat = WritePSISection( p_mux->p_sout, p_section );
- PEStoTS( p_mux->p_sout, pp_ts, p_pat, &p_sys->pat );
+ PEStoTS( p_mux->p_sout, c, p_pat, &p_sys->pat );
dvbpsi_DeletePSISections( p_section );
dvbpsi_EmptyPAT( &pat );
- return( 0 );
}
static uint32_t GetDescriptorLength24b( int i_length )
return( 0x808000 | ( i_l3 << 16 ) | ( i_l2 << 8 ) | i_l1 );
}
-static int GetPMT( sout_mux_t *p_mux,
- sout_buffer_t **pp_ts )
+static void GetPMT( sout_mux_t *p_mux,
+ sout_buffer_chain_t *c )
{
sout_mux_sys_t *p_sys = p_mux->p_sys;
sout_buffer_t *p_pmt;
bits_buffer_t bits;
bits_buffer_t bits_fix_IOD;
+ /* Make valgrind happy : it works at byte level not bit one so
+ * bit_write confuse it (but DON'T CHANGE the way that bit_write is
+ * working (needed when fixing some bits) */
+ memset( iod, 0, 4096 );
+
bits_initwrite( &bits, 4096, iod );
// IOD_label
bits_write( &bits, 8, 0x01 );
bits_write( &bits, 32, 0x7fffffff ); // maxBitrate
bits_write( &bits, 32, 0 ); // avgBitrate
- if( p_stream->i_decoder_specific_info_len > 0 )
+ if( p_stream->i_decoder_specific_info > 0 )
{
int i;
// DecoderSpecificInfo
bits_align( &bits );
bits_write( &bits, 8, 0x05 ); // tag
bits_write( &bits, 24,
- GetDescriptorLength24b( p_stream->i_decoder_specific_info_len ) );
- for( i = 0; i < p_stream->i_decoder_specific_info_len; i++ )
+ 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_fix_Decoder, 24,
GetDescriptorLength24b( bits.i_data - bits_fix_Decoder.i_data - 3 ) );
- // SLConfigDescriptor
- switch( p_stream->i_sl_predefined )
- {
- case 0x01:
- // FIXME
- bits_align( &bits );
- 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_align( &bits );
- break;
- default:
- msg_Err( p_mux,"Unsupported SL profile => broken IOD");
- break;
- }
+ /* SLConfigDescriptor : predifined (0x01) */
+ bits_align( &bits );
+ 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_align( &bits );
+
/* fix ESDescr length */
bits_write( &bits_fix_ESDescr, 24,
GetDescriptorLength24b( bits.i_data - bits_fix_ESDescr.i_data - 3 ) );
p_stream->i_pid );
if( p_stream->i_stream_id == 0xfa || p_stream->i_stream_id == 0xfb )
{
- uint8_t data[512];
- bits_buffer_t bits;
+ uint8_t es_id[2];
/* SL descriptor */
- bits_initwrite( &bits, 512, data );
- bits_write( &bits, 16, p_stream->i_es_id );
-
- dvbpsi_PMTESAddDescriptor( p_es,
- 0x1f,
- bits.i_data,
- bits.p_data );
+ es_id[0] = (p_stream->i_es_id >> 8)&0xff;
+ es_id[1] = (p_stream->i_es_id)&0xff;
+ dvbpsi_PMTESAddDescriptor( p_es, 0x1f, 2, es_id );
}
- else if( p_stream->i_stream_id == 0xa0 )
+ else if( p_stream->i_stream_type == 0xa0 )
{
uint8_t data[512];
- bits_buffer_t bits;
+ int i_extra = __MIN( p_stream->i_decoder_specific_info,
+ 502 );
/* private DIV3 descripor */
- bits_initwrite( &bits, 512, data );
- bits_write( &bits, 32, p_stream->i_bih_codec );
- bits_write( &bits, 16, p_stream->i_bih_width );
- bits_write( &bits, 16, p_stream->i_bih_height );
- bits_write( &bits, 16, p_stream->i_decoder_specific_info_len );
- if( p_stream->i_decoder_specific_info_len > 0 )
+ memcpy( &data[0], &p_stream->i_bih_codec, 4 );
+ data[4] = ( p_stream->i_bih_width >> 8 )&0xff;
+ data[5] = ( p_stream->i_bih_width )&0xff;
+ data[6] = ( p_stream->i_bih_height>> 8 )&0xff;
+ data[7] = ( p_stream->i_bih_height )&0xff;
+ data[8] = ( i_extra >> 8 )&0xff;
+ data[9] = ( i_extra )&0xff;
+ if( i_extra > 0 )
{
- int i;
- for( i = 0; i < p_stream->i_decoder_specific_info_len; i++ )
- {
- bits_write( &bits, 8, p_stream->p_decoder_specific_info[i] );
- }
+ memcpy( &data[10], p_stream->p_decoder_specific_info, i_extra );
}
- dvbpsi_PMTESAddDescriptor( p_es,
- 0xa0, // private
- bits.i_data,
- bits.p_data );
+
+ /* 0xa0 is private */
+ dvbpsi_PMTESAddDescriptor( p_es, 0xa0, i_extra + 10, data );
+ }
+ else if( p_stream->i_stream_type == 0x81 )
+ {
+ uint8_t format[4] = { 0x41, 0x43, 0x2d, 0x33 };
+
+ /* "registration" descriptor : "AC-3" */
+ dvbpsi_PMTESAddDescriptor( p_es, 0x05, 4, format );
}
}
p_pmt = WritePSISection( p_mux->p_sout, p_section );
- PEStoTS( p_mux->p_sout, pp_ts, p_pmt, &p_sys->pmt );
+ PEStoTS( p_mux->p_sout, c, p_pmt, &p_sys->pmt );
dvbpsi_DeletePSISections( p_section );
dvbpsi_EmptyPMT( &pmt );
- return( 0 );
}
#endif
projects / vlc / blobdiff