Commit cda2c4ba authored by François Cartegnie's avatar François Cartegnie 🤞

mux: ts: prefix structs with mux

parent 2cf52d0c
...@@ -270,14 +270,14 @@ void MissingPATPMTFixup( demux_t *p_demux ) ...@@ -270,14 +270,14 @@ void MissingPATPMTFixup( demux_t *p_demux )
if( i_num_pes == 0 ) if( i_num_pes == 0 )
return; return;
ts_stream_t patstream = tsmux_stream_t patstream =
{ {
.i_pid = 0, .i_pid = 0,
.i_continuity_counter = 0x10, .i_continuity_counter = 0x10,
.b_discontinuity = false .b_discontinuity = false
}; };
ts_stream_t pmtprogramstream = tsmux_stream_t pmtprogramstream =
{ {
.i_pid = i_program_pid, .i_pid = i_program_pid,
.i_continuity_counter = 0x0, .i_continuity_counter = 0x0,
...@@ -301,8 +301,8 @@ void MissingPATPMTFixup( demux_t *p_demux ) ...@@ -301,8 +301,8 @@ void MissingPATPMTFixup( demux_t *p_demux )
: TS_MUX_STANDARD_DVB; : TS_MUX_STANDARD_DVB;
struct esstreams_t struct esstreams_t
{ {
pes_stream_t pes; pesmux_stream_t pes;
ts_stream_t ts; tsmux_stream_t ts;
}; };
es_format_t esfmt = {0}; es_format_t esfmt = {0};
struct esstreams_t *esstreams = calloc( i_num_pes, sizeof(struct esstreams_t) ); struct esstreams_t *esstreams = calloc( i_num_pes, sizeof(struct esstreams_t) );
......
...@@ -28,7 +28,7 @@ typedef struct ...@@ -28,7 +28,7 @@ typedef struct
uint8_t i_continuity_counter; uint8_t i_continuity_counter;
bool b_discontinuity; bool b_discontinuity;
} ts_stream_t; } tsmux_stream_t;
typedef struct typedef struct
{ {
...@@ -47,6 +47,6 @@ typedef struct ...@@ -47,6 +47,6 @@ typedef struct
/* language is iso639-2T */ /* language is iso639-2T */
size_t i_langs; size_t i_langs;
uint8_t *lang; uint8_t *lang;
} pes_stream_t; } pesmux_stream_t;
#endif #endif
...@@ -83,8 +83,8 @@ error: ...@@ -83,8 +83,8 @@ error:
void BuildPAT( dvbpsi_t *p_dvbpsi, void BuildPAT( dvbpsi_t *p_dvbpsi,
void *p_opaque, PEStoTSCallback pf_callback, void *p_opaque, PEStoTSCallback pf_callback,
int i_tsid, int i_pat_version_number, int i_tsid, int i_pat_version_number,
ts_stream_t *p_pat, tsmux_stream_t *p_pat,
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 )
{ {
dvbpsi_pat_t patpsi; dvbpsi_pat_t patpsi;
dvbpsi_psi_section_t *p_section; dvbpsi_psi_section_t *p_section;
...@@ -255,7 +255,7 @@ static void GetPMTmpeg4( vlc_object_t *p_object, dvbpsi_pmt_t *p_dvbpmt, ...@@ -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, 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; uint8_t i_type = 0x00;
...@@ -360,7 +360,7 @@ void BuildPMT( dvbpsi_t *p_dvbpsi, vlc_object_t *p_object, ...@@ -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_tsid, int i_pmt_version_number,
int i_pcr_pid, int i_pcr_pid,
sdt_psi_t *p_sdt, 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 ) unsigned i_mapped_streams, const pes_mapped_stream_t *p_mapped_streams )
{ {
dvbpsi_pmt_t *dvbpmt = malloc( i_programs * sizeof(dvbpsi_pmt_t) ); 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, ...@@ -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, 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 ) switch( fmt->i_codec )
{ {
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
typedef struct typedef struct
{ {
ts_stream_t ts; tsmux_stream_t ts;
int i_netid; int i_netid;
struct struct
{ {
...@@ -38,13 +38,13 @@ block_t * WritePSISection( dvbpsi_psi_section_t* p_section ); ...@@ -38,13 +38,13 @@ block_t * WritePSISection( dvbpsi_psi_section_t* p_section );
void BuildPAT( dvbpsi_t *p_dvbpsi, void BuildPAT( dvbpsi_t *p_dvbpsi,
void *p_opaque, PEStoTSCallback pf_callback, void *p_opaque, PEStoTSCallback pf_callback,
int i_tsid, int i_pat_version_number, int i_tsid, int i_pat_version_number,
ts_stream_t *p_pat, tsmux_stream_t *p_pat,
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 );
typedef struct typedef struct
{ {
const pes_stream_t *pes; const pesmux_stream_t *pes;
const ts_stream_t *ts; const tsmux_stream_t *ts;
const es_format_t *fmt; const es_format_t *fmt;
int i_mapped_prog; int i_mapped_prog;
} pes_mapped_stream_t; } pes_mapped_stream_t;
...@@ -61,11 +61,11 @@ void BuildPMT( dvbpsi_t *p_dvbpsi, vlc_object_t *p_object, ...@@ -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_tsid, int i_pmt_version_number,
int i_pcr_pid, int i_pcr_pid,
sdt_psi_t *p_sdt, 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 ); unsigned i_mapped_streams, const pes_mapped_stream_t *p_mapped_streams );
int FillPMTESParams( ts_mux_standard, const es_format_t *, int FillPMTESParams( ts_mux_standard, const es_format_t *,
ts_stream_t *, pes_stream_t * ); tsmux_stream_t *, pesmux_stream_t * );
#endif #endif
...@@ -333,8 +333,8 @@ typedef struct ...@@ -333,8 +333,8 @@ typedef struct
typedef struct typedef struct
{ {
ts_stream_t ts; tsmux_stream_t ts;
pes_stream_t pes; pesmux_stream_t pes;
pes_state_t state; pes_state_t state;
} sout_input_sys_t; } sout_input_sys_t;
...@@ -354,10 +354,10 @@ struct sout_mux_sys_t ...@@ -354,10 +354,10 @@ struct sout_mux_sys_t
unsigned i_num_pmt; unsigned i_num_pmt;
int i_pmtslots; int i_pmtslots;
int i_pat_version_number; int i_pat_version_number;
ts_stream_t pat; tsmux_stream_t pat;
int i_pmt_version_number; int i_pmt_version_number;
ts_stream_t pmt[MAX_PMT]; tsmux_stream_t pmt[MAX_PMT];
pmt_map_t pmtmap[MAX_PMT_PID]; pmt_map_t pmtmap[MAX_PMT_PID];
int i_pmt_program_number[MAX_PMT]; int i_pmt_program_number[MAX_PMT];
bool b_data_alignment; bool b_data_alignment;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment