* ps.c: MPEG PS (ISO/IEC 13818-1) / MPEG SYSTEM (ISO/IEC 1172-1)
* multiplexer module for vlc
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
+ * Copyright (C) 2001, 2002 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
+#include <vlc_sout.h>
+#include <vlc_codecs.h>
+#include <vlc_block.h>
-#include "codecs.h"
#include "bits.h"
#include "pes.h"
* Module descriptor
*****************************************************************************/
#define DTS_TEXT N_("DTS delay (ms)")
-#define DTS_LONGTEXT N_("This option will delay the DTS (decoding time " \
+#define DTS_LONGTEXT N_("Delay the DTS (decoding time " \
"stamps) and PTS (presentation timestamps) of the data in the " \
"stream, compared to the SCRs. This allows for some buffering inside " \
"the client decoder.")
+#define PES_SIZE_TEXT N_("PES maximum size")
+#define PES_SIZE_LONGTEXT N_("Set the maximum allowed PES "\
+ "size when producing the MPEG PS streams.")
+
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
add_integer( SOUT_CFG_PREFIX "dts-delay", 200, NULL, DTS_TEXT,
DTS_LONGTEXT, VLC_TRUE );
+ add_integer( SOUT_CFG_PREFIX "pes-max-size", PES_PAYLOAD_SIZE_MAX, NULL,
+ PES_SIZE_TEXT, PES_SIZE_LONGTEXT, VLC_TRUE );
vlc_module_end();
/*****************************************************************************
{
int i_stream_id;
int i_stream_type;
+ int i_max_buff_size; /* used in system header */
/* Language is iso639-2T */
uint8_t lang[3];
int i_pes_count;
int i_system_header;
int i_dts_delay;
-
+ int i_rate_bound; /* units of 50 bytes/second */
+
int64_t i_instant_bitrate;
int64_t i_instant_size;
int64_t i_instant_dts;
vlc_bool_t b_mpeg2;
+ int i_pes_max_size;
+
int i_psm_version;
uint32_t crc32_table[256];
};
static const char *ppsz_sout_options[] = {
- "dts-delay", NULL
+ "dts-delay", "pes-max-size", NULL
};
/*****************************************************************************
vlc_value_t val;
msg_Info( p_mux, "Open" );
- sout_CfgParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg );
+ config_ChainParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg );
p_mux->pf_control = Control;
p_mux->pf_addstream = AddStream;
p_sys->i_instant_bitrate = 0;
p_sys->i_instant_size = 0;
p_sys->i_instant_dts = 0;
-
+ p_sys->i_rate_bound = 0;
p_sys->b_mpeg2 = !(p_mux->psz_mux && !strcmp( p_mux->psz_mux, "mpeg1" ));
var_Get( p_mux, SOUT_CFG_PREFIX "dts-delay", &val );
p_sys->i_dts_delay = (int64_t)val.i_int * 1000;
+ var_Get( p_mux, SOUT_CFG_PREFIX "pes-max-size", &val );
+ p_sys->i_pes_max_size = (int64_t)val.i_int;
+
/* Initialise CRC32 table */
if( p_sys->b_mpeg2 )
{
*****************************************************************************/
static int Control( sout_mux_t *p_mux, int i_query, va_list args )
{
+ VLC_UNUSED(p_mux);
vlc_bool_t *pb_bool;
char **ppsz;
- switch( i_query )
- {
- case MUX_CAN_ADD_STREAM_WHILE_MUXING:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
- *pb_bool = VLC_TRUE;
- return VLC_SUCCESS;
+ switch( i_query )
+ {
+ case MUX_CAN_ADD_STREAM_WHILE_MUXING:
+ pb_bool = (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_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" );
- return VLC_SUCCESS;
+ case MUX_GET_MIME:
+ ppsz = (char**)va_arg( args, char ** );
+ *ppsz = strdup( "video/mpeg" );
+ return VLC_SUCCESS;
default:
return VLC_EGENERIC;
- }
+ }
}
/*****************************************************************************
{
sout_mux_sys_t *p_sys = p_mux->p_sys;
ps_stream_t *p_stream;
+
msg_Dbg( p_mux, "adding input codec=%4.4s",
(char*)&p_input->p_fmt->i_codec );
if( p_input->p_fmt->i_cat == AUDIO_ES )
{
p_sys->i_audio_bound++;
+ p_stream->i_max_buff_size = 4 * 1024;
}
else if( p_input->p_fmt->i_cat == VIDEO_ES )
{
p_sys->i_video_bound++;
+ p_stream->i_max_buff_size = 400 * 1024; /* FIXME -- VCD uses 46, SVCD
+ uses 230, ffmpeg has 230 with a note that it is small */
+ }
+ else
+ { /* FIXME -- what's valid for not audio or video? */
+ p_stream->i_max_buff_size = 4 * 1024;
}
/* Try to set a sensible default value for the instant bitrate */
p_sys->i_instant_bitrate += p_input->p_fmt->i_bitrate + 1000/* overhead */;
+ /* FIXME -- spec requires an upper limit rate boundary in the system header;
+ our codecs are VBR; using 2x nominal rate, convert to 50 bytes/sec */
+ p_sys->i_rate_bound += p_input->p_fmt->i_bitrate * 2 / (8 * 50);
p_sys->i_psm_version++;
p_stream->lang[0] = p_stream->lang[1] = p_stream->lang[2] = 0;
p_stream->lang[0], p_stream->lang[1], p_stream->lang[2] );
}
}
-
return VLC_SUCCESS;
error:
/* Try to set a sensible default value for the instant bitrate */
p_sys->i_instant_bitrate -= (p_input->p_fmt->i_bitrate + 1000);
+ /* rate_bound is in units of 50 bytes/second */
+ p_sys->i_rate_bound -= (p_input->p_fmt->i_bitrate * 2)/(8 * 50);
p_sys->i_psm_version++;
p_data = block_FifoGet( p_input->p_fifo );
E_( EStoPES )( p_mux->p_sout, &p_data, p_data,
p_input->p_fmt, p_stream->i_stream_id,
- p_sys->b_mpeg2, 0, 0 );
+ p_sys->b_mpeg2, 0, 0, p_sys->i_pes_max_size );
block_ChainAppend( &p_ps, p_data );
if( p_sys->b_mpeg2 )
{
- bits_write( &bits, 9, 0 ); // src extention
+ bits_write( &bits, 9, 0 ); // src extension
}
bits_write( &bits, 1, 1 ); // marker
block_t *p_hdr;
bits_buffer_t bits;
vlc_bool_t b_private;
- int i_mux_rate;
+ int i_rate_bound;
int i_nb_private, i_nb_stream;
int i;
p_hdr = block_New( p_mux, 12 + i_nb_stream * 3 );
p_hdr->i_dts = p_hdr->i_pts = i_dts;
- /* The spec specifies that the mux rate must be rounded upwards */
- i_mux_rate = (p_sys->i_instant_bitrate + 8 * 50 - 1 ) / (8 * 50);
+ /* The spec specifies that the reported rate_bound must be upper limit */
+ i_rate_bound = (p_sys->i_rate_bound);
bits_initwrite( &bits, 12 + i_nb_stream * 3, p_hdr->p_buffer );
bits_write( &bits, 32, 0x01bb );
bits_write( &bits, 16, 12 - 6 + i_nb_stream * 3 );
bits_write( &bits, 1, 1 ); // marker bit
- bits_write( &bits, 22, i_mux_rate); // FIXME rate bound
+ bits_write( &bits, 22, i_rate_bound);
bits_write( &bits, 1, 1 ); // marker bit
bits_write( &bits, 6, p_sys->i_audio_bound );
if( p_input->p_fmt->i_cat == AUDIO_ES )
{
bits_write( &bits, 1, 0 );
- bits_write( &bits, 13, /* stream->max_buffer_size */ 0 / 128 );
+ bits_write( &bits, 13, p_stream->i_max_buff_size / 128 );
}
else if( p_input->p_fmt->i_cat == VIDEO_ES )
{
bits_write( &bits, 1, 1 );
- bits_write( &bits, 13, /* stream->max_buffer_size */ 0 / 1024);
+ bits_write( &bits, 13, p_stream->i_max_buff_size / 1024);
}
else
{
- /* FIXME */
+ /* FIXME -- the scale of 0 means do a /128 */
bits_write( &bits, 1, 0 );
- bits_write( &bits, 13, /* stream->max_buffer_size */ 0 );
+ bits_write( &bits, 13, p_stream->i_max_buff_size / 128 );
}
}
/* CRC32 */
{
uint32_t i_crc = 0xffffffff;
- for( i = 0; i < p_hdr->i_buffer; i++ )
+ for( i = 0; (size_t)i < p_hdr->i_buffer; i++ )
i_crc = (i_crc << 8) ^
p_sys->crc32_table[((i_crc >> 24) ^ p_hdr->p_buffer[i]) & 0xff];
static int MuxGetStream( sout_mux_t *p_mux, int *pi_stream, mtime_t *pi_dts )
{
mtime_t i_dts;
- int i_stream;
- int i;
+ int i_stream, i;
for( i = 0, i_dts = 0, i_stream = -1; i < p_mux->i_nb_inputs; i++ )
{
sout_input_t *p_input = p_mux->pp_inputs[i];
block_t *p_data;
- if( p_input->p_fifo->i_depth <= 0 )
+ if( block_FifoCount( p_input->p_fifo ) <= 0 )
{
if( p_input->p_fmt->i_cat == AUDIO_ES ||
p_input->p_fmt->i_cat == VIDEO_ES )
projects / vlc / blobdiff