support for DVB-MABR flute muxing

Author: jeanlf

.gitignore

@@ -89,5 +89,11 @@ tests/external_media/
 tests/results/
 tests/hash_refs/
 
+*doxygen_warnings.txt
+*/nodejs/node_modules/
+*/nodejs/package-lock.json
+applications/deprecated/
+
+
 # nix output
 result

Changelog

@@ -7,7 +7,7 @@
 - Fixes in UI
 
 ## Filters
-- experimental DVB-I MABR flute demux
+- DVB-I MABR flute aux and demux
 
 #04/2024: GPAC 2.4
 

build/android/jni/libgpac/Android.mk

@@ -423,6 +423,7 @@ LOCAL_SRC_FILES := \
 	../../../../src/utils/path2d_stroker.c \
 	../../../../src/utils/sha1.c \
 	../../../../src/utils/sha256.c \
+	../../../../src/utils/md5.c \
 	../../../../src/utils/token.c \
 	../../../../src/utils/uni_bidi.c \
 	../../../../src/utils/unicode.c \

build/msvc14/libgpac.vcxproj

@@ -585,6 +585,7 @@
     <ClCompile Include="..\..\src\utils\Remotery.c" />
     <ClCompile Include="..\..\src\utils\sha1.c" />
     <ClCompile Include="..\..\src\utils\sha256.c" />
+    <ClCompile Include="..\..\src\utils\md5.c" />
     <ClCompile Include="..\..\src\utils\token.c" />
     <ClCompile Include="..\..\src\utils\unicode.c" />
     <ClCompile Include="..\..\src\utils\uni_bidi.c" />

build/msvc14/libgpac.vcxproj.filters

@@ -1055,6 +1055,9 @@
     <ClCompile Include="..\..\src\utils\sha256.c">
       <Filter>utils</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\utils\md5.c">
+      <Filter>utils</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\utils\token.c">
       <Filter>utils</Filter>
     </ClCompile>

build/xcode/gpac.xcodeproj/project.pbxproj

@@ -178,6 +178,7 @@
 		92256CCD20E0DA26004EB243 /* encrypt_cenc_isma.c in Sources */ = {isa = PBXBuildFile; fileRef = 92256CCC20E0DA26004EB243 /* encrypt_cenc_isma.c */; };
 		9225DD752326790C00F94C42 /* mpd.h in Headers */ = {isa = PBXBuildFile; fileRef = 9225DD742326790C00F94C42 /* mpd.h */; };
 		92261A87239A6E4600C14199 /* out_http.c in Sources */ = {isa = PBXBuildFile; fileRef = 92261A86239A6E4600C14199 /* out_http.c */; };
+		92277E1B2BE8F32B005E0955 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 92277E1A2BE8F32B005E0955 /* md5.c */; };
 		922B0FAA2A5E81EB003690BB /* dec_mpeghdec.c in Sources */ = {isa = PBXBuildFile; fileRef = 922B0FA92A5E81EB003690BB /* dec_mpeghdec.c */; };
 		922B0FC72A602176003690BB /* caca_out.c in Sources */ = {isa = PBXBuildFile; fileRef = 922B0FC62A602176003690BB /* caca_out.c */; };
 		922B0FC82A6028C5003690BB /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
@@ -813,6 +814,7 @@
 		92256CCC20E0DA26004EB243 /* encrypt_cenc_isma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = encrypt_cenc_isma.c; path = filters/encrypt_cenc_isma.c; sourceTree = "<group>"; };
 		9225DD742326790C00F94C42 /* mpd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mpd.h; path = ../include/gpac/mpd.h; sourceTree = "<group>"; };
 		92261A86239A6E4600C14199 /* out_http.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_http.c; path = filters/out_http.c; sourceTree = "<group>"; };
+		92277E1A2BE8F32B005E0955 /* md5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = md5.c; sourceTree = "<group>"; };
 		922B0FA92A5E81EB003690BB /* dec_mpeghdec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_mpeghdec.c; path = filters/dec_mpeghdec.c; sourceTree = "<group>"; };
 		922B0FC12A602153003690BB /* gm_caca_out.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_caca_out.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		922B0FC62A602176003690BB /* caca_out.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = caca_out.c; path = ../../modules/caca_out/caca_out.c; sourceTree = "<group>"; };
@@ -1404,6 +1406,7 @@
 				92E164BA20F8F2860024A9CA /* Remotery.c */,
 				920100A418D5A444003D1ACA /* sha1.c */,
 				925A760E292F965D00664F38 /* sha256.c */,
