Buildbot scte35 id3 markers

include/gpac/constants.h

@@ -528,6 +528,9 @@ typedef enum
 
 	GF_CODECID_DVB_SUBS = GF_4CC( 'd', 'v', 'b', 's' ),
 	GF_CODECID_DVB_TELETEXT = GF_4CC( 'd', 'v', 'b', 't' ),
+
+	GF_CODECID_SCTE35 = GF_4CC( 's', 'c', '3', '5' ),
+
 	/*!
 		\brief OGG DecoderConfig
 

include/gpac/media_tools.h

@@ -738,7 +738,7 @@ typedef enum
 	/*! out of band parameter sets except PPS and APS, used for VVC */
 	GF_DASH_BSMODE_INBAND_PPS,
 	/*! both inband and out of band parameter sets */
-	GF_DASH_BSMODE_BOTH, //Romain
+	GF_DASH_BSMODE_BOTH,
 	/*! attempts to merge parameter sets in a single sample entry */
 	GF_DASH_BSMODE_MERGED,
 	/*! parameter sets are in different sample entries */

include/gpac/mpegts.h

@@ -55,6 +55,7 @@ extern "C" {
 /*! metadata types for GF_M2TS_METADATA_POINTER_DESCRIPTOR*/
 enum {
 	GF_M2TS_META_ID3 	= GF_4CC('I','D','3',' '),
+	GF_M2TS_META_KLVA 	= GF_4CC('K','L','V','A'),
 };
 
 
@@ -213,6 +214,7 @@ enum {
 	GF_M2TS_TABLE_ID_DIT			= 0x7E,
 	GF_M2TS_TABLE_ID_SIT			= 0x7F, /* max size for section 4096 */
 	/* 0x80 - 0xfe reserved */
+	GF_M2TS_TABLE_ID_SCTE35_SPLICE_INFO	= 0xFC,
 	/* 0xff reserved */
 };
 
@@ -279,40 +281,43 @@ typedef enum
 
 	/*the rest is internal use*/
 
-	GF_M2TS_VIDEO_VC1				= 0xEA,
-	GF_M2TS_VIDEO_DCII				= 0x80,
-	GF_M2TS_AUDIO_AC3				= 0x81,
-	GF_M2TS_AUDIO_DTS				= 0x82,
-	GF_M2TS_AUDIO_TRUEHD			= 0x83,
-	GF_M2TS_AUDIO_EC3				= 0x84,
-	GF_M2TS_MPE_SECTIONS            = 0x90,
-	GF_M2TS_SUBTITLE_DVB			= 0x100,
-	GF_M2TS_AUDIO_OPUS				= 0x101,
-	GF_M2TS_VIDEO_AV1				= 0x102,
-
-	GF_M2TS_DVB_TELETEXT			= 0x152,
-	GF_M2TS_DVB_VBI					= 0x153,
-	GF_M2TS_DVB_SUBTITLE			= 0x154,
-	GF_M2TS_METADATA_ID3_HLS		= 0x155,
+	GF_M2TS_VIDEO_VC1					= 0xEA,
+	GF_M2TS_VIDEO_DCII					= 0x80,
+	GF_M2TS_AUDIO_AC3					= 0x81,
+	GF_M2TS_AUDIO_DTS					= 0x82,
+	GF_M2TS_AUDIO_TRUEHD				= 0x83,
+	GF_M2TS_AUDIO_EC3					= 0x84,
+	GF_M2TS_SCTE35_SPLICE_INFO_SECTIONS	= 0x86,
+	GF_M2TS_MPE_SECTIONS	            = 0x90,
+	GF_M2TS_SUBTITLE_DVB				= 0x100,
+	GF_M2TS_AUDIO_OPUS					= 0x101,
+	GF_M2TS_VIDEO_AV1					= 0x102,
+
+	GF_M2TS_DVB_TELETEXT				= 0x152,
+	GF_M2TS_DVB_VBI						= 0x153,
+	GF_M2TS_DVB_SUBTITLE				= 0x154,
+	GF_M2TS_METADATA_ID3_HLS			= 0x155,
+	GF_M2TS_METADATA_ID3_KLVA			= 0x156,
 
 } GF_M2TSStreamType;
 
 
 /*! MPEG-2 TS Registration codes types*/
 enum
 {
-	GF_M2TS_RA_STREAM_AC3	= GF_4CC('A','C','-','3'),
-	GF_M2TS_RA_STREAM_EAC3	= GF_4CC('E','A','C','3'),
-	GF_M2TS_RA_STREAM_VC1	= GF_4CC('V','C','-','1'),
-	GF_M2TS_RA_STREAM_HEVC	= GF_4CC('H','E','V','C'),
-	GF_M2TS_RA_STREAM_DTS1	= GF_4CC('D','T','S','1'),
-	GF_M2TS_RA_STREAM_DTS2	= GF_4CC('D','T','S','2'),
-	GF_M2TS_RA_STREAM_DTS3	= GF_4CC('D','T','S','3'),
-	GF_M2TS_RA_STREAM_OPUS	= GF_4CC('O','p','u','s'),
-	GF_M2TS_RA_STREAM_DOVI	= GF_4CC('D','O','V','I'),
-	GF_M2TS_RA_STREAM_AV1	= GF_4CC('A','V','0','1'),
-
-	GF_M2TS_RA_STREAM_GPAC	= GF_4CC('G','P','A','C')
+	GF_M2TS_RA_STREAM_AC3		= GF_4CC('A','C','-','3'),
+	GF_M2TS_RA_STREAM_EAC3		= GF_4CC('E','A','C','3'),
+	GF_M2TS_RA_STREAM_VC1		= GF_4CC('V','C','-','1'),
+	GF_M2TS_RA_STREAM_HEVC		= GF_4CC('H','E','V','C'),
+	GF_M2TS_RA_STREAM_DTS1		= GF_4CC('D','T','S','1'),
+	GF_M2TS_RA_STREAM_DTS2		= GF_4CC('D','T','S','2'),
+	GF_M2TS_RA_STREAM_DTS3		= GF_4CC('D','T','S','3'),
+	GF_M2TS_RA_STREAM_OPUS		= GF_4CC('O','p','u','s'),
+	GF_M2TS_RA_STREAM_DOVI		= GF_4CC('D','O','V','I'),
+	GF_M2TS_RA_STREAM_AV1		= GF_4CC('A','V','0','1'),
+	GF_M2TS_RA_STREAM_SCTE35	= GF_4CC('C','U','E','I'),
+
+	GF_M2TS_RA_STREAM_GPAC		= GF_4CC('G','P','A','C')
 };
 
 
