From 211cd095d69726a3a2208feddd921d05b60c6540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 23 Oct 2022 18:23:45 +0300 Subject: [PATCH] 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 --- Cargo.toml | 8 +++++--- meson.build | 3 ++- {video => mux}/flavors/Cargo.toml | 0 {video => mux}/flavors/LICENSE-APACHE | 0 {video => mux}/flavors/LICENSE-MIT | 0 {generic/fmp4 => mux/flavors}/build.rs | 0 {video => mux}/flavors/src/bytes.rs | 0 {video => mux}/flavors/src/flvdemux/imp.rs | 0 {video => mux}/flavors/src/flvdemux/mod.rs | 0 {video => mux}/flavors/src/lib.rs | 0 {generic => mux}/fmp4/Cargo.toml | 0 {generic => mux}/fmp4/LICENSE | 0 {video/flavors => mux/fmp4}/build.rs | 0 {generic => mux}/fmp4/examples/dash_vod.rs | 0 {generic => mux}/fmp4/examples/hls_live.rs | 0 {generic => mux}/fmp4/examples/hls_vod.rs | 0 {generic => mux}/fmp4/src/fmp4mux/boxes.rs | 0 {generic => mux}/fmp4/src/fmp4mux/imp.rs | 0 {generic => mux}/fmp4/src/fmp4mux/mod.rs | 0 {generic => mux}/fmp4/src/lib.rs | 0 {generic => mux}/fmp4/tests/tests.rs | 0 21 files changed, 7 insertions(+), 4 deletions(-) rename {video => mux}/flavors/Cargo.toml (100%) rename {video => mux}/flavors/LICENSE-APACHE (100%) rename {video => mux}/flavors/LICENSE-MIT (100%) rename {generic/fmp4 => mux/flavors}/build.rs (100%) rename {video => mux}/flavors/src/bytes.rs (100%) rename {video => mux}/flavors/src/flvdemux/imp.rs (100%) rename {video => mux}/flavors/src/flvdemux/mod.rs (100%) rename {video => mux}/flavors/src/lib.rs (100%) rename {generic => mux}/fmp4/Cargo.toml (100%) rename {generic => mux}/fmp4/LICENSE (100%) rename {video/flavors => mux/fmp4}/build.rs (100%) rename {generic => mux}/fmp4/examples/dash_vod.rs (100%) rename {generic => mux}/fmp4/examples/hls_live.rs (100%) rename {generic => mux}/fmp4/examples/hls_vod.rs (100%) rename {generic => mux}/fmp4/src/fmp4mux/boxes.rs (100%) rename {generic => mux}/fmp4/src/fmp4mux/imp.rs (100%) rename {generic => mux}/fmp4/src/fmp4mux/mod.rs (100%) rename {generic => mux}/fmp4/src/lib.rs (100%) rename {generic => mux}/fmp4/tests/tests.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 95f6f122..dff1cf5d 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 e8d7a14c..6f68ddfb 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 similarity index 100% rename from video/flavors/Cargo.toml rename to mux/flavors/Cargo.toml diff --git a/video/flavors/LICENSE-APACHE b/mux/flavors/LICENSE-APACHE similarity index 100% rename from video/flavors/LICENSE-APACHE rename to mux/flavors/LICENSE-APACHE diff --git a/video/flavors/LICENSE-MIT b/mux/flavors/LICENSE-MIT similarity index 100% rename from video/flavors/LICENSE-MIT rename to mux/flavors/LICENSE-MIT diff --git a/generic/fmp4/build.rs b/mux/flavors/build.rs similarity index 100% rename from generic/fmp4/build.rs rename to mux/flavors/build.rs diff --git a/video/flavors/src/bytes.rs b/mux/flavors/src/bytes.rs similarity index 100% rename from video/flavors/src/bytes.rs rename to mux/flavors/src/bytes.rs diff --git a/video/flavors/src/flvdemux/imp.rs b/mux/flavors/src/flvdemux/imp.rs similarity index 100% rename from video/flavors/src/flvdemux/imp.rs rename to mux/flavors/src/flvdemux/imp.rs diff --git a/video/flavors/src/flvdemux/mod.rs b/mux/flavors/src/flvdemux/mod.rs similarity index 100% rename from video/flavors/src/flvdemux/mod.rs rename to mux/flavors/src/flvdemux/mod.rs diff --git a/video/flavors/src/lib.rs b/mux/flavors/src/lib.rs similarity index 100% rename from video/flavors/src/lib.rs rename to mux/flavors/src/lib.rs diff --git a/generic/fmp4/Cargo.toml b/mux/fmp4/Cargo.toml similarity index 100% rename from generic/fmp4/Cargo.toml rename to mux/fmp4/Cargo.toml diff --git a/generic/fmp4/LICENSE b/mux/fmp4/LICENSE similarity index 100% rename from generic/fmp4/LICENSE rename to mux/fmp4/LICENSE diff --git a/video/flavors/build.rs b/mux/fmp4/build.rs similarity index 100% rename from video/flavors/build.rs rename to mux/fmp4/build.rs diff --git a/generic/fmp4/examples/dash_vod.rs b/mux/fmp4/examples/dash_vod.rs similarity index 100% rename from generic/fmp4/examples/dash_vod.rs rename to mux/fmp4/examples/dash_vod.rs diff --git a/generic/fmp4/examples/hls_live.rs b/mux/fmp4/examples/hls_live.rs similarity index 100% rename from generic/fmp4/examples/hls_live.rs rename to mux/fmp4/examples/hls_live.rs diff --git a/generic/fmp4/examples/hls_vod.rs b/mux/fmp4/examples/hls_vod.rs similarity index 100% rename from generic/fmp4/examples/hls_vod.rs rename to mux/fmp4/examples/hls_vod.rs diff --git a/generic/fmp4/src/fmp4mux/boxes.rs b/mux/fmp4/src/fmp4mux/boxes.rs similarity index 100% rename from generic/fmp4/src/fmp4mux/boxes.rs rename to mux/fmp4/src/fmp4mux/boxes.rs diff --git a/generic/fmp4/src/fmp4mux/imp.rs b/mux/fmp4/src/fmp4mux/imp.rs similarity index 100% rename from generic/fmp4/src/fmp4mux/imp.rs rename to mux/fmp4/src/fmp4mux/imp.rs diff --git a/generic/fmp4/src/fmp4mux/mod.rs b/mux/fmp4/src/fmp4mux/mod.rs similarity index 100% rename from generic/fmp4/src/fmp4mux/mod.rs rename to mux/fmp4/src/fmp4mux/mod.rs diff --git a/generic/fmp4/src/lib.rs b/mux/fmp4/src/lib.rs similarity index 100% rename from generic/fmp4/src/lib.rs rename to mux/fmp4/src/lib.rs diff --git a/generic/fmp4/tests/tests.rs b/mux/fmp4/tests/tests.rs similarity index 100% rename from generic/fmp4/tests/tests.rs rename to mux/fmp4/tests/tests.rs