diff --git a/Cargo.lock b/Cargo.lock index 137b66f7..97181752 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2134,6 +2134,7 @@ dependencies = [ "hrtf", "nnnoiseless", "num-traits", + "once_cell", "rayon", "smallvec", ] @@ -2160,6 +2161,7 @@ dependencies = [ "gstreamer-audio", "gstreamer-base", "gstreamer-check", + "once_cell", "percent-encoding", "rand", "serde", @@ -2183,6 +2185,7 @@ dependencies = [ "gstreamer-video", "image", "muldiv", + "once_cell", ] [[package]] @@ -2217,6 +2220,7 @@ dependencies = [ "gstreamer-check", "gstreamer-video", "nom", + "once_cell", "pango", "pangocairo", "pretty_assertions", @@ -2237,6 +2241,7 @@ dependencies = [ "gstreamer-audio", "gstreamer-base", "gstreamer-check", + "once_cell", ] [[package]] @@ -2249,6 +2254,7 @@ dependencies = [ "gstreamer-base", "gstreamer-video", "num_cpus", + "once_cell", ] [[package]] @@ -2265,6 +2271,7 @@ dependencies = [ "gstreamer-check", "gstreamer-video", "gtk4", + "once_cell", "parking_lot", ] @@ -2278,6 +2285,7 @@ dependencies = [ "gstreamer", "gstreamer-check", "gstreamer-video", + "once_cell", ] [[package]] @@ -2287,6 +2295,7 @@ dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-base", + "once_cell", "url", ] @@ -2303,6 +2312,7 @@ dependencies = [ "muldiv", "nom", "num-rational", + "once_cell", "smallvec", ] @@ -2322,6 +2332,7 @@ dependencies = [ "gstreamer-pbutils", "gstreamer-video", "m3u8-rs", + "once_cell", "quick-xml", "serde", ] @@ -2356,6 +2367,7 @@ dependencies = [ "gstreamer-gl-x11", "gstreamer-video", "gtk4", + "once_cell", "windows-sys 0.52.0", ] @@ -2390,6 +2402,7 @@ dependencies = [ "gstreamer-check", "gstreamer-video", "num-traits", + "once_cell", ] [[package]] @@ -2417,6 +2430,7 @@ dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-check", + "once_cell", "serde", "serde_json", ] @@ -2432,6 +2446,7 @@ dependencies = [ "gstreamer-audio", "gstreamer-check", "lewton", + "once_cell", ] [[package]] @@ -2447,6 +2462,7 @@ dependencies = [ "gtk4", "muldiv", "num-rational", + "once_cell", "parking_lot", ] @@ -2461,6 +2477,7 @@ dependencies = [ "gstreamer-base", "gstreamer-pbutils", "gstreamer-video", + "once_cell", "tempfile", "url", ] @@ -2481,6 +2498,7 @@ dependencies = [ "gstreamer-base", "gstreamer-video", "libloading", + "once_cell", "quick-xml", "smallvec", "thiserror", @@ -2497,6 +2515,7 @@ dependencies = [ "gstreamer-base", "gstreamer-rtp", "gstreamer-video", + "once_cell", "pango", "pangocairo", "xmlparser", @@ -2525,6 +2544,7 @@ dependencies = [ "gstreamer-base", "gstreamer-check", "gstreamer-rtp", + "once_cell", "rand", "raptorq", ] @@ -2538,6 +2558,7 @@ dependencies = [ "gstreamer", "gstreamer-check", "gstreamer-video", + "once_cell", "rav1e", ] @@ -2548,6 +2569,7 @@ dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-check", + "once_cell", "regex", ] @@ -2562,6 +2584,7 @@ dependencies = [ "headers", "hyper", "mime", + "once_cell", "reqwest", "tokio", "url", @@ -2577,6 +2600,7 @@ dependencies = [ "gstreamer", "gstreamer-check", "gstreamer-rtp", + "once_cell", ] [[package]] @@ -2609,6 +2633,7 @@ dependencies = [ "gstreamer", "gstreamer-base", "librespot", + "once_cell", "tokio", "url", ] @@ -2619,6 +2644,7 @@ version = "0.12.0-alpha.1" dependencies = [ "gst-plugin-version-helper", "gstreamer", + "once_cell", ] [[package]] @@ -2629,6 +2655,7 @@ dependencies = [ "gstreamer", "gstreamer-check", "hyphenation", + "once_cell", "textwrap", ] @@ -2676,6 +2703,7 @@ dependencies = [ "gstreamer-check", "gstreamer-video", "gtk4", + "once_cell", "parking_lot", ] @@ -2686,6 +2714,7 @@ dependencies = [ "anyhow", "gst-plugin-version-helper", "gstreamer", + "once_cell", "regex", "signal-hook", ] @@ -2701,6 +2730,7 @@ dependencies = [ "gstreamer-base", "gstreamer-video", "num-traits", + "once_cell", ] [[package]] @@ -2713,6 +2743,7 @@ dependencies = [ "gstreamer", "gstreamer-app", "more-asserts", + "once_cell", "thiserror", "url", ] @@ -2741,6 +2772,7 @@ dependencies = [ "gstreamer-video", "image", "image_hasher", + "once_cell", "rgb", ] @@ -2753,6 +2785,7 @@ dependencies = [ "gstreamer-check", "gstreamer-video", "libwebp-sys2", + "once_cell", "pretty_assertions", ] @@ -2791,6 +2824,7 @@ dependencies = [ "human_bytes", "livekit-api", "livekit-protocol", + "once_cell", "parse_link_header", "rand", "regex", @@ -2851,6 +2885,7 @@ dependencies = [ "gstreamer", "gstreamer-sdp", "gstreamer-webrtc", + "once_cell", "parse_link_header", "reqwest", "tokio", diff --git a/audio/audiofx/Cargo.toml b/audio/audiofx/Cargo.toml index 0a86ac36..ef0ea73b 100644 --- a/audio/audiofx/Cargo.toml +++ b/audio/audiofx/Cargo.toml @@ -21,6 +21,7 @@ nnnoiseless = { version = "0.5", default-features = false } smallvec = "1" atomic_refcell = "0.1" rayon = "1.5" +once_cell = "1" [lib] name = "gstrsaudiofx" diff --git a/audio/audiofx/src/audioecho/imp.rs b/audio/audiofx/src/audioecho/imp.rs index 8983f425..a3f9423c 100644 --- a/audio/audiofx/src/audioecho/imp.rs +++ b/audio/audiofx/src/audioecho/imp.rs @@ -19,7 +19,7 @@ use byte_slice_cast::*; use num_traits::cast::{FromPrimitive, ToPrimitive}; use num_traits::float::Float; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; static _CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( "rsaudioecho", diff --git a/audio/audiofx/src/audioloudnorm/imp.rs b/audio/audiofx/src/audioloudnorm/imp.rs index e73df077..5ba17ad5 100644 --- a/audio/audiofx/src/audioloudnorm/imp.rs +++ b/audio/audiofx/src/audioloudnorm/imp.rs @@ -22,7 +22,7 @@ use std::u64; use byte_slice_cast::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use atomic_refcell::AtomicRefCell; diff --git a/audio/audiofx/src/audiornnoise/imp.rs b/audio/audiofx/src/audiornnoise/imp.rs index e20700f6..8ed211ca 100644 --- a/audio/audiofx/src/audiornnoise/imp.rs +++ b/audio/audiofx/src/audiornnoise/imp.rs @@ -21,7 +21,7 @@ use nnnoiseless::DenoiseState; use byte_slice_cast::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use atomic_refcell::AtomicRefCell; diff --git a/audio/audiofx/src/ebur128level/imp.rs b/audio/audiofx/src/ebur128level/imp.rs index 7207be79..bb39445b 100644 --- a/audio/audiofx/src/ebur128level/imp.rs +++ b/audio/audiofx/src/ebur128level/imp.rs @@ -16,7 +16,7 @@ use std::i32; use std::sync::atomic; use std::sync::Mutex; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use byte_slice_cast::*; diff --git a/audio/audiofx/src/hrtfrender/imp.rs b/audio/audiofx/src/hrtfrender/imp.rs index c38bbecb..06d49689 100644 --- a/audio/audiofx/src/hrtfrender/imp.rs +++ b/audio/audiofx/src/hrtfrender/imp.rs @@ -23,7 +23,7 @@ use byte_slice_cast::*; use rayon::prelude::*; use rayon::{ThreadPool, ThreadPoolBuilder}; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; static CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( "hrtfrender", diff --git a/audio/audiofx/tests/hrtfrender.rs b/audio/audiofx/tests/hrtfrender.rs index 9b61d2e8..1c4ff997 100644 --- a/audio/audiofx/tests/hrtfrender.rs +++ b/audio/audiofx/tests/hrtfrender.rs @@ -9,7 +9,7 @@ use gst::glib; use gst::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; static CONFIG: Lazy = Lazy::new(|| { let buff = include_bytes!("test.hrir"); diff --git a/audio/claxon/src/claxondec/imp.rs b/audio/claxon/src/claxondec/imp.rs index a5a33502..001559e3 100644 --- a/audio/claxon/src/claxondec/imp.rs +++ b/audio/claxon/src/claxondec/imp.rs @@ -19,7 +19,7 @@ use atomic_refcell::AtomicRefCell; use byte_slice_cast::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; static CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( diff --git a/audio/csound/Cargo.toml b/audio/csound/Cargo.toml index fc1fa419..f2a585b4 100644 --- a/audio/csound/Cargo.toml +++ b/audio/csound/Cargo.toml @@ -14,6 +14,7 @@ gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/g gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } csound = "0.1.8" byte-slice-cast = "1.0" +once_cell = "1" [dev-dependencies] gst-check = { package = "gstreamer-check", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } diff --git a/audio/csound/src/filter/imp.rs b/audio/csound/src/filter/imp.rs index a8052c5b..ed2a3426 100644 --- a/audio/csound/src/filter/imp.rs +++ b/audio/csound/src/filter/imp.rs @@ -23,7 +23,7 @@ use byte_slice_cast::*; use csound::{Csound, MessageType}; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; static CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( diff --git a/audio/lewton/Cargo.toml b/audio/lewton/Cargo.toml index 9e31bc3f..399fd4b3 100644 --- a/audio/lewton/Cargo.toml +++ b/audio/lewton/Cargo.toml @@ -14,6 +14,7 @@ gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org lewton = { version = "0.10", default-features = false } byte-slice-cast = "1.0" atomic_refcell = "0.1" +once_cell = "1" [dev-dependencies] gst-check = { package = "gstreamer-check", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } diff --git a/audio/lewton/src/lewtondec/imp.rs b/audio/lewton/src/lewtondec/imp.rs index 77851075..51bb4d76 100644 --- a/audio/lewton/src/lewtondec/imp.rs +++ b/audio/lewton/src/lewtondec/imp.rs @@ -18,7 +18,7 @@ use atomic_refcell::AtomicRefCell; use byte_slice_cast::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; struct State { header_bufs: ( diff --git a/audio/spotify/Cargo.toml b/audio/spotify/Cargo.toml index 8b9802bd..7b807da2 100644 --- a/audio/spotify/Cargo.toml +++ b/audio/spotify/Cargo.toml @@ -16,6 +16,7 @@ tokio = "1.0" futures = "0.3" anyhow = "1.0" url = "2.3" +once_cell = "1" [lib] name = "gstspotify" diff --git a/audio/spotify/src/spotifyaudiosrc/imp.rs b/audio/spotify/src/spotifyaudiosrc/imp.rs index a04483f3..fcaab88f 100644 --- a/audio/spotify/src/spotifyaudiosrc/imp.rs +++ b/audio/spotify/src/spotifyaudiosrc/imp.rs @@ -9,7 +9,7 @@ use std::sync::{mpsc, Arc, Mutex, MutexGuard}; use futures::future::{AbortHandle, Abortable, Aborted}; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use tokio::{runtime, task::JoinHandle}; use gst::glib; diff --git a/generic/file/Cargo.toml b/generic/file/Cargo.toml index e77881ac..caef2d95 100644 --- a/generic/file/Cargo.toml +++ b/generic/file/Cargo.toml @@ -12,6 +12,7 @@ rust-version = "1.70" url = "2" gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } +once_cell = "1" [lib] name = "gstrsfile" diff --git a/generic/file/src/filesink/imp.rs b/generic/file/src/filesink/imp.rs index 2981d1ab..23f4456e 100644 --- a/generic/file/src/filesink/imp.rs +++ b/generic/file/src/filesink/imp.rs @@ -55,7 +55,7 @@ pub struct FileSink { state: Mutex, } -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; static CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( "rsfilesink", diff --git a/generic/file/src/filesrc/imp.rs b/generic/file/src/filesrc/imp.rs index 572de21b..137a2de5 100644 --- a/generic/file/src/filesrc/imp.rs +++ b/generic/file/src/filesrc/imp.rs @@ -54,7 +54,7 @@ pub struct FileSrc { state: Mutex, } -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; static CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( "rsfilesrc", diff --git a/generic/sodium/src/decrypter/imp.rs b/generic/sodium/src/decrypter/imp.rs index 84feb0d4..794e0d5a 100644 --- a/generic/sodium/src/decrypter/imp.rs +++ b/generic/sodium/src/decrypter/imp.rs @@ -29,7 +29,7 @@ use sodiumoxide::crypto::box_; use std::sync::Mutex; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; static CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( "sodiumdecrypter", diff --git a/generic/sodium/src/encrypter/imp.rs b/generic/sodium/src/encrypter/imp.rs index d0960a26..b6560e0f 100644 --- a/generic/sodium/src/encrypter/imp.rs +++ b/generic/sodium/src/encrypter/imp.rs @@ -32,7 +32,7 @@ type BufferVec = SmallVec<[gst::Buffer; 16]>; use std::sync::Mutex; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; static CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( "sodiumencrypter", diff --git a/generic/sodium/tests/decrypter.rs b/generic/sodium/tests/decrypter.rs index 51666f59..a8a154ca 100644 --- a/generic/sodium/tests/decrypter.rs +++ b/generic/sodium/tests/decrypter.rs @@ -31,7 +31,7 @@ use std::path::PathBuf; use pretty_assertions::assert_eq; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; static SENDER_PUBLIC: Lazy = Lazy::new(|| { let public = [ 66, 248, 199, 74, 216, 55, 228, 116, 52, 17, 147, 56, 65, 130, 134, 148, 157, 153, 235, diff --git a/generic/sodium/tests/encrypter.rs b/generic/sodium/tests/encrypter.rs index 5607fd89..e0c18faf 100644 --- a/generic/sodium/tests/encrypter.rs +++ b/generic/sodium/tests/encrypter.rs @@ -25,7 +25,7 @@ use gst::glib; use gst::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use pretty_assertions::assert_eq; diff --git a/generic/threadshare/examples/benchmark.rs b/generic/threadshare/examples/benchmark.rs index 0f77ec89..7f75c6e9 100644 --- a/generic/threadshare/examples/benchmark.rs +++ b/generic/threadshare/examples/benchmark.rs @@ -18,8 +18,8 @@ // SPDX-License-Identifier: LGPL-2.1-or-later use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::prelude::*; +use once_cell::sync::Lazy; use std::env; use std::sync::atomic::{AtomicU64, Ordering}; diff --git a/generic/threadshare/examples/standalone/main.rs b/generic/threadshare/examples/standalone/main.rs index 723994e7..1cc43e29 100644 --- a/generic/threadshare/examples/standalone/main.rs +++ b/generic/threadshare/examples/standalone/main.rs @@ -1,5 +1,5 @@ use gst::glib; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; mod args; use args::*; diff --git a/generic/threadshare/examples/standalone/sink/async_mutex/imp.rs b/generic/threadshare/examples/standalone/sink/async_mutex/imp.rs index faba1613..75613181 100644 --- a/generic/threadshare/examples/standalone/sink/async_mutex/imp.rs +++ b/generic/threadshare/examples/standalone/sink/async_mutex/imp.rs @@ -14,7 +14,7 @@ use gst::prelude::*; use gst::subclass::prelude::*; use gst::EventView; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use gstthreadshare::runtime::executor::block_on_or_add_sub_task; use gstthreadshare::runtime::{prelude::*, PadSink}; diff --git a/generic/threadshare/examples/standalone/sink/mod.rs b/generic/threadshare/examples/standalone/sink/mod.rs index 4b3d78de..bf9b7aae 100644 --- a/generic/threadshare/examples/standalone/sink/mod.rs +++ b/generic/threadshare/examples/standalone/sink/mod.rs @@ -12,7 +12,7 @@ pub const ASYNC_MUTEX_ELEMENT_NAME: &str = "ts-standalone-async-mutex-sink"; pub const SYNC_MUTEX_ELEMENT_NAME: &str = "ts-standalone-sync-mutex-sink"; pub const TASK_ELEMENT_NAME: &str = "ts-standalone-task-sink"; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; static CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( "ts-standalone-sink", diff --git a/generic/threadshare/examples/standalone/sink/sync_mutex/imp.rs b/generic/threadshare/examples/standalone/sink/sync_mutex/imp.rs index eab0243a..18957e40 100644 --- a/generic/threadshare/examples/standalone/sink/sync_mutex/imp.rs +++ b/generic/threadshare/examples/standalone/sink/sync_mutex/imp.rs @@ -14,7 +14,7 @@ use gst::prelude::*; use gst::subclass::prelude::*; use gst::EventView; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use gstthreadshare::runtime::{prelude::*, PadSink}; diff --git a/generic/threadshare/examples/standalone/sink/task/imp.rs b/generic/threadshare/examples/standalone/sink/task/imp.rs index aca3de0a..1ac86965 100644 --- a/generic/threadshare/examples/standalone/sink/task/imp.rs +++ b/generic/threadshare/examples/standalone/sink/task/imp.rs @@ -15,7 +15,7 @@ use gst::prelude::*; use gst::subclass::prelude::*; use gst::EventView; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use gstthreadshare::runtime::prelude::*; use gstthreadshare::runtime::{Context, PadSink, Task}; diff --git a/generic/threadshare/examples/standalone/src/imp.rs b/generic/threadshare/examples/standalone/src/imp.rs index dfddcad2..821025f9 100644 --- a/generic/threadshare/examples/standalone/src/imp.rs +++ b/generic/threadshare/examples/standalone/src/imp.rs @@ -13,7 +13,7 @@ use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::sync::Mutex; use std::time::Duration; diff --git a/generic/threadshare/examples/udpsrc_benchmark_sender.rs b/generic/threadshare/examples/udpsrc_benchmark_sender.rs index 2fe7504b..42130ba4 100644 --- a/generic/threadshare/examples/udpsrc_benchmark_sender.rs +++ b/generic/threadshare/examples/udpsrc_benchmark_sender.rs @@ -20,7 +20,7 @@ use gst::glib; use gst::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::net; use std::net::{IpAddr, Ipv4Addr, SocketAddr}; diff --git a/generic/threadshare/src/appsrc/imp.rs b/generic/threadshare/src/appsrc/imp.rs index deeffbfa..10e5c963 100644 --- a/generic/threadshare/src/appsrc/imp.rs +++ b/generic/threadshare/src/appsrc/imp.rs @@ -26,7 +26,7 @@ use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::sync::Mutex; use std::time::Duration; diff --git a/generic/threadshare/src/audiotestsrc/imp.rs b/generic/threadshare/src/audiotestsrc/imp.rs index fddcea61..a628c193 100644 --- a/generic/threadshare/src/audiotestsrc/imp.rs +++ b/generic/threadshare/src/audiotestsrc/imp.rs @@ -13,7 +13,7 @@ use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::mem::size_of; use std::sync::Mutex; diff --git a/generic/threadshare/src/dataqueue.rs b/generic/threadshare/src/dataqueue.rs index 17bdefe5..092cb381 100644 --- a/generic/threadshare/src/dataqueue.rs +++ b/generic/threadshare/src/dataqueue.rs @@ -21,7 +21,7 @@ use futures::future::{self, abortable, AbortHandle}; use gst::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::collections::VecDeque; use std::sync::Arc; diff --git a/generic/threadshare/src/inputselector/imp.rs b/generic/threadshare/src/inputselector/imp.rs index 57e6ea33..81cf5cd3 100644 --- a/generic/threadshare/src/inputselector/imp.rs +++ b/generic/threadshare/src/inputselector/imp.rs @@ -25,7 +25,7 @@ use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::collections::HashMap; use std::sync::{Arc, Mutex}; diff --git a/generic/threadshare/src/jitterbuffer/imp.rs b/generic/threadshare/src/jitterbuffer/imp.rs index 54e53330..73528398 100644 --- a/generic/threadshare/src/jitterbuffer/imp.rs +++ b/generic/threadshare/src/jitterbuffer/imp.rs @@ -26,7 +26,7 @@ use gst::prelude::*; use gst::subclass::prelude::*; use gst_rtp::RTPBuffer; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::cmp::Ordering; use std::collections::{BTreeSet, VecDeque}; diff --git a/generic/threadshare/src/proxy/imp.rs b/generic/threadshare/src/proxy/imp.rs index 18fa4239..50537414 100644 --- a/generic/threadshare/src/proxy/imp.rs +++ b/generic/threadshare/src/proxy/imp.rs @@ -25,7 +25,7 @@ use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::collections::{HashMap, VecDeque}; use std::sync::{Arc, Weak}; diff --git a/generic/threadshare/src/queue/imp.rs b/generic/threadshare/src/queue/imp.rs index a8802f70..cc528763 100644 --- a/generic/threadshare/src/queue/imp.rs +++ b/generic/threadshare/src/queue/imp.rs @@ -25,7 +25,7 @@ use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::collections::VecDeque; use std::sync::Mutex; diff --git a/generic/threadshare/src/runtime/executor/context.rs b/generic/threadshare/src/runtime/executor/context.rs index de7ec5f1..06f74364 100644 --- a/generic/threadshare/src/runtime/executor/context.rs +++ b/generic/threadshare/src/runtime/executor/context.rs @@ -5,7 +5,7 @@ use futures::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::collections::HashMap; use std::io; diff --git a/generic/threadshare/src/runtime/mod.rs b/generic/threadshare/src/runtime/mod.rs index a48c372a..4d77f78f 100644 --- a/generic/threadshare/src/runtime/mod.rs +++ b/generic/threadshare/src/runtime/mod.rs @@ -44,7 +44,7 @@ pub mod prelude { pub use super::task::TaskImpl; } -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; static RUNTIME_CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( diff --git a/generic/threadshare/src/socket.rs b/generic/threadshare/src/socket.rs index 702fa283..9f9af5fb 100644 --- a/generic/threadshare/src/socket.rs +++ b/generic/threadshare/src/socket.rs @@ -23,7 +23,7 @@ use futures::future::BoxFuture; use gst::glib; use gst::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::error; use std::fmt; diff --git a/generic/threadshare/src/tcpclientsrc/imp.rs b/generic/threadshare/src/tcpclientsrc/imp.rs index 66a55660..ee6c18d6 100644 --- a/generic/threadshare/src/tcpclientsrc/imp.rs +++ b/generic/threadshare/src/tcpclientsrc/imp.rs @@ -25,7 +25,7 @@ use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::io; use std::net::{IpAddr, SocketAddr, TcpStream}; diff --git a/generic/threadshare/src/udpsink/imp.rs b/generic/threadshare/src/udpsink/imp.rs index 0f19a761..25203086 100644 --- a/generic/threadshare/src/udpsink/imp.rs +++ b/generic/threadshare/src/udpsink/imp.rs @@ -26,7 +26,7 @@ use gst::subclass::prelude::*; use gst::EventView; use gst::{element_error, error_msg}; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use crate::runtime::executor::block_on_or_add_sub_task; use crate::runtime::prelude::*; diff --git a/generic/threadshare/src/udpsrc/imp.rs b/generic/threadshare/src/udpsrc/imp.rs index 39bc9fbb..0e2ca9de 100644 --- a/generic/threadshare/src/udpsrc/imp.rs +++ b/generic/threadshare/src/udpsrc/imp.rs @@ -25,7 +25,7 @@ use gst::prelude::*; use gst::subclass::prelude::*; use gst_net::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::i32; use std::io; diff --git a/generic/threadshare/tests/jitterbuffer.rs b/generic/threadshare/tests/jitterbuffer.rs index e9422664..851d66a3 100644 --- a/generic/threadshare/tests/jitterbuffer.rs +++ b/generic/threadshare/tests/jitterbuffer.rs @@ -21,7 +21,7 @@ use gst::prelude::*; use std::sync::mpsc; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; static CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( diff --git a/generic/threadshare/tests/pad.rs b/generic/threadshare/tests/pad.rs index c1d7c41c..406b1503 100644 --- a/generic/threadshare/tests/pad.rs +++ b/generic/threadshare/tests/pad.rs @@ -29,7 +29,7 @@ use gst::prelude::*; use gst::subclass::prelude::*; use gst::EventView; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::Mutex; diff --git a/generic/threadshare/tests/pipeline.rs b/generic/threadshare/tests/pipeline.rs index b01485f7..5e12d6b3 100644 --- a/generic/threadshare/tests/pipeline.rs +++ b/generic/threadshare/tests/pipeline.rs @@ -20,7 +20,7 @@ use gst::glib; use gst::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::sync::mpsc; diff --git a/mux/flavors/Cargo.toml b/mux/flavors/Cargo.toml index 4126cd20..17961aa6 100644 --- a/mux/flavors/Cargo.toml +++ b/mux/flavors/Cargo.toml @@ -18,6 +18,7 @@ flavors = { git = "https://github.com/rust-av/flavors" } muldiv = "1.0" byteorder = "1.0" smallvec = "1.0" +once_cell = "1" [lib] name = "gstrsflv" diff --git a/mux/flavors/src/flvdemux/imp.rs b/mux/flavors/src/flvdemux/imp.rs index 586be920..528d3dae 100644 --- a/mux/flavors/src/flvdemux/imp.rs +++ b/mux/flavors/src/flvdemux/imp.rs @@ -21,7 +21,7 @@ use gst::subclass::prelude::*; use num_rational::Rational32; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use smallvec::SmallVec; diff --git a/mux/fmp4/Cargo.toml b/mux/fmp4/Cargo.toml index eec86677..019a556c 100644 --- a/mux/fmp4/Cargo.toml +++ b/mux/fmp4/Cargo.toml @@ -15,6 +15,7 @@ gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/g gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_18"] } gst-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_18"] } gst-pbutils = { package = "gstreamer-pbutils", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_18"] } +once_cell = "1" [lib] name = "gstfmp4" diff --git a/mux/fmp4/src/fmp4mux/imp.rs b/mux/fmp4/src/fmp4mux/imp.rs index fc941468..592b42dd 100644 --- a/mux/fmp4/src/fmp4mux/imp.rs +++ b/mux/fmp4/src/fmp4mux/imp.rs @@ -16,7 +16,7 @@ use std::collections::VecDeque; use std::mem; use std::sync::Mutex; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use super::boxes; use super::Buffer; diff --git a/mux/mp4/Cargo.toml b/mux/mp4/Cargo.toml index ce74a7d9..3e2f8f56 100644 --- a/mux/mp4/Cargo.toml +++ b/mux/mp4/Cargo.toml @@ -15,6 +15,7 @@ gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/g gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_18"] } gst-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_18"] } gst-pbutils = { package = "gstreamer-pbutils", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_18"] } +once_cell = "1" [lib] name = "gstmp4" diff --git a/mux/mp4/src/mp4mux/imp.rs b/mux/mp4/src/mp4mux/imp.rs index 6ea81c19..24c06173 100644 --- a/mux/mp4/src/mp4mux/imp.rs +++ b/mux/mp4/src/mp4mux/imp.rs @@ -15,7 +15,7 @@ use gst_base::subclass::prelude::*; use std::collections::VecDeque; use std::sync::Mutex; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use super::boxes; diff --git a/net/aws/Cargo.toml b/net/aws/Cargo.toml index 8a1e4f1d..2f9c168e 100644 --- a/net/aws/Cargo.toml +++ b/net/aws/Cargo.toml @@ -31,6 +31,7 @@ serde = "1" serde_derive = "1" serde_json = "1" url = "2" +once_cell = "1" [dev-dependencies] chrono = { version = "0.4", features = [ "alloc" ] } diff --git a/net/aws/src/s3hlssink/imp.rs b/net/aws/src/s3hlssink/imp.rs index dde5714d..6b62d5f7 100644 --- a/net/aws/src/s3hlssink/imp.rs +++ b/net/aws/src/s3hlssink/imp.rs @@ -9,7 +9,7 @@ // SPDX-License-Identifier: MPL-2.0 use futures::future; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::io::Write; use std::str::FromStr; use std::sync::mpsc::{self, Receiver, SyncSender}; diff --git a/net/aws/src/s3sink/multipartsink.rs b/net/aws/src/s3sink/multipartsink.rs index 22e69d8a..5f8d25fb 100644 --- a/net/aws/src/s3sink/multipartsink.rs +++ b/net/aws/src/s3sink/multipartsink.rs @@ -26,7 +26,7 @@ use aws_sdk_s3::{ }; use futures::future; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::collections::HashMap; use std::convert::From; use std::sync::Mutex; diff --git a/net/aws/src/s3sink/putobjectsink.rs b/net/aws/src/s3sink/putobjectsink.rs index d84fff53..3c6df124 100644 --- a/net/aws/src/s3sink/putobjectsink.rs +++ b/net/aws/src/s3sink/putobjectsink.rs @@ -21,7 +21,7 @@ use aws_sdk_s3::{ }; use futures::future; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::collections::HashMap; use std::convert::From; use std::sync::Mutex; diff --git a/net/aws/src/s3src/imp.rs b/net/aws/src/s3src/imp.rs index 7c6dc87b..242725ae 100644 --- a/net/aws/src/s3src/imp.rs +++ b/net/aws/src/s3src/imp.rs @@ -8,7 +8,7 @@ use bytes::Bytes; use futures::future; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::sync::Mutex; use std::time::Duration; diff --git a/net/aws/src/s3utils.rs b/net/aws/src/s3utils.rs index f983d65b..45d56625 100644 --- a/net/aws/src/s3utils.rs +++ b/net/aws/src/s3utils.rs @@ -15,7 +15,7 @@ use aws_types::sdk_config::SdkConfig; use bytes::{buf::BufMut, Bytes, BytesMut}; use futures::{future, Future}; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::sync::Mutex; use std::time::Duration; use tokio::runtime; diff --git a/net/aws/src/transcribe_parse/imp.rs b/net/aws/src/transcribe_parse/imp.rs index aaa0a902..4a3a4865 100644 --- a/net/aws/src/transcribe_parse/imp.rs +++ b/net/aws/src/transcribe_parse/imp.rs @@ -11,7 +11,7 @@ use gst::subclass::prelude::*; use gst::{element_imp_error, error_msg}; use serde_derive::Deserialize; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::sync::Mutex; diff --git a/net/aws/src/transcriber/imp.rs b/net/aws/src/transcriber/imp.rs index 6b94a10b..6f3430ef 100644 --- a/net/aws/src/transcriber/imp.rs +++ b/net/aws/src/transcriber/imp.rs @@ -31,7 +31,7 @@ use tokio::{runtime, sync::broadcast, task}; use std::collections::{BTreeSet, VecDeque}; use std::sync::{Arc, Mutex}; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use super::transcribe::{TranscriberSettings, TranscriberStream, TranscriptEvent, TranscriptItem}; use super::translate::{TranslateLoop, TranslatedItem}; diff --git a/net/aws/src/transcriber/mod.rs b/net/aws/src/transcriber/mod.rs index 8c9c1bee..f64585ce 100644 --- a/net/aws/src/transcriber/mod.rs +++ b/net/aws/src/transcriber/mod.rs @@ -13,7 +13,7 @@ mod imp; mod transcribe; mod translate; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; static CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( diff --git a/net/hlssink3/src/imp.rs b/net/hlssink3/src/imp.rs index 0198ccc4..84bc2dd0 100644 --- a/net/hlssink3/src/imp.rs +++ b/net/hlssink3/src/imp.rs @@ -12,10 +12,10 @@ use crate::HlsSink3PlaylistType; use chrono::{DateTime, Duration, Utc}; use gio::prelude::*; use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::prelude::*; use gst::subclass::prelude::*; use m3u8_rs::{MediaPlaylist, MediaPlaylistType, MediaSegment}; +use once_cell::sync::Lazy; use std::fs; use std::io::Write; use std::path; diff --git a/net/hlssink3/tests/hlssink3.rs b/net/hlssink3/tests/hlssink3.rs index a6ad73d8..4f3ec2bc 100644 --- a/net/hlssink3/tests/hlssink3.rs +++ b/net/hlssink3/tests/hlssink3.rs @@ -7,9 +7,9 @@ // SPDX-License-Identifier: MPL-2.0 use gio::prelude::*; -use gst::glib::once_cell::sync::Lazy; use gst::prelude::*; use gsthlssink3::HlsSink3PlaylistType; +use once_cell::sync::Lazy; use std::io::Write; use std::sync::{mpsc, Arc, Mutex}; use std::time::Duration; diff --git a/net/ndi/Cargo.toml b/net/ndi/Cargo.toml index b35c994a..341a9557 100644 --- a/net/ndi/Cargo.toml +++ b/net/ndi/Cargo.toml @@ -23,6 +23,7 @@ libloading = "0.8" quick-xml = "0.31" smallvec = { version = "1.11", features = ["const_generics"] } thiserror = "1.0" +once_cell = "1" [build-dependencies] gst-plugin-version-helper = { path = "../../version-helper" } diff --git a/net/ndi/src/device_provider/imp.rs b/net/ndi/src/device_provider/imp.rs index eaecb7d2..a6f56d80 100644 --- a/net/ndi/src/device_provider/imp.rs +++ b/net/ndi/src/device_provider/imp.rs @@ -3,13 +3,12 @@ use gst::prelude::*; use gst::subclass::prelude::*; -use gst::glib::once_cell::sync::OnceCell; +use std::{ + sync::{atomic, Mutex, OnceLock}, + thread, +}; -use std::sync::atomic; -use std::sync::Mutex; -use std::thread; - -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use crate::ndi; @@ -190,7 +189,7 @@ impl DeviceProvider { #[derive(Debug)] pub struct Device { - source: OnceCell>, + source: OnceLock>, } #[glib::object_subclass] @@ -201,7 +200,7 @@ impl ObjectSubclass for Device { fn new() -> Self { Self { - source: OnceCell::new(), + source: OnceLock::new(), } } } diff --git a/net/ndi/src/lib.rs b/net/ndi/src/lib.rs index 4def1f96..4e87faab 100644 --- a/net/ndi/src/lib.rs +++ b/net/ndi/src/lib.rs @@ -30,7 +30,7 @@ mod ndi_cc_meta; #[cfg(feature = "doc")] use gst::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy, glib::Enum, Default)] #[repr(u32)] diff --git a/net/ndi/src/ndi_cc_meta.rs b/net/ndi/src/ndi_cc_meta.rs index 120c183b..de1b8a86 100644 --- a/net/ndi/src/ndi_cc_meta.rs +++ b/net/ndi/src/ndi_cc_meta.rs @@ -9,9 +9,9 @@ use anyhow::{bail, Result}; use data_encoding::BASE64; use smallvec::SmallVec; -use gst::glib::once_cell::sync::Lazy; use gst::glib::translate::IntoGlib; use gst_video::{VideoAncillary, VideoAncillaryDID16, VideoVBIEncoder, VideoVBIParser}; +use once_cell::sync::Lazy; use std::ffi::CString; diff --git a/net/ndi/src/ndisink/imp.rs b/net/ndi/src/ndisink/imp.rs index c33d6e14..c14c66e3 100644 --- a/net/ndi/src/ndisink/imp.rs +++ b/net/ndi/src/ndisink/imp.rs @@ -8,7 +8,7 @@ use gst_base::subclass::prelude::*; use std::sync::Mutex; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use crate::ndi::SendInstance; use crate::ndi_cc_meta::NDICCMetaEncoder; diff --git a/net/ndi/src/ndisinkcombiner/imp.rs b/net/ndi/src/ndisinkcombiner/imp.rs index 91df7905..289a0d42 100644 --- a/net/ndi/src/ndisinkcombiner/imp.rs +++ b/net/ndi/src/ndisinkcombiner/imp.rs @@ -7,7 +7,7 @@ use gst::subclass::prelude::*; use gst_base::prelude::*; use gst_base::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::mem; use std::sync::Mutex; diff --git a/net/ndi/src/ndisinkmeta.rs b/net/ndi/src/ndisinkmeta.rs index 4924ef0f..cbacdb06 100644 --- a/net/ndi/src/ndisinkmeta.rs +++ b/net/ndi/src/ndisinkmeta.rs @@ -53,7 +53,7 @@ impl fmt::Debug for NdiSinkAudioMeta { mod imp { use glib::translate::*; - use gst::glib::once_cell::sync::Lazy; + use once_cell::sync::Lazy; use std::mem; use std::ptr; diff --git a/net/ndi/src/ndisrc/imp.rs b/net/ndi/src/ndisrc/imp.rs index b2bdea7a..4f9dad46 100644 --- a/net/ndi/src/ndisrc/imp.rs +++ b/net/ndi/src/ndisrc/imp.rs @@ -9,7 +9,7 @@ use gst_base::subclass::prelude::*; use std::sync::Mutex; use std::u32; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use crate::ndisrcmeta::NdiSrcMeta; use crate::ndisys; diff --git a/net/ndi/src/ndisrc/receiver.rs b/net/ndi/src/ndisrc/receiver.rs index 0e4f93d1..eb9452e0 100644 --- a/net/ndi/src/ndisrc/receiver.rs +++ b/net/ndi/src/ndisrc/receiver.rs @@ -8,7 +8,7 @@ use std::sync::{Arc, Condvar, Mutex, Weak}; use std::thread; use std::time; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use crate::ndi::*; use crate::ndisrcmeta::Buffer; diff --git a/net/ndi/src/ndisrcdemux/imp.rs b/net/ndi/src/ndisrcdemux/imp.rs index c9a51956..b2b896d1 100644 --- a/net/ndi/src/ndisrcdemux/imp.rs +++ b/net/ndi/src/ndisrcdemux/imp.rs @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MPL-2.0 use atomic_refcell::AtomicRefCell; -use gst::glib::once_cell::sync::Lazy; use gst::prelude::*; use gst::subclass::prelude::*; use gst_video::prelude::*; +use once_cell::sync::Lazy; use std::{cmp, collections::VecDeque, sync::Mutex}; diff --git a/net/ndi/src/ndisrcmeta.rs b/net/ndi/src/ndisrcmeta.rs index c6d3a7ac..14727c2e 100644 --- a/net/ndi/src/ndisrcmeta.rs +++ b/net/ndi/src/ndisrcmeta.rs @@ -85,7 +85,7 @@ mod imp { use super::Buffer; use glib::translate::*; - use gst::glib::once_cell::sync::Lazy; + use once_cell::sync::Lazy; use std::mem; use std::ptr; diff --git a/net/ndi/src/ndisys.rs b/net/ndi/src/ndisys.rs index 1746f64a..ccb9eecd 100644 --- a/net/ndi/src/ndisys.rs +++ b/net/ndi/src/ndisys.rs @@ -8,7 +8,7 @@ clippy::missing_safety_doc )] -use glib::once_cell::sync::OnceCell; +use once_cell::sync::OnceCell; #[cfg(unix)] use libloading::os::unix::{Library, Symbol}; diff --git a/net/onvif/Cargo.toml b/net/onvif/Cargo.toml index c394b8b8..3ff9b19c 100644 --- a/net/onvif/Cargo.toml +++ b/net/onvif/Cargo.toml @@ -19,6 +19,7 @@ cairo-rs = { git = "https://github.com/gtk-rs/gtk-rs-core", features=["use_glib" pango = { git = "https://github.com/gtk-rs/gtk-rs-core" } pangocairo = { git = "https://github.com/gtk-rs/gtk-rs-core" } xmltree = "0.10" +once_cell = "1" [lib] name = "gstrsonvif" diff --git a/net/onvif/src/lib.rs b/net/onvif/src/lib.rs index da06a289..1b5b7887 100644 --- a/net/onvif/src/lib.rs +++ b/net/onvif/src/lib.rs @@ -13,7 +13,7 @@ * Since: plugins-rs-0.9.0 */ use gst::glib; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; mod onvifmetadatacombiner; mod onvifmetadatadepay; diff --git a/net/onvif/src/onvifmetadatacombiner/imp.rs b/net/onvif/src/onvifmetadatacombiner/imp.rs index 3932b161..9cd56f53 100644 --- a/net/onvif/src/onvifmetadatacombiner/imp.rs +++ b/net/onvif/src/onvifmetadatacombiner/imp.rs @@ -1,10 +1,10 @@ use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::prelude::*; use gst::subclass::prelude::*; use gst_base::prelude::*; use gst_base::subclass::prelude::*; use gst_base::AGGREGATOR_FLOW_NEED_DATA; +use once_cell::sync::Lazy; use std::sync::Mutex; #[derive(Default)] diff --git a/net/onvif/src/onvifmetadatadepay/imp.rs b/net/onvif/src/onvifmetadatadepay/imp.rs index 0a623513..05fcc2c3 100644 --- a/net/onvif/src/onvifmetadatadepay/imp.rs +++ b/net/onvif/src/onvifmetadatadepay/imp.rs @@ -1,8 +1,8 @@ use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::subclass::prelude::*; use gst_rtp::prelude::*; use gst_rtp::subclass::prelude::*; +use once_cell::sync::Lazy; use std::sync::Mutex; #[derive(Default)] diff --git a/net/onvif/src/onvifmetadataoverlay/imp.rs b/net/onvif/src/onvifmetadataoverlay/imp.rs index fab8576c..6003ff3a 100644 --- a/net/onvif/src/onvifmetadataoverlay/imp.rs +++ b/net/onvif/src/onvifmetadataoverlay/imp.rs @@ -4,7 +4,7 @@ use gst::subclass::prelude::*; use gst_video::prelude::*; use pango::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::collections::HashSet; use std::sync::Mutex; diff --git a/net/onvif/src/onvifmetadataparse/imp.rs b/net/onvif/src/onvifmetadataparse/imp.rs index 6416e153..fea2faf8 100644 --- a/net/onvif/src/onvifmetadataparse/imp.rs +++ b/net/onvif/src/onvifmetadataparse/imp.rs @@ -10,7 +10,7 @@ use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::collections::BTreeMap; use std::sync::{Condvar, Mutex}; diff --git a/net/onvif/src/onvifmetadatapay/imp.rs b/net/onvif/src/onvifmetadatapay/imp.rs index 81326a0c..93aba5ac 100644 --- a/net/onvif/src/onvifmetadatapay/imp.rs +++ b/net/onvif/src/onvifmetadatapay/imp.rs @@ -1,8 +1,8 @@ use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::subclass::prelude::*; use gst_rtp::prelude::*; use gst_rtp::subclass::prelude::*; +use once_cell::sync::Lazy; #[derive(Default)] pub struct OnvifMetadataPay {} diff --git a/net/raptorq/Cargo.toml b/net/raptorq/Cargo.toml index cc3129c6..db33c1bc 100644 --- a/net/raptorq/Cargo.toml +++ b/net/raptorq/Cargo.toml @@ -12,6 +12,7 @@ rust-version = "1.70" gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } gst-rtp = { package = "gstreamer-rtp", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } +once_cell = "1" raptorq = "1.7" [dev-dependencies] diff --git a/net/raptorq/src/raptorqdec/imp.rs b/net/raptorq/src/raptorqdec/imp.rs index 01fd03f1..9d5ce2da 100644 --- a/net/raptorq/src/raptorqdec/imp.rs +++ b/net/raptorq/src/raptorqdec/imp.rs @@ -11,7 +11,7 @@ use gst::subclass::prelude::*; use gst_rtp::RTPBuffer; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::collections::BTreeMap; use std::iter; diff --git a/net/raptorq/src/raptorqenc/imp.rs b/net/raptorq/src/raptorqenc/imp.rs index 75784759..cb37a0a2 100644 --- a/net/raptorq/src/raptorqenc/imp.rs +++ b/net/raptorq/src/raptorqenc/imp.rs @@ -12,7 +12,7 @@ use gst::subclass::prelude::*; use gst_rtp::rtp_buffer::*; use gst_rtp::RTPBuffer; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::collections::HashSet; use std::sync::{mpsc, Mutex}; diff --git a/net/reqwest/Cargo.toml b/net/reqwest/Cargo.toml index ffd8d844..dda36941 100644 --- a/net/reqwest/Cargo.toml +++ b/net/reqwest/Cargo.toml @@ -17,6 +17,7 @@ mime = "0.3" gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } tokio = { version = "1.0", default-features = false, features = ["time", "rt-multi-thread"] } +once_cell = "1" [dev-dependencies] hyper = { version = "0.14", features = ["server"] } diff --git a/net/reqwest/src/reqwesthttpsrc/imp.rs b/net/reqwest/src/reqwesthttpsrc/imp.rs index ab77de01..be9c9605 100644 --- a/net/reqwest/src/reqwesthttpsrc/imp.rs +++ b/net/reqwest/src/reqwesthttpsrc/imp.rs @@ -17,7 +17,7 @@ use reqwest::{Client, Response, StatusCode}; use tokio::runtime; use url::Url; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use gst::glib; use gst::prelude::*; diff --git a/net/rtp/Cargo.toml b/net/rtp/Cargo.toml index 6474608e..9e3aefd8 100644 --- a/net/rtp/Cargo.toml +++ b/net/rtp/Cargo.toml @@ -13,6 +13,7 @@ bitstream-io = "2.0" gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_20"] } gst-rtp = { package = "gstreamer-rtp", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_20"]} chrono = { version = "0.4", default-features = false } +once_cell = "1" [dev-dependencies] gst-check = { package = "gstreamer-check", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_20"] } diff --git a/net/rtp/src/av1/common/obu.rs b/net/rtp/src/av1/common/obu.rs index 60187c1d..54e31414 100644 --- a/net/rtp/src/av1/common/obu.rs +++ b/net/rtp/src/av1/common/obu.rs @@ -232,7 +232,7 @@ impl From for u8 { mod tests { use super::*; use bitstream_io::{BigEndian, BitRead, BitReader}; - use gst::glib::once_cell::sync::Lazy; + use once_cell::sync::Lazy; use std::io::Cursor; #[allow(clippy::type_complexity)] diff --git a/net/rtp/src/av1/depay/imp.rs b/net/rtp/src/av1/depay/imp.rs index 1fd5173d..0cc92f70 100644 --- a/net/rtp/src/av1/depay/imp.rs +++ b/net/rtp/src/av1/depay/imp.rs @@ -17,7 +17,7 @@ use std::{ }; use bitstream_io::{BitReader, BitWriter}; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use crate::av1::common::{ err_flow, leb128_size, parse_leb128, write_leb128, AggregationHeader, ObuType, SizedObu, diff --git a/net/rtp/src/av1/pay/imp.rs b/net/rtp/src/av1/pay/imp.rs index 92e707c6..4182c14b 100644 --- a/net/rtp/src/av1/pay/imp.rs +++ b/net/rtp/src/av1/pay/imp.rs @@ -17,7 +17,7 @@ use std::{ }; use bitstream_io::{BitReader, BitWriter}; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use crate::av1::common::{ err_flow, leb128_size, write_leb128, ObuType, SizedObu, CLOCK_RATE, ENDIANNESS, diff --git a/net/rtp/src/gcc/imp.rs b/net/rtp/src/gcc/imp.rs index f01eb1bb..84269ce0 100644 --- a/net/rtp/src/gcc/imp.rs +++ b/net/rtp/src/gcc/imp.rs @@ -18,8 +18,8 @@ * */ use chrono::Duration; -use gst::glib::once_cell::sync::Lazy; use gst::{glib, prelude::*, subclass::prelude::*}; +use once_cell::sync::Lazy; use std::{ collections::{BTreeMap, VecDeque}, fmt, diff --git a/net/webrtc/Cargo.toml b/net/webrtc/Cargo.toml index b961320d..27968107 100644 --- a/net/webrtc/Cargo.toml +++ b/net/webrtc/Cargo.toml @@ -57,6 +57,7 @@ livekit-api = { version = "0.3", default-features = false, features = ["signal-c warp = "0.3" crossbeam-channel = "0.5" rand = "0.8" +once_cell = "1" [dev-dependencies] tracing = { version = "0.1", features = ["log"] } diff --git a/net/webrtc/src/aws_kvs_signaller/imp.rs b/net/webrtc/src/aws_kvs_signaller/imp.rs index 2a058b7d..254434a0 100644 --- a/net/webrtc/src/aws_kvs_signaller/imp.rs +++ b/net/webrtc/src/aws_kvs_signaller/imp.rs @@ -8,9 +8,9 @@ use async_tungstenite::tungstenite::Message as WsMessage; use futures::channel::mpsc; use futures::prelude::*; use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::glib::prelude::*; use gst::subclass::prelude::*; +use once_cell::sync::Lazy; use std::path::PathBuf; use std::sync::Mutex; use tokio::task; diff --git a/net/webrtc/src/janusvr_signaller/imp.rs b/net/webrtc/src/janusvr_signaller/imp.rs index 7155f4b3..72039420 100644 --- a/net/webrtc/src/janusvr_signaller/imp.rs +++ b/net/webrtc/src/janusvr_signaller/imp.rs @@ -9,11 +9,11 @@ use futures::channel::mpsc; use futures::sink::SinkExt; use futures::stream::StreamExt; use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::glib::Properties; use gst::prelude::*; use gst::subclass::prelude::*; use http::Uri; +use once_cell::sync::Lazy; use rand::prelude::*; use serde::{Deserialize, Serialize}; use std::ops::ControlFlow; diff --git a/net/webrtc/src/lib.rs b/net/webrtc/src/lib.rs index 847a6bba..1d67b9a3 100644 --- a/net/webrtc/src/lib.rs +++ b/net/webrtc/src/lib.rs @@ -11,7 +11,7 @@ * Since: plugins-rs-0.9 */ use gst::glib; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use tokio::runtime; mod aws_kvs_signaller; diff --git a/net/webrtc/src/livekit_signaller/imp.rs b/net/webrtc/src/livekit_signaller/imp.rs index 3ad237f6..e0aa1c71 100644 --- a/net/webrtc/src/livekit_signaller/imp.rs +++ b/net/webrtc/src/livekit_signaller/imp.rs @@ -8,9 +8,9 @@ use crate::RUNTIME; use anyhow::anyhow; use futures::executor::block_on; use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::prelude::*; use gst::subclass::prelude::*; +use once_cell::sync::Lazy; use serde::{Deserialize, Serialize}; use std::collections::HashMap; use std::sync::{Arc, Mutex}; diff --git a/net/webrtc/src/signaller/iface.rs b/net/webrtc/src/signaller/iface.rs index ede912aa..545e4c3d 100644 --- a/net/webrtc/src/signaller/iface.rs +++ b/net/webrtc/src/signaller/iface.rs @@ -1,8 +1,8 @@ use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::glib::subclass::*; use gst::prelude::*; use gst::subclass::prelude::*; +use once_cell::sync::Lazy; #[derive(Copy, Clone)] #[repr(C)] diff --git a/net/webrtc/src/signaller/imp.rs b/net/webrtc/src/signaller/imp.rs index 9299c0b1..18c1a148 100644 --- a/net/webrtc/src/signaller/imp.rs +++ b/net/webrtc/src/signaller/imp.rs @@ -8,10 +8,10 @@ use async_tungstenite::tungstenite::Message as WsMessage; use futures::channel::mpsc; use futures::prelude::*; use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::glib::prelude::*; use gst::subclass::prelude::*; use gst_plugin_webrtc_protocol as p; +use once_cell::sync::Lazy; use std::collections::HashSet; use std::ops::ControlFlow; use std::str::FromStr; diff --git a/net/webrtc/src/signaller/mod.rs b/net/webrtc/src/signaller/mod.rs index 1af26a68..c4992a14 100644 --- a/net/webrtc/src/signaller/mod.rs +++ b/net/webrtc/src/signaller/mod.rs @@ -8,7 +8,7 @@ use gst::glib; * * Interface that WebRTC elements can implement their own protocol with. */ -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; // Expose traits and objects from the module itself so it exactly looks like // generated bindings pub use imp::WebRTCSignallerRole; diff --git a/net/webrtc/src/utils.rs b/net/webrtc/src/utils.rs index 46176ec6..9daf006b 100644 --- a/net/webrtc/src/utils.rs +++ b/net/webrtc/src/utils.rs @@ -5,8 +5,8 @@ use std::{ }; use anyhow::{Context, Error}; -use gst::glib::once_cell::sync::Lazy; use gst::{glib, prelude::*}; +use once_cell::sync::Lazy; static CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( diff --git a/net/webrtc/src/webrtcsink/homegrown_cc.rs b/net/webrtc/src/webrtcsink/homegrown_cc.rs index bea08d85..acea1dd8 100644 --- a/net/webrtc/src/webrtcsink/homegrown_cc.rs +++ b/net/webrtc/src/webrtcsink/homegrown_cc.rs @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MPL-2.0 -use gst::glib::once_cell::sync::Lazy; use gst::{ glib::{self, value::FromValue}, prelude::*, }; +use once_cell::sync::Lazy; use super::imp::VideoEncoder; diff --git a/net/webrtc/src/webrtcsink/imp.rs b/net/webrtc/src/webrtcsink/imp.rs index ff628c49..3d8aa8af 100644 --- a/net/webrtc/src/webrtcsink/imp.rs +++ b/net/webrtc/src/webrtcsink/imp.rs @@ -13,7 +13,7 @@ use gst_webrtc::{WebRTCDataChannel, WebRTCICETransportPolicy}; use futures::prelude::*; use anyhow::{anyhow, Error}; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::collections::HashMap; use std::ops::Mul; diff --git a/net/webrtc/src/webrtcsrc/imp.rs b/net/webrtc/src/webrtcsrc/imp.rs index 2a25c7e2..e8817f33 100644 --- a/net/webrtc/src/webrtcsrc/imp.rs +++ b/net/webrtc/src/webrtcsrc/imp.rs @@ -8,9 +8,9 @@ use crate::webrtcsrc::WebRTCSrcPad; use crate::whip_signaller::WhipServerSignaller; use anyhow::{Context, Error}; use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::subclass::prelude::*; use gst_webrtc::WebRTCDataChannel; +use once_cell::sync::Lazy; use std::borrow::BorrowMut; use std::collections::HashSet; use std::str::FromStr; diff --git a/net/webrtc/src/whip_signaller/imp.rs b/net/webrtc/src/whip_signaller/imp.rs index 50ff91f6..769ad765 100644 --- a/net/webrtc/src/whip_signaller/imp.rs +++ b/net/webrtc/src/whip_signaller/imp.rs @@ -7,12 +7,12 @@ use crate::utils::{ }; use crate::RUNTIME; use async_recursion::async_recursion; -use gst::glib::once_cell::sync::Lazy; use gst::glib::{self, RustClosure}; use gst::prelude::*; use gst::subclass::prelude::*; use gst_sdp::SDPMessage; use gst_webrtc::{WebRTCICEGatheringState, WebRTCSessionDescription}; +use once_cell::sync::Lazy; use reqwest::header::HeaderMap; use reqwest::header::HeaderValue; use reqwest::StatusCode; diff --git a/net/webrtchttp/Cargo.toml b/net/webrtchttp/Cargo.toml index d53f9185..2af2aca3 100644 --- a/net/webrtchttp/Cargo.toml +++ b/net/webrtchttp/Cargo.toml @@ -20,6 +20,7 @@ tokio = { version = "1.20.1", default-features = false, features = ["time", "rt- futures = "0.3.23" bytes = "1" async-recursion = "1.0.0" +once_cell = "1" [lib] name = "gstwebrtchttp" diff --git a/net/webrtchttp/src/utils.rs b/net/webrtchttp/src/utils.rs index 9861cefd..ad019f68 100644 --- a/net/webrtchttp/src/utils.rs +++ b/net/webrtchttp/src/utils.rs @@ -1,7 +1,7 @@ use futures::future; use futures::prelude::*; -use gst::glib::once_cell::sync::Lazy; use gst::{prelude::*, ErrorMessage}; +use once_cell::sync::Lazy; use reqwest::header::HeaderMap; use reqwest::redirect::Policy; use std::sync::Mutex; diff --git a/net/webrtchttp/src/whepsrc/imp.rs b/net/webrtchttp/src/whepsrc/imp.rs index 0a157bab..30b4acda 100644 --- a/net/webrtchttp/src/whepsrc/imp.rs +++ b/net/webrtchttp/src/whepsrc/imp.rs @@ -15,10 +15,10 @@ use crate::IceTransportPolicy; use async_recursion::async_recursion; use bytes::Bytes; use futures::future; -use gst::glib::once_cell::sync::Lazy; use gst::{glib, prelude::*, subclass::prelude::*}; use gst_sdp::*; use gst_webrtc::*; +use once_cell::sync::Lazy; use reqwest::header::{HeaderMap, HeaderValue}; use reqwest::StatusCode; use std::sync::Mutex; diff --git a/net/webrtchttp/src/whipsink/imp.rs b/net/webrtchttp/src/whipsink/imp.rs index 619b0214..b3c82f4f 100644 --- a/net/webrtchttp/src/whipsink/imp.rs +++ b/net/webrtchttp/src/whipsink/imp.rs @@ -15,11 +15,11 @@ use crate::IceTransportPolicy; use async_recursion::async_recursion; use futures::future; use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::prelude::*; use gst::subclass::prelude::*; use gst_sdp::*; use gst_webrtc::*; +use once_cell::sync::Lazy; use reqwest::header::HeaderMap; use reqwest::header::HeaderValue; use reqwest::StatusCode; diff --git a/text/ahead/Cargo.toml b/text/ahead/Cargo.toml index f405a772..50cd3945 100644 --- a/text/ahead/Cargo.toml +++ b/text/ahead/Cargo.toml @@ -10,6 +10,7 @@ rust-version = "1.70" [dependencies] gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } +once_cell = "1" [lib] name = "gsttextahead" diff --git a/text/ahead/src/textahead/imp.rs b/text/ahead/src/textahead/imp.rs index 2d60721f..90c937ea 100644 --- a/text/ahead/src/textahead/imp.rs +++ b/text/ahead/src/textahead/imp.rs @@ -9,7 +9,7 @@ use std::collections::VecDeque; use std::sync::{Mutex, MutexGuard}; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use gst::glib; use gst::prelude::*; diff --git a/text/json/Cargo.toml b/text/json/Cargo.toml index 874b9865..65b37c8c 100644 --- a/text/json/Cargo.toml +++ b/text/json/Cargo.toml @@ -9,6 +9,7 @@ description = "GStreamer JSON Plugin" repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" [dependencies] +once_cell = "1" serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", features = ["raw_value"] } diff --git a/text/json/src/jsongstenc/imp.rs b/text/json/src/jsongstenc/imp.rs index a0c25255..42e87021 100644 --- a/text/json/src/jsongstenc/imp.rs +++ b/text/json/src/jsongstenc/imp.rs @@ -10,7 +10,7 @@ use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::sync::Mutex; diff --git a/text/json/src/jsongstparse/imp.rs b/text/json/src/jsongstparse/imp.rs index 2f6f9577..2ad067c4 100644 --- a/text/json/src/jsongstparse/imp.rs +++ b/text/json/src/jsongstparse/imp.rs @@ -10,7 +10,7 @@ use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::cmp; use std::sync::{Mutex, MutexGuard}; diff --git a/text/regex/Cargo.toml b/text/regex/Cargo.toml index 0de5c95f..86fa9eb4 100644 --- a/text/regex/Cargo.toml +++ b/text/regex/Cargo.toml @@ -9,6 +9,7 @@ description = "GStreamer Regular Expression Plugin" repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" [dependencies] +once_cell = "1" regex = "1.5" [dependencies.gst] diff --git a/text/regex/src/gstregex/imp.rs b/text/regex/src/gstregex/imp.rs index f1ec01cf..1b373654 100644 --- a/text/regex/src/gstregex/imp.rs +++ b/text/regex/src/gstregex/imp.rs @@ -14,7 +14,7 @@ use regex::Regex; use std::default::Default; use std::sync::Mutex; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; static CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( diff --git a/text/wrap/Cargo.toml b/text/wrap/Cargo.toml index 4f9f41a0..2e0c96d5 100644 --- a/text/wrap/Cargo.toml +++ b/text/wrap/Cargo.toml @@ -11,6 +11,7 @@ repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" [dependencies] textwrap = { version = "0.16", features = ["hyphenation"] } hyphenation = "0.8" +once_cell = "1" [dependencies.gst] git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" diff --git a/text/wrap/src/gsttextwrap/imp.rs b/text/wrap/src/gsttextwrap/imp.rs index 34d2f895..890201bb 100644 --- a/text/wrap/src/gsttextwrap/imp.rs +++ b/text/wrap/src/gsttextwrap/imp.rs @@ -16,7 +16,7 @@ use std::io; use std::mem; use std::sync::Mutex; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use hyphenation::{Load, Standard}; diff --git a/tutorial/Cargo.toml b/tutorial/Cargo.toml index aabeb9e8..5a26e12e 100644 --- a/tutorial/Cargo.toml +++ b/tutorial/Cargo.toml @@ -15,6 +15,7 @@ gst-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } byte-slice-cast = "1.0" num-traits = "0.2" +once_cell = "1" [lib] name = "gstrstutorial" diff --git a/tutorial/src/identity/imp.rs b/tutorial/src/identity/imp.rs index e5599bb3..7b26806c 100644 --- a/tutorial/src/identity/imp.rs +++ b/tutorial/src/identity/imp.rs @@ -12,7 +12,7 @@ use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; // This module contains the private implementation details of our element diff --git a/tutorial/src/progressbin/imp.rs b/tutorial/src/progressbin/imp.rs index 72bdd528..eee52691 100644 --- a/tutorial/src/progressbin/imp.rs +++ b/tutorial/src/progressbin/imp.rs @@ -13,7 +13,7 @@ use gst::prelude::*; use gst::subclass::prelude::*; use std::sync::Mutex; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use super::ProgressBinOutput; diff --git a/tutorial/src/rgb2gray/imp.rs b/tutorial/src/rgb2gray/imp.rs index 211ea503..e182d067 100644 --- a/tutorial/src/rgb2gray/imp.rs +++ b/tutorial/src/rgb2gray/imp.rs @@ -17,7 +17,7 @@ use gst_video::subclass::prelude::*; use std::sync::Mutex; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; // This module contains the private implementation details of our element // diff --git a/tutorial/src/sinesrc/imp.rs b/tutorial/src/sinesrc/imp.rs index d2e98c3d..8e70e9ef 100644 --- a/tutorial/src/sinesrc/imp.rs +++ b/tutorial/src/sinesrc/imp.rs @@ -24,7 +24,7 @@ use std::u32; use num_traits::cast::NumCast; use num_traits::float::Float; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; // This module contains the private implementation details of our element diff --git a/utils/fallbackswitch/Cargo.toml b/utils/fallbackswitch/Cargo.toml index e4164ac2..ed03a5cd 100644 --- a/utils/fallbackswitch/Cargo.toml +++ b/utils/fallbackswitch/Cargo.toml @@ -17,6 +17,7 @@ gst-plugin-gtk4 = { path = "../../video/gtk4", optional = true } gtk = { package = "gtk4", git = "https://github.com/gtk-rs/gtk4-rs", optional = true } gio = { git = "https://github.com/gtk-rs/gtk-rs-core", optional = true } parking_lot = "0.12" +once_cell = "1" [dev-dependencies] gst-app = { package = "gstreamer-app", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } diff --git a/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs b/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs index a462bd68..89a05a9e 100644 --- a/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs +++ b/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs @@ -11,10 +11,12 @@ use gst::glib::SignalHandlerId; use gst::prelude::*; use gst::subclass::prelude::*; -use std::{mem, sync::Mutex}; +use std::{ + mem, + sync::{Mutex, OnceLock}, +}; -use gst::glib::once_cell::sync::Lazy; -use gst::glib::once_cell::sync::OnceCell; +use once_cell::sync::Lazy; static CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( @@ -43,7 +45,7 @@ struct State { #[derive(Default)] pub struct CustomSource { - source: OnceCell, + source: OnceLock, state: Mutex, } diff --git a/utils/fallbackswitch/src/fallbacksrc/imp.rs b/utils/fallbackswitch/src/fallbacksrc/imp.rs index f1e51e13..37a36726 100644 --- a/utils/fallbackswitch/src/fallbacksrc/imp.rs +++ b/utils/fallbackswitch/src/fallbacksrc/imp.rs @@ -14,7 +14,7 @@ use parking_lot::Mutex; use std::time::Instant; use std::{cmp, mem}; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use super::custom_source::CustomSource; use super::{RetryReason, Status}; diff --git a/utils/fallbackswitch/src/fallbackswitch/imp.rs b/utils/fallbackswitch/src/fallbackswitch/imp.rs index 42c994e3..52b6ce3e 100644 --- a/utils/fallbackswitch/src/fallbackswitch/imp.rs +++ b/utils/fallbackswitch/src/fallbackswitch/imp.rs @@ -12,7 +12,7 @@ use gst::prelude::*; use gst::subclass::prelude::*; use gst::{debug, log, trace}; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use parking_lot::{Condvar, Mutex, MutexGuard}; use std::sync::atomic::{AtomicU32, Ordering}; diff --git a/utils/fallbackswitch/tests/fallbackswitch.rs b/utils/fallbackswitch/tests/fallbackswitch.rs index 960adf7d..21ff07bc 100644 --- a/utils/fallbackswitch/tests/fallbackswitch.rs +++ b/utils/fallbackswitch/tests/fallbackswitch.rs @@ -10,7 +10,7 @@ use gst::debug; use gst::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; const LATENCY: gst::ClockTime = gst::ClockTime::from_mseconds(10); diff --git a/utils/livesync/Cargo.toml b/utils/livesync/Cargo.toml index c146ce6a..81b84d5e 100644 --- a/utils/livesync/Cargo.toml +++ b/utils/livesync/Cargo.toml @@ -16,6 +16,7 @@ gst-plugin-gtk4 = { path = "../../video/gtk4", optional = true } gtk = { package = "gtk4", git = "https://github.com/gtk-rs/gtk4-rs", optional = true } muldiv = "1.0" num-rational = { version = "0.4", default-features = false, features = [] } +once_cell = "1" parking_lot = "0.12" [dev-dependencies] diff --git a/utils/livesync/src/livesync/imp.rs b/utils/livesync/src/livesync/imp.rs index 335a9d2f..f4d644a7 100644 --- a/utils/livesync/src/livesync/imp.rs +++ b/utils/livesync/src/livesync/imp.rs @@ -7,12 +7,12 @@ // // SPDX-License-Identifier: MPL-2.0 -use gst::glib::once_cell::sync::Lazy; use gst::{ glib::{self, translate::IntoGlib}, prelude::*, subclass::prelude::*, }; +use once_cell::sync::Lazy; use parking_lot::{Condvar, Mutex, MutexGuard}; use std::{collections::VecDeque, sync::mpsc}; diff --git a/utils/togglerecord/Cargo.toml b/utils/togglerecord/Cargo.toml index ac7000ee..af147b40 100644 --- a/utils/togglerecord/Cargo.toml +++ b/utils/togglerecord/Cargo.toml @@ -16,6 +16,7 @@ gst-plugin-gtk4 = { path = "../../video/gtk4", optional = true } gtk = { package = "gtk4", git = "https://github.com/gtk-rs/gtk4-rs", optional = true } gio = { git = "https://github.com/gtk-rs/gtk-rs-core", optional = true } parking_lot = "0.12" +once_cell = "1" [dev-dependencies] either = "1.0" diff --git a/utils/togglerecord/src/togglerecord/imp.rs b/utils/togglerecord/src/togglerecord/imp.rs index 2340220e..adbed4b2 100644 --- a/utils/togglerecord/src/togglerecord/imp.rs +++ b/utils/togglerecord/src/togglerecord/imp.rs @@ -16,7 +16,7 @@ use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use parking_lot::{Condvar, Mutex, MutexGuard}; use std::cmp; use std::collections::HashMap; diff --git a/utils/tracers/Cargo.toml b/utils/tracers/Cargo.toml index 479bc0c7..5de1143e 100644 --- a/utils/tracers/Cargo.toml +++ b/utils/tracers/Cargo.toml @@ -12,6 +12,7 @@ rust-version = "1.70" gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } anyhow = "1" regex = "1" +once_cell = "1" [target.'cfg(unix)'.dependencies] signal-hook = "0.3" diff --git a/utils/tracers/src/buffer_lateness/imp.rs b/utils/tracers/src/buffer_lateness/imp.rs index 56750635..48228750 100644 --- a/utils/tracers/src/buffer_lateness/imp.rs +++ b/utils/tracers/src/buffer_lateness/imp.rs @@ -50,9 +50,9 @@ use std::str::FromStr; use std::sync::{Arc, Mutex}; use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::prelude::*; use gst::subclass::prelude::*; +use once_cell::sync::Lazy; use regex::Regex; static CAT: Lazy = Lazy::new(|| { diff --git a/utils/tracers/src/pipeline_snapshot/imp.rs b/utils/tracers/src/pipeline_snapshot/imp.rs index 4dd75a47..1e9229c7 100644 --- a/utils/tracers/src/pipeline_snapshot/imp.rs +++ b/utils/tracers/src/pipeline_snapshot/imp.rs @@ -42,10 +42,10 @@ use std::str::FromStr; use std::sync::{Arc, Mutex}; use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::glib::translate::ToGlibPtr; use gst::prelude::*; use gst::subclass::prelude::*; +use once_cell::sync::Lazy; static CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( diff --git a/utils/tracers/src/queue_levels/imp.rs b/utils/tracers/src/queue_levels/imp.rs index 6a5b24b0..3a9ac7c7 100644 --- a/utils/tracers/src/queue_levels/imp.rs +++ b/utils/tracers/src/queue_levels/imp.rs @@ -50,9 +50,9 @@ use std::str::FromStr; use std::sync::{Arc, Mutex}; use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::prelude::*; use gst::subclass::prelude::*; +use once_cell::sync::Lazy; use regex::Regex; static CAT: Lazy = Lazy::new(|| { diff --git a/utils/uriplaylistbin/Cargo.toml b/utils/uriplaylistbin/Cargo.toml index e71dd5f9..6c99f433 100644 --- a/utils/uriplaylistbin/Cargo.toml +++ b/utils/uriplaylistbin/Cargo.toml @@ -13,6 +13,7 @@ gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/g anyhow = "1" clap = { version = "4", optional = true, features = ["derive"] } thiserror = "1" +once_cell = "1" [dev-dependencies] gst-app = { package = "gstreamer-app", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } diff --git a/utils/uriplaylistbin/src/uriplaylistbin/imp.rs b/utils/uriplaylistbin/src/uriplaylistbin/imp.rs index 38e9a93f..88c97a0e 100644 --- a/utils/uriplaylistbin/src/uriplaylistbin/imp.rs +++ b/utils/uriplaylistbin/src/uriplaylistbin/imp.rs @@ -13,7 +13,7 @@ use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; static CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( diff --git a/video/cdg/Cargo.toml b/video/cdg/Cargo.toml index 8b104200..c7f9ecf5 100644 --- a/video/cdg/Cargo.toml +++ b/video/cdg/Cargo.toml @@ -16,6 +16,7 @@ cdg = "0.1" cdg_renderer = "0.7" image = { version = "0.24", default-features = false } muldiv = "1.0" +once_cell = "1" [dev-dependencies] gst-app = { package = "gstreamer-app", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } diff --git a/video/cdg/src/cdgdec/imp.rs b/video/cdg/src/cdgdec/imp.rs index c0cc9ece..ae6874c8 100644 --- a/video/cdg/src/cdgdec/imp.rs +++ b/video/cdg/src/cdgdec/imp.rs @@ -9,11 +9,11 @@ // SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::subclass::prelude::*; use gst_video::prelude::*; use gst_video::subclass::prelude::*; use image::GenericImageView; +use once_cell::sync::Lazy; use std::sync::Mutex; use crate::constants::{CDG_HEIGHT, CDG_WIDTH}; diff --git a/video/cdg/src/cdgparse/imp.rs b/video/cdg/src/cdgparse/imp.rs index 6f6f075b..d80a9bb6 100644 --- a/video/cdg/src/cdgparse/imp.rs +++ b/video/cdg/src/cdgparse/imp.rs @@ -10,10 +10,10 @@ use gst::format::Bytes; use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::subclass::prelude::*; use gst_base::prelude::*; use gst_base::subclass::prelude::*; +use once_cell::sync::Lazy; use crate::constants::{ CDG_COMMAND, CDG_HEIGHT, CDG_MASK, CDG_PACKET_PERIOD, CDG_PACKET_SIZE, CDG_WIDTH, diff --git a/video/closedcaption/Cargo.toml b/video/closedcaption/Cargo.toml index e1e84ca8..dcb95c18 100644 --- a/video/closedcaption/Cargo.toml +++ b/video/closedcaption/Cargo.toml @@ -22,6 +22,7 @@ byteorder = "1" serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", features = ["raw_value"] } cea708-types = "0.3" +once_cell = "1" [dependencies.gst] git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" diff --git a/video/closedcaption/src/ccdetect/imp.rs b/video/closedcaption/src/ccdetect/imp.rs index 96ac7d0a..39ea519f 100644 --- a/video/closedcaption/src/ccdetect/imp.rs +++ b/video/closedcaption/src/ccdetect/imp.rs @@ -12,7 +12,7 @@ use gst::subclass::prelude::*; use gst_base::subclass::prelude::*; use crate::ccutils::{extract_cdp, ParseError, ParseErrorCode}; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::sync::Mutex; use std::u64; diff --git a/video/closedcaption/src/cea608overlay/imp.rs b/video/closedcaption/src/cea608overlay/imp.rs index f912393f..c3cba027 100644 --- a/video/closedcaption/src/cea608overlay/imp.rs +++ b/video/closedcaption/src/cea608overlay/imp.rs @@ -11,7 +11,7 @@ use gst::prelude::*; use gst::subclass::prelude::*; use gst_video::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::sync::Mutex; diff --git a/video/closedcaption/src/cea608tocea708/imp.rs b/video/closedcaption/src/cea608tocea708/imp.rs index 1d7b3aa4..7cb12a8a 100644 --- a/video/closedcaption/src/cea608tocea708/imp.rs +++ b/video/closedcaption/src/cea608tocea708/imp.rs @@ -17,7 +17,7 @@ use atomic_refcell::AtomicRefCell; use crate::cea608utils::*; use crate::cea708utils::{textstyle_foreground_color, textstyle_to_pen_color, Cea708ServiceWriter}; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; #[derive(Debug, Copy, Clone)] enum Cea608Format { diff --git a/video/closedcaption/src/cea608tojson/imp.rs b/video/closedcaption/src/cea608tojson/imp.rs index a074f68b..4eda8472 100644 --- a/video/closedcaption/src/cea608tojson/imp.rs +++ b/video/closedcaption/src/cea608tojson/imp.rs @@ -34,7 +34,7 @@ use crate::ttutils::{Chunk, Line, Lines}; use atomic_refcell::AtomicRefCell; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::collections::BTreeMap; use std::sync::Mutex; diff --git a/video/closedcaption/src/cea608tott/imp.rs b/video/closedcaption/src/cea608tott/imp.rs index 0715f9e2..c781585b 100644 --- a/video/closedcaption/src/cea608tott/imp.rs +++ b/video/closedcaption/src/cea608tott/imp.rs @@ -13,7 +13,7 @@ use gst::subclass::prelude::*; use crate::caption_frame::{CaptionFrame, Status}; use atomic_refcell::AtomicRefCell; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; #[derive(Copy, Clone, Debug)] enum Format { diff --git a/video/closedcaption/src/cea608utils.rs b/video/closedcaption/src/cea608utils.rs index 51fc4a6a..ae0ba8a2 100644 --- a/video/closedcaption/src/cea608utils.rs +++ b/video/closedcaption/src/cea608utils.rs @@ -7,7 +7,7 @@ // SPDX-License-Identifier: MPL-2.0 use gst::glib; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use serde::{Deserialize, Serialize}; use crate::ffi; diff --git a/video/closedcaption/src/cea708utils.rs b/video/closedcaption/src/cea708utils.rs index 2bc0abf3..001f3ee0 100644 --- a/video/closedcaption/src/cea708utils.rs +++ b/video/closedcaption/src/cea708utils.rs @@ -9,7 +9,7 @@ use cea708_types::{tables::*, Service}; use gst::glib; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use serde::{Deserialize, Serialize}; use crate::cea608utils::TextStyle; diff --git a/video/closedcaption/src/jsontovtt/imp.rs b/video/closedcaption/src/jsontovtt/imp.rs index 3f096574..4350110f 100644 --- a/video/closedcaption/src/jsontovtt/imp.rs +++ b/video/closedcaption/src/jsontovtt/imp.rs @@ -14,7 +14,7 @@ use gst::subclass::prelude::*; use crate::jsontovtt::fku::ForceKeyUnitRequest; use crate::ttutils::Lines; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::collections::{BinaryHeap, VecDeque}; use std::sync::Mutex; diff --git a/video/closedcaption/src/mcc_enc/imp.rs b/video/closedcaption/src/mcc_enc/imp.rs index 30fdf648..634955dc 100644 --- a/video/closedcaption/src/mcc_enc/imp.rs +++ b/video/closedcaption/src/mcc_enc/imp.rs @@ -14,7 +14,7 @@ use gst::subclass::prelude::*; use chrono::prelude::*; use uuid::Uuid; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::io::Write; use std::sync::Mutex; diff --git a/video/closedcaption/src/mcc_parse/imp.rs b/video/closedcaption/src/mcc_parse/imp.rs index 11c57e72..439929d2 100644 --- a/video/closedcaption/src/mcc_parse/imp.rs +++ b/video/closedcaption/src/mcc_parse/imp.rs @@ -14,7 +14,7 @@ use gst_video::ValidVideoTimeCode; use std::cmp; use std::sync::{Mutex, MutexGuard}; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use super::parser::{MccLine, MccParser}; use crate::line_reader::LineReader; diff --git a/video/closedcaption/src/scc_enc/imp.rs b/video/closedcaption/src/scc_enc/imp.rs index cd45d0f4..4c04fa82 100644 --- a/video/closedcaption/src/scc_enc/imp.rs +++ b/video/closedcaption/src/scc_enc/imp.rs @@ -13,7 +13,7 @@ use gst::structure; use gst::subclass::prelude::*; use gst_video::{self, ValidVideoTimeCode}; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::io::Write; use std::sync::Mutex; diff --git a/video/closedcaption/src/scc_parse/imp.rs b/video/closedcaption/src/scc_parse/imp.rs index 6fda83b0..e184f139 100644 --- a/video/closedcaption/src/scc_parse/imp.rs +++ b/video/closedcaption/src/scc_parse/imp.rs @@ -14,7 +14,7 @@ use gst::subclass::prelude::*; use std::cmp; use std::sync::{Mutex, MutexGuard}; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use super::parser::{SccLine, SccParser}; use crate::line_reader::LineReader; diff --git a/video/closedcaption/src/transcriberbin/imp.rs b/video/closedcaption/src/transcriberbin/imp.rs index 5e05b9d8..e4547618 100644 --- a/video/closedcaption/src/transcriberbin/imp.rs +++ b/video/closedcaption/src/transcriberbin/imp.rs @@ -14,7 +14,7 @@ use gst::subclass::prelude::*; use std::collections::HashMap; use std::sync::Mutex; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use super::CaptionSource; diff --git a/video/closedcaption/src/tttocea608/imp.rs b/video/closedcaption/src/tttocea608/imp.rs index 18a8d293..f5c1853a 100644 --- a/video/closedcaption/src/tttocea608/imp.rs +++ b/video/closedcaption/src/tttocea608/imp.rs @@ -10,7 +10,7 @@ use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use crate::ffi; use std::sync::Mutex; diff --git a/video/closedcaption/src/tttojson/imp.rs b/video/closedcaption/src/tttojson/imp.rs index fe0e69b2..e4f98fe3 100644 --- a/video/closedcaption/src/tttojson/imp.rs +++ b/video/closedcaption/src/tttojson/imp.rs @@ -10,7 +10,7 @@ use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::cmp::min; use std::sync::Mutex; diff --git a/video/dav1d/Cargo.toml b/video/dav1d/Cargo.toml index 1e011c21..9ae37496 100644 --- a/video/dav1d/Cargo.toml +++ b/video/dav1d/Cargo.toml @@ -14,6 +14,7 @@ gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/g gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } gst-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } num_cpus = "1.0" +once_cell = "1" [lib] name = "gstdav1d" diff --git a/video/dav1d/src/dav1ddec/imp.rs b/video/dav1d/src/dav1ddec/imp.rs index 2e0dba41..b65e5a5b 100644 --- a/video/dav1d/src/dav1ddec/imp.rs +++ b/video/dav1d/src/dav1ddec/imp.rs @@ -14,7 +14,7 @@ use gst::subclass::prelude::*; use gst_video::prelude::*; use gst_video::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::i32; use std::sync::{Mutex, MutexGuard}; diff --git a/video/ffv1/Cargo.toml b/video/ffv1/Cargo.toml index a27fa230..85574fd8 100644 --- a/video/ffv1/Cargo.toml +++ b/video/ffv1/Cargo.toml @@ -13,6 +13,7 @@ byte-slice-cast = "1" ffv1 = { git = "https://github.com/rust-av/ffv1.git", rev = "2afb025a327173ce891954c052e804d0f880368a" } gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_18"] } gst-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_18"] } +once_cell = "1" [dev-dependencies] gst-check = { package = "gstreamer-check", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_18"] } diff --git a/video/ffv1/src/ffv1dec/imp.rs b/video/ffv1/src/ffv1dec/imp.rs index 4d1b517f..8911f6e1 100644 --- a/video/ffv1/src/ffv1dec/imp.rs +++ b/video/ffv1/src/ffv1dec/imp.rs @@ -18,7 +18,7 @@ use gst_video::prelude::*; use gst_video::subclass::prelude::*; use gst_video::VideoFormat; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::sync::Mutex; #[derive(Default)] diff --git a/video/gif/src/gifenc/imp.rs b/video/gif/src/gifenc/imp.rs index 5f5efc58..c813a809 100644 --- a/video/gif/src/gifenc/imp.rs +++ b/video/gif/src/gifenc/imp.rs @@ -10,11 +10,11 @@ use atomic_refcell::AtomicRefCell; use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::subclass::prelude::*; use gst_video::prelude::*; use gst_video::subclass::prelude::*; use gst_video::VideoFormat; +use once_cell::sync::Lazy; use std::{ io, io::Write, diff --git a/video/gtk4/Cargo.toml b/video/gtk4/Cargo.toml index df6bb757..711c816b 100644 --- a/video/gtk4/Cargo.toml +++ b/video/gtk4/Cargo.toml @@ -22,6 +22,7 @@ gst_gl_wayland = { package = "gstreamer-gl-wayland", git = "https://gitlab.freed gst_gl_x11 = { package = "gstreamer-gl-x11", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_16"], optional = true } gst_gl_egl = { package = "gstreamer-gl-egl", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_16"], optional = true } async-channel = "2.0.0" +once_cell = "1" [target.'cfg(target_os = "macos")'.dependencies] diff --git a/video/gtk4/src/sink/imp.rs b/video/gtk4/src/sink/imp.rs index 28936d3f..22927b16 100644 --- a/video/gtk4/src/sink/imp.rs +++ b/video/gtk4/src/sink/imp.rs @@ -21,7 +21,7 @@ use gst::subclass::prelude::*; use gst_base::subclass::prelude::*; use gst_video::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::sync::{Mutex, MutexGuard}; use crate::utils; diff --git a/video/gtk4/src/sink/paintable/imp.rs b/video/gtk4/src/sink/paintable/imp.rs index dedfcdf1..5fc9eb9c 100644 --- a/video/gtk4/src/sink/paintable/imp.rs +++ b/video/gtk4/src/sink/paintable/imp.rs @@ -18,7 +18,7 @@ use crate::sink::frame::{Frame, Texture}; use std::cell::RefCell; use std::collections::HashMap; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; static CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( diff --git a/video/hsv/Cargo.toml b/video/hsv/Cargo.toml index 6ffe36f2..77e0f3c1 100644 --- a/video/hsv/Cargo.toml +++ b/video/hsv/Cargo.toml @@ -15,6 +15,7 @@ gst-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } byte-slice-cast = "1.0" num-traits = "0.2" +once_cell = "1" [dev-dependencies] gst_check = { package = "gstreamer-check", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } diff --git a/video/hsv/src/hsvdetector/imp.rs b/video/hsv/src/hsvdetector/imp.rs index 4f10ce59..e32b3534 100644 --- a/video/hsv/src/hsvdetector/imp.rs +++ b/video/hsv/src/hsvdetector/imp.rs @@ -18,7 +18,7 @@ use gst_video::subclass::prelude::*; use std::sync::Mutex; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use super::super::hsvutils; diff --git a/video/hsv/src/hsvfilter/imp.rs b/video/hsv/src/hsvfilter/imp.rs index 8cbeeeec..8beccf7c 100644 --- a/video/hsv/src/hsvfilter/imp.rs +++ b/video/hsv/src/hsvfilter/imp.rs @@ -17,7 +17,7 @@ use gst_video::subclass::prelude::*; use std::sync::Mutex; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use super::super::hsvutils; diff --git a/video/png/src/pngenc/imp.rs b/video/png/src/pngenc/imp.rs index 03f5940e..5adacbde 100644 --- a/video/png/src/pngenc/imp.rs +++ b/video/png/src/pngenc/imp.rs @@ -14,7 +14,7 @@ use gst::subclass::prelude::*; use gst_video::prelude::*; use gst_video::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use parking_lot::Mutex; use super::CompressionLevel; diff --git a/video/rav1e/Cargo.toml b/video/rav1e/Cargo.toml index bed8183a..e1b23eab 100644 --- a/video/rav1e/Cargo.toml +++ b/video/rav1e/Cargo.toml @@ -13,6 +13,7 @@ gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/g gst-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } rav1e = { version = "0.7", default-features = false, features = ["threading"] } atomic_refcell = "0.1" +once_cell = "1" [dev-dependencies] gst-check = { package = "gstreamer-check", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } diff --git a/video/rav1e/src/rav1enc/imp.rs b/video/rav1e/src/rav1enc/imp.rs index a0e28d8d..14f7148b 100644 --- a/video/rav1e/src/rav1enc/imp.rs +++ b/video/rav1e/src/rav1enc/imp.rs @@ -10,10 +10,10 @@ use atomic_refcell::AtomicRefCell; use gst::glib; -use gst::glib::once_cell::sync::Lazy; use gst::subclass::prelude::*; use gst_video::prelude::*; use gst_video::subclass::prelude::*; +use once_cell::sync::Lazy; use rav1e::color; use rav1e::config; use rav1e::data; diff --git a/video/videofx/Cargo.toml b/video/videofx/Cargo.toml index c9a444b5..77961d40 100644 --- a/video/videofx/Cargo.toml +++ b/video/videofx/Cargo.toml @@ -17,6 +17,7 @@ image = { version = "0.24.2", default-features = false } image_hasher = "1.0.0" dssim-core = { version = "3.2.3", optional = true } rgb = { version = "0.8", optional = true } +once_cell = "1" [dependencies.gst] git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" diff --git a/video/videofx/src/border/imp.rs b/video/videofx/src/border/imp.rs index e2175bd9..99681b75 100644 --- a/video/videofx/src/border/imp.rs +++ b/video/videofx/src/border/imp.rs @@ -14,7 +14,7 @@ use gst_base::{ }; use gst_video::{subclass::prelude::*, VideoFormat}; -use gst::glib::once_cell::sync::Lazy; +use once_cell::sync::Lazy; use std::sync::Mutex; const DEFAULT_BORDER_RADIUS: u32 = 0; diff --git a/video/videofx/src/colordetect/imp.rs b/video/videofx/src/colordetect/imp.rs index 2dd2536a..f3112c86 100644 --- a/video/videofx/src/colordetect/imp.rs +++ b/video/videofx/src/colordetect/imp.rs @@ -10,10 +10,10 @@ use atomic_refcell::AtomicRefCell; use color_name; use color_thief::{get_palette, Color, ColorFormat}; -use gst::glib::once_cell::sync::Lazy; use gst::{glib, subclass::prelude::*}; use gst_base::prelude::*; use gst_video::{subclass::prelude::*, VideoFormat}; +use once_cell::sync::Lazy; use std::sync::Mutex; const DEFAULT_QUALITY: u32 = 10; diff --git a/video/videofx/src/videocompare/imp.rs b/video/videofx/src/videocompare/imp.rs index 3002d447..15b9aa3f 100644 --- a/video/videofx/src/videocompare/imp.rs +++ b/video/videofx/src/videocompare/imp.rs @@ -9,7 +9,6 @@ use crate::videocompare::hashed_image::HasherEngine; use crate::videocompare::HashAlgorithm; use crate::{PadDistance, VideoCompareMessage}; -use gst::glib::once_cell::sync::Lazy; use gst::subclass::prelude::*; use gst::{glib, glib::prelude::*, prelude::*}; use gst_base::prelude::*; @@ -18,6 +17,7 @@ use gst_video::prelude::*; use gst_video::subclass::prelude::*; use gst_video::subclass::AggregateFramesToken; use gst_video::VideoFormat; +use once_cell::sync::Lazy; use std::sync::{Arc, Mutex}; static CAT: Lazy = Lazy::new(|| { diff --git a/video/webp/Cargo.toml b/video/webp/Cargo.toml index 4f3d1940..d4609e71 100644 --- a/video/webp/Cargo.toml +++ b/video/webp/Cargo.toml @@ -10,6 +10,7 @@ repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" [dependencies] libwebp-sys2 = { version = "0.1.2", features = ["demux", "0_5"] } +once_cell = "1" [dependencies.gst] git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" diff --git a/video/webp/src/dec/imp.rs b/video/webp/src/dec/imp.rs index dec1c4a9..8e70c950 100644 --- a/video/webp/src/dec/imp.rs +++ b/video/webp/src/dec/imp.rs @@ -10,8 +10,8 @@ use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::glib::once_cell::sync::Lazy; use libwebp_sys as ffi; +use once_cell::sync::Lazy; use std::sync::Mutex;