+				92277E1A2BE8F32B005E0955 /* md5.c */,
 				920100A718D5A444003D1ACA /* token.c */,
 				920100A818D5A444003D1ACA /* uni_bidi.c */,
 				920100A918D5A444003D1ACA /* unicode.c */,
@@ -2530,6 +2533,7 @@
 				920100B618D5A444003D1ACA /* field_decode.c in Sources */,
 				92BB85721F7BFB63009BC9C8 /* ff_common.c in Sources */,
 				920100B718D5A444003D1ACA /* field_encode.c in Sources */,
+				92277E1B2BE8F32B005E0955 /* md5.c in Sources */,
 				92455F8C2A52B4B90080321C /* dec_cc.c in Sources */,
 				9234CF471FD8344000CCDFA1 /* in_rtp.c in Sources */,
 				92B9A5911F8660D700A24FE4 /* mpeg4_geometry_2d.c in Sources */,

build/xcode/gpac4ios.xcodeproj/project.pbxproj

@@ -328,6 +328,7 @@
 		921FEBA01CF8670A00B437C2 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 921FEB9E1CF8665900B437C2 /* CoreLocation.framework */; };
 		921FEBA11CF8671300B437C2 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 921FEB9C1CF8664800B437C2 /* CoreMotion.framework */; };
 		92261A89239E326900C14199 /* out_http.c in Sources */ = {isa = PBXBuildFile; fileRef = 92261A88239E326900C14199 /* out_http.c */; };
+		92277E1D2BE910E1005E0955 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 92277E1C2BE910E1005E0955 /* md5.c */; };
 		9227B8582799F8E700BF3D1B /* bs_agg.c in Sources */ = {isa = PBXBuildFile; fileRef = 9227B8562799F8E600BF3D1B /* bs_agg.c */; };
 		9227B8592799F8E700BF3D1B /* bs_split.c in Sources */ = {isa = PBXBuildFile; fileRef = 9227B8572799F8E600BF3D1B /* bs_split.c */; };
 		922B0FAC2A5EBCF2003690BB /* dec_mpeghdec.c in Sources */ = {isa = PBXBuildFile; fileRef = 922B0FAB2A5EBCF2003690BB /* dec_mpeghdec.c */; };
