Commit c2f4acbe authored by Laurent Aimar's avatar Laurent Aimar
Browse files

ts: large rewrite of the TS muxer to produce better TS and support DVD

     subtitle.
     I have added some options:
        - bmin : minimum bitrate (bits/s) of the TS. Padding is added in
        case of insuffisant bitrate. (default: disabled).
        - bmax : maximum bitrate (bit/s) of the TS. It just drops packets
        to achieve the target. (default: disabled)
        - pcr : minimum delay between two pcr equal to dts of the video
        stream (default 100ms)
        - pcr-soft : minimum delay between two pcr interpolated from the
        pcr that are equal to dts. (default: none)
 Remarks:
  - bmin/bmax allow to create CBR stream.
  - Bitrate is calculated on a PCR time.
  - PCR delay cannot be less than length of a frame of the PCR stream.
  - PCR soft is used to help when using big PCR delay. It is usefull to
  produce stream with smoother bitrate variation.
  - Big PCR delay introduce more latency.

 TODO:
  Test stability, bugs ...
parent 95a10916
/*****************************************************************************
* ts.c
* ts.c: MPEG-II TS Muxer
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: ts.c,v 1.22 2003/06/10 22:42:59 gbazin Exp $
* $Id: ts.c,v 1.23 2003/08/01 19:38:25 fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
......@@ -27,20 +27,11 @@
* 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"
......@@ -63,6 +54,96 @@
# endif
#endif
/*
* TODO:
* - check PCR frequency requirement
* - check PAT/PMT " "
* - check PCR/PCR "soft"
*
* - 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_SOFT ( 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;
}
typedef struct ts_stream_s
{
int i_pid;
......@@ -76,15 +157,20 @@ typedef struct ts_stream_s
/* 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;
/* for TS building */
sout_buffer_chain_t chain_ts;
} ts_stream_t;
struct sout_mux_sys_t
{
int i_pcr_pid;
sout_input_t *p_pcr_input;
int i_stream_id_mpga;
int i_stream_id_mpgv;
int i_stream_id_a52;
......@@ -100,53 +186,59 @@ struct sout_mux_sys_t
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;
};
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
int i_null_continuity_counter; /* Needed ? */
/* for TS building */
int64_t i_bitrate_min;
int64_t i_bitrate_max;
int64_t i_pcr_delay;
int64_t i_pcr_soft_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 * );
mtime_t i_pcr; /* last PCR emited (for pcr-soft) */
mtime_t i_dts;
mtime_t i_length;
sout_buffer_chain_t chain_ts;
};
/* Reserve a pid and return it */
static int AllocatePID( sout_mux_sys_t *p_sys )
static int AllocatePID( sout_mux_sys_t *p_sys )
{
return( ++p_sys->i_pid_free );
}
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" );
static int TSFill ( sout_mux_t *, sout_input_t * );
static void PEStoTS ( sout_instance_t *, sout_buffer_chain_t *, sout_buffer_t *, ts_stream_t *, vlc_bool_t );
static void TSSetDate( sout_buffer_chain_t *, mtime_t, mtime_t );
static void TSSetConstraints( sout_mux_t*, sout_buffer_chain_t *,
mtime_t i_length, int i_bitrate_min, int i_bitrate_max );
#if !defined( HAVE_ATOLL )
/* Et oui y'a des systemes de MERDE (ex: OS X, Solaris) qui ne l'ont pas :((( */
static long long atoll(const char *str)
{
long long i_value = 0;
int sign = 1;
if( *str == '-' )
{
sign = -1;
}
while( *str >= '0' && *str <= '9' )
{
i_value = i_value * 10 + ( *str - '0' );
}
return i_value * sign;
}
#endif
set_callbacks( Open, Close );
vlc_module_end();
/*****************************************************************************
* Open:
......@@ -155,8 +247,9 @@ static int Open( vlc_object_t *p_this )
{
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 ) );
......@@ -185,28 +278,90 @@ static int Open( vlc_object_t *p_this )
p_sys->pmt.i_continuity_counter = 0;
p_sys->i_pid_free = 0x43;
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;
}
p_sys->i_pcr_delay = 100000;
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 )
{
msg_Err( p_mux,
"invalid pcr delay (%lldms) reseting to 100ms",
p_sys->i_pcr_delay / 1000 );
p_sys->i_pcr_delay = 100000;
}
}
p_sys->i_pcr_soft_delay = 0;
if( ( val = sout_cfg_find_value( p_mux->p_cfg, "pcr-soft" ) ) )
{
p_sys->i_pcr_soft_delay = (int64_t)atoi( val ) * 1000;
if( p_sys->i_pcr_soft_delay <= 0 ||
p_sys->i_pcr_soft_delay >= p_sys->i_pcr_delay )
{
msg_Err( p_mux,
"invalid pcr-soft delay (%lldms) disabled",
p_sys->i_pcr_soft_delay / 1000 );
p_sys->i_pcr_soft_delay = 0;
}
}
msg_Dbg( p_mux, "pcr_delay=%lld pcr_soft_delay=%lld", p_sys->i_pcr_delay, p_sys->i_pcr_soft_delay );
/* for TS gnration */
p_sys->i_pcr = 0;
p_sys->i_dts = 0;
p_sys->i_length = 0;
BufferChainInit( &p_sys->chain_ts );
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;
sout_buffer_t *p_data;
msg_Info( p_mux, "Close" );
msg_Dbg( p_mux, "Close" );
/* Empty TS buffer */
while( ( p_data = BufferChainGet( &p_sys->chain_ts ) ) )
{
sout_BufferDelete( p_mux->p_sout, p_data );
}
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 )
......@@ -219,27 +374,32 @@ static int Capability( sout_mux_t *p_mux, int i_query, void *p_args, void *p_ans
}
}
/*****************************************************************************
* 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" );
msg_Dbg( p_mux, "adding input codec=%4.4s", (char*)&p_input->p_fmt->i_fourcc );
p_input->p_sys = (void*)p_stream = malloc( sizeof( ts_stream_t ) );
/* Init this new stream */
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;
p_stream->i_continuity_counter = 0;
p_stream->i_decoder_specific_info = 0;
p_stream->p_decoder_specific_info = NULL;
/* All others fields depand on codec */
switch( p_input->p_fmt->i_cat )
{
case VIDEO_ES:
switch( p_input->p_fmt->i_fourcc )
{
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++;
......@@ -249,13 +409,12 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
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' ):
......@@ -263,36 +422,26 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
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_fourcc;
p_stream->i_bih_width = p_input->p_fmt->i_width;
p_stream->i_bih_height = p_input->p_fmt->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 )
{
case VLC_FOURCC( 'm', 'p','g', 'a' ):
p_stream->i_stream_type = p_input->p_fmt->i_sample_rate >= 32000 ? 0x03 : 0x04;
p_stream->i_stream_id = p_sys->i_stream_id_mpga;
p_sys->i_stream_id_mpga++;
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++;
......@@ -302,51 +451,129 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
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 )
{
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
case SPU_ES:
switch( p_input->p_fmt->i_fourcc )
{
p_stream->p_decoder_specific_info = NULL;
case VLC_FOURCC( 's', 'p','u', ' ' ):
p_stream->i_stream_type = 0x82;
p_stream->i_stream_id = 0x82;
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_data;
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_data,
p_input->p_fmt->i_extra_data );
}
/* Init chain for TS building */
BufferChainInit( &p_stream->chain_ts );
/* 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 ) )
{
sout_buffer_t *p_data;
if( p_sys->p_pcr_input )
{
/* There was already a PCR stream, so clean context */
ts_stream_t *p_pcr_stream = (ts_stream_t*)p_sys->p_pcr_input->p_sys;
while( ( p_data = BufferChainGet( &p_pcr_stream->chain_ts ) ) )
{
sout_BufferDelete( p_mux->p_sout, p_data );
}
}
p_sys->i_pcr_pid = p_stream->i_pid;
p_sys->p_pcr_input = p_input;
return( 0 );
/* Empty TS buffer (avoid broken data or problem with pcr stream changement ) */
while( ( p_data = BufferChainGet( &p_sys->chain_ts ) ) )
{
sout_BufferDelete( p_mux->p_sout, p_data );
}
}
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;
sout_buffer_t *p_data;
msg_Dbg( p_mux, "removing input" );
p_stream = (ts_stream_t*)p_input->p_sys;
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;
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 */
while( ( p_data = BufferChainGet( &((ts_stream_t*)p_sys->p_pcr_input->p_sys)->chain_ts ) ) )
{
sout_BufferDelete( p_mux->p_sout, p_data );
}
}
}
/* Empty all data in chain_ts */
while( ( p_data = BufferChainGet( &p_stream->chain_ts ) ) )
{
sout_BufferDelete( p_mux->p_sout, p_data );
}
if( p_stream->p_decoder_specific_info )
{
free( p_stream->p_decoder_specific_info );
......@@ -357,263 +584,454 @@ static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input )
}
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 );
/* Empty TS buffer (avoid broken data or problem with pcr stream changement ) */
while( ( p_data = BufferChainGet( &p_sys->chain_ts ) ) )
{
sout_BufferDelete( p_mux->p_sout, p_data );
}
return VLC_SUCCESS;