mux: ts: make PMT/PAT generation reusable

modules/mux/Modules.am

@@ -25,7 +25,7 @@ libmux_ts_plugin_la_SOURCES = \
 	mpeg/pes.c mpeg/pes.h \
 	mpeg/csa.c mpeg/csa.h \
 	mpeg/streams.h \
-	mpeg/tables.h \
+	mpeg/tables.c mpeg/tables.h \
 	mpeg/tsutil.c mpeg/tsutil.h \
 	mpeg/ts.c mpeg/bits.h mpeg/dvbpsi_compat.h
 libmux_ts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS)

modules/mux/mpeg/tables.h

@@ -20,6 +20,12 @@
 #ifndef _TABLES_H
 #define _TABLES_H 1
 
+#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0))
+    #define DVBPSI_HANDLE_PARAM(a) a,
+#else
+    #define DVBPSI_HANDLE_PARAM(a)
+#endif
+
 #define MAX_SDT_DESC 64
 
 typedef struct
@@ -33,4 +39,28 @@ typedef struct
     } desc[MAX_SDT_DESC];
 } sdt_psi_t;
 
+block_t * WritePSISection( dvbpsi_psi_section_t* p_section );
+
+void BuildPAT( DVBPSI_HANDLE_PARAM(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 );
+
+typedef struct
+{
+    const pes_stream_t *pes;
+    const ts_stream_t  *ts;
+    const es_format_t  *fmt;
+    int i_mapped_prog;
+} pes_mapped_stream_t;
+
+void BuildPMT( DVBPSI_HANDLE_PARAM(dvbpsi_t *p_dvbpsi) vlc_object_t *p_object,
+               void *p_opaque, PEStoTSCallback pf_callback,
+               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_mapped_streams, const pes_mapped_stream_t *p_mapped_streams );
+
 #endif