@@ -938,6 +939,7 @@
 		921FEB9C1CF8664800B437C2 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
 		921FEB9E1CF8665900B437C2 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
 		92261A88239E326900C14199 /* out_http.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_http.c; path = ../../src/filters/out_http.c; sourceTree = "<group>"; };
+		92277E1C2BE910E1005E0955 /* md5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = md5.c; sourceTree = "<group>"; };
 		9227B8562799F8E600BF3D1B /* bs_agg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bs_agg.c; path = ../../src/filters/bs_agg.c; sourceTree = "<group>"; };
 		9227B8572799F8E600BF3D1B /* bs_split.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bs_split.c; path = ../../src/filters/bs_split.c; sourceTree = "<group>"; };
 		922B0FAB2A5EBCF2003690BB /* dec_mpeghdec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_mpeghdec.c; path = ../../src/filters/dec_mpeghdec.c; sourceTree = "<group>"; };
@@ -1668,6 +1670,7 @@
 		71CCF2291277045100339E12 /* utils */ = {
 			isa = PBXGroup;
 			children = (
+				92277E1C2BE910E1005E0955 /* md5.c */,
 				7141FF2F1292CB9200FCB27D /* alloc.c */,
 				71CCF22A1277045100339E12 /* base_encoding.c */,
 				71CCF22B1277045100339E12 /* bitstream.c */,
@@ -2647,6 +2650,7 @@
 				9296BF2422CFBB3900DC9742 /* reframe_flac.c in Sources */,
 				71CCF3141277045100339E12 /* x3d_nodes.c in Sources */,
 				71CCF3161277045100339E12 /* xml_ns.c in Sources */,
+				92277E1D2BE910E1005E0955 /* md5.c in Sources */,
 				92EB6E1A20E4E19700A97A49 /* in_http.c in Sources */,
 				92EB6E1720E4E19700A97A49 /* enc_jpg.c in Sources */,
 				92B2A4AF229D6646002A65A7 /* hevcsplit.c in Sources */,

include/gpac/route.h

@@ -5,7 +5,7 @@
  *			Copyright (c) Telecom ParisTech 2017-2024
  *					All rights reserved
  *
- *  This file is part of GPAC / ROUTE (ATSC3, DVB-I) and DVBI-Flute demuxer
+ *  This file is part of GPAC / ROUTE (ATSC3, DVB-MABR) and DVB-MABR demuxer
  *
  *  GPAC is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -185,7 +185,7 @@ GF_ROUTEDmx *gf_route_dmx_new(const char *ip, u32 port, const char *ifce, u32 so
 */
 GF_ROUTEDmx *gf_route_dmx_new_ex(const char *ip, u32 port, const char *ifce, u32 sock_buffer_size, const char *netcap_id, void (*on_event)(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *finfo), void *udta);
 
-/*! Creates a new DVBI+Flute MABR demultiplexer
+/*! Creates a new DVB MABR Flute demultiplexer
 \param ip IP address of LCT session carrying the initial FDT
 \param port port of LCT session carrying the initial FDT
 \param ifce network interface to monitor, NULL for INADDR_ANY
@@ -195,7 +195,7 @@ GF_ROUTEDmx *gf_route_dmx_new_ex(const char *ip, u32 port, const char *ifce, u32
 \param udta the user data passed back by the callback
 \return the demultiplexer created
 */
-GF_ROUTEDmx *gf_dvbi_flute_dmx_new(const char *ip, u32 port, const char *ifce, u32 sock_buffer_size, const char *netcap_id, void (*on_event)(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *finfo), void *udta);
+GF_ROUTEDmx *gf_dvb_mabr_dmx_new(const char *ip, u32 port, const char *ifce, u32 sock_buffer_size, const char *netcap_id, void (*on_event)(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *finfo), void *udta);
 
 /*! Deletes an ROUTE demultiplexer
 \param routedmx the ROUTE demultiplexer to delete

include/gpac/setup.h

@@ -858,10 +858,12 @@ size_t gf_strlcpy(char *dst, const char *src, size_t dsize);
 #endif
 
 
+//! @cond Doxygen_Suppress
 /*needed for unittests (disabled)*/
 #ifndef GF_STATIC
 #define GF_STATIC static
 #endif
+//! @endcond
 
 #ifdef __cplusplus
 }

include/gpac/tools.h

@@ -2184,7 +2184,7 @@ GF_Err gf_sha1_file_ptr(FILE *file, u8 digest[GF_SHA1_DIGEST_SIZE] );
 
 /*! gets SHA-1 of input buffer
 \param buf input buffer to hash
-\param buflen sizeo of input buffer in bytes
+\param buflen size of input buffer in bytes
 \param digest buffer to store message digest
  */
 void gf_sha1_csum(u8 *buf, u32 buflen, u8 digest[GF_SHA1_DIGEST_SIZE]);
@@ -2194,12 +2194,22 @@ void gf_sha1_csum(u8 *buf, u32 buflen, u8 digest[GF_SHA1_DIGEST_SIZE]);
 #define GF_SHA256_DIGEST_SIZE 32
 /*! gets SHA-256 of input buffer
 \param buf input buffer to hash
-\param buflen sizeo of input buffer in bytes
+\param buflen size of input buffer in bytes
 \param digest buffer to store message digest
  */
 void gf_sha256_csum(const void *buf, u64 buflen, u8 digest[GF_SHA256_DIGEST_SIZE]);
 
 
+/*! checksum size for MD5*/
+#define GF_MD5_DIGEST_SIZE	16
+
+/*! gets MD5 of input buffer
+\param buf input buffer to hash
+\param buflen size of input buffer in bytes
+\param digest buffer to store message digest
+ */
+void gf_md5_csum(const void *buf, u64 buflen, u8 digest[GF_MD5_DIGEST_SIZE]);
+
 /*!
 \addtogroup libsys_grp
 @{