[vlc-commits] mux: ts: prefix structs with mux
Francois Cartegnie
git at videolan.org
Wed Jun 21 21:34:00 CEST 2017
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Jun 19 17:56:39 2017 +0200| [cda2c4ba723aa5cf24e2eac9751773c0502d6eee] | committer: Francois Cartegnie
mux: ts: prefix structs with mux
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cda2c4ba723aa5cf24e2eac9751773c0502d6eee
---
modules/demux/mpeg/ts_hotfixes.c | 8 ++++----
modules/mux/mpeg/streams.h | 4 ++--
modules/mux/mpeg/tables.c | 10 +++++-----
modules/mux/mpeg/tables.h | 14 +++++++-------
modules/mux/mpeg/ts.c | 8 ++++----
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/modules/demux/mpeg/ts_hotfixes.c b/modules/demux/mpeg/ts_hotfixes.c
index 175fffd335..f26425bd6c 100644
--- a/modules/demux/mpeg/ts_hotfixes.c
+++ b/modules/demux/mpeg/ts_hotfixes.c
@@ -270,14 +270,14 @@ void MissingPATPMTFixup( demux_t *p_demux )
if( i_num_pes == 0 )
return;
- ts_stream_t patstream =
+ tsmux_stream_t patstream =
{
.i_pid = 0,
.i_continuity_counter = 0x10,
.b_discontinuity = false
};
- ts_stream_t pmtprogramstream =
+ tsmux_stream_t pmtprogramstream =
{
.i_pid = i_program_pid,
.i_continuity_counter = 0x0,
@@ -301,8 +301,8 @@ void MissingPATPMTFixup( demux_t *p_demux )
: TS_MUX_STANDARD_DVB;
struct esstreams_t
{
- pes_stream_t pes;
- ts_stream_t ts;
+ pesmux_stream_t pes;
+ tsmux_stream_t ts;
};
es_format_t esfmt = {0};
struct esstreams_t *esstreams = calloc( i_num_pes, sizeof(struct esstreams_t) );
diff --git a/modules/mux/mpeg/streams.h b/modules/mux/mpeg/streams.h
index 5958ef7acd..5f31822980 100644
--- a/modules/mux/mpeg/streams.h
+++ b/modules/mux/mpeg/streams.h
@@ -28,7 +28,7 @@ typedef struct
uint8_t i_continuity_counter;
bool b_discontinuity;
-} ts_stream_t;
+} tsmux_stream_t;
typedef struct
{
@@ -47,6 +47,6 @@ typedef struct
/* language is iso639-2T */
size_t i_langs;
uint8_t *lang;
-} pes_stream_t;
+} pesmux_stream_t;
#endif
diff --git a/modules/mux/mpeg/tables.c b/modules/mux/mpeg/tables.c
index 8f43ffeb29..0cba57efbe 100644
--- a/modules/mux/mpeg/tables.c
+++ b/modules/mux/mpeg/tables.c
@@ -83,8 +83,8 @@ error:
void BuildPAT( dvbpsi_t *p_dvbpsi,
void *p_opaque, PEStoTSCallback pf_callback,
int i_tsid, int i_pat_version_number,
- ts_stream_t *p_pat,
- unsigned i_programs, ts_stream_t *p_pmt, const int *pi_programs_number )
+ tsmux_stream_t *p_pat,
+ unsigned i_programs, tsmux_stream_t *p_pmt, const int *pi_programs_number )
{
dvbpsi_pat_t patpsi;
dvbpsi_psi_section_t *p_section;
@@ -255,7 +255,7 @@ static void GetPMTmpeg4( vlc_object_t *p_object, dvbpsi_pmt_t *p_dvbpmt,
}
static void UpdateServiceType( uint8_t *pi_service_cat, uint8_t *pi_service_type,
- const ts_stream_t *p_ts, const pes_stream_t *p_pes )
+ const tsmux_stream_t *p_ts, const pesmux_stream_t *p_pes )
{
uint8_t i_type = 0x00;
@@ -360,7 +360,7 @@ void BuildPMT( dvbpsi_t *p_dvbpsi, vlc_object_t *p_object,
int i_tsid, int i_pmt_version_number,
int i_pcr_pid,
sdt_psi_t *p_sdt,
- unsigned i_programs, ts_stream_t *p_pmt, const int *pi_programs_number,
+ unsigned i_programs, tsmux_stream_t *p_pmt, const int *pi_programs_number,
unsigned i_mapped_streams, const pes_mapped_stream_t *p_mapped_streams )
{
dvbpsi_pmt_t *dvbpmt = malloc( i_programs * sizeof(dvbpsi_pmt_t) );
@@ -635,7 +635,7 @@ void BuildPMT( dvbpsi_t *p_dvbpsi, vlc_object_t *p_object,
}
int FillPMTESParams( ts_mux_standard standard, const es_format_t *fmt,
- ts_stream_t *ts, pes_stream_t *pes )
+ tsmux_stream_t *ts, pesmux_stream_t *pes )
{
switch( fmt->i_codec )
{
diff --git a/modules/mux/mpeg/tables.h b/modules/mux/mpeg/tables.h
index 4aeba364d0..bd988dfe65 100644
--- a/modules/mux/mpeg/tables.h
+++ b/modules/mux/mpeg/tables.h
@@ -24,7 +24,7 @@
typedef struct
{
- ts_stream_t ts;
+ tsmux_stream_t ts;
int i_netid;
struct
{
@@ -38,13 +38,13 @@ block_t * WritePSISection( dvbpsi_psi_section_t* p_section );
void BuildPAT( dvbpsi_t *p_dvbpsi,
void *p_opaque, PEStoTSCallback pf_callback,
int i_tsid, int i_pat_version_number,
- ts_stream_t *p_pat,
- unsigned i_programs, ts_stream_t *p_pmt, const int *pi_programs_number );
+ tsmux_stream_t *p_pat,
+ unsigned i_programs, tsmux_stream_t *p_pmt, const int *pi_programs_number );
typedef struct
{
- const pes_stream_t *pes;
- const ts_stream_t *ts;
+ const pesmux_stream_t *pes;
+ const tsmux_stream_t *ts;
const es_format_t *fmt;
int i_mapped_prog;
} pes_mapped_stream_t;
@@ -61,11 +61,11 @@ void BuildPMT( dvbpsi_t *p_dvbpsi, vlc_object_t *p_object,
int i_tsid, int i_pmt_version_number,
int i_pcr_pid,
sdt_psi_t *p_sdt,
- unsigned i_programs, ts_stream_t *p_pmt, const int *pi_programs_number,
+ unsigned i_programs, tsmux_stream_t *p_pmt, const int *pi_programs_number,
unsigned i_mapped_streams, const pes_mapped_stream_t *p_mapped_streams );
int FillPMTESParams( ts_mux_standard, const es_format_t *,
- ts_stream_t *, pes_stream_t * );
+ tsmux_stream_t *, pesmux_stream_t * );
#endif
diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index 79bde06c40..8a2366ab85 100644
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -333,8 +333,8 @@ typedef struct
typedef struct
{
- ts_stream_t ts;
- pes_stream_t pes;
+ tsmux_stream_t ts;
+ pesmux_stream_t pes;
pes_state_t state;
} sout_input_sys_t;
@@ -354,10 +354,10 @@ struct sout_mux_sys_t
unsigned i_num_pmt;
int i_pmtslots;
int i_pat_version_number;
- ts_stream_t pat;
+ tsmux_stream_t pat;
int i_pmt_version_number;
- ts_stream_t pmt[MAX_PMT];
+ tsmux_stream_t pmt[MAX_PMT];
pmt_map_t pmtmap[MAX_PMT_PID];
int i_pmt_program_number[MAX_PMT];
bool b_data_alignment;
More information about the vlc-commits
mailing list