Add new mux subdirectory for container formats

Contains the (incomplete) flavors FLV demuxer and the fragmented MP4
muxer for now.

Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/173

21 files changed, 7 insertions, 4 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 95f6f1225..dff1cf5dc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,10 +11,12 @@ members = [
     "audio/spotify",
 
     "generic/file",
-    "generic/fmp4",
     "generic/sodium",
     "generic/threadshare",
 
+    "mux/flavors",
+    "mux/fmp4",
+
     "net/aws",
     "net/hlssink3",
     "net/ndi",
@@ -41,7 +43,6 @@ members = [
     "video/closedcaption",
     "video/dav1d",
     "video/ffv1",
-    "video/flavors",
     "video/gif",
     "video/gtk4",
     "video/hsv",
@@ -59,9 +60,10 @@ default-members = [
     "audio/claxon",
     "audio/lewton",
 
-    "generic/fmp4",
     "generic/threadshare",
 
+    "mux/fmp4",
+
     "net/aws",
     "net/hlssink3",
     "net/onvif",
diff --git a/meson.build b/meson.build
index e8d7a14c6..6f68ddfbc 100644
--- a/meson.build
+++ b/meson.build
@@ -46,10 +46,11 @@ plugins = {
   'gst-plugin-spotify': 'libgstspotify',
 
   'gst-plugin-file': 'libgstrsfile',
-  'gst-plugin-fmp4': 'libgstfmp4',
   # sodium has an external dependency, see below
   'gst-plugin-threadshare': 'libgstthreadshare',
 
+  'gst-plugin-fmp4': 'libgstfmp4',
+
   'gst-plugin-aws': 'libgstaws',
   'gst-plugin-hlssink3': 'libgsthlssink3',
   'gst-plugin-ndi': 'libgstndi',
diff --git a/video/flavors/Cargo.toml b/mux/flavors/Cargo.toml
index 7f8eceeb8..7f8eceeb8 100644
--- a/video/flavors/Cargo.toml
+++ b/mux/flavors/Cargo.toml
diff --git a/video/flavors/LICENSE-APACHE b/mux/flavors/LICENSE-APACHE
index 1cd601d0a..1cd601d0a 120000
--- a/video/flavors/LICENSE-APACHE
+++ b/mux/flavors/LICENSE-APACHE
diff --git a/video/flavors/LICENSE-MIT b/mux/flavors/LICENSE-MIT
index b2cfbdc7b..b2cfbdc7b 120000
--- a/video/flavors/LICENSE-MIT
+++ b/mux/flavors/LICENSE-MIT
diff --git a/generic/fmp4/build.rs b/mux/flavors/build.rs
index cda12e57e..cda12e57e 100644
--- a/generic/fmp4/build.rs
+++ b/mux/flavors/build.rs
diff --git a/video/flavors/src/bytes.rs b/mux/flavors/src/bytes.rs
index 02263993c..02263993c 100644
--- a/video/flavors/src/bytes.rs
+++ b/mux/flavors/src/bytes.rs
diff --git a/video/flavors/src/flvdemux/imp.rs b/mux/flavors/src/flvdemux/imp.rs
index 67d2f7d9d..67d2f7d9d 100644
--- a/video/flavors/src/flvdemux/imp.rs
+++ b/mux/flavors/src/flvdemux/imp.rs
diff --git a/video/flavors/src/flvdemux/mod.rs b/mux/flavors/src/flvdemux/mod.rs
index aa311bdf8..aa311bdf8 100644
--- a/video/flavors/src/flvdemux/mod.rs
+++ b/mux/flavors/src/flvdemux/mod.rs
diff --git a/video/flavors/src/lib.rs b/mux/flavors/src/lib.rs
index 7813d92e3..7813d92e3 100644
--- a/video/flavors/src/lib.rs
+++ b/mux/flavors/src/lib.rs
diff --git a/generic/fmp4/Cargo.toml b/mux/fmp4/Cargo.toml
index f72c84a7b..f72c84a7b 100644
--- a/generic/fmp4/Cargo.toml
+++ b/mux/fmp4/Cargo.toml
diff --git a/generic/fmp4/LICENSE b/mux/fmp4/LICENSE
index eb5d24fe9..eb5d24fe9 120000
--- a/generic/fmp4/LICENSE
+++ b/mux/fmp4/LICENSE
diff --git a/video/flavors/build.rs b/mux/fmp4/build.rs
index cda12e57e..cda12e57e 100644
--- a/video/flavors/build.rs
+++ b/mux/fmp4/build.rs
diff --git a/generic/fmp4/examples/dash_vod.rs b/mux/fmp4/examples/dash_vod.rs
index eb291d6eb..eb291d6eb 100644
--- a/generic/fmp4/examples/dash_vod.rs
+++ b/mux/fmp4/examples/dash_vod.rs
diff --git a/generic/fmp4/examples/hls_live.rs b/mux/fmp4/examples/hls_live.rs
index f1d9ed6d1..f1d9ed6d1 100644
--- a/generic/fmp4/examples/hls_live.rs
+++ b/mux/fmp4/examples/hls_live.rs
diff --git a/generic/fmp4/examples/hls_vod.rs b/mux/fmp4/examples/hls_vod.rs
index 4a2533cd1..4a2533cd1 100644
--- a/generic/fmp4/examples/hls_vod.rs
+++ b/mux/fmp4/examples/hls_vod.rs
diff --git a/generic/fmp4/src/fmp4mux/boxes.rs b/mux/fmp4/src/fmp4mux/boxes.rs
index 9b69fb36f..9b69fb36f 100644
--- a/generic/fmp4/src/fmp4mux/boxes.rs
+++ b/mux/fmp4/src/fmp4mux/boxes.rs
diff --git a/generic/fmp4/src/fmp4mux/imp.rs b/mux/fmp4/src/fmp4mux/imp.rs
index a7a8932dc..a7a8932dc 100644
--- a/generic/fmp4/src/fmp4mux/imp.rs
+++ b/mux/fmp4/src/fmp4mux/imp.rs
diff --git a/generic/fmp4/src/fmp4mux/mod.rs b/mux/fmp4/src/fmp4mux/mod.rs
index 76c2da9c2..76c2da9c2 100644
--- a/generic/fmp4/src/fmp4mux/mod.rs
+++ b/mux/fmp4/src/fmp4mux/mod.rs
diff --git a/generic/fmp4/src/lib.rs b/mux/fmp4/src/lib.rs
index 697c7cbf1..697c7cbf1 100644
--- a/generic/fmp4/src/lib.rs
+++ b/mux/fmp4/src/lib.rs
diff --git a/generic/fmp4/tests/tests.rs b/mux/fmp4/tests/tests.rs
index 073b6ae05..073b6ae05 100644
--- a/generic/fmp4/tests/tests.rs
+++ b/mux/fmp4/tests/tests.rs