@@ -495,6 +500,13 @@ enum
 	GF_M2TS_EVT_TEMI_LOCATION,
 	/*! a TEMI timecode has been found*/
 	GF_M2TS_EVT_TEMI_TIMECODE,
+
+	/*! a SCTE35 splice info has been found*/
+	GF_M2TS_EVT_SCTE35_SPLICE_INFO,
+
+	/*! a generic ID3 tag has been found*/
+	GF_M2TS_EVT_ID3,
+
 	/*! a stream is about to be removed -  - associated parameter: pointer to GF_M2TS_ES being removed*/
 	GF_M2TS_EVT_STREAM_REMOVED
 };
@@ -599,7 +611,7 @@ enum metadata_carriage {
 	METADATA_CARRIAGE_OTHER			= 3
 };
 
-/*! MPEG-2 TS demuxer metadat pointer*/
+/*! MPEG-2 TS demuxer metadata pointer*/
 typedef struct tag_m2ts_metadata_pointer_descriptor {
 	u16 application_format;
 	u32 application_format_identifier;
@@ -867,8 +879,7 @@ typedef struct tag_m2ts_pes
 	u32 last_pat_packet_number, before_last_pat_pn, before_last_pes_start_pn;
 
 	/*! PES reframer callback. If NULL, pes processing is skipped
-
-	returns the number of bytes NOT consumed from the input data buffer - these bytes are kept when reassembling the next PES packet*/
+	    returns the number of bytes NOT consumed from the input data buffer - these bytes are kept when reassembling the next PES packet*/
 	u32 (*reframe)(struct tag_m2ts_demux *ts, struct tag_m2ts_pes *pes, Bool same_pts, u8 *data, u32 data_len, GF_M2TS_PESHeader *hdr);
 
 	/*! DVB subtitling info*/
@@ -882,14 +893,15 @@ typedef struct tag_m2ts_pes
 	u32 temi_tc_desc_len;
 	/*! allocated size of TEMI reception buffer*/
 	u32 temi_tc_desc_alloc_size;
-
 	/*! last decoded temi (may be one ahead of time as the last received TEMI)*/
 	GF_M2TS_TemiTimecodeDescriptor temi_tc;
 	/*! flag set to indicate a TEMI descriptor should be flushed with next packet*/
 	Bool temi_pending;
+
 	/*! flag set to indicate the last PES packet was not flushed (HLS) to avoid warning on same PTS/DTS used*/
 	Bool is_resume;
-	/*! DolbiVison info, last byte set to 1 if non-compatible signaling*/
+
+	/*! DolbyVison info, last byte set to 1 if non-compatible signaling*/
 	u8 dv_info[25];
 
 	u64 map_utc, map_utc_pcr, map_pcr;

src/filter_core/filter_session.h

@@ -1098,7 +1098,6 @@ struct __gf_filter_pid
 	volatile u32 num_pidinst_del_pending;
 
 	u32 link_flags;
-
 };