#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_sout.h>
-#include <vlc_codecs.h>
#include <vlc_block.h>
+#include <vlc_rand.h>
#include <vlc_iso_lang.h>
#include "pes.h"
#include "csa.h"
-#ifdef HAVE_DVBPSI_DR_H
-# include <dvbpsi/dvbpsi.h>
-# include <dvbpsi/demux.h>
-# include <dvbpsi/descriptor.h>
-# include <dvbpsi/pat.h>
-# include <dvbpsi/pmt.h>
-# include <dvbpsi/sdt.h>
-# include <dvbpsi/dr.h>
-# include <dvbpsi/psi.h>
-#else
-# include "dvbpsi.h"
-# include "demux.h"
-# include "descriptor.h"
-# include "tables/pat.h"
-# include "tables/pmt.h"
-# include "tables/sdt.h"
-# include "descriptors/dr.h"
-# include "psi.h"
-#endif
+# include <dvbpsi/dvbpsi.h>
+# include <dvbpsi/demux.h>
+# include <dvbpsi/descriptor.h>
+# include <dvbpsi/pat.h>
+# include <dvbpsi/pmt.h>
+# include <dvbpsi/sdt.h>
+# include <dvbpsi/dr.h>
+# include <dvbpsi/psi.h>
+
+#include "dvbpsi_compat.h"
/*
* TODO:
#define PID_TEXT N_("Set PID to ID of ES")
#define PID_LONGTEXT N_("Sets PID to the ID if the incoming ES. This is for " \
- "use with --ts-es-id-pid, and allows to have the same PIDs in the input " \
+ "use with --ts-es-id-pid, and allows having the same PIDs in the input " \
"and output streams.")
#define ALIGNMENT_TEXT N_("Data alignment")
"of the shaping algorithm, since I frames are usually the biggest " \
"frames in the stream.")
-#define PCR_TEXT N_("PCR delay (ms)")
+#define PCR_TEXT N_("PCR interval (ms)")
#define PCR_LONGTEXT N_("Set at which interval " \
"PCRs (Program Clock Reference) will be sent (in milliseconds). " \
"This value should be below 100ms. (default is 70ms).")
"encrypting." )
#define SOUT_CFG_PREFIX "sout-ts-"
-#define MAX_PMT 64 /* Maximum number of programs. FIXME: I just chose an arbitary number. Where is the maximum in the spec? */
-#define MAX_PMT_PID 64 /* Maximum pids in each pmt. FIXME: I just chose an arbitary number. Where is the maximum in the spec? */
+#define MAX_PMT 64 /* Maximum number of programs. FIXME: I just chose an arbitrary number. Where is the maximum in the spec? */
+#define MAX_PMT_PID 64 /* Maximum pids in each pmt. FIXME: I just chose an arbitrary number. Where is the maximum in the spec? */
vlc_module_begin ()
set_description( N_("TS muxer (libdvbpsi)") )
set_capability( "sout mux", 120 )
add_shortcut( "ts" )
- add_integer( SOUT_CFG_PREFIX "pid-video", 0, NULL,VPID_TEXT, VPID_LONGTEXT,
- true )
- add_integer( SOUT_CFG_PREFIX "pid-audio", 0, NULL, APID_TEXT,
- APID_LONGTEXT, true )
- add_integer( SOUT_CFG_PREFIX "pid-spu", 0, NULL, SPUPID_TEXT,
- SPUPID_LONGTEXT, true )
- add_integer( SOUT_CFG_PREFIX "pid-pmt", 0, NULL, PMTPID_TEXT,
- PMTPID_LONGTEXT, true )
- add_integer( SOUT_CFG_PREFIX "tsid", 0, NULL, TSID_TEXT,
- TSID_LONGTEXT, true )
-#ifdef HAVE_DVBPSI_SDT
- add_integer( SOUT_CFG_PREFIX "netid", 0, NULL, NETID_TEXT,
- NETID_LONGTEXT, true )
-#endif
- add_string( SOUT_CFG_PREFIX "program-pmt", NULL, NULL, PMTPROG_TEXT,
- PMTPROG_LONGTEXT, true )
- add_bool( SOUT_CFG_PREFIX "es-id-pid", 0, NULL, PID_TEXT, PID_LONGTEXT,
- true )
- add_string( SOUT_CFG_PREFIX "muxpmt", NULL, NULL, MUXPMT_TEXT, MUXPMT_LONGTEXT, true )
-#ifdef HAVE_DVBPSI_SDT
- add_string( SOUT_CFG_PREFIX "sdtdesc", NULL, NULL, SDTDESC_TEXT, SDTDESC_LONGTEXT, true )
-#endif
- add_bool( SOUT_CFG_PREFIX "alignment", true, NULL, ALIGNMENT_TEXT,
- ALIGNMENT_LONGTEXT, true )
-
- add_integer( SOUT_CFG_PREFIX "shaping", 200, NULL, SHAPING_TEXT,
- SHAPING_LONGTEXT, true )
- add_bool( SOUT_CFG_PREFIX "use-key-frames", false, NULL, KEYF_TEXT,
- KEYF_LONGTEXT, true )
-
- add_integer( SOUT_CFG_PREFIX "pcr", 70, NULL, PCR_TEXT, PCR_LONGTEXT,
- true )
- add_integer( SOUT_CFG_PREFIX "bmin", 0, NULL, BMIN_TEXT, BMIN_LONGTEXT,
- true )
- add_integer( SOUT_CFG_PREFIX "bmax", 0, NULL, BMAX_TEXT, BMAX_LONGTEXT,
- true )
- add_integer( SOUT_CFG_PREFIX "dts-delay", 400, NULL, DTS_TEXT,
- DTS_LONGTEXT, true )
-
- add_bool( SOUT_CFG_PREFIX "crypt-audio", true, NULL, ACRYPT_TEXT,
- ACRYPT_LONGTEXT, true )
- add_bool( SOUT_CFG_PREFIX "crypt-video", true, NULL, VCRYPT_TEXT,
- VCRYPT_LONGTEXT, true )
-
- add_string( SOUT_CFG_PREFIX "csa-ck", NULL, NULL, CK_TEXT, CK_LONGTEXT,
- true )
- add_string( SOUT_CFG_PREFIX "csa2-ck", NULL, NULL, CK2_TEXT, CK2_LONGTEXT,
- true )
- add_string( SOUT_CFG_PREFIX "csa-use", "1", NULL, CU_TEXT, CU_LONGTEXT,
- true )
- add_integer( SOUT_CFG_PREFIX "csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, true )
+ add_integer(SOUT_CFG_PREFIX "pid-video", 0, VPID_TEXT, VPID_LONGTEXT, true)
+ add_integer(SOUT_CFG_PREFIX "pid-audio", 0, APID_TEXT, APID_LONGTEXT, true)
+ add_integer(SOUT_CFG_PREFIX "pid-spu", 0, SPUPID_TEXT, SPUPID_LONGTEXT, true)
+ add_integer(SOUT_CFG_PREFIX "pid-pmt", 0, PMTPID_TEXT, PMTPID_LONGTEXT, true)
+ add_integer(SOUT_CFG_PREFIX "tsid", 0, TSID_TEXT, TSID_LONGTEXT, true)
+ add_integer(SOUT_CFG_PREFIX "netid", 0, NETID_TEXT, NETID_LONGTEXT, true)
+ add_string(SOUT_CFG_PREFIX "program-pmt", NULL, PMTPROG_TEXT, PMTPROG_LONGTEXT, true)
+ add_bool(SOUT_CFG_PREFIX "es-id-pid", false, PID_TEXT, PID_LONGTEXT, true)
+ add_string(SOUT_CFG_PREFIX "muxpmt", NULL, MUXPMT_TEXT, MUXPMT_LONGTEXT, true)
+ add_string(SOUT_CFG_PREFIX "sdtdesc", NULL, SDTDESC_TEXT, SDTDESC_LONGTEXT, true)
+ add_bool(SOUT_CFG_PREFIX "alignment", true, ALIGNMENT_TEXT, ALIGNMENT_LONGTEXT, true)
+
+ add_integer(SOUT_CFG_PREFIX "shaping", 200, SHAPING_TEXT, SHAPING_LONGTEXT, true)
+ add_bool(SOUT_CFG_PREFIX "use-key-frames", false, KEYF_TEXT, KEYF_LONGTEXT, true)
+
+ add_integer( SOUT_CFG_PREFIX "pcr", 70, PCR_TEXT, PCR_LONGTEXT, true)
+ add_integer( SOUT_CFG_PREFIX "bmin", 0, BMIN_TEXT, BMIN_LONGTEXT, true)
+ add_integer( SOUT_CFG_PREFIX "bmax", 0, BMAX_TEXT, BMAX_LONGTEXT, true)
+ add_integer( SOUT_CFG_PREFIX "dts-delay", 400, DTS_TEXT, DTS_LONGTEXT, true)
+
+ add_bool( SOUT_CFG_PREFIX "crypt-audio", true, ACRYPT_TEXT, ACRYPT_LONGTEXT, true)
+ add_bool( SOUT_CFG_PREFIX "crypt-video", true, VCRYPT_TEXT, VCRYPT_LONGTEXT, true)
+ add_string( SOUT_CFG_PREFIX "csa-ck", NULL, CK_TEXT, CK_LONGTEXT, true)
+ add_string( SOUT_CFG_PREFIX "csa2-ck", NULL, CK2_TEXT, CK2_LONGTEXT, true)
+ add_string( SOUT_CFG_PREFIX "csa-use", "1", CU_TEXT, CU_LONGTEXT, true)
+ add_integer(SOUT_CFG_PREFIX "csa-pkt", 188, CPKT_TEXT, CPKT_LONGTEXT, true)
set_callbacks( Open, Close )
vlc_module_end ()
* Local data structures
*****************************************************************************/
static const char *const ppsz_sout_options[] = {
- "pid-video", "pid-audio", "pid-spu", "pid-pmt", "tsid", "netid",
+ "pid-video", "pid-audio", "pid-spu", "pid-pmt", "tsid",
+ "netid", "sdtdesc",
"es-id-pid", "shaping", "pcr", "bmin", "bmax", "use-key-frames",
"dts-delay", "csa-ck", "csa2-ck", "csa-use", "csa-pkt", "crypt-audio", "crypt-video",
- "muxpmt", "sdtdesc", "program-pmt", "alignment",
+ "muxpmt", "program-pmt", "alignment",
NULL
};
typedef struct pmt_map_t /* Holds the mapping between the pmt-pid/pmt table */
{
int i_pid;
- unsigned long i_prog;
+ unsigned i_prog;
} pmt_map_t;
typedef struct sdt_desc_t
/* Specific to mpeg4 in mpeg2ts */
int i_es_id;
- int i_decoder_specific_info;
- uint8_t *p_decoder_specific_info;
+ int i_extra;
+ uint8_t *p_extra;
/* language is iso639-2T */
int i_langs;
vlc_mutex_t csa_lock;
- int i_audio_bound;
- int i_video_bound;
-
+#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0))
+ dvbpsi_t *p_dvbpsi;
+#endif
bool b_es_id_pid;
bool b_sdt;
int i_pid_video;
int i_tsid;
int i_netid;
- int i_num_pmt;
+ unsigned i_num_pmt;
int i_pmtslots;
int i_pat_version_number;
ts_stream_t pat;
int i_mpeg4_streams;
- int i_null_continuity_counter; /* Needed ? */
ts_stream_t sdt;
dvbpsi_pmt_t *dvbpmt;
static int pmtcompare( const void *pa, const void *pb )
{
- if ( ((pmt_map_t *)pa)->i_pid < ((pmt_map_t *)pb)->i_pid )
- return -1;
- else if ( ((pmt_map_t *)pa)->i_pid > ((pmt_map_t *)pb)->i_pid )
- return 1;
- else
- return 0;
+ int id1 = ((pmt_map_t *)pa)->i_pid;
+ int id2 = ((pmt_map_t *)pb)->i_pid;
+
+ return id1 - id2;
}
static int intcompare( const void *pa, const void *pb )
{
- if ( *(int *)pa < *(int *)pb )
- return -1;
- else if ( *(int *)pa > *(int *)pb )
- return 1;
- else
- return 0;
+ return *(int*)pa - *(int*)pb;
}
/*****************************************************************************
static block_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, bool b_pcr );
static void TSSetPCR( block_t *p_ts, mtime_t i_dts );
-static void PEStoTS ( sout_instance_t *, sout_buffer_chain_t *, block_t *, ts_stream_t * );
+static csa_t *csaSetup( 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;
+ char *csack = var_CreateGetNonEmptyStringCommand( p_mux, SOUT_CFG_PREFIX "csa-ck" );
+ if( !csack )
+ return NULL;
+
+ csa_t *csa = csa_New();
+
+ if( csa_SetCW( p_this, csa, csack, true ) )
+ {
+ free(csack);
+ csa_Delete( csa );
+ return NULL;
+ }
+
+ vlc_mutex_init( &p_sys->csa_lock );
+ p_sys->b_crypt_audio = var_GetBool( p_mux, SOUT_CFG_PREFIX "crypt-audio" );
+ p_sys->b_crypt_video = var_GetBool( p_mux, SOUT_CFG_PREFIX "crypt-video" );
+
+ char *csa2ck = var_CreateGetNonEmptyStringCommand( p_mux, SOUT_CFG_PREFIX "csa2-ck");
+ if (!csa2ck || csa_SetCW( p_this, csa, csa2ck, false ) )
+ csa_SetCW( p_this, csa, csack, false );
+ free(csa2ck);
+
+ var_Create( p_mux, SOUT_CFG_PREFIX "csa-use", VLC_VAR_STRING | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_mux, SOUT_CFG_PREFIX "csa-use", ActiveKeyCallback, NULL );
+ var_AddCallback( p_mux, SOUT_CFG_PREFIX "csa-ck", ChangeKeyCallback, (void *)1 );
+ var_AddCallback( p_mux, SOUT_CFG_PREFIX "csa2-ck", ChangeKeyCallback, NULL );
+
+ vlc_value_t use_val;
+ var_Get( p_mux, SOUT_CFG_PREFIX "csa-use", &use_val );
+ if ( var_Set( p_mux, SOUT_CFG_PREFIX "csa-use", use_val ) )
+ var_SetString( p_mux, SOUT_CFG_PREFIX "csa-use", "odd" );
+ free( use_val.psz_string );
+
+ p_sys->i_csa_pkt_size = var_GetInteger( p_mux, SOUT_CFG_PREFIX "csa-pkt" );
+ if( p_sys->i_csa_pkt_size < 12 || p_sys->i_csa_pkt_size > 188 )
+ {
+ msg_Err( p_mux, "wrong packet size %d specified",
+ p_sys->i_csa_pkt_size );
+ p_sys->i_csa_pkt_size = 188;
+ }
+
+ msg_Dbg( p_mux, "encrypting %d bytes of packet", p_sys->i_csa_pkt_size );
+
+ free(csack);
+
+ return csa;
+}
/*****************************************************************************
* Open:
{
sout_mux_t *p_mux =(sout_mux_t*)p_this;
sout_mux_sys_t *p_sys = NULL;
- vlc_value_t val;
- int i;
config_ChainParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg );
- p_sys = malloc( sizeof( sout_mux_sys_t ) );
+ p_sys = calloc( 1, sizeof( sout_mux_sys_t ) );
if( !p_sys )
return VLC_ENOMEM;
- p_sys->i_pmtslots = p_sys->b_sdt = 0;
p_sys->i_num_pmt = 1;
- p_sys->dvbpmt = NULL;
- memset( &p_sys->pmtmap, 0, sizeof(p_sys->pmtmap) );
-
- vlc_mutex_init( &p_sys->csa_lock );
p_mux->pf_control = Control;
p_mux->pf_addstream = AddStream;
p_mux->pf_mux = Mux;
p_mux->p_sys = p_sys;
- srand( (uint32_t)mdate() );
- for ( i = 0; i < MAX_PMT; i++ )
- p_sys->sdt_descriptors[i].psz_service_name
- = p_sys->sdt_descriptors[i].psz_provider = NULL;
- memset( p_sys->sdt_descriptors, 0, sizeof(sdt_desc_t) );
-
- p_sys->i_audio_bound = 0;
- p_sys->i_video_bound = 0;
+#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0))
+ p_sys->p_dvbpsi = dvbpsi_new( &dvbpsi_messages, DVBPSI_MSG_DEBUG );
+ if( !p_sys->p_dvbpsi )
+ {
+ free( p_sys );
+ return VLC_ENOMEM;
+ }
+ p_sys->p_dvbpsi->p_sys = (void *) p_mux;
+#endif
- var_Get( p_mux, SOUT_CFG_PREFIX "es-id-pid", &val );
- p_sys->b_es_id_pid = val.b_bool;
+ p_sys->b_es_id_pid = var_GetBool( p_mux, SOUT_CFG_PREFIX "es-id-pid" );
- var_Get( p_mux, SOUT_CFG_PREFIX "muxpmt", &val );
/*
fetch string of pmts. Here's a sample: --sout-ts-muxpmt="0x451,0x200,0x28a,0x240,,0x450,0x201,0x28b,0x241,,0x452,0x202,0x28c,0x242"
This would mean 0x451, 0x200, 0x28a, 0x240 would fall under one pmt (program), 0x450,0x201,0x28b,0x241 would fall under another
*/
- if( val.psz_string != NULL && *val.psz_string )
+ char *muxpmt = var_GetNonEmptyString(p_mux, SOUT_CFG_PREFIX "muxpmt");
+ for (char *psz = muxpmt; psz; )
{
char *psz_next;
- char *psz = val.psz_string;
- uint16_t i_pid;
- psz_next = psz;
+ uint16_t i_pid = strtoul( psz, &psz_next, 0 );
+ psz = *psz_next ? &psz_next[1] : NULL;
- while( psz != NULL )
+ if ( i_pid == 0 )
{
- i_pid = strtoul( psz, &psz_next, 0 );
-
- if ( strlen(psz_next) > 0 )
- psz = &psz_next[1];
- if ( i_pid == 0 )
+ if ( ++p_sys->i_num_pmt > MAX_PMT )
{
- p_sys->i_num_pmt++;
- if ( p_sys->i_num_pmt > MAX_PMT )
- {
- msg_Err( p_mux,
- "Number of PMTs greater than compiled maximum (%d)", MAX_PMT );
- p_sys->i_num_pmt = MAX_PMT;
- }
+ msg_Err( p_mux, "Number of PMTs > %d)", MAX_PMT );
+ p_sys->i_num_pmt = MAX_PMT;
}
- else
+ }
+ else
+ {
+ p_sys->pmtmap[p_sys->i_pmtslots].i_pid = i_pid;
+ p_sys->pmtmap[p_sys->i_pmtslots].i_prog = p_sys->i_num_pmt - 1;
+ if ( ++p_sys->i_pmtslots > MAX_PMT_PID )
{
- p_sys->pmtmap[p_sys->i_pmtslots].i_pid = i_pid;
- p_sys->pmtmap[p_sys->i_pmtslots].i_prog = p_sys->i_num_pmt - 1;
- p_sys->i_pmtslots++;
- if ( p_sys->i_pmtslots > MAX_PMT_PID )
- {
- msg_Err( p_mux,
- "Number of pids in PMT greater than compiled maximum (%d)",
- MAX_PMT_PID );
- p_sys->i_pmtslots = MAX_PMT_PID;
- }
+ msg_Err( p_mux, "Number of pids in PMT > %d", MAX_PMT_PID );
+ p_sys->i_pmtslots = MAX_PMT_PID;
}
-
- /* Now sort according to pids for fast search later on */
- qsort( (void *)p_sys->pmtmap, p_sys->i_pmtslots,
- sizeof(pmt_map_t), &pmtcompare );
- if ( !*psz_next )
- psz = NULL;
}
}
- free( val.psz_string );
+ /* Now sort according to pids for fast search later on */
+ qsort( (void *)p_sys->pmtmap, p_sys->i_pmtslots,
+ sizeof(pmt_map_t), pmtcompare );
+ free(muxpmt);
- p_sys->i_pat_version_number = rand() % 32;
- p_sys->pat.i_pid = 0;
- p_sys->pat.i_continuity_counter = 0;
- p_sys->pat.b_discontinuity = false;
+ unsigned short subi[3];
+ vlc_rand_bytes(subi, sizeof(subi));
+ p_sys->i_pat_version_number = nrand48(subi) & 0x1f;
+ vlc_value_t val;
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_tsid = nrand48(subi) & 0xffff;
+
+ p_sys->i_netid = nrand48(subi) & 0xffff;
- p_sys->i_netid = rand() % 65536;
-#ifdef HAVE_DVBPSI_SDT
var_Get( p_mux, SOUT_CFG_PREFIX "netid", &val );
if ( val.i_int )
p_sys->i_netid = val.i_int;
-#endif
-
- p_sys->i_pmt_version_number = rand() % 32;
- for( i = 0; i < p_sys->i_num_pmt; i++ )
- {
- p_sys->pmt[i].i_continuity_counter = 0;
- p_sys->pmt[i].b_discontinuity = false;
- }
+ p_sys->i_pmt_version_number = nrand48(subi) & 0x1f;
p_sys->sdt.i_pid = 0x11;
- p_sys->sdt.i_continuity_counter = 0;
- p_sys->sdt.b_discontinuity = false;
-#ifdef HAVE_DVBPSI_SDT
- var_Get( p_mux, SOUT_CFG_PREFIX "sdtdesc", &val );
- p_sys->b_sdt = val.psz_string && *val.psz_string ? true : false;
+ char *sdtdesc = var_GetNonEmptyString( p_mux, SOUT_CFG_PREFIX "sdtdesc" );
/* Syntax is provider_sdt1,service_name_sdt1,provider_sdt2,service_name_sdt2... */
- if( p_sys->b_sdt )
+ if( sdtdesc )
{
+ p_sys->b_sdt = true;
- char *psz = val.psz_string;
- char *psz_sdttoken = psz;
+ char *psz_sdttoken = sdtdesc;
- i = 0;
- while ( psz_sdttoken != NULL )
+ for (int i = 0; i < MAX_PMT * 2 && psz_sdttoken; i++)
{
+ sdt_desc_t *sdt = &p_sys->sdt_descriptors[i/2];
char *psz_end = strchr( psz_sdttoken, ',' );
- if( psz_end != NULL )
- {
+ if ( psz_end )
*psz_end++ = '\0';
- }
- if ( !(i % 2) )
- {
- p_sys->sdt_descriptors[i/2].psz_provider
- = strdup(psz_sdttoken);
- }
+
+ if (i % 2)
+ sdt->psz_service_name = strdup(psz_sdttoken);
else
- {
- p_sys->sdt_descriptors[i/2].psz_service_name
- = strdup(psz_sdttoken);
- }
+ sdt->psz_provider = strdup(psz_sdttoken);
- i++;
psz_sdttoken = psz_end;
}
+ free(sdtdesc);
}
- free( val.psz_string );
-#else
- p_sys->b_sdt = false;
-#endif
- var_Get( p_mux, SOUT_CFG_PREFIX "alignment", &val );
- p_sys->b_data_alignment = val.b_bool;
+ p_sys->b_data_alignment = var_GetBool( p_mux, SOUT_CFG_PREFIX "alignment" );
- var_Get( p_mux, SOUT_CFG_PREFIX "program-pmt", &val );
- if( val.psz_string && *val.psz_string )
+ char *pgrpmt = var_GetNonEmptyString(p_mux, SOUT_CFG_PREFIX "program-pmt");
+ if( pgrpmt )
{
- char *psz_next;
- char *psz = val.psz_string;
- uint16_t i_pid;
+ char *psz = pgrpmt;
+ char *psz_next = psz;
- psz_next = psz;
- i = 0;
- while ( psz != NULL )
+ for (int i = 0; psz; )
{
- i_pid = strtoul( psz, &psz_next, 0 );
- if( strlen(psz_next) > 0 )
+ uint16_t i_pid = strtoul( psz, &psz_next, 0 );
+ if( psz_next[0] != '\0' )
psz = &psz_next[1];
else
psz = NULL;
if( i_pid == 0 )
{
if( i > MAX_PMT )
- msg_Err( p_mux, "Number of PMTs > maximum (%d)",
- MAX_PMT );
+ msg_Err( p_mux, "Number of PMTs > maximum (%d)", MAX_PMT );
}
else
{
i++;
}
}
+ free(pgrpmt);
}
else
{
/* Option not specified, use 1, 2, 3... */
- for( i = 0; i < p_sys->i_num_pmt; i++ )
+ for (unsigned i = 0; i < p_sys->i_num_pmt; i++ )
p_sys->i_pmt_program_number[i] = i + 1;
}
- free( val.psz_string );
var_Get( p_mux, SOUT_CFG_PREFIX "pid-pmt", &val );
- if( val.i_int )
- {
- for( i = 0; i < p_sys->i_num_pmt; i++ )
- p_sys->pmt[i].i_pid = val.i_int + i; /* Does this make any sense? */
- }
- else
- {
- for( i = 0; i < p_sys->i_num_pmt; i++ )
- p_sys->pmt[i].i_pid = 0x42 + i;
- }
+ if( !val.i_int ) /* Does this make any sense? */
+ val.i_int = 0x42;
+ for (unsigned i = 0; i < p_sys->i_num_pmt; i++ )
+ p_sys->pmt[i].i_pid = val.i_int + i;
p_sys->i_pid_free = p_sys->pmt[p_sys->i_num_pmt - 1].i_pid + 1;
- var_Get( p_mux, SOUT_CFG_PREFIX "pid-video", &val );
- p_sys->i_pid_video = val.i_int;
+ p_sys->i_pid_video = var_GetInteger( p_mux, SOUT_CFG_PREFIX "pid-video" );
if ( p_sys->i_pid_video > p_sys->i_pid_free )
{
p_sys->i_pid_free = p_sys->i_pid_video + 1;
}
- var_Get( p_mux, SOUT_CFG_PREFIX "pid-audio", &val );
- p_sys->i_pid_audio = val.i_int;
+ p_sys->i_pid_audio = var_GetInteger( p_mux, SOUT_CFG_PREFIX "pid-audio" );
if ( p_sys->i_pid_audio > p_sys->i_pid_free )
{
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;
+ p_sys->i_pid_spu = var_GetInteger( p_mux, SOUT_CFG_PREFIX "pid-spu" );
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;
-
- p_sys->i_mpeg4_streams = 0;
-
- p_sys->i_null_continuity_counter = 0;
/* Allow to create constrained stream */
- var_Get( p_mux, SOUT_CFG_PREFIX "bmin", &val );
- p_sys->i_bitrate_min = val.i_int;
+ p_sys->i_bitrate_min = var_GetInteger( p_mux, SOUT_CFG_PREFIX "bmin" );
- var_Get( p_mux, SOUT_CFG_PREFIX "bmax", &val );
- p_sys->i_bitrate_max = val.i_int;
+ p_sys->i_bitrate_max = var_GetInteger( p_mux, SOUT_CFG_PREFIX "bmax" );
if( p_sys->i_bitrate_min > 0 && p_sys->i_bitrate_max > 0 &&
p_sys->i_bitrate_min > p_sys->i_bitrate_max )
}
var_Get( p_mux, SOUT_CFG_PREFIX "shaping", &val );
- p_sys->i_shaping_delay = (int64_t)val.i_int * 1000;
+ p_sys->i_shaping_delay = val.i_int * 1000;
if( p_sys->i_shaping_delay <= 0 )
{
msg_Err( p_mux,
}
var_Get( p_mux, SOUT_CFG_PREFIX "pcr", &val );
- p_sys->i_pcr_delay = (int64_t)val.i_int * 1000;
+ p_sys->i_pcr_delay = val.i_int * 1000;
if( p_sys->i_pcr_delay <= 0 ||
p_sys->i_pcr_delay >= p_sys->i_shaping_delay )
{
}
var_Get( p_mux, SOUT_CFG_PREFIX "dts-delay", &val );
- p_sys->i_dts_delay = (int64_t)val.i_int * 1000;
+ p_sys->i_dts_delay = val.i_int * 1000;
msg_Dbg( p_mux, "shaping=%"PRId64" pcr=%"PRId64" dts_delay=%"PRId64,
p_sys->i_shaping_delay, p_sys->i_pcr_delay, p_sys->i_dts_delay );
- var_Get( p_mux, SOUT_CFG_PREFIX "use-key-frames", &val );
- p_sys->b_use_key_frames = val.b_bool;
-
- /* for TS generation */
- p_sys->i_pcr = 0;
-
- p_sys->csa = NULL;
- var_Create( p_mux, SOUT_CFG_PREFIX "csa-ck", VLC_VAR_STRING | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND );
- var_Get( p_mux, SOUT_CFG_PREFIX "csa-ck", &val );
- if( val.psz_string && *val.psz_string )
- {
- int i_res;
- vlc_value_t csa2;
-
- p_sys->csa = csa_New();
-
- var_Create( p_mux, SOUT_CFG_PREFIX "csa2-ck", VLC_VAR_STRING | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND );
- var_Get( p_mux, SOUT_CFG_PREFIX "csa2-ck", &csa2 );
- i_res = csa_SetCW( (vlc_object_t*)p_mux, p_sys->csa, val.psz_string, true );
- if( i_res == VLC_SUCCESS && csa2.psz_string && *csa2.psz_string )
- {
- if( csa_SetCW( (vlc_object_t*)p_mux, p_sys->csa, csa2.psz_string, false ) != VLC_SUCCESS )
- {
- csa_SetCW( (vlc_object_t*)p_mux, p_sys->csa, val.psz_string, false );
- }
- }
- else if( i_res == VLC_SUCCESS )
- {
- csa_SetCW( (vlc_object_t*)p_mux, p_sys->csa, val.psz_string, false );
- }
- else
- {
- csa_Delete( p_sys->csa );
- p_sys->csa = NULL;
- }
-
- if( p_sys->csa )
- {
- vlc_value_t use_val, pkt_val;
-
- var_Create( p_mux, SOUT_CFG_PREFIX "csa-use", VLC_VAR_STRING | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND );
- var_Get( p_mux, SOUT_CFG_PREFIX "csa-use", &use_val );
- var_AddCallback( p_mux, SOUT_CFG_PREFIX "csa-use", ActiveKeyCallback, NULL );
- var_AddCallback( p_mux, SOUT_CFG_PREFIX "csa-ck", ChangeKeyCallback, (void *)1 );
- var_AddCallback( p_mux, SOUT_CFG_PREFIX "csa2-ck", ChangeKeyCallback, NULL );
-
- if ( var_Set( p_mux, SOUT_CFG_PREFIX "csa-use", use_val ) != VLC_SUCCESS )
- {
- var_SetString( p_mux, SOUT_CFG_PREFIX "csa-use", "odd" );
- }
- free( use_val.psz_string );
-
- 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 );
- }
- free( csa2.psz_string );
- }
- free( val.psz_string );
-
- var_Get( p_mux, SOUT_CFG_PREFIX "crypt-audio", &val );
- p_sys->b_crypt_audio = val.b_bool;
+ p_sys->b_use_key_frames = var_GetBool( p_mux, SOUT_CFG_PREFIX "use-key-frames" );
- var_Get( p_mux, SOUT_CFG_PREFIX "crypt-video", &val );
- p_sys->b_crypt_video = val.b_bool;
+ p_sys->csa = csaSetup(p_this);
return VLC_SUCCESS;
}
{
sout_mux_t *p_mux = (sout_mux_t*)p_this;
sout_mux_sys_t *p_sys = p_mux->p_sys;
- int i;
- vlc_mutex_lock( &p_sys->csa_lock );
+#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0))
+ if( p_sys->p_dvbpsi )
+ dvbpsi_delete( p_sys->p_dvbpsi );
+#endif
+
if( p_sys->csa )
{
var_DelCallback( p_mux, SOUT_CFG_PREFIX "csa-ck", ChangeKeyCallback, NULL );
var_DelCallback( p_mux, SOUT_CFG_PREFIX "csa2-ck", ChangeKeyCallback, NULL );
var_DelCallback( p_mux, SOUT_CFG_PREFIX "csa-use", ActiveKeyCallback, NULL );
csa_Delete( p_sys->csa );
- p_sys->csa = NULL;
+ vlc_mutex_destroy( &p_sys->csa_lock );
}
- vlc_mutex_unlock( &p_sys->csa_lock );
- for( i = 0; i < MAX_PMT; i++ )
+ for (int i = 0; i < MAX_PMT; i++ )
{
free( p_sys->sdt_descriptors[i].psz_service_name );
free( p_sys->sdt_descriptors[i].psz_provider );
}
- vlc_mutex_destroy( &p_sys->csa_lock );
free( p_sys->dvbpmt );
free( p_sys );
}
sout_mux_sys_t *p_sys = p_mux->p_sys;
int ret;
- vlc_mutex_lock( &p_sys->csa_lock );
- ret = csa_SetCW( p_this, p_sys->csa, newval.psz_string,
- !!(intptr_t)p_data );
- vlc_mutex_unlock( &p_sys->csa_lock );
+ vlc_mutex_lock(&p_sys->csa_lock);
+ ret = csa_SetCW(p_this, p_sys->csa, newval.psz_string, !!(intptr_t)p_data);
+ vlc_mutex_unlock(&p_sys->csa_lock);
return ret;
}
VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data);
sout_mux_t *p_mux = (sout_mux_t*)p_this;
sout_mux_sys_t *p_sys = p_mux->p_sys;
- int i_res = VLC_EBADVAR;
+ int i_res, use_odd = -1;
- vlc_mutex_lock( &p_sys->csa_lock );
- if( !strcmp(newval.psz_string, "odd" ) || !strcmp(newval.psz_string, "first" ) || !strcmp(newval.psz_string, "1" ) )
+ if( !strcmp(newval.psz_string, "odd" ) ||
+ !strcmp(newval.psz_string, "first" ) ||
+ !strcmp(newval.psz_string, "1" ) )
{
- i_res = csa_UseKey( (vlc_object_t*)p_mux, p_sys->csa, 1 );
+ use_odd = 1;
}
- else if( !strcmp(newval.psz_string, "even" ) || !strcmp(newval.psz_string, "second" ) || !strcmp(newval.psz_string, "2" ) )
+ else if( !strcmp(newval.psz_string, "even" ) ||
+ !strcmp(newval.psz_string, "second" ) ||
+ !strcmp(newval.psz_string, "2" ) )
{
- i_res = csa_UseKey( (vlc_object_t*)p_mux, p_sys->csa, 0 );
+ use_odd = 0;
}
+
+ if (use_odd < 0)
+ return VLC_EBADVAR;
+
+ vlc_mutex_lock( &p_sys->csa_lock );
+ i_res = csa_UseKey( p_this, p_sys->csa, use_odd );
vlc_mutex_unlock( &p_sys->csa_lock );
return i_res;
switch( i_query )
{
- case MUX_CAN_ADD_STREAM_WHILE_MUXING:
- pb_bool = (bool*)va_arg( args, bool * );
- *pb_bool = true;
- return VLC_SUCCESS;
+ case MUX_CAN_ADD_STREAM_WHILE_MUXING:
+ pb_bool = (bool*)va_arg( args, bool * );
+ *pb_bool = true;
+ return VLC_SUCCESS;
+
+ case MUX_GET_ADD_STREAM_WAIT:
+ pb_bool = (bool*)va_arg( args, bool * );
+ *pb_bool = false;
+ return VLC_SUCCESS;
+
+ case MUX_GET_MIME:
+ ppsz = (char**)va_arg( args, char ** );
+ *ppsz = strdup( "video/mp2t" );
+ return VLC_SUCCESS;
- case MUX_GET_ADD_STREAM_WAIT:
- pb_bool = (bool*)va_arg( args, bool * );
- *pb_bool = false;
- return VLC_SUCCESS;
+ default:
+ return VLC_EGENERIC;
+ }
+}
+
+/* returns a pointer to a valid string, with length 0 or 3 */
+static const char *GetIso639_2LangCode(const char *lang)
+{
+ const iso639_lang_t *pl;
- case MUX_GET_MIME:
- ppsz = (char**)va_arg( args, char ** );
- *ppsz = strdup( "video/mpeg" ); /* FIXME not sure */
- return VLC_SUCCESS;
+ if (strlen(lang) == 2)
+ {
+ pl = GetLang_1(lang);
+ }
+ else
+ {
+ pl = GetLang_2B(lang); /* try native code first */
+ if (!*pl->psz_iso639_2T)
+ pl = GetLang_2T(lang); /* else fallback to english code */
- default:
- return VLC_EGENERIC;
}
+
+ return pl->psz_iso639_2T; /* returns the english code */
}
/*****************************************************************************
{
sout_mux_sys_t *p_sys = p_mux->p_sys;
ts_stream_t *p_stream;
- int i;
- p_input->p_sys = p_stream = malloc( sizeof( ts_stream_t ) );
- if( !p_input->p_sys )
- return VLC_ENOMEM;
+ p_input->p_sys = p_stream = calloc( 1, sizeof( ts_stream_t ) );
+ if( !p_stream )
+ goto oom;
- /* Init this new stream */
if ( p_sys->b_es_id_pid )
p_stream->i_pid = p_input->p_fmt->i_id & 0x1fff;
else
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 = false;
- 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 );
+ p_stream->i_codec = p_input->p_fmt->i_codec;
- /* All others fields depand on codec */
- switch( p_input->p_fmt->i_cat )
+ p_stream->i_stream_type = -1;
+ switch( p_input->p_fmt->i_codec )
{
- case VIDEO_ES:
- switch( p_input->p_fmt->i_codec )
- {
- case VLC_CODEC_MPGV:
- /* TODO: do we need to check MPEG-I/II ? */
- p_stream->i_stream_type = 0x02;
- p_stream->i_stream_id = 0xe0;
- break;
- case VLC_CODEC_MP4V:
- p_stream->i_stream_type = 0x10;
- p_stream->i_stream_id = 0xe0;
- p_stream->i_es_id = p_stream->i_pid;
- break;
- case VLC_CODEC_H264:
- p_stream->i_stream_type = 0x1b;
- p_stream->i_stream_id = 0xe0;
- break;
- /* XXX dirty dirty but somebody want that:
- * using crapy MS-codec XXX */
- /* I didn't want to do that :P */
- case VLC_CODEC_H263I:
- case VLC_CODEC_H263:
- case VLC_CODEC_WMV3:
- case VLC_CODEC_WMV2:
- case VLC_CODEC_WMV1:
- case VLC_CODEC_DIV3:
- case VLC_CODEC_DIV2:
- case VLC_CODEC_DIV1:
- case VLC_CODEC_MJPG:
- 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;
- case VLC_CODEC_DIRAC:
- /* stream_id makes use of stream_id_extension */
- p_stream->i_stream_id = (PES_EXTENDED_STREAM_ID << 8) | 0x60;
- p_stream->i_stream_type = 0xd1;
- break;
- default:
- free( p_stream );
- return VLC_EGENERIC;
- }
- p_sys->i_video_bound++;
- break;
-
- case AUDIO_ES:
- switch( p_input->p_fmt->i_codec )
- {
- case VLC_CODEC_MPGA:
- case VLC_FOURCC( 'm', 'p', '3', ' ' ):
- p_stream->i_stream_type =
- p_input->p_fmt->audio.i_rate >= 32000 ? 0x03 : 0x04;
- p_stream->i_stream_id = 0xc0;
- break;
- case VLC_CODEC_A52:
- p_stream->i_stream_type = 0x81;
- p_stream->i_stream_id = 0xbd;
- break;
- case VLC_CODEC_DVD_LPCM:
- p_stream->i_stream_type = 0x83;
- p_stream->i_stream_id = 0xbd;
- break;
- case VLC_CODEC_DTS:
- p_stream->i_stream_type = 0x06;
- p_stream->i_stream_id = 0xbd;
- break;
- case VLC_CODEC_MP4A:
- /* XXX: make that configurable in some way when LOAS
- * is implemented for AAC in TS */
- //p_stream->i_stream_type = 0x11; /* LOAS/LATM */
- p_stream->i_stream_type = 0x0f; /* ADTS */
- p_stream->i_stream_id = 0xc0;
- p_sys->i_mpeg4_streams++;
- p_stream->i_es_id = p_stream->i_pid;
- break;
- default:
- free( p_stream );
- return VLC_EGENERIC;
- }
- p_sys->i_audio_bound++;
- break;
-
- case SPU_ES:
- switch( p_input->p_fmt->i_codec )
- {
- case VLC_CODEC_SPU:
- p_stream->i_stream_type = 0x82;
- p_stream->i_stream_id = 0xbd;
- break;
- case VLC_CODEC_SUBT:
- p_stream->i_stream_type = 0x12;
- p_stream->i_stream_id = 0xfa;
- p_sys->i_mpeg4_streams++;
- p_stream->i_es_id = p_stream->i_pid;
- break;
- case VLC_CODEC_DVBS:
- p_stream->i_stream_type = 0x06;
- p_stream->i_es_id = p_input->p_fmt->subs.dvb.i_id;
- p_stream->i_stream_id = 0xbd;
- break;
- case VLC_CODEC_TELETEXT:
- p_stream->i_stream_type = 0x06;
- p_stream->i_stream_id = 0xbd; /* FIXME */
- break;
- default:
- free( p_stream );
- return VLC_EGENERIC;
- }
- break;
-
- default:
- free( p_stream );
- return VLC_EGENERIC;
- }
-
- p_stream->i_langs = 1+p_input->p_fmt->i_extra_languages;
- p_stream->lang = malloc(p_stream->i_langs*3);
- if( !p_stream->lang )
+ /* VIDEO */
+
+ case VLC_CODEC_MPGV:
+ /* TODO: do we need to check MPEG-I/II ? */
+ p_stream->i_stream_type = 0x02;
+ p_stream->i_stream_id = 0xe0;
+ break;
+ case VLC_CODEC_MP4V:
+ p_stream->i_stream_type = 0x10;
+ p_stream->i_stream_id = 0xe0;
+ p_stream->i_es_id = p_stream->i_pid;
+ break;
+ case VLC_CODEC_H264:
+ p_stream->i_stream_type = 0x1b;
+ p_stream->i_stream_id = 0xe0;
+ break;
+ /* XXX dirty dirty but somebody want crapy MS-codec XXX */
+ case VLC_CODEC_H263I:
+ case VLC_CODEC_H263:
+ case VLC_CODEC_WMV3:
+ case VLC_CODEC_WMV2:
+ case VLC_CODEC_WMV1:
+ case VLC_CODEC_DIV3:
+ case VLC_CODEC_DIV2:
+ case VLC_CODEC_DIV1:
+ case VLC_CODEC_MJPG:
+ 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;
+ case VLC_CODEC_DIRAC:
+ /* stream_id makes use of stream_id_extension */
+ p_stream->i_stream_id = (PES_EXTENDED_STREAM_ID << 8) | 0x60;
+ p_stream->i_stream_type = 0xd1;
+ break;
+
+ /* AUDIO */
+
+ case VLC_CODEC_MPGA:
+ p_stream->i_stream_type =
+ p_input->p_fmt->audio.i_rate >= 32000 ? 0x03 : 0x04;
+ p_stream->i_stream_id = 0xc0;
+ break;
+ case VLC_CODEC_A52:
+ p_stream->i_stream_type = 0x81;
+ p_stream->i_stream_id = 0xbd;
+ break;
+ case VLC_CODEC_EAC3:
+ p_stream->i_stream_type = 0x06;
+ p_stream->i_stream_id = 0xbd;
+ break;
+ case VLC_CODEC_DVD_LPCM:
+ p_stream->i_stream_type = 0x83;
+ p_stream->i_stream_id = 0xbd;
+ break;
+ case VLC_CODEC_DTS:
+ p_stream->i_stream_type = 0x06;
+ p_stream->i_stream_id = 0xbd;
+ break;
+ case VLC_CODEC_MP4A:
+ /* XXX: make that configurable in some way when LOAS
+ * is implemented for AAC in TS */
+ //p_stream->i_stream_type = 0x11; /* LOAS/LATM */
+ p_stream->i_stream_type = 0x0f; /* ADTS */
+ p_stream->i_stream_id = 0xc0;
+ p_sys->i_mpeg4_streams++;
+ p_stream->i_es_id = p_stream->i_pid;
+ break;
+
+ /* TEXT */
+
+ case VLC_CODEC_SPU:
+ p_stream->i_stream_type = 0x82;
+ p_stream->i_stream_id = 0xbd;
+ break;
+ case VLC_CODEC_SUBT:
+ p_stream->i_stream_type = 0x12;
+ p_stream->i_stream_id = 0xfa;
+ p_sys->i_mpeg4_streams++;
+ p_stream->i_es_id = p_stream->i_pid;
+ break;
+ case VLC_CODEC_DVBS:
+ p_stream->i_stream_type = 0x06;
+ p_stream->i_es_id = p_input->p_fmt->subs.dvb.i_id;
+ p_stream->i_stream_id = 0xbd;
+ break;
+ case VLC_CODEC_TELETEXT:
+ p_stream->i_stream_type = 0x06;
+ p_stream->i_stream_id = 0xbd; /* FIXME */
+ break;
+ }
+
+ if (p_stream->i_stream_type == -1)
{
- p_stream->i_langs = 0;
free( p_stream );
- return VLC_ENOMEM;
+ return VLC_EGENERIC;
}
- i = 1;
- p_stream->lang[0] =
- p_stream->lang[1] =
- p_stream->lang[2] = '\0';
- if( p_input->p_fmt->psz_language )
- {
- char *psz = p_input->p_fmt->psz_language;
- const iso639_lang_t *pl = NULL;
- if( strlen( psz ) == 2 )
- {
- pl = GetLang_1( psz );
- }
- else if( strlen( psz ) == 3 )
- {
- pl = GetLang_2B( psz );
- if( !strcmp( pl->psz_iso639_1, "??" ) )
- {
- pl = GetLang_2T( psz );
- }
- }
- if( pl && strcmp( pl->psz_iso639_1, "??" ) )
- {
- p_stream->lang[0] = pl->psz_iso639_2T[0];
- p_stream->lang[1] = pl->psz_iso639_2T[1];
- p_stream->lang[2] = pl->psz_iso639_2T[2];
+ p_stream->i_langs = 1 + p_input->p_fmt->i_extra_languages;
+ p_stream->lang = calloc(1, p_stream->i_langs * 4);
+ if( !p_stream->lang )
+ goto oom;
- msg_Dbg( p_mux, " - lang=%c%c%c",
- p_stream->lang[0], p_stream->lang[1],
- p_stream->lang[2] );
- }
- }
- while( i < p_stream->i_langs ) {
- if( p_input->p_fmt->p_extra_languages[i-1].psz_language )
- {
- char *psz = p_input->p_fmt->p_extra_languages[i-1].psz_language;
- const iso639_lang_t *pl = NULL;
+ msg_Dbg( p_mux, "adding input codec=%4.4s pid=%d",
+ (char*)&p_stream->i_codec, p_stream->i_pid );
- if( strlen( psz ) == 2 )
- {
- pl = GetLang_1( psz );
- }
- else if( strlen( psz ) == 3 )
- {
- pl = GetLang_2B( psz );
- if( !strcmp( pl->psz_iso639_1, "??" ) )
- {
- pl = GetLang_2T( psz );
- }
- }
- if( pl && strcmp( pl->psz_iso639_1, "??" ) )
- {
- p_stream->lang[i*3+0] = pl->psz_iso639_2T[0];
- p_stream->lang[i*3+1] = pl->psz_iso639_2T[1];
- p_stream->lang[i*3+2] = pl->psz_iso639_2T[2];
-
- msg_Dbg( p_mux, " - lang=%c%c%c",
- p_stream->lang[i*3+0], p_stream->lang[i*3+1],
- p_stream->lang[i*3+2] );
- }
+ for (int i = 0; i < p_stream->i_langs; i++) {
+ char *lang = (i == 0)
+ ? p_input->p_fmt->psz_language
+ : p_input->p_fmt->p_extra_languages[i-1].psz_language;
+
+ if (!lang)
+ continue;
+
+ const char *code = GetIso639_2LangCode(lang);
+ if (*code)
+ {
+ memcpy(&p_stream->lang[i*4], code, 3);
+ p_stream->lang[i*4+3] = 0x00; /* audio type: 0x00 undefined */
+ msg_Dbg( p_mux, " - lang=%3.3s", &p_stream->lang[i*4] );
}
- i++;
}
/* Create decoder specific info for subt */
if( p_stream->i_codec == VLC_CODEC_SUBT )
{
- uint8_t *p;
-
- p_stream->i_decoder_specific_info = 55;
- p_stream->p_decoder_specific_info = p =
- malloc( p_stream->i_decoder_specific_info );
- if( p )
- {
- p[0] = 0x10; /* textFormat, 0x10 for 3GPP TS 26.245 */
- p[1] = 0x00; /* flags: 1b: associated video info flag
- 3b: reserved
- 1b: duration flag
- 3b: reserved */
- p[2] = 52; /* remaining size */
-
- p += 3;
-
- p[0] = p[1] = p[2] = p[3] = 0; p+=4; /* display flags */
- *p++ = 0; /* horizontal justification (-1: left, 0 center, 1 right) */
- *p++ = 1; /* vertical justification (-1: top, 0 center, 1 bottom) */
-
- p[0] = p[1] = p[2] = 0x00; p+=3;/* background rgb */
- *p++ = 0xff; /* background a */
-
- p[0] = p[1] = 0; p += 2; /* text box top */
- p[0] = p[1] = 0; p += 2; /* text box left */
- p[0] = p[1] = 0; p += 2; /* text box bottom */
- p[0] = p[1] = 0; p += 2; /* text box right */
-
- p[0] = p[1] = 0; p += 2; /* start char */
- p[0] = p[1] = 0; p += 2; /* end char */
- p[0] = p[1] = 0; p += 2; /* default font id */
-
- *p++ = 0; /* font style flags */
- *p++ = 12; /* font size */
-
- p[0] = p[1] = p[2] = 0x00; p+=3;/* foreground rgb */
- *p++ = 0x00; /* foreground a */
-
- p[0] = p[1] = p[2] = 0; p[3] = 22; p += 4;
- memcpy( p, "ftab", 4 ); p += 4;
- *p++ = 0; *p++ = 1; /* entry count */
- p[0] = p[1] = 0; p += 2; /* font id */
- *p++ = 9; /* font name length */
- memcpy( p, "Helvetica", 9 ); /* font name */
- }
- else p_stream->i_decoder_specific_info = 0;
+ p_stream->i_extra = 55;
+ p_stream->p_extra = malloc( p_stream->i_extra );
+ if (!p_stream->p_extra)
+ goto oom;
+
+ uint8_t *p = p_stream->p_extra;
+ p[0] = 0x10; /* textFormat, 0x10 for 3GPP TS 26.245 */
+ p[1] = 0x00; /* flags: 1b: associated video info flag
+ 3b: reserved
+ 1b: duration flag
+ 3b: reserved */
+ p[2] = 52; /* remaining size */
+
+ p += 3;
+
+ p[0] = p[1] = p[2] = p[3] = 0; p+=4; /* display flags */
+ *p++ = 0; /* horizontal justification (-1: left, 0 center, 1 right) */
+ *p++ = 1; /* vertical justification (-1: top, 0 center, 1 bottom) */
+
+ p[0] = p[1] = p[2] = 0x00; p+=3;/* background rgb */
+ *p++ = 0xff; /* background a */
+
+ p[0] = p[1] = 0; p += 2; /* text box top */
+ p[0] = p[1] = 0; p += 2; /* text box left */
+ p[0] = p[1] = 0; p += 2; /* text box bottom */
+ p[0] = p[1] = 0; p += 2; /* text box right */
+
+ p[0] = p[1] = 0; p += 2; /* start char */
+ p[0] = p[1] = 0; p += 2; /* end char */
+ p[0] = p[1] = 0; p += 2; /* default font id */
+
+ *p++ = 0; /* font style flags */
+ *p++ = 12; /* font size */
+
+ p[0] = p[1] = p[2] = 0x00; p+=3;/* foreground rgb */
+ *p++ = 0x00; /* foreground a */
+
+ p[0] = p[1] = p[2] = 0; p[3] = 22; p += 4;
+ memcpy( p, "ftab", 4 ); p += 4;
+ *p++ = 0; *p++ = 1; /* entry count */
+ p[0] = p[1] = 0; p += 2; /* font id */
+ *p++ = 9; /* font name length */
+ memcpy( p, "Helvetica", 9 ); /* font name */
}
else
{
/* 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 )
+ es_format_t *fmt = p_input->p_fmt;
+ if( fmt->i_extra > 0 )
{
- p_stream->p_decoder_specific_info =
- malloc( p_stream->i_decoder_specific_info );
- if( p_stream->p_decoder_specific_info )
- {
- memcpy( p_stream->p_decoder_specific_info,
- p_input->p_fmt->p_extra,
- p_input->p_fmt->i_extra );
- }
- else p_stream->i_decoder_specific_info = 0;
+ p_stream->i_extra = fmt->i_extra;
+ p_stream->p_extra = malloc( fmt->i_extra );
+ if( !p_stream->p_extra )
+ goto oom;
+
+ memcpy( p_stream->p_extra, fmt->p_extra, 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;
- p_stream->b_key_frame = 0;
/* We only change PMT version (PAT isn't changed) */
p_sys->i_pmt_version_number = ( p_sys->i_pmt_version_number + 1 )%32;
}
return VLC_SUCCESS;
+
+oom:
+ free(p_stream->lang);
+ free(p_stream);
+ return VLC_ENOMEM;
}
/*****************************************************************************
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;
- vlc_value_t val;
+ ts_stream_t *p_stream = (ts_stream_t*)p_input->p_sys;
+ int pid;
- 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++ )
+ for (int i = 0; i < p_mux->i_nb_inputs; i++ )
{
if( p_mux->pp_inputs[i] == p_input )
{
BufferChainClean( &p_stream->chain_pes );
free(p_stream->lang);
- free( p_stream->p_decoder_specific_info );
+ free( p_stream->p_extra );
if( p_stream->i_stream_id == 0xfa ||
p_stream->i_stream_id == 0xfb ||
p_stream->i_stream_id == 0xfe )
p_sys->i_mpeg4_streams--;
}
- var_Get( p_mux, SOUT_CFG_PREFIX "pid-video", &val );
- if( val.i_int > 0 )
+ pid = var_GetInteger( p_mux, SOUT_CFG_PREFIX "pid-video" );
+ if ( pid > 0 && pid == p_stream->i_pid )
{
- int i_pid_video = val.i_int;
- 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 );
- }
+ p_sys->i_pid_video = pid;
+ msg_Dbg( p_mux, "freeing video PID %d", pid);
}
- var_Get( p_mux, SOUT_CFG_PREFIX "pid-audio", &val );
- if( val.i_int > 0 )
+ pid = var_GetInteger( p_mux, SOUT_CFG_PREFIX "pid-audio" );
+ if ( pid > 0 && pid == p_stream->i_pid )
{
- int i_pid_audio = val.i_int;
- 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 );
- }
+ p_sys->i_pid_audio = pid;
+ msg_Dbg( p_mux, "freeing audio PID %d", pid);
}
- var_Get( p_mux, SOUT_CFG_PREFIX "pid-spu", &val );
- if( val.i_int > 0 )
+ pid = var_GetInteger( p_mux, SOUT_CFG_PREFIX "pid-spu" );
+ if ( pid > 0 && pid == p_stream->i_pid )
{
- 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 );
- }
+ p_sys->i_pid_spu = pid;
+ msg_Dbg( p_mux, "freeing spu PID %d", pid);
}
+
free( p_stream );
/* We only change PMT version (PAT isn't changed) */
- p_sys->i_pmt_version_number++; p_sys->i_pmt_version_number %= 32;
+ p_sys->i_pmt_version_number++;
+ p_sys->i_pmt_version_number %= 32;
return VLC_SUCCESS;
}
-/*****************************************************************************
- * Mux: Call each time there is new data for at least one stream
- *****************************************************************************
- *
- *****************************************************************************/
-static int Mux( sout_mux_t *p_mux )
+static void SetHeader( sout_buffer_chain_t *c,
+ int depth )
+{
+ block_t *p_ts = BufferChainPeek( c );
+ while( depth > 0 )
+ {
+ p_ts = p_ts->p_next;
+ depth--;
+ }
+ p_ts->i_flags |= BLOCK_FLAG_HEADER;
+}
+
+/* returns true if needs more data */
+static bool MuxStreams(sout_mux_t *p_mux )
{
sout_mux_sys_t *p_sys = p_mux->p_sys;
- ts_stream_t *p_pcr_stream;
+ ts_stream_t *p_pcr_stream = (ts_stream_t*)p_sys->p_pcr_input->p_sys;
- if( p_sys->i_pcr_pid == 0x1fff )
+ sout_buffer_chain_t chain_ts;
+ mtime_t i_shaping_delay = p_pcr_stream->b_key_frame
+ ? p_pcr_stream->i_pes_length
+ : p_sys->i_shaping_delay;
+
+ bool b_ok = true;
+
+ /* Accumulate enough data in the pcr stream (>i_shaping_delay) */
+ /* Accumulate enough data in all other stream ( >= length of pcr)*/
+ for (int i = -1; !b_ok || i < p_mux->i_nb_inputs; i++ )
{
- int i;
- for( i = 0; i < p_mux->i_nb_inputs; i++ )
+ if (i == p_mux->i_nb_inputs)
{
- block_FifoEmpty( p_mux->pp_inputs[i]->p_fifo );
+ /* get enough PES packet for all input */
+ b_ok = true;
+ i = -1;
}
- msg_Dbg( p_mux, "waiting for PCR streams" );
- msleep( 1000 );
- return VLC_SUCCESS;
- }
- p_pcr_stream = (ts_stream_t*)p_sys->p_pcr_input->p_sys;
+ sout_input_t *p_input;
- 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;
- mtime_t i_shaping_delay;
- int i;
+ if( i == -1 )
+ p_input = p_sys->p_pcr_input;
+ else if( p_mux->pp_inputs[i]->p_sys == p_pcr_stream )
+ continue;
+ else
+ p_input = p_mux->pp_inputs[i];
+ ts_stream_t *p_stream = (ts_stream_t*)p_input->p_sys;
- if( p_pcr_stream->b_key_frame )
+ if( ( p_stream != p_pcr_stream ||
+ p_stream->i_pes_length >= i_shaping_delay ) &&
+ p_stream->i_pes_dts + p_stream->i_pes_length >=
+ p_pcr_stream->i_pes_dts + p_pcr_stream->i_pes_length )
+ continue;
+
+ /* Need more data */
+ if( block_FifoCount( p_input->p_fifo ) <= 1 )
{
- i_shaping_delay = p_pcr_stream->i_pes_length;
+ if( ( p_input->p_fmt->i_cat == AUDIO_ES ) ||
+ ( p_input->p_fmt->i_cat == VIDEO_ES ) )
+ {
+ /* We need more data */
+ return true;
+ }
+ else if( block_FifoCount( p_input->p_fifo ) <= 0 )
+ {
+ /* spu, only one packet is needed */
+ continue;
+ }
+ else if( p_input->p_fmt->i_cat == SPU_ES )
+ {
+ /* Don't mux the SPU yet if it is too early */
+ block_t *p_spu = block_FifoShow( p_input->p_fifo );
+
+ int64_t i_spu_delay = p_spu->i_dts - p_pcr_stream->i_pes_dts;
+ if( ( i_spu_delay > i_shaping_delay ) &&
+ ( i_spu_delay < INT64_C(100000000) ) )
+ continue;
+
+ if ( ( i_spu_delay >= INT64_C(100000000) ) ||
+ ( i_spu_delay < INT64_C(10000) ) )
+ {
+ BufferChainClean( &p_stream->chain_pes );
+ p_stream->i_pes_dts = 0;
+ p_stream->i_pes_used = 0;
+ p_stream->i_pes_length = 0;
+ continue;
+ }
+ }
}
- else
+ b_ok = false;
+
+ block_t *p_data;
+ if( p_stream == p_pcr_stream || p_sys->b_data_alignment
+ || p_input->p_fmt->i_codec != VLC_CODEC_MPGA )
{
- i_shaping_delay = p_sys->i_shaping_delay;
+ p_data = block_FifoGet( p_input->p_fifo );
+ if (p_data->i_pts <= VLC_TS_INVALID)
+ p_data->i_pts = p_data->i_dts;
+
+ if( p_input->p_fmt->i_codec == VLC_CODEC_MP4A )
+ p_data = Add_ADTS( p_data, p_input->p_fmt );
}
+ else
+ p_data = FixPES( p_mux, p_input->p_fifo );
- /* 1: get enough PES packet for all input */
- for( ;; )
+ if( block_FifoCount( p_input->p_fifo ) > 0 &&
+ p_input->p_fmt->i_cat != SPU_ES )
+ {
+ block_t *p_next = block_FifoShow( p_input->p_fifo );
+ p_data->i_length = p_next->i_dts - p_data->i_dts;
+ }
+ else if( p_input->p_fmt->i_codec !=
+ VLC_CODEC_SUBT )
+ p_data->i_length = 1000;
+
+ if( ( p_pcr_stream->i_pes_dts > 0 &&
+ 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 - 10000000 > p_stream->i_pes_dts +
+ p_stream->i_pes_length ) )
{
- bool b_ok = true;
- block_t *p_data;
+ msg_Warn( p_mux, "packet with too strange dts "
+ "(dts=%"PRId64",old=%"PRId64",pcr=%"PRId64")",
+ p_data->i_dts, p_stream->i_pes_dts,
+ p_pcr_stream->i_pes_dts );
+ block_Release( p_data );
- /* Accumulate enough data in the pcr stream (>i_shaping_delay) */
- /* Accumulate enough data in all other stream ( >= length of pcr)*/
- for( i = -1; i < p_mux->i_nb_inputs; i++ )
- {
- sout_input_t *p_input;
- ts_stream_t *p_stream;
- int64_t i_spu_delay = 0;
+ BufferChainClean( &p_stream->chain_pes );
+ p_stream->i_pes_dts = 0;
+ p_stream->i_pes_used = 0;
+ p_stream->i_pes_length = 0;
- if( i == -1 )
- p_input = p_sys->p_pcr_input;
- else if( p_mux->pp_inputs[i]->p_sys == p_pcr_stream )
- continue;
- else
- p_input = p_mux->pp_inputs[i];
- p_stream = (ts_stream_t*)p_input->p_sys;
-
- if( ( ( p_stream == p_pcr_stream ) &&
- ( p_stream->i_pes_length < i_shaping_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( block_FifoCount( p_input->p_fifo ) <= 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( block_FifoCount( p_input->p_fifo ) <= 0 )
- {
- /* spu, only one packet is needed */
- continue;
- }
- else if( p_input->p_fmt->i_cat == SPU_ES )
- {
- /* Don't mux the SPU yet if it is too early */
- block_t *p_spu = block_FifoShow( p_input->p_fifo );
-
- i_spu_delay =
- p_spu->i_dts - p_pcr_stream->i_pes_dts;
-
- if( ( i_spu_delay > i_shaping_delay ) &&
- ( i_spu_delay < INT64_C(100000000) ) )
- continue;
-
- if ( ( i_spu_delay >= INT64_C(100000000) ) ||
- ( i_spu_delay < INT64_C(10000) ) )
- {
- BufferChainClean( &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 = false;
-
- if( p_stream == p_pcr_stream || p_sys->b_data_alignment
- || p_input->p_fmt->i_codec !=
- VLC_CODEC_MPGA )
- {
- p_data = block_FifoGet( p_input->p_fifo );
-
- if( p_input->p_fmt->i_codec ==
- VLC_CODEC_MP4A )
- p_data = Add_ADTS( p_data, p_input->p_fmt );
- }
- else
- p_data = FixPES( p_mux, p_input->p_fifo );
-
- if( block_FifoCount( p_input->p_fifo ) > 0 &&
- p_input->p_fmt->i_cat != SPU_ES )
- {
- block_t *p_next = block_FifoShow( p_input->p_fifo );
- p_data->i_length = p_next->i_dts - p_data->i_dts;
- }
- else if( p_input->p_fmt->i_codec !=
- VLC_CODEC_SUBT )
- p_data->i_length = 1000;
-
- if( ( p_pcr_stream->i_pes_dts > 0 &&
- 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 - 10000000 > p_stream->i_pes_dts +
- p_stream->i_pes_length ) )
- {
- msg_Warn( p_mux, "packet with too strange dts "
- "(dts=%"PRId64",old=%"PRId64",pcr=%"PRId64")",
- p_data->i_dts, p_stream->i_pes_dts,
- p_pcr_stream->i_pes_dts );
- block_Release( p_data );
-
- BufferChainClean( &p_stream->chain_pes );
- p_stream->i_pes_dts = 0;
- p_stream->i_pes_used = 0;
- p_stream->i_pes_length = 0;
-
- if( p_input->p_fmt->i_cat != SPU_ES )
- {
- BufferChainClean( &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;
- }
- }
- else
- {
- int i_header_size = 0;
- int i_max_pes_size = 0;
- int b_data_alignment = 0;
- if( p_input->p_fmt->i_cat == SPU_ES )
- {
- if( p_input->p_fmt->i_codec ==
- VLC_CODEC_SUBT )
- {
- /* Prepend header */
- p_data = block_Realloc( p_data, 2,
- p_data->i_buffer );
- p_data->p_buffer[0] =
- ( (p_data->i_buffer - 2) >> 8) & 0xff;
- p_data->p_buffer[1] =
- ( (p_data->i_buffer - 2) ) & 0xff;
-
- /* remove trailling \0 if any */
- if( p_data->i_buffer > 2 &&
- p_data->p_buffer[p_data->i_buffer -1] ==
- '\0' )
- p_data->i_buffer--;
-
- /* Append a empty sub (sub text only) */
- if( p_data->i_length > 0 &&
- !( p_data->i_buffer == 1 &&
- *p_data->p_buffer == ' ' ) )
- {
- block_t *p_spu = block_New( p_mux, 3 );
-
- p_spu->i_dts = p_spu->i_pts =
- p_data->i_dts + p_data->i_length;
- p_spu->i_length = 1000;
-
- p_spu->p_buffer[0] = 0;
- p_spu->p_buffer[1] = 1;
- p_spu->p_buffer[2] = ' ';
-
- EStoPES( p_mux->p_sout, &p_spu, p_spu,
- p_input->p_fmt,
- p_stream->i_stream_id, 1,
- 0, 0, 0 );
- p_data->p_next = p_spu;
- }
- }
- else if( p_input->p_fmt->i_codec ==
- VLC_CODEC_TELETEXT )
- {
- /* EN 300 472 */
- i_header_size = 0x24;
- b_data_alignment = 1;
- }
- else if( p_input->p_fmt->i_codec ==
- VLC_CODEC_DVBS )
- {
- /* EN 300 743 */
- b_data_alignment = 1;
- }
- }
- else if( p_data->i_length < 0 ||
- p_data->i_length > 2000000 )
- {
- /* FIXME choose a better value, but anyway we
- * should never have to do that */
- p_data->i_length = 1000;
- }
-
- 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 */
- if( p_stream->i_stream_id == 0xa0 &&
- p_data->i_pts <= 0 )
- {
- /* XXX yes I know, it's awful, but it's needed,
- * so don't remove it ... */
- p_data->i_pts = p_data->i_dts;
- }
-
- if( p_input->p_fmt->i_codec ==
- VLC_CODEC_DIRAC )
- {
- b_data_alignment = 1;
- /* dirac pes packets should be unbounded in
- * length, specify a suitibly large max size */
- i_max_pes_size = INT_MAX;
- }
-
- 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,
- i_max_pes_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_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;
- }
- }
- }
+ if( p_input->p_fmt->i_cat != SPU_ES )
+ {
+ BufferChainClean( &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( b_ok )
+ continue;
+ }
+
+ int i_header_size = 0;
+ int i_max_pes_size = 0;
+ int b_data_alignment = 0;
+ if( p_input->p_fmt->i_cat == SPU_ES ) switch (p_input->p_fmt->i_codec)
+ {
+ case VLC_CODEC_SUBT:
+ /* Prepend header */
+ p_data = block_Realloc( p_data, 2, p_data->i_buffer );
+ p_data->p_buffer[0] = ( (p_data->i_buffer - 2) >> 8) & 0xff;
+ p_data->p_buffer[1] = ( (p_data->i_buffer - 2) ) & 0xff;
+
+ /* remove trailling \0 if any */
+ if( p_data->i_buffer > 2 && !p_data->p_buffer[p_data->i_buffer-1] )
+ p_data->i_buffer--;
+
+ /* Append a empty sub (sub text only) */
+ if( p_data->i_length > 0 &&
+ ( p_data->i_buffer != 1 || *p_data->p_buffer != ' ' ) )
{
- break;
+ block_t *p_spu = block_Alloc( 3 );
+
+ p_spu->i_dts = p_data->i_dts + p_data->i_length;
+ p_spu->i_pts = p_spu->i_dts;
+ p_spu->i_length = 1000;
+
+ p_spu->p_buffer[0] = 0;
+ p_spu->p_buffer[1] = 1;
+ p_spu->p_buffer[2] = ' ';
+
+ EStoPES( &p_spu, p_spu, p_input->p_fmt,
+ p_stream->i_stream_id, 1, 0, 0, 0 );
+ p_data->p_next = p_spu;
}
+ break;
+
+ case VLC_CODEC_TELETEXT:
+ /* EN 300 472 */
+ i_header_size = 0x24;
+ b_data_alignment = 1;
+ break;
+
+ case VLC_CODEC_DVBS:
+ /* EN 300 743 */
+ b_data_alignment = 1;
+ break;
+ }
+ else if( p_data->i_length < 0 || p_data->i_length > 2000000 )
+ {
+ /* FIXME choose a better value, but anyway we
+ * should never have to do that */
+ p_data->i_length = 1000;
}
- /* save */
- i_pcr_dts = p_pcr_stream->i_pes_dts;
- i_pcr_length = p_pcr_stream->i_pes_length;
- p_pcr_stream->b_key_frame = 0;
+ 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;
+ }
- /* 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++ )
+ /* Convert to pes */
+ if( p_stream->i_stream_id == 0xa0 && p_data->i_pts <= 0 )
{
- ts_stream_t *p_stream = (ts_stream_t*)p_mux->pp_inputs[i]->p_sys;
- block_t *p_pes;
+ /* XXX yes I know, it's awful, but it's needed,
+ * so don't remove it ... */
+ p_data->i_pts = p_data->i_dts;
+ }
- /* False for pcr stream but it will be enough to do PCR algo */
- for( p_pes = p_stream->chain_pes.p_first; p_pes != NULL;
- p_pes = p_pes->p_next )
- {
- int i_size = p_pes->i_buffer;
- 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_buffer * i_frag / p_pes->i_length;
- }
- i_packet_count += ( i_size + 183 ) / 184;
- }
+ if( p_input->p_fmt->i_codec == VLC_CODEC_DIRAC )
+ {
+ b_data_alignment = 1;
+ /* dirac pes packets should be unbounded in
+ * length, specify a suitibly large max size */
+ i_max_pes_size = INT_MAX;
}
- /* 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( ;; )
+
+ EStoPES ( &p_data, p_data, p_input->p_fmt, p_stream->i_stream_id,
+ 1, b_data_alignment, i_header_size,
+ i_max_pes_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_data->i_flags & BLOCK_FLAG_NO_KEYFRAME)
+ && (p_stream->i_pes_length > 400000) )
{
- int i_stream;
- mtime_t i_dts;
- ts_stream_t *p_stream;
- sout_input_t *p_input;
- block_t *p_ts;
- bool 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;
+ i_shaping_delay = p_stream->i_pes_length;
+ p_stream->b_key_frame = 1;
+ }
+ }
- if( p_stream->i_pes_dts == 0 )
- {
- continue;
- }
+ /* save */
+ const mtime_t i_pcr_length = p_pcr_stream->i_pes_length;
+ p_pcr_stream->b_key_frame = 0;
+
+ /* msg_Dbg( p_mux, "starting muxing %lldms", i_pcr_length / 1000 ); */
+ /* 2: calculate non accurate total size of muxed ts */
+ int i_packet_count = 0;
+ for (int i = 0; i < p_mux->i_nb_inputs; i++ )
+ {
+ ts_stream_t *p_stream = (ts_stream_t*)p_mux->pp_inputs[i]->p_sys;
- if( i_stream == -1 ||
- p_stream->i_pes_dts < i_dts )
+ /* False for pcr stream but it will be enough to do PCR algo */
+ for (block_t *p_pes = p_stream->chain_pes.p_first; p_pes != NULL;
+ p_pes = p_pes->p_next )
+ {
+ int i_size = p_pes->i_buffer;
+ 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 )
{
- i_stream = i;
- i_dts = p_stream->i_pes_dts;
+ /* Next stream */
+ break;
}
+ i_size = p_pes->i_buffer * i_frag / p_pes->i_length;
}
- if( i_stream == -1 || i_dts > i_pcr_dts + i_pcr_length )
+ i_packet_count += ( i_size + 183 ) / 184;
+ }
+ }
+ /* 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 */
+ bool pat_was_previous = true; //This is to prevent unnecessary double PAT/PMT insertions
+ GetPAT( p_mux, &chain_ts );
+ GetPMT( p_mux, &chain_ts );
+ int i_packet_pos = 0;
+ i_packet_count += chain_ts.i_depth;
+ /* msg_Dbg( p_mux, "estimated pck=%d", i_packet_count ); */
+
+ const mtime_t i_pcr_dts = p_pcr_stream->i_pes_dts;
+ for (;;)
+ {
+ int i_stream = -1;
+ mtime_t i_dts = 0;
+ ts_stream_t *p_stream;
+
+ /* Select stream (lowest dts) */
+ for (int i = 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 )
{
- break;
+ continue;
}
- p_stream = (ts_stream_t*)p_mux->pp_inputs[i_stream]->p_sys;
- p_input = p_mux->pp_inputs[i_stream];
-
- /* do we need to issue pcr */
- b_pcr = 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 )
+
+ if( i_stream == -1 || p_stream->i_pes_dts < i_dts )
{
- b_pcr = true;
- p_sys->i_pcr = i_pcr_dts + i_packet_pos *
- i_pcr_length / i_packet_count;
+ i_stream = i;
+ i_dts = p_stream->i_pes_dts;
}
+ }
+ if( i_stream == -1 || i_dts > i_pcr_dts + i_pcr_length )
+ {
+ break;
+ }
+ p_stream = (ts_stream_t*)p_mux->pp_inputs[i_stream]->p_sys;
+ sout_input_t *p_input = p_mux->pp_inputs[i_stream];
+
+ /* do we need to issue pcr */
+ bool b_pcr = 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 = true;
+ p_sys->i_pcr = i_pcr_dts + i_packet_pos *
+ i_pcr_length / i_packet_count;
+ }
+
+ /* Build the TS packet */
+ block_t *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 != VIDEO_ES || p_sys->b_crypt_video) )
+ {
+ p_ts->i_flags |= BLOCK_FLAG_SCRAMBLED;
+ }
+ i_packet_pos++;
- /* 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 != VIDEO_ES || p_sys->b_crypt_video) )
+ /* Write PAT/PMT before every keyframe if use-key-frames is enabled,
+ * this helps to do segmenting with livehttp-output so it can cut segment
+ * and start new one with pat,pmt,keyframe*/
+ if( ( p_sys->b_use_key_frames ) && ( p_ts->i_flags & BLOCK_FLAG_TYPE_I ) )
+ {
+ if( likely( !pat_was_previous ) )
{
- p_ts->i_flags |= BLOCK_FLAG_SCRAMBLED;
+ int startcount = chain_ts.i_depth;
+ GetPAT( p_mux, &chain_ts );
+ GetPMT( p_mux, &chain_ts );
+ SetHeader( &chain_ts, startcount );
+ i_packet_count += (chain_ts.i_depth - startcount );
+ } else {
+ SetHeader( &chain_ts, 0); //We just inserted pat/pmt,so just flag it instead of adding new one
}
- i_packet_pos++;
-
- /* */
- BufferChainAppend( &chain_ts, p_ts );
}
+ pat_was_previous = false;
+
+ /* */
+ BufferChainAppend( &chain_ts, p_ts );
+ }
+
+ /* 4: date and send */
+ TSSchedule( p_mux, &chain_ts, i_pcr_length, i_pcr_dts );
+ return false;
+}
+
+/*****************************************************************************
+ * Mux: Call each time there is new data for at least one stream
+ *****************************************************************************
+ *
+ *****************************************************************************/
+static int Mux( sout_mux_t *p_mux )
+{
+ sout_mux_sys_t *p_sys = p_mux->p_sys;
- /* 4: date and send */
- TSSchedule( p_mux, &chain_ts, i_pcr_length, i_pcr_dts );
+ if( p_sys->i_pcr_pid == 0x1fff )
+ {
+ for (int i = 0; i < p_mux->i_nb_inputs; i++ )
+ {
+ block_FifoEmpty( p_mux->pp_inputs[i]->p_fifo );
+ }
+ msg_Dbg( p_mux, "waiting for PCR streams" );
+ return VLC_SUCCESS;
}
+
+ while (!MuxStreams(p_mux))
+ ;
+ return VLC_SUCCESS;
}
#define STD_PES_PAYLOAD 170
static block_t *FixPES( sout_mux_t *p_mux, block_fifo_t *p_fifo )
{
+ VLC_UNUSED(p_mux);
block_t *p_data;
size_t i_size;
}
else if( i_size > STD_PES_PAYLOAD )
{
- block_t *p_new = block_New( p_mux, STD_PES_PAYLOAD );
- vlc_memcpy( p_new->p_buffer, p_data->p_buffer, STD_PES_PAYLOAD );
+ block_t *p_new = block_Alloc( STD_PES_PAYLOAD );
+ memcpy( p_new->p_buffer, p_data->p_buffer, STD_PES_PAYLOAD );
p_new->i_pts = p_data->i_pts;
p_new->i_dts = p_data->i_dts;
p_new->i_length = p_data->i_length * STD_PES_PAYLOAD
}
i_copy = __MIN( STD_PES_PAYLOAD - i_size, p_next->i_buffer );
- vlc_memcpy( &p_data->p_buffer[i_size], p_next->p_buffer, i_copy );
+ memcpy( &p_data->p_buffer[i_size], p_next->p_buffer, 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;
static block_t *Add_ADTS( block_t *p_data, es_format_t *p_fmt )
{
+#define ADTS_HEADER_SIZE 7 /* CRC needs 2 more bytes */
+
uint8_t *p_extra = p_fmt->p_extra;
if( !p_data || p_fmt->i_extra < 2 || !p_extra )
return p_data; /* no data to construct the headers */
+ size_t frame_length = p_data->i_buffer + ADTS_HEADER_SIZE;
int i_index = ( (p_extra[0] << 1) | (p_extra[1] >> 7) ) & 0x0f;
int i_profile = (p_extra[0] >> 3) - 1; /* i_profile < 4 */
int i_channels = (p_extra[i_index == 0x0f ? 4 : 1] >> 3) & 0x0f;
-#define ADTS_HEADER_SIZE 7 /* CRC needs 2 more bytes */
-
-
/* keep a copy in case block_Realloc() fails */
block_t *p_bak_block = block_Duplicate( p_data );
if( !p_bak_block ) /* OOM, block_Realloc() is likely to lose our block */
p_buffer[0] = 0xff;
p_buffer[1] = 0xf1; /* 0xf0 | 0x00 | 0x00 | 0x01 */
p_buffer[2] = (i_profile << 6) | ((i_index & 0x0f) << 2) | ((i_channels >> 2) & 0x01) ;
- p_buffer[3] = (i_channels << 6) | ((p_data->i_buffer >> 11) & 0x03);
+ p_buffer[3] = (i_channels << 6) | ((frame_length >> 11) & 0x03);
/* variable header (starts at last 2 bits of 4th byte) */
/* XXX: We should check if it's CBR or VBR, but no known implementation
* do that, and it's a pain to calculate this field */
- p_buffer[4] = p_data->i_buffer >> 3;
- p_buffer[5] = ((p_data->i_buffer & 0x07) << 5) | ((i_fullness >> 6) & 0x1f);
+ p_buffer[4] = frame_length >> 3;
+ p_buffer[5] = ((frame_length & 0x07) << 5) | ((i_fullness >> 6) & 0x1f);
p_buffer[6] = ((i_fullness & 0x3f) << 2) /* | 0xfc */;
return p_new_block;
sout_mux_sys_t *p_sys = p_mux->p_sys;
sout_buffer_chain_t new_chain;
int i_packet_count = p_chain_ts->i_depth;
- int i;
BufferChainInit( &new_chain );
i_pcr_length = i_packet_count;
}
- for( i = 0; i < i_packet_count; i++ )
+ for (int i = 0; i < i_packet_count; i++ )
{
block_t *p_ts = BufferChainGet( p_chain_ts );
mtime_t i_new_dts = i_pcr_dts + i_pcr_length * i / i_packet_count;
BufferChainAppend( &new_chain, p_ts );
- if( p_ts->i_dts &&
- p_ts->i_dts + p_sys->i_dts_delay * 2/3 < i_new_dts )
+ if (!p_ts->i_dts || p_ts->i_dts + p_sys->i_dts_delay * 2/3 >= i_new_dts)
+ continue;
+
+ mtime_t i_max_diff = i_new_dts - p_ts->i_dts;
+ mtime_t i_cut_dts = p_ts->i_dts;
+
+ p_ts = BufferChainPeek( p_chain_ts );
+ i++;
+ i_new_dts = i_pcr_dts + i_pcr_length * i / i_packet_count;
+ while ( p_ts != NULL && i_new_dts - p_ts->i_dts >= i_max_diff )
{
- mtime_t i_max_diff = i_new_dts - p_ts->i_dts;
- mtime_t i_cut_dts = p_ts->i_dts;
+ p_ts = BufferChainGet( p_chain_ts );
+ i_max_diff = i_new_dts - p_ts->i_dts;
+ i_cut_dts = p_ts->i_dts;
+ BufferChainAppend( &new_chain, p_ts );
p_ts = BufferChainPeek( p_chain_ts );
i++;
i_new_dts = i_pcr_dts + i_pcr_length * i / i_packet_count;
- while ( p_ts != NULL && i_new_dts - p_ts->i_dts >= i_max_diff )
- {
- p_ts = BufferChainGet( p_chain_ts );
- i_max_diff = i_new_dts - p_ts->i_dts;
- i_cut_dts = p_ts->i_dts;
- BufferChainAppend( &new_chain, p_ts );
-
- p_ts = BufferChainPeek( p_chain_ts );
- i++;
- i_new_dts = i_pcr_dts + i_pcr_length * i / i_packet_count;
- }
- msg_Dbg( p_mux, "adjusting rate at %"PRId64"/%"PRId64" (%d/%d)",
- i_cut_dts - i_pcr_dts, i_pcr_length, new_chain.i_depth,
- p_chain_ts->i_depth );
- if ( new_chain.i_depth )
- TSDate( p_mux, &new_chain,
- i_cut_dts - i_pcr_dts,
- i_pcr_dts );
- if ( p_chain_ts->i_depth )
- TSSchedule( p_mux,
- p_chain_ts, i_pcr_dts + i_pcr_length - i_cut_dts,
- i_cut_dts );
- return;
}
+ msg_Dbg( p_mux, "adjusting rate at %"PRId64"/%"PRId64" (%d/%d)",
+ i_cut_dts - i_pcr_dts, i_pcr_length, new_chain.i_depth,
+ p_chain_ts->i_depth );
+ if ( new_chain.i_depth )
+ TSDate( p_mux, &new_chain, i_cut_dts - i_pcr_dts, i_pcr_dts );
+ if ( p_chain_ts->i_depth )
+ TSSchedule( p_mux, p_chain_ts, i_pcr_dts + i_pcr_length - i_cut_dts,
+ i_cut_dts );
+ return;
}
if ( new_chain.i_depth )
{
sout_mux_sys_t *p_sys = p_mux->p_sys;
int i_packet_count = p_chain_ts->i_depth;
- int i;
if ( i_pcr_length / 1000 > 0 )
{
i_pcr_dts + p_sys->i_shaping_delay * 3 / 2 - mdate(),
i_bitrate, i_packet_count, i_pcr_length);
}
-#if 0
- else
- {
- msg_Dbg( p_mux, "starting at %"PRId64
- " (%d bi/s for %d packets in %"PRId64" us)",
- i_pcr_dts + p_sys->i_shaping_delay * 3 / 2 - mdate(),
- i_bitrate, i_packet_count, i_pcr_length);
- }
-#endif
}
else
{
}
/* msg_Dbg( p_mux, "real pck=%d", i_packet_count ); */
- for( i = 0; i < i_packet_count; i++ )
+ for (int i = 0; i < i_packet_count; i++ )
{
block_t *p_ts = BufferChainGet( p_chain_ts );
mtime_t i_new_dts = i_pcr_dts + i_pcr_length * i / i_packet_count;
static block_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream,
bool b_pcr )
{
+ VLC_UNUSED(p_mux);
block_t *p_pes = p_stream->chain_pes.p_first;
- block_t *p_ts;
bool b_new_pes = false;
bool b_adaptation_field = false;
int i_payload_max = 184 - ( b_pcr ? 8 : 0 );
- int i_payload;
if( p_stream->i_pes_used <= 0 )
{
b_new_pes = true;
}
- i_payload = __MIN( (int)p_pes->i_buffer - p_stream->i_pes_used,
+ int i_payload = __MIN( (int)p_pes->i_buffer - p_stream->i_pes_used,
i_payload_max );
if( b_pcr || i_payload < i_payload_max )
b_adaptation_field = true;
}
- p_ts = block_New( p_mux, 188 );
+ block_t *p_ts = block_Alloc( 188 );
+
+ if (b_new_pes && !(p_pes->i_flags & BLOCK_FLAG_NO_KEYFRAME) && p_pes->i_flags & BLOCK_FLAG_TYPE_I)
+ {
+ p_ts->i_flags |= BLOCK_FLAG_TYPE_I;
+ }
+
p_ts->i_dts = p_pes->i_dts;
p_ts->p_buffer[0] = 0x47;
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);
+ p_stream->b_discontinuity = p_pes->i_flags & BLOCK_FLAG_DISCONTINUITY;
if( b_adaptation_field )
{
- int i;
-
+ int i_stuffing = i_payload_max - i_payload;
if( b_pcr )
{
- int i_stuffing = i_payload_max - i_payload;
-
p_ts->i_flags |= BLOCK_FLAG_CLOCK;
p_ts->p_buffer[4] = 7 + i_stuffing;
p_ts->p_buffer[5] |= 0x80; /* flag TS dicontinuity */
p_stream->b_discontinuity = false;
}
- 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 ) | 0x7e;
+ 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 ) | 0x7e;
p_ts->p_buffer[11]= 0;
- for( i = 12; i < 12 + i_stuffing; i++ )
+ for (int i = 12; i < 12 + i_stuffing; i++ )
{
p_ts->p_buffer[i] = 0xff;
}
}
else
{
- int i_stuffing = i_payload_max - i_payload;
-
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++ )
+ for (int i = 6; i < 6 + i_stuffing - 2; i++ )
{
p_ts->p_buffer[i] = 0xff;
}
if( p_stream->i_pes_used >= (int)p_pes->i_buffer )
{
- p_pes = BufferChainGet( &p_stream->chain_pes );
- block_Release( p_pes );
+ block_Release(BufferChainGet( &p_stream->chain_pes ));
p_pes = p_stream->chain_pes.p_first;
+ p_stream->i_pes_length = 0;
if( p_pes )
{
- p_stream->i_pes_dts = p_pes->i_dts;
- p_stream->i_pes_length = 0;
+ p_stream->i_pes_dts = p_pes->i_dts;
while( p_pes )
{
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;
}
p_ts->p_buffer[10]|= ( i_pcr << 7 )&0x80;
}
-#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 )
-{
- 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;
-
- if( i_length <= 0 )
- {
- return;
- }
-
- 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 )
- {
- block_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;
-
- BufferChainAppend( c, p_pk );
-
- i_null = i_div + ( i_rest + i_mod ) / i_packets;
-
- for( i = 0; i < i_null; i++ )
- {
- block_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 );
- }
-
- i_rest = ( i_rest + i_mod ) % i_packets;
- }
- }
- else if( i_packets > i_packets_max && i_packets_max > 0 )
- {
- block_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 ) );
- }
-
- while( ( p_pk = BufferChainGet( &s ) ) )
- {
- sout_BufferDelete( p_mux->p_sout, p_pk );
- }
- }
-}
-#endif
-
-static void PEStoTS( sout_instance_t *p_sout,
- sout_buffer_chain_t *c, block_t *p_pes,
+static void PEStoTS( sout_buffer_chain_t *c, block_t *p_pes,
ts_stream_t *p_stream )
{
- uint8_t *p_data;
- int i_size;
- int b_new_pes;
-
/* get PES total size */
- i_size = p_pes->i_buffer;
- p_data = p_pes->p_buffer;
+ uint8_t *p_data = p_pes->p_buffer;
+ int i_size = p_pes->i_buffer;
- b_new_pes = true;
+ bool b_new_pes = true;
- for( ;; )
+ for (;;)
{
- int b_adaptation_field;
- int i_copy;
- block_t *p_ts;
-
- p_ts = block_New( p_sout, 188 );
/* write header
* 8b 0x47 sync byte
* 1b transport_error_indicator
* 4b continuity_counter
*/
- i_copy = __MIN( i_size, 184 );
- b_adaptation_field = i_size < 184 ? true : false;
+ int i_copy = __MIN( i_size, 184 );
+ bool b_adaptation_field = i_size < 184;
+ block_t *p_ts = block_Alloc( 188 );
p_ts->p_buffer[0] = 0x47;
p_ts->p_buffer[1] = ( b_new_pes ? 0x40 : 0x00 )|
if( b_adaptation_field )
{
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] |= 0x80;
p_stream->b_discontinuity = false;
}
- for( i = 6; i < 6 + i_stuffing - 2; i++ )
+ for (int i = 6; i < 6 + i_stuffing - 2; i++ )
{
p_ts->p_buffer[i] = 0xff;
}
p_pes->p_next = NULL;
block_Release( p_pes );
if( p_next == NULL )
- {
- break;
- }
+ return;
+
b_new_pes = true;
p_pes = p_next;
i_size = p_pes->i_buffer;
p_data = p_pes->p_buffer;
}
}
-
- return;
}
-static block_t *WritePSISection( sout_instance_t *p_sout,
- dvbpsi_psi_section_t* p_section )
+static block_t *WritePSISection( dvbpsi_psi_section_t* p_section )
{
block_t *p_psi, *p_first = NULL;
while( p_section )
{
- int i_size;
-
- i_size = (uint32_t)( p_section->p_payload_end - p_section->p_data )+
- ( p_section->b_syntax_indicator ? 4 : 0 );
+ int i_size = (uint32_t)(p_section->p_payload_end - p_section->p_data) +
+ (p_section->b_syntax_indicator ? 4 : 0);
- p_psi = block_New( p_sout, i_size + 1 );
+ p_psi = block_Alloc( i_size + 1 );
+ if( !p_psi )
+ goto error;
p_psi->i_pts = 0;
p_psi->i_dts = 0;
p_psi->i_length = 0;
}
return( p_first );
+
+error:
+ if( p_first )
+ block_ChainRelease( p_first );
+ return NULL;
}
static void GetPAT( sout_mux_t *p_mux,
block_t *p_pat;
dvbpsi_pat_t pat;
dvbpsi_psi_section_t *p_section;
- int i;
dvbpsi_InitPAT( &pat, p_sys->i_tsid, p_sys->i_pat_version_number,
1 ); /* b_current_next */
/* add all programs */
- for ( i = 0; i < p_sys->i_num_pmt; i++ )
- dvbpsi_PATAddProgram( &pat,
- p_sys->i_pmt_program_number[i],
+ for (unsigned i = 0; i < p_sys->i_num_pmt; i++ )
+ dvbpsi_PATAddProgram( &pat, p_sys->i_pmt_program_number[i],
p_sys->pmt[i].i_pid );
- p_section = dvbpsi_GenPATSections( &pat,
- 0 ); /* max program per section */
-
- p_pat = WritePSISection( p_mux->p_sout, p_section );
+#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0))
+ p_section = dvbpsi_pat_sections_generate( p_sys->p_dvbpsi, &pat, 0 );
+#else
+ p_section = dvbpsi_GenPATSections( &pat, 0 /* max program per section */ );
+#endif
+ p_pat = WritePSISection( p_section );
- PEStoTS( p_mux->p_sout, c, p_pat, &p_sys->pat );
+ PEStoTS( c, p_pat, &p_sys->pat );
dvbpsi_DeletePSISections( p_section );
dvbpsi_EmptyPAT( &pat );
return( 0x808000 | ( i_l3 << 16 ) | ( i_l2 << 8 ) | i_l1 );
}
-static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c )
+static void GetPMTmpeg4(sout_mux_t *p_mux)
{
- sout_mux_sys_t *p_sys = p_mux->p_sys;
- block_t *p_pmt[MAX_PMT];
+ sout_mux_sys_t *p_sys = p_mux->p_sys;
+ uint8_t iod[4096];
+ bits_buffer_t bits, 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_scope */
+ bits_write( &bits, 8, 0x11 );
+ /* IOD_label */
+ bits_write( &bits, 8, 0x01 );
+ /* InitialObjectDescriptor */
+ bits_align( &bits );
+ 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 ) */
+ for (int i_stream = 0; i_stream < p_mux->i_nb_inputs; i_stream++ )
+ {
+ ts_stream_t *p_stream = (ts_stream_t*)p_mux->pp_inputs[i_stream]->p_sys;
+
+ if( p_stream->i_stream_id != 0xfa && p_stream->i_stream_id != 0xfb &&
+ p_stream->i_stream_id != 0xfe )
+ continue;
+
+ bits_buffer_t bits_fix_ESDescr, bits_fix_Decoder;
+ /* ES descriptor */
+ bits_align( &bits );
+ 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 */
- dvbpsi_pmt_es_t *p_es;
- dvbpsi_psi_section_t *p_section[MAX_PMT];
+ /* DecoderConfigDesciptor */
+ bits_align( &bits );
+ 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 */
+ }
+ else if( p_stream->i_stream_type == 0x1b )
+ {
+ 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 */
+ }
+ else if( p_stream->i_stream_type == 0x12 &&
+ p_stream->i_codec == VLC_CODEC_SUBT )
+ {
+ bits_write( &bits, 8, 0x0B ); /* Text Stream */
+ bits_write( &bits, 6, 0x04 ); /* VisualStream */
+ }
+ else
+ {
+ bits_write( &bits, 8, 0x00 );
+ bits_write( &bits, 6, 0x00 );
- int i_pidinput;
- int i_stream;
- int i;
- int *p_usepid = NULL;
+ msg_Err( p_mux, "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 */
-#ifdef HAVE_DVBPSI_SDT
- block_t *p_sdt;
- dvbpsi_sdt_t sdt;
+ if( p_stream->i_extra > 0 )
+ {
+ /* DecoderSpecificInfo */
+ bits_align( &bits );
+ bits_write( &bits, 8, 0x05 ); /* tag */
+ bits_write( &bits, 24, GetDescriptorLength24b(
+ p_stream->i_extra ) );
+ for (int i = 0; i < p_stream->i_extra; i++ )
+ {
+ bits_write( &bits, 8,
+ ((uint8_t*)p_stream->p_extra)[i] );
+ }
+ }
+ /* fix Decoder length */
+ bits_write( &bits_fix_Decoder, 24,
+ GetDescriptorLength24b( bits.i_data -
+ bits_fix_Decoder.i_data - 3 ) );
- dvbpsi_psi_section_t* p_section2;
- dvbpsi_sdt_service_t *p_service;
+ /* SLConfigDescriptor : predefined (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 );
- uint8_t *psz_sdt_desc;
-#endif
+ /* fix ESDescr length */
+ bits_write( &bits_fix_ESDescr, 24,
+ GetDescriptorLength24b( bits.i_data -
+ bits_fix_ESDescr.i_data - 3 ) );
+ }
+ bits_align( &bits );
+ /* fix IOD length */
+ bits_write( &bits_fix_IOD, 24,
+ GetDescriptorLength24b(bits.i_data - bits_fix_IOD.i_data - 3 ));
+
+ dvbpsi_PMTAddDescriptor(&p_sys->dvbpmt[0], 0x1d, bits.i_data, bits.p_data);
+}
+
+static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c )
+{
+ sout_mux_sys_t *p_sys = p_mux->p_sys;
if( p_sys->dvbpmt == NULL )
{
p_sys->dvbpmt = malloc( p_sys->i_num_pmt * sizeof(dvbpsi_pmt_t) );
- if( !p_sys->dvbpmt )
- {
+ if( p_sys->dvbpmt == NULL )
return;
- }
}
-#ifdef HAVE_DVBPSI_SDT
+
+ dvbpsi_sdt_t sdt;
if( p_sys->b_sdt )
dvbpsi_InitSDT( &sdt, p_sys->i_tsid, 1, 1, p_sys->i_netid );
-#endif
- for( i = 0; i < p_sys->i_num_pmt; i++ )
+ for (unsigned i = 0; i < p_sys->i_num_pmt; i++ )
{
dvbpsi_InitPMT( &p_sys->dvbpmt[i],
p_sys->i_pmt_program_number[i], /* program number */
1, /* b_current_next */
p_sys->i_pcr_pid );
-#ifdef HAVE_DVBPSI_SDT
- if( p_sys->b_sdt )
- {
- p_service = dvbpsi_SDTAddService( &sdt,
- p_sys->i_pmt_program_number[i], /* service id */
- 0, /* eit schedule */
- 0, /* eit present */
- 4, /* running status ("4=RUNNING") */
- 0 ); /* free ca */
-
-#define psz_sdtprov p_sys->sdt_descriptors[i].psz_provider
-#define psz_sdtserv p_sys->sdt_descriptors[i].psz_service_name
-
- /* FIXME: Ineffecient malloc's & ugly code...... */
- if( ( psz_sdtprov != NULL ) && ( psz_sdtserv != NULL ) )
- {
- psz_sdt_desc = malloc( 3 + strlen(psz_sdtprov)
- + strlen(psz_sdtserv) );
- if( psz_sdt_desc )
- {
- psz_sdt_desc[0] = 0x01; /* digital television service */
-
- /* service provider name length */
- psz_sdt_desc[1] = (char)strlen(psz_sdtprov);
- memcpy( &psz_sdt_desc[2], psz_sdtprov, strlen(psz_sdtprov) );
-
- /* service name length */
- psz_sdt_desc[ 2 + strlen(psz_sdtprov) ]
- = (char)strlen(psz_sdtserv);
- memcpy( &psz_sdt_desc[3+strlen(psz_sdtprov)], psz_sdtserv,
- strlen(psz_sdtserv) );
-
- dvbpsi_SDTServiceAddDescriptor( p_service, 0x48,
- 3 + strlen(psz_sdtprov) + strlen(psz_sdtserv),
- (uint8_t *)psz_sdt_desc );
- free( psz_sdt_desc );
- psz_sdt_desc = NULL;
- }
- }
-#undef psz_sdtprov
-#undef psz_sdtserv
- }
-#endif
- }
+ if( !p_sys->b_sdt )
+ continue;
- if( p_sys->i_mpeg4_streams > 0 )
- {
- uint8_t iod[4096];
- 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_scope */
- bits_write( &bits, 8, 0x11 );
- /* IOD_label */
- bits_write( &bits, 8, 0x01 );
- /* InitialObjectDescriptor */
- bits_align( &bits );
- 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 ) */
- for( i_stream = 0; i_stream < p_mux->i_nb_inputs; i_stream++ )
- {
- ts_stream_t *p_stream;
- p_stream = (ts_stream_t*)p_mux->pp_inputs[i_stream]->p_sys;
+ dvbpsi_sdt_service_t *p_service = dvbpsi_SDTAddService( &sdt,
+ p_sys->i_pmt_program_number[i], /* service id */
+ 0, /* eit schedule */
+ 0, /* eit present */
+ 4, /* running status ("4=RUNNING") */
+ 0 ); /* free ca */
- if( p_stream->i_stream_id == 0xfa ||
- p_stream->i_stream_id == 0xfb ||
- p_stream->i_stream_id == 0xfe )
- {
- bits_buffer_t bits_fix_ESDescr, bits_fix_Decoder;
- /* ES descriptor */
- bits_align( &bits );
- 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 */
- bits_align( &bits );
- 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 */
- }
- else if( p_stream->i_stream_type == 0x1b )
- {
- 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 */
- }
- else if( p_stream->i_stream_type == 0x12 &&
- p_stream->i_codec == VLC_CODEC_SUBT )
- {
- bits_write( &bits, 8, 0x0B ); /* Text Stream */
- bits_write( &bits, 6, 0x04 ); /* VisualStream */
- }
- else
- {
- bits_write( &bits, 8, 0x00 );
- bits_write( &bits, 6, 0x00 );
+ const char *psz_sdtprov = p_sys->sdt_descriptors[i].psz_provider;
+ const char *psz_sdtserv = p_sys->sdt_descriptors[i].psz_service_name;
- 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 */
+ if( !psz_sdtprov || !psz_sdtserv )
+ continue;
+ size_t provlen = VLC_CLIP(strlen(psz_sdtprov), 0, 255);
+ size_t servlen = VLC_CLIP(strlen(psz_sdtserv), 0, 255);
- 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 ) );
- for( i = 0; i < p_stream->i_decoder_specific_info; i++ )
- {
- bits_write( &bits, 8,
- ((uint8_t*)p_stream->p_decoder_specific_info)[i] );
- }
- }
- /* fix Decoder length */
- bits_write( &bits_fix_Decoder, 24,
- GetDescriptorLength24b( bits.i_data -
- bits_fix_Decoder.i_data - 3 ) );
-
- /* SLConfigDescriptor : predefined (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 ) );
- }
- }
- bits_align( &bits );
- /* fix IOD length */
- bits_write( &bits_fix_IOD, 24,
- GetDescriptorLength24b( bits.i_data -
- bits_fix_IOD.i_data - 3 ) );
-
-#if 0 /* FIXME!!! This can't possibly work */
- i_pidinput = p_mux->pp_inputs[i]->p_fmt->i_id;
- p_usepid = bsearch( &i_pidinput, p_sys->pmtmap, p_sys->i_pmtslots,
- sizeof(pmt_map_t), intcompare );
- p_usepid = bsearch( &p_usepid, p_sys->pmtmap, p_sys->i_num_pmt,
- sizeof(pmt_map_t), pmtcompare );
- if( p_usepid != NULL )
- dvbpsi_PMTAddDescriptor(
- &p_sys->dvbpmt[((pmt_map_t *)p_usepid)->i_prog], 0x1d,
- bits.i_data, bits.p_data );
- else
- msg_Err( p_mux, "Received an unmapped PID" );
+ uint8_t psz_sdt_desc[3 + provlen + servlen];
+
+ psz_sdt_desc[0] = 0x01; /* digital television service */
+
+ /* service provider name length */
+ psz_sdt_desc[1] = (char)provlen;
+ memcpy( &psz_sdt_desc[2], psz_sdtprov, provlen );
+
+ /* service name length */
+ psz_sdt_desc[ 2 + provlen ] = (char)servlen;
+ memcpy( &psz_sdt_desc[3+provlen], psz_sdtserv, servlen );
+
+#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0))
+ dvbpsi_sdt_service_descriptor_add( p_service, 0x48,
+ (3 + provlen + servlen),
+ psz_sdt_desc );
#else
- dvbpsi_PMTAddDescriptor( &p_sys->dvbpmt[0], 0x1d, bits.i_data,
- bits.p_data );
+ dvbpsi_SDTServiceAddDescriptor( p_service, 0x48,
+ 3 + provlen + servlen, psz_sdt_desc );
#endif
}
- for( i_stream = 0; i_stream < p_mux->i_nb_inputs; i_stream++ )
+ if( p_sys->i_mpeg4_streams > 0 )
+ GetPMTmpeg4(p_mux);
+
+ for (int i_stream = 0; i_stream < p_mux->i_nb_inputs; i_stream++ )
{
- ts_stream_t *p_stream;
+ ts_stream_t *p_stream = (ts_stream_t*)p_mux->pp_inputs[i_stream]->p_sys;
- p_stream = (ts_stream_t *)p_mux->pp_inputs[i_stream]->p_sys;
+ int i_pidinput = p_mux->pp_inputs[i_stream]->p_fmt->i_id;
+ pmt_map_t *p_usepid = bsearch( &i_pidinput, p_sys->pmtmap,
+ p_sys->i_pmtslots, sizeof(pmt_map_t), intcompare );
- i_pidinput = p_mux->pp_inputs[i_stream]->p_fmt->i_id;
- p_usepid = bsearch( &i_pidinput, p_sys->pmtmap, p_sys->i_pmtslots,
- sizeof(pmt_map_t), intcompare );
+ /* If there's an error somewhere, dump it to the first pmt */
+ unsigned prog = p_usepid ? p_usepid->i_prog : 0;
- if( p_usepid != NULL )
- p_es = dvbpsi_PMTAddES(
- &p_sys->dvbpmt[((pmt_map_t *)p_usepid)->i_prog],
+ dvbpsi_pmt_es_t *p_es = dvbpsi_PMTAddES( &p_sys->dvbpmt[prog],
p_stream->i_stream_type, p_stream->i_pid );
- else
- /* If there's an error somewhere, dump it to the first pmt */
- p_es = dvbpsi_PMTAddES( &p_sys->dvbpmt[0], p_stream->i_stream_type,
- p_stream->i_pid );
if( p_stream->i_stream_id == 0xfa || p_stream->i_stream_id == 0xfb )
{
else if( p_stream->i_stream_type == 0xa0 )
{
uint8_t data[512];
- int i_extra = __MIN( p_stream->i_decoder_specific_info, 502 );
+ int i_extra = __MIN( p_stream->i_extra, 502 );
/* private DIV3 descripor */
memcpy( &data[0], &p_stream->i_bih_codec, 4 );
data[9] = ( i_extra )&0xff;
if( i_extra > 0 )
{
- memcpy( &data[10], p_stream->p_decoder_specific_info, i_extra );
+ memcpy( &data[10], p_stream->p_extra, i_extra );
}
/* 0xa0 is private */
}
else if( p_stream->i_stream_type == 0x81 )
{
- uint8_t format[4] = { 0x41, 0x43, 0x2d, 0x33 };
+ uint8_t format[4] = { 'A', 'C', '-', '3'};
/* "registration" descriptor : "AC-3" */
dvbpsi_PMTESAddDescriptor( p_es, 0x05, 4, format );
/* DTS registration descriptor (ETSI TS 101 154 Annex F) */
/* DTS format identifier, frame size 1024 - FIXME */
- uint8_t data[4] = { 0x44, 0x54, 0x53, 0x32 };
+ uint8_t data[4] = { 'D', 'T', 'S', '2' };
dvbpsi_PMTESAddDescriptor( p_es, 0x05, 4, data );
}
+ else if( p_stream->i_codec == VLC_CODEC_EAC3 )
+ {
+ uint8_t data[1] = { 0x00 };
+ dvbpsi_PMTESAddDescriptor( p_es, 0x7a, 1, data );
+ }
else if( p_stream->i_codec == VLC_CODEC_TELETEXT )
{
- if( p_stream->i_decoder_specific_info )
+ if( p_stream->i_extra )
{
dvbpsi_PMTESAddDescriptor( p_es, 0x56,
- p_stream->i_decoder_specific_info,
- p_stream->p_decoder_specific_info );
+ p_stream->i_extra,
+ p_stream->p_extra );
}
continue;
}
else if( p_stream->i_codec == VLC_CODEC_DVBS )
{
/* DVB subtitles */
- if( p_stream->i_decoder_specific_info )
+ if( p_stream->i_extra )
{
/* pass-through from the TS demux */
dvbpsi_PMTESAddDescriptor( p_es, 0x59,
- p_stream->i_decoder_specific_info,
- p_stream->p_decoder_specific_info );
+ p_stream->i_extra,
+ p_stream->p_extra );
}
-#ifdef _DVBPSI_DR_59_H_
else
{
/* from the dvbsub transcoder */
dvbpsi_PMTESAddDescriptor( p_es, p_descr->i_tag,
p_descr->i_length, p_descr->p_data );
}
-#endif /* _DVBPSI_DR_59_H_ */
continue;
}
- if( p_stream->lang[0] != 0 )
+ if( p_stream->i_langs )
{
- uint8_t data[4*p_stream->i_langs];
-
- /* I construct the content myself, way faster than looking at
- * over complicated/mind broken libdvbpsi way */
- for(i = 0; i < p_stream->i_langs; i++ )
- {
- data[i*4+0] = p_stream->lang[i*3+0];
- data[i*4+1] = p_stream->lang[i*3+1];
- data[i*4+2] = p_stream->lang[i*3+2];
- data[i*4+3] = 0x00; /* audio type: 0x00 undefined */
- }
- dvbpsi_PMTESAddDescriptor( p_es, 0x0a, 4*p_stream->i_langs, data );
+ dvbpsi_PMTESAddDescriptor( p_es, 0x0a, 4*p_stream->i_langs,
+ p_stream->lang);
}
}
- for( i = 0; i < p_sys->i_num_pmt; i++ )
+ for (unsigned i = 0; i < p_sys->i_num_pmt; i++ )
{
- p_section[i] = dvbpsi_GenPMTSections( &p_sys->dvbpmt[i] );
- p_pmt[i] = WritePSISection( p_mux->p_sout, p_section[i] );
- PEStoTS( p_mux->p_sout, c, p_pmt[i], &p_sys->pmt[i] );
- dvbpsi_DeletePSISections( p_section[i] );
+ dvbpsi_psi_section_t *sect;
+#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0))
+ sect = dvbpsi_pmt_sections_generate( p_sys->p_dvbpsi, &p_sys->dvbpmt[i] );
+#else
+ sect = dvbpsi_GenPMTSections( &p_sys->dvbpmt[i] );
+#endif
+ block_t *pmt = WritePSISection( sect );
+ PEStoTS( c, pmt, &p_sys->pmt[i] );
+ dvbpsi_DeletePSISections(sect);
dvbpsi_EmptyPMT( &p_sys->dvbpmt[i] );
}
-#ifdef HAVE_DVBPSI_SDT
if( p_sys->b_sdt )
{
- p_section2 = dvbpsi_GenSDTSections( &sdt );
- p_sdt = WritePSISection( p_mux->p_sout, p_section2 );
- PEStoTS( p_mux->p_sout, c, p_sdt, &p_sys->sdt );
- dvbpsi_DeletePSISections( p_section2 );
+ dvbpsi_psi_section_t *sect;
+#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0))
+ sect = dvbpsi_sdt_sections_generate( p_sys->p_dvbpsi, &sdt );
+#else
+ sect = dvbpsi_GenSDTSections( &sdt );
+#endif
+ block_t *p_sdt = WritePSISection( sect );
+ PEStoTS( c, p_sdt, &p_sys->sdt );
+ dvbpsi_DeletePSISections( sect );
dvbpsi_EmptySDT( &sdt );
}
-#endif
}
projects / vlc / blobdiff