mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git
synced 2025-04-03 14:49:39 +00:00
gstreamer: Make use of iterators / smallvec instead of temporary Vecs for messages/events/queries
And also take owned values if the C API takes ownership of them. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1669>
This commit is contained in:
Sebastian Dröge
GStreamer Marge Bot
parent
c5ea622fd4
commit
ab43303c7a
5 changed files with 351 additions and 272 deletions
44
Cargo.lock
generated
44
Cargo.lock
generated
|
|
@ -159,7 +159,7 @@ checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
|
|||
[[package]]
|
||||
name = "cairo-rs"
|
||||
version = "0.21.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#e6b43dc4d7cdb1ab62d6522c90807e6cd40973aa"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#36ef92912d7363e15ed3524d9195b4bafced27cc"
|
||||
dependencies = [
|
||||
"bitflags 2.9.0",
|
||||
"cairo-sys-rs",
|
||||
|
|
@ -170,7 +170,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "cairo-sys-rs"
|
||||
version = "0.21.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#e6b43dc4d7cdb1ab62d6522c90807e6cd40973aa"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#36ef92912d7363e15ed3524d9195b4bafced27cc"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"libc",
|
||||
|
|
@ -468,7 +468,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"windows-sys 0.59.0",
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -716,7 +716,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gio"
|
||||
version = "0.21.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#e6b43dc4d7cdb1ab62d6522c90807e6cd40973aa"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#36ef92912d7363e15ed3524d9195b4bafced27cc"
|
||||
dependencies = [
|
||||
"futures-channel",
|
||||
"futures-core",
|
||||
|
|
@ -732,13 +732,13 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gio-sys"
|
||||
version = "0.21.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#e6b43dc4d7cdb1ab62d6522c90807e6cd40973aa"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#36ef92912d7363e15ed3524d9195b4bafced27cc"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"libc",
|
||||
"system-deps",
|
||||
"windows-sys 0.59.0",
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -761,7 +761,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "glib"
|
||||
version = "0.21.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#e6b43dc4d7cdb1ab62d6522c90807e6cd40973aa"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#36ef92912d7363e15ed3524d9195b4bafced27cc"
|
||||
dependencies = [
|
||||
"bitflags 2.9.0",
|
||||
"futures-channel",
|
||||
|
|
@ -781,7 +781,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "glib-macros"
|
||||
version = "0.21.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#e6b43dc4d7cdb1ab62d6522c90807e6cd40973aa"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#36ef92912d7363e15ed3524d9195b4bafced27cc"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro-crate",
|
||||
|
|
@ -793,7 +793,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "glib-sys"
|
||||
version = "0.21.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#e6b43dc4d7cdb1ab62d6522c90807e6cd40973aa"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#36ef92912d7363e15ed3524d9195b4bafced27cc"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"system-deps",
|
||||
|
|
@ -868,7 +868,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gobject-sys"
|
||||
version = "0.21.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#e6b43dc4d7cdb1ab62d6522c90807e6cd40973aa"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#36ef92912d7363e15ed3524d9195b4bafced27cc"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"libc",
|
||||
|
|
@ -1716,7 +1716,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"windows-targets 0.52.6",
|
||||
"windows-targets 0.48.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2116,7 +2116,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "pango"
|
||||
version = "0.21.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#e6b43dc4d7cdb1ab62d6522c90807e6cd40973aa"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#36ef92912d7363e15ed3524d9195b4bafced27cc"
|
||||
dependencies = [
|
||||
"gio",
|
||||
"glib",
|
||||
|
|
@ -2127,7 +2127,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "pango-sys"
|
||||
version = "0.21.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#e6b43dc4d7cdb1ab62d6522c90807e6cd40973aa"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#36ef92912d7363e15ed3524d9195b4bafced27cc"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
|
|
@ -2138,7 +2138,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "pangocairo"
|
||||
version = "0.21.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#e6b43dc4d7cdb1ab62d6522c90807e6cd40973aa"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#36ef92912d7363e15ed3524d9195b4bafced27cc"
|
||||
dependencies = [
|
||||
"cairo-rs",
|
||||
"glib",
|
||||
|
|
@ -2150,7 +2150,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "pangocairo-sys"
|
||||
version = "0.21.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#e6b43dc4d7cdb1ab62d6522c90807e6cd40973aa"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#36ef92912d7363e15ed3524d9195b4bafced27cc"
|
||||
dependencies = [
|
||||
"cairo-sys-rs",
|
||||
"glib-sys",
|
||||
|
|
@ -2245,9 +2245,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "proc-macro-crate"
|
||||
version = "3.2.0"
|
||||
version = "3.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
|
||||
checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
|
||||
dependencies = [
|
||||
"toml_edit",
|
||||
]
|
||||
|
|
@ -2331,7 +2331,7 @@ dependencies = [
|
|||
"errno",
|
||||
"libc",
|
||||
"linux-raw-sys",
|
||||
"windows-sys 0.59.0",
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2486,9 +2486,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
|||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.99"
|
||||
version = "2.0.100"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e02e925281e18ffd9d640e234264753c43edc62d64b2d4cf898f1bc5e75f3fc2"
|
||||
checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -2525,7 +2525,7 @@ dependencies = [
|
|||
"getrandom 0.3.1",
|
||||
"once_cell",
|
||||
"rustix",
|
||||
"windows-sys 0.59.0",
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2920,7 +2920,7 @@ version = "0.1.9"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
|
||||
dependencies = [
|
||||
"windows-sys 0.59.0",
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
|
|||
|
|
@ -3090,14 +3090,7 @@ impl<'a> SelectStreamsBuilder<'a> {
|
|||
skip_assert_initialized!();
|
||||
Self {
|
||||
builder: EventBuilder::new(),
|
||||
streams: streams
|
||||
.into_iter()
|
||||
.map(|s| unsafe {
|
||||
// See https://github.com/gtk-rs/gtk-rs-core/pull/1688
|
||||
let ptr = glib::ffi::g_strndup(s.as_ptr() as *const _, s.len());
|
||||
mem::transmute::<*const _, glib::GStringPtr>(ptr)
|
||||
})
|
||||
.collect(),
|
||||
streams: streams.into_iter().map(glib::GStringPtr::from).collect(),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ use glib::{
|
|||
translate::*,
|
||||
value::{SendValue, ValueType},
|
||||
};
|
||||
use smallvec::SmallVec;
|
||||
|
||||
use crate::{
|
||||
ffi,
|
||||
|
|
@ -824,12 +825,12 @@ declare_concrete_message!(Tag, T);
|
|||
impl Tag {
|
||||
#[doc(alias = "gst_message_new_tag")]
|
||||
#[allow(clippy::new_ret_no_self)]
|
||||
pub fn new(tags: &TagList) -> Message {
|
||||
pub fn new(tags: TagList) -> Message {
|
||||
skip_assert_initialized!();
|
||||
Self::builder(tags).build()
|
||||
}
|
||||
|
||||
pub fn builder(tags: &TagList) -> TagBuilder {
|
||||
pub fn builder<'a>(tags: TagList) -> TagBuilder<'a> {
|
||||
assert_initialized_main_thread!();
|
||||
TagBuilder::new(tags)
|
||||
}
|
||||
|
|
@ -2474,29 +2475,26 @@ impl StreamsSelected {
|
|||
#[doc(alias = "get_streams")]
|
||||
#[doc(alias = "gst_message_streams_selected_get_size")]
|
||||
#[doc(alias = "gst_message_streams_selected_get_stream")]
|
||||
pub fn streams(&self) -> Vec<crate::Stream> {
|
||||
unsafe {
|
||||
let n = ffi::gst_message_streams_selected_get_size(self.as_mut_ptr());
|
||||
|
||||
(0..n)
|
||||
.map(|i| {
|
||||
from_glib_full(ffi::gst_message_streams_selected_get_stream(
|
||||
self.as_mut_ptr(),
|
||||
i,
|
||||
))
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
pub fn streams(&self) -> StreamsSelectedIter<'_> {
|
||||
StreamsSelectedIter::new(self)
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Debug for StreamsSelected {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
struct StreamsDebug<'a>(&'a StreamsSelected);
|
||||
|
||||
impl std::fmt::Debug for StreamsDebug<'_> {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
f.debug_list().entries(self.0.streams()).finish()
|
||||
}
|
||||
}
|
||||
|
||||
f.debug_struct("StreamsSelected")
|
||||
.field("structure", &self.message().structure())
|
||||
.field("source", &self.src().map(|obj| (obj, obj.name())))
|
||||
.field("stream-collection", &self.stream_collection())
|
||||
.field("streams", &self.streams())
|
||||
.field("streams", &StreamsDebug(self))
|
||||
.finish()
|
||||
}
|
||||
}
|
||||
|
|
@ -2507,6 +2505,21 @@ impl std::fmt::Debug for StreamsSelected<Message> {
|
|||
}
|
||||
}
|
||||
|
||||
crate::utils::define_fixed_size_iter!(
|
||||
StreamsSelectedIter,
|
||||
&'a StreamsSelected,
|
||||
crate::Stream,
|
||||
|collection: &StreamsSelected| unsafe {
|
||||
ffi::gst_message_streams_selected_get_size(collection.as_mut_ptr()) as usize
|
||||
},
|
||||
|collection: &StreamsSelected, idx: usize| unsafe {
|
||||
from_glib_full(ffi::gst_message_streams_selected_get_stream(
|
||||
collection.as_mut_ptr(),
|
||||
idx as u32,
|
||||
))
|
||||
}
|
||||
);
|
||||
|
||||
declare_concrete_message!(Redirect, T);
|
||||
impl Redirect {
|
||||
#[doc(alias = "gst_message_new_redirect")]
|
||||
|
|
@ -2524,47 +2537,25 @@ impl Redirect {
|
|||
#[doc(alias = "get_entries")]
|
||||
#[doc(alias = "gst_message_get_num_redirect_entries")]
|
||||
#[doc(alias = "gst_message_parse_redirect_entry")]
|
||||
pub fn entries(&self) -> Vec<(&str, Option<TagList>, Option<&StructureRef>)> {
|
||||
unsafe {
|
||||
let n = ffi::gst_message_get_num_redirect_entries(self.as_mut_ptr());
|
||||
|
||||
(0..n)
|
||||
.map(|i| {
|
||||
let mut location = ptr::null();
|
||||
let mut tags = ptr::null_mut();
|
||||
let mut structure = ptr::null();
|
||||
|
||||
ffi::gst_message_parse_redirect_entry(
|
||||
self.as_mut_ptr(),
|
||||
i,
|
||||
&mut location,
|
||||
&mut tags,
|
||||
&mut structure,
|
||||
);
|
||||
|
||||
let structure = if structure.is_null() {
|
||||
None
|
||||
} else {
|
||||
Some(StructureRef::from_glib_borrow(structure))
|
||||
};
|
||||
|
||||
(
|
||||
CStr::from_ptr(location).to_str().unwrap(),
|
||||
from_glib_none(tags),
|
||||
structure,
|
||||
)
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
pub fn entries(&self) -> RedirectEntriesIter<'_> {
|
||||
RedirectEntriesIter::new(self)
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Debug for Redirect {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
struct EntriesDebug<'a>(&'a Redirect);
|
||||
|
||||
impl std::fmt::Debug for EntriesDebug<'_> {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
f.debug_list().entries(self.0.entries()).finish()
|
||||
}
|
||||
}
|
||||
|
||||
f.debug_struct("Redirect")
|
||||
.field("structure", &self.message().structure())
|
||||
.field("source", &self.src().map(|obj| (obj, obj.name())))
|
||||
.field("entries", &self.entries())
|
||||
.field("entries", &EntriesDebug(self))
|
||||
.finish()
|
||||
}
|
||||
}
|
||||
|
|
@ -2575,6 +2566,40 @@ impl std::fmt::Debug for Redirect<Message> {
|
|||
}
|
||||
}
|
||||
|
||||
crate::utils::define_fixed_size_iter!(
|
||||
RedirectEntriesIter,
|
||||
&'a Redirect,
|
||||
(&'a str, Option<TagList>, Option<&'a StructureRef>),
|
||||
|collection: &Redirect| unsafe {
|
||||
ffi::gst_message_get_num_redirect_entries(collection.as_mut_ptr()) as usize
|
||||
},
|
||||
|collection: &Redirect, idx: usize| unsafe {
|
||||
let mut location = ptr::null();
|
||||
let mut tags = ptr::null_mut();
|
||||
let mut structure = ptr::null();
|
||||
|
||||
ffi::gst_message_parse_redirect_entry(
|
||||
collection.as_mut_ptr(),
|
||||
idx,
|
||||
&mut location,
|
||||
&mut tags,
|
||||
&mut structure,
|
||||
);
|
||||
|
||||
let structure = if structure.is_null() {
|
||||
None
|
||||
} else {
|
||||
Some(StructureRef::from_glib_borrow(structure))
|
||||
};
|
||||
|
||||
(
|
||||
CStr::from_ptr(location).to_str().unwrap(),
|
||||
from_glib_none(tags),
|
||||
structure,
|
||||
)
|
||||
}
|
||||
);
|
||||
|
||||
#[cfg(feature = "v1_16")]
|
||||
#[cfg_attr(docsrs, doc(cfg(feature = "v1_16")))]
|
||||
declare_concrete_message!(DeviceChanged, T);
|
||||
|
|
@ -3153,21 +3178,21 @@ impl<'a> InfoBuilder<'a> {
|
|||
#[must_use = "The builder must be built to be used"]
|
||||
pub struct TagBuilder<'a> {
|
||||
builder: MessageBuilder<'a>,
|
||||
tags: &'a TagList,
|
||||
tags: Option<TagList>,
|
||||
}
|
||||
|
||||
impl<'a> TagBuilder<'a> {
|
||||
fn new(tags: &'a TagList) -> Self {
|
||||
fn new(tags: TagList) -> Self {
|
||||
skip_assert_initialized!();
|
||||
Self {
|
||||
builder: MessageBuilder::new(),
|
||||
tags,
|
||||
tags: Some(tags),
|
||||
}
|
||||
}
|
||||
|
||||
message_builder_generic_impl!(|s: &Self, src| ffi::gst_message_new_tag(
|
||||
message_builder_generic_impl!(|s: &mut Self, src| ffi::gst_message_new_tag(
|
||||
src,
|
||||
s.tags.to_glib_full()
|
||||
s.tags.take().into_glib_ptr()
|
||||
));
|
||||
}
|
||||
|
||||
|
|
@ -4143,7 +4168,7 @@ impl<'a> StreamCollectionBuilder<'a> {
|
|||
pub struct StreamsSelectedBuilder<'a> {
|
||||
builder: MessageBuilder<'a>,
|
||||
collection: &'a crate::StreamCollection,
|
||||
streams: Option<Vec<crate::Stream>>,
|
||||
streams: SmallVec<[crate::Stream; 8]>,
|
||||
}
|
||||
|
||||
impl<'a> StreamsSelectedBuilder<'a> {
|
||||
|
|
@ -4152,7 +4177,7 @@ impl<'a> StreamsSelectedBuilder<'a> {
|
|||
Self {
|
||||
builder: MessageBuilder::new(),
|
||||
collection,
|
||||
streams: None,
|
||||
streams: SmallVec::default(),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -4161,12 +4186,10 @@ impl<'a> StreamsSelectedBuilder<'a> {
|
|||
streams: impl IntoIterator<Item = impl std::borrow::Borrow<crate::Stream>>,
|
||||
) -> Self {
|
||||
Self {
|
||||
streams: Some(
|
||||
streams
|
||||
.into_iter()
|
||||
.map(|s| s.borrow().clone())
|
||||
.collect::<Vec<_>>(),
|
||||
),
|
||||
streams: streams
|
||||
.into_iter()
|
||||
.map(|s| s.borrow().clone())
|
||||
.collect::<SmallVec<_>>(),
|
||||
..self
|
||||
}
|
||||
}
|
||||
|
|
@ -4208,10 +4231,8 @@ impl<'a> StreamsSelectedBuilder<'a> {
|
|||
|
||||
message_builder_generic_impl!(|s: &mut Self, src| {
|
||||
let msg = ffi::gst_message_new_streams_selected(src, s.collection.to_glib_none().0);
|
||||
if let Some(ref streams) = s.streams {
|
||||
for stream in streams {
|
||||
ffi::gst_message_streams_selected_add(msg, stream.to_glib_none().0);
|
||||
}
|
||||
for stream in &s.streams {
|
||||
ffi::gst_message_streams_selected_add(msg, stream.to_glib_none().0);
|
||||
}
|
||||
msg
|
||||
});
|
||||
|
|
@ -4221,10 +4242,10 @@ impl<'a> StreamsSelectedBuilder<'a> {
|
|||
pub struct RedirectBuilder<'a> {
|
||||
builder: MessageBuilder<'a>,
|
||||
location: &'a str,
|
||||
tag_list: Option<&'a TagList>,
|
||||
tag_list: Option<TagList>,
|
||||
entry_struct: Option<Structure>,
|
||||
#[allow(clippy::type_complexity)]
|
||||
entries: Option<&'a [(&'a str, Option<&'a TagList>, Option<&'a Structure>)]>,
|
||||
entries: SmallVec<[(&'a str, Option<TagList>, Option<Structure>); 4]>,
|
||||
}
|
||||
|
||||
impl<'a> RedirectBuilder<'a> {
|
||||
|
|
@ -4235,18 +4256,18 @@ impl<'a> RedirectBuilder<'a> {
|
|||
location,
|
||||
tag_list: None,
|
||||
entry_struct: None,
|
||||
entries: None,
|
||||
entries: SmallVec::default(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn tag_list(self, tag_list: &'a TagList) -> Self {
|
||||
pub fn tag_list(self, tag_list: TagList) -> Self {
|
||||
Self {
|
||||
tag_list: Some(tag_list),
|
||||
..self
|
||||
}
|
||||
}
|
||||
|
||||
pub fn tag_list_if(self, tag_list: &'a TagList, predicate: bool) -> Self {
|
||||
pub fn tag_list_if(self, tag_list: TagList, predicate: bool) -> Self {
|
||||
if predicate {
|
||||
self.tag_list(tag_list)
|
||||
} else {
|
||||
|
|
@ -4254,7 +4275,7 @@ impl<'a> RedirectBuilder<'a> {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn tag_list_if_some(self, tag_list: Option<&'a TagList>) -> Self {
|
||||
pub fn tag_list_if_some(self, tag_list: Option<TagList>) -> Self {
|
||||
if let Some(tag_list) = tag_list {
|
||||
self.tag_list(tag_list)
|
||||
} else {
|
||||
|
|
@ -4287,11 +4308,11 @@ impl<'a> RedirectBuilder<'a> {
|
|||
|
||||
pub fn entries(
|
||||
self,
|
||||
entries: &'a [(&'a str, Option<&'a TagList>, Option<&'a Structure>)],
|
||||
entries: impl IntoIterator<Item = (&'a str, Option<TagList>, Option<Structure>)>,
|
||||
) -> Self {
|
||||
skip_assert_initialized!();
|
||||
Self {
|
||||
entries: Some(entries),
|
||||
entries: entries.into_iter().collect(),
|
||||
..self
|
||||
}
|
||||
}
|
||||
|
|
@ -4299,7 +4320,7 @@ impl<'a> RedirectBuilder<'a> {
|
|||
#[allow(clippy::type_complexity)]
|
||||
pub fn entries_if(
|
||||
self,
|
||||
entries: &'a [(&'a str, Option<&'a TagList>, Option<&'a Structure>)],
|
||||
entries: impl IntoIterator<Item = (&'a str, Option<TagList>, Option<Structure>)>,
|
||||
predicate: bool,
|
||||
) -> Self {
|
||||
if predicate {
|
||||
|
|
@ -4312,7 +4333,7 @@ impl<'a> RedirectBuilder<'a> {
|
|||
#[allow(clippy::type_complexity)]
|
||||
pub fn entries_if_some(
|
||||
self,
|
||||
entries: Option<&'a [(&'a str, Option<&'a TagList>, Option<&'a Structure>)]>,
|
||||
entries: Option<impl IntoIterator<Item = (&'a str, Option<TagList>, Option<Structure>)>>,
|
||||
) -> Self {
|
||||
if let Some(entries) = entries {
|
||||
self.entries(entries)
|
||||
|
|
@ -4323,33 +4344,21 @@ impl<'a> RedirectBuilder<'a> {
|
|||
|
||||
message_builder_generic_impl!(|s: &mut Self, src| {
|
||||
let entry_struct = s.entry_struct.take();
|
||||
let entry_struct_ptr = if let Some(entry_struct) = entry_struct {
|
||||
entry_struct.into_glib_ptr()
|
||||
} else {
|
||||
ptr::null_mut()
|
||||
};
|
||||
let tag_list = s.tag_list.take();
|
||||
|
||||
let msg = ffi::gst_message_new_redirect(
|
||||
src,
|
||||
s.location.to_glib_none().0,
|
||||
s.tag_list.to_glib_full(),
|
||||
entry_struct_ptr,
|
||||
tag_list.into_glib_ptr(),
|
||||
entry_struct.into_glib_ptr(),
|
||||
);
|
||||
if let Some(entries) = s.entries {
|
||||
for &(location, tag_list, entry_struct) in entries {
|
||||
let entry_struct = entry_struct.cloned();
|
||||
let entry_struct_ptr = if let Some(entry_struct) = entry_struct {
|
||||
entry_struct.into_glib_ptr()
|
||||
} else {
|
||||
ptr::null_mut()
|
||||
};
|
||||
ffi::gst_message_add_redirect_entry(
|
||||
msg,
|
||||
location.to_glib_none().0,
|
||||
tag_list.to_glib_full(),
|
||||
entry_struct_ptr,
|
||||
);
|
||||
}
|
||||
for (location, tag_list, entry_struct) in mem::take(&mut s.entries) {
|
||||
ffi::gst_message_add_redirect_entry(
|
||||
msg,
|
||||
location.to_glib_none().0,
|
||||
tag_list.into_glib_ptr(),
|
||||
entry_struct.into_glib_ptr(),
|
||||
);
|
||||
}
|
||||
msg
|
||||
});
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ use std::{
|
|||
};
|
||||
|
||||
use glib::{object::IsA, translate::*};
|
||||
use smallvec::SmallVec;
|
||||
|
||||
use crate::{
|
||||
ffi,
|
||||
|
|
@ -791,28 +792,18 @@ impl Formats {
|
|||
#[doc(alias = "get_result")]
|
||||
#[doc(alias = "gst_query_parse_n_formats")]
|
||||
#[doc(alias = "gst_query_parse_nth_format")]
|
||||
pub fn result(&self) -> Vec<crate::Format> {
|
||||
unsafe {
|
||||
let mut n = mem::MaybeUninit::uninit();
|
||||
ffi::gst_query_parse_n_formats(self.as_mut_ptr(), n.as_mut_ptr());
|
||||
let n = n.assume_init();
|
||||
let mut res = Vec::with_capacity(n as usize);
|
||||
|
||||
for i in 0..n {
|
||||
let mut fmt = mem::MaybeUninit::uninit();
|
||||
ffi::gst_query_parse_nth_format(self.as_mut_ptr(), i, fmt.as_mut_ptr());
|
||||
res.push(from_glib(fmt.assume_init()));
|
||||
}
|
||||
|
||||
res
|
||||
}
|
||||
pub fn result(&self) -> FormatsIter<'_> {
|
||||
FormatsIter::new(self)
|
||||
}
|
||||
|
||||
#[doc(alias = "gst_query_set_formats")]
|
||||
#[doc(alias = "gst_query_set_formatsv")]
|
||||
pub fn set(&mut self, formats: &[crate::Format]) {
|
||||
pub fn set(&mut self, formats: impl IntoIterator<Item = crate::Format>) {
|
||||
unsafe {
|
||||
let v: Vec<_> = formats.iter().map(|f| f.into_glib()).collect();
|
||||
let v = formats
|
||||
.into_iter()
|
||||
.map(|f| f.into_glib())
|
||||
.collect::<SmallVec<[_; 8]>>();
|
||||
ffi::gst_query_set_formatsv(self.as_mut_ptr(), v.len() as i32, v.as_ptr() as *mut _);
|
||||
}
|
||||
}
|
||||
|
|
@ -820,9 +811,17 @@ impl Formats {
|
|||
|
||||
impl std::fmt::Debug for Formats {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
struct FormatsDebug<'a>(&'a Formats);
|
||||
|
||||
impl std::fmt::Debug for FormatsDebug<'_> {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
f.debug_list().entries(self.0.result()).finish()
|
||||
}
|
||||
}
|
||||
|
||||
f.debug_struct("Formats")
|
||||
.field("structure", &self.query().structure())
|
||||
.field("result", &self.result())
|
||||
.field("result", &FormatsDebug(self))
|
||||
.finish()
|
||||
}
|
||||
}
|
||||
|
|
@ -833,6 +832,22 @@ impl std::fmt::Debug for Formats<Query> {
|
|||
}
|
||||
}
|
||||
|
||||
crate::utils::define_fixed_size_iter!(
|
||||
FormatsIter,
|
||||
&'a Formats,
|
||||
crate::Format,
|
||||
|collection: &Formats| unsafe {
|
||||
let mut n = mem::MaybeUninit::uninit();
|
||||
ffi::gst_query_parse_n_formats(collection.as_mut_ptr(), n.as_mut_ptr());
|
||||
n.assume_init() as usize
|
||||
},
|
||||
|collection: &Formats, idx: usize| unsafe {
|
||||
let mut fmt = mem::MaybeUninit::uninit();
|
||||
ffi::gst_query_parse_nth_format(collection.as_mut_ptr(), idx as u32, fmt.as_mut_ptr());
|
||||
from_glib(fmt.assume_init())
|
||||
}
|
||||
);
|
||||
|
||||
declare_concrete_query!(Buffering, T);
|
||||
impl Buffering<Query> {
|
||||
#[doc(alias = "gst_query_new_buffering")]
|
||||
|
|
@ -935,39 +950,8 @@ impl Buffering {
|
|||
#[doc(alias = "get_ranges")]
|
||||
#[doc(alias = "gst_query_get_n_buffering_ranges")]
|
||||
#[doc(alias = "gst_query_parse_nth_buffering_range")]
|
||||
pub fn ranges(&self) -> Vec<(GenericFormattedValue, GenericFormattedValue)> {
|
||||
unsafe {
|
||||
let mut fmt = mem::MaybeUninit::uninit();
|
||||
ffi::gst_query_parse_buffering_range(
|
||||
self.as_mut_ptr(),
|
||||
fmt.as_mut_ptr(),
|
||||
ptr::null_mut(),
|
||||
ptr::null_mut(),
|
||||
ptr::null_mut(),
|
||||
);
|
||||
let fmt = from_glib(fmt.assume_init());
|
||||
|
||||
let n = ffi::gst_query_get_n_buffering_ranges(self.as_mut_ptr());
|
||||
let mut res = Vec::with_capacity(n as usize);
|
||||
for i in 0..n {
|
||||
let mut start = mem::MaybeUninit::uninit();
|
||||
let mut stop = mem::MaybeUninit::uninit();
|
||||
let s: bool = from_glib(ffi::gst_query_parse_nth_buffering_range(
|
||||
self.as_mut_ptr(),
|
||||
i,
|
||||
start.as_mut_ptr(),
|
||||
stop.as_mut_ptr(),
|
||||
));
|
||||
if s {
|
||||
res.push((
|
||||
GenericFormattedValue::new(fmt, start.assume_init()),
|
||||
GenericFormattedValue::new(fmt, stop.assume_init()),
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
res
|
||||
}
|
||||
pub fn ranges(&self) -> RangesIter<'_> {
|
||||
RangesIter::new(self)
|
||||
}
|
||||
|
||||
#[doc(alias = "gst_query_set_buffering_percent")]
|
||||
|
|
@ -1021,12 +1005,12 @@ impl Buffering {
|
|||
#[doc(alias = "gst_query_add_buffering_range")]
|
||||
pub fn add_buffering_ranges<V: FormattedValue, U: CompatibleFormattedValue<V> + Copy>(
|
||||
&mut self,
|
||||
ranges: &[(V, U)],
|
||||
ranges: impl IntoIterator<Item = (V, U)>,
|
||||
) {
|
||||
unsafe {
|
||||
let fmt = self.format();
|
||||
|
||||
for &(start, stop) in ranges {
|
||||
for (start, stop) in ranges.into_iter() {
|
||||
assert_eq!(start.format(), fmt);
|
||||
let stop = stop.try_into_checked(start).unwrap();
|
||||
ffi::gst_query_add_buffering_range(
|
||||
|
|
@ -1041,11 +1025,19 @@ impl Buffering {
|
|||
|
||||
impl std::fmt::Debug for Buffering {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
struct RangesDebug<'a>(&'a Buffering);
|
||||
|
||||
impl std::fmt::Debug for RangesDebug<'_> {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
f.debug_list().entries(self.0.ranges()).finish()
|
||||
}
|
||||
}
|
||||
|
||||
f.debug_struct("Buffering")
|
||||
.field("structure", &self.query().structure())
|
||||
.field("format", &self.format())
|
||||
.field("percent", &self.percent())
|
||||
.field("range", &self.range())
|
||||
.field("range", &RangesDebug(self))
|
||||
.finish()
|
||||
}
|
||||
}
|
||||
|
|
@ -1056,6 +1048,40 @@ impl std::fmt::Debug for Buffering<Query> {
|
|||
}
|
||||
}
|
||||
|
||||
crate::utils::define_fixed_size_iter!(
|
||||
RangesIter,
|
||||
&'a Buffering,
|
||||
(GenericFormattedValue, GenericFormattedValue),
|
||||
|collection: &Buffering| unsafe {
|
||||
ffi::gst_query_get_n_buffering_ranges(collection.as_mut_ptr()) as usize
|
||||
},
|
||||
|collection: &Buffering, idx: usize| unsafe {
|
||||
let mut fmt = mem::MaybeUninit::uninit();
|
||||
ffi::gst_query_parse_buffering_range(
|
||||
collection.as_mut_ptr(),
|
||||
fmt.as_mut_ptr(),
|
||||
ptr::null_mut(),
|
||||
ptr::null_mut(),
|
||||
ptr::null_mut(),
|
||||
);
|
||||
let fmt = from_glib(fmt.assume_init());
|
||||
|
||||
let mut start = mem::MaybeUninit::uninit();
|
||||
let mut stop = mem::MaybeUninit::uninit();
|
||||
ffi::gst_query_parse_nth_buffering_range(
|
||||
collection.as_mut_ptr(),
|
||||
idx as u32,
|
||||
start.as_mut_ptr(),
|
||||
stop.as_mut_ptr(),
|
||||
);
|
||||
|
||||
(
|
||||
GenericFormattedValue::new(fmt, start.assume_init()),
|
||||
GenericFormattedValue::new(fmt, stop.assume_init()),
|
||||
)
|
||||
}
|
||||
);
|
||||
|
||||
declare_concrete_query!(Custom, T);
|
||||
impl Custom<Query> {
|
||||
#[doc(alias = "gst_query_new_custom")]
|
||||
|
|
@ -1222,83 +1248,22 @@ impl Allocation {
|
|||
#[doc(alias = "gst_allocation_params")]
|
||||
#[doc(alias = "gst_query_get_n_allocation_params")]
|
||||
#[doc(alias = "gst_query_parse_nth_allocation_param")]
|
||||
pub fn allocation_params(&self) -> Vec<(Option<crate::Allocator>, crate::AllocationParams)> {
|
||||
unsafe {
|
||||
let n = ffi::gst_query_get_n_allocation_params(self.as_mut_ptr());
|
||||
let mut params = Vec::with_capacity(n as usize);
|
||||
for i in 0..n {
|
||||
let mut allocator = ptr::null_mut();
|
||||
let mut p = mem::MaybeUninit::uninit();
|
||||
ffi::gst_query_parse_nth_allocation_param(
|
||||
self.as_mut_ptr(),
|
||||
i,
|
||||
&mut allocator,
|
||||
p.as_mut_ptr(),
|
||||
);
|
||||
params.push((from_glib_full(allocator), from_glib(p.assume_init())));
|
||||
}
|
||||
|
||||
params
|
||||
}
|
||||
pub fn allocation_params(&self) -> AllocationParamsIter<'_> {
|
||||
AllocationParamsIter::new(self)
|
||||
}
|
||||
|
||||
#[doc(alias = "get_allocation_pools")]
|
||||
#[doc(alias = "gst_query_get_n_allocation_pools")]
|
||||
#[doc(alias = "gst_query_parse_nth_allocation_pool")]
|
||||
pub fn allocation_pools(&self) -> Vec<(Option<crate::BufferPool>, u32, u32, u32)> {
|
||||
unsafe {
|
||||
let n = ffi::gst_query_get_n_allocation_pools(self.as_mut_ptr());
|
||||
let mut pools = Vec::with_capacity(n as usize);
|
||||
for i in 0..n {
|
||||
let mut pool = ptr::null_mut();
|
||||
let mut size = mem::MaybeUninit::uninit();
|
||||
let mut min_buffers = mem::MaybeUninit::uninit();
|
||||
let mut max_buffers = mem::MaybeUninit::uninit();
|
||||
|
||||
ffi::gst_query_parse_nth_allocation_pool(
|
||||
self.0.as_mut_ptr(),
|
||||
i,
|
||||
&mut pool,
|
||||
size.as_mut_ptr(),
|
||||
min_buffers.as_mut_ptr(),
|
||||
max_buffers.as_mut_ptr(),
|
||||
);
|
||||
pools.push((
|
||||
from_glib_full(pool),
|
||||
size.assume_init(),
|
||||
min_buffers.assume_init(),
|
||||
max_buffers.assume_init(),
|
||||
));
|
||||
}
|
||||
|
||||
pools
|
||||
}
|
||||
pub fn allocation_pools(&self) -> AllocationPoolsIter<'_> {
|
||||
AllocationPoolsIter::new(self)
|
||||
}
|
||||
|
||||
#[doc(alias = "get_allocation_metas")]
|
||||
#[doc(alias = "gst_query_get_n_allocation_metas")]
|
||||
#[doc(alias = "gst_query_parse_nth_allocation_meta")]
|
||||
pub fn allocation_metas(&self) -> Vec<(glib::Type, Option<&crate::StructureRef>)> {
|
||||
unsafe {
|
||||
let n = ffi::gst_query_get_n_allocation_metas(self.0.as_mut_ptr());
|
||||
let mut metas = Vec::with_capacity(n as usize);
|
||||
for i in 0..n {
|
||||
let mut structure = ptr::null();
|
||||
|
||||
let api =
|
||||
ffi::gst_query_parse_nth_allocation_meta(self.as_mut_ptr(), i, &mut structure);
|
||||
metas.push((
|
||||
from_glib(api),
|
||||
if structure.is_null() {
|
||||
None
|
||||
} else {
|
||||
Some(crate::StructureRef::from_glib_borrow(structure))
|
||||
},
|
||||
));
|
||||
}
|
||||
|
||||
metas
|
||||
}
|
||||
pub fn allocation_metas(&self) -> AllocationMetasIter<'_> {
|
||||
AllocationMetasIter::new(self)
|
||||
}
|
||||
|
||||
#[doc(alias = "gst_query_find_allocation_meta")]
|
||||
|
|
@ -1443,13 +1408,38 @@ impl Allocation {
|
|||
impl std::fmt::Debug for Allocation {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
let (caps, need_pool) = self.get();
|
||||
|
||||
struct AllocationParamsDebug<'a>(&'a Allocation);
|
||||
|
||||
impl std::fmt::Debug for AllocationParamsDebug<'_> {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
f.debug_list().entries(self.0.allocation_params()).finish()
|
||||
}
|
||||
}
|
||||
|
||||
struct AllocationPoolsDebug<'a>(&'a Allocation);
|
||||
|
||||
impl std::fmt::Debug for AllocationPoolsDebug<'_> {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
f.debug_list().entries(self.0.allocation_pools()).finish()
|
||||
}
|
||||
}
|
||||
|
||||
struct AllocationMetasDebug<'a>(&'a Allocation);
|
||||
|
||||
impl std::fmt::Debug for AllocationMetasDebug<'_> {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
f.debug_list().entries(self.0.allocation_metas()).finish()
|
||||
}
|
||||
}
|
||||
|
||||
f.debug_struct("Allocation")
|
||||
.field("structure", &self.query().structure())
|
||||
.field("caps", &caps)
|
||||
.field("need-pool", &need_pool)
|
||||
.field("allocation-params", &self.allocation_params())
|
||||
.field("allocation-pools", &self.allocation_pools())
|
||||
.field("allocation-metas", &self.allocation_metas())
|
||||
.field("allocation-params", &AllocationParamsDebug(self))
|
||||
.field("allocation-pools", &AllocationPoolsDebug(self))
|
||||
.field("allocation-metas", &AllocationMetasDebug(self))
|
||||
.finish()
|
||||
}
|
||||
}
|
||||
|
|
@ -1460,6 +1450,84 @@ impl std::fmt::Debug for Allocation<Query> {
|
|||
}
|
||||
}
|
||||
|
||||
crate::utils::define_fixed_size_iter!(
|
||||
AllocationParamsIter,
|
||||
&'a Allocation,
|
||||
(Option<crate::Allocator>, crate::AllocationParams),
|
||||
|collection: &Allocation| unsafe {
|
||||
ffi::gst_query_get_n_allocation_params(collection.as_mut_ptr()) as usize
|
||||
},
|
||||
|collection: &Allocation, idx: usize| unsafe {
|
||||
let mut allocator = ptr::null_mut();
|
||||
let mut p = mem::MaybeUninit::uninit();
|
||||
ffi::gst_query_parse_nth_allocation_param(
|
||||
collection.as_mut_ptr(),
|
||||
idx as u32,
|
||||
&mut allocator,
|
||||
p.as_mut_ptr(),
|
||||
);
|
||||
(from_glib_full(allocator), from_glib(p.assume_init()))
|
||||
}
|
||||
);
|
||||
|
||||
crate::utils::define_fixed_size_iter!(
|
||||
AllocationPoolsIter,
|
||||
&'a Allocation,
|
||||
(Option<crate::BufferPool>, u32, u32, u32),
|
||||
|collection: &Allocation| unsafe {
|
||||
ffi::gst_query_get_n_allocation_pools(collection.as_mut_ptr()) as usize
|
||||
},
|
||||
|collection: &Allocation, idx: usize| unsafe {
|
||||
let mut pool = ptr::null_mut();
|
||||
let mut size = mem::MaybeUninit::uninit();
|
||||
let mut min_buffers = mem::MaybeUninit::uninit();
|
||||
let mut max_buffers = mem::MaybeUninit::uninit();
|
||||
|
||||
ffi::gst_query_parse_nth_allocation_pool(
|
||||
collection.as_mut_ptr(),
|
||||
idx as u32,
|
||||
&mut pool,
|
||||
size.as_mut_ptr(),
|
||||
min_buffers.as_mut_ptr(),
|
||||
max_buffers.as_mut_ptr(),
|
||||
);
|
||||
|
||||
(
|
||||
from_glib_full(pool),
|
||||
size.assume_init(),
|
||||
min_buffers.assume_init(),
|
||||
max_buffers.assume_init(),
|
||||
)
|
||||
}
|
||||
);
|
||||
|
||||
crate::utils::define_fixed_size_iter!(
|
||||
AllocationMetasIter,
|
||||
&'a Allocation,
|
||||
(glib::Type, Option<&'a crate::StructureRef>),
|
||||
|collection: &Allocation| unsafe {
|
||||
ffi::gst_query_get_n_allocation_metas(collection.as_mut_ptr()) as usize
|
||||
},
|
||||
|collection: &Allocation, idx: usize| unsafe {
|
||||
let mut structure = ptr::null();
|
||||
|
||||
let api = ffi::gst_query_parse_nth_allocation_meta(
|
||||
collection.as_mut_ptr(),
|
||||
idx as u32,
|
||||
&mut structure,
|
||||
);
|
||||
|
||||
(
|
||||
from_glib(api),
|
||||
if structure.is_null() {
|
||||
None
|
||||
} else {
|
||||
Some(crate::StructureRef::from_glib_borrow(structure))
|
||||
},
|
||||
)
|
||||
}
|
||||
);
|
||||
|
||||
declare_concrete_query!(Scheduling, T);
|
||||
impl Scheduling<Query> {
|
||||
#[doc(alias = "gst_query_new_scheduling")]
|
||||
|
|
@ -1504,19 +1572,8 @@ impl Scheduling {
|
|||
|
||||
#[doc(alias = "get_scheduling_modes")]
|
||||
#[doc(alias = "gst_query_get_n_scheduling_modes")]
|
||||
pub fn scheduling_modes(&self) -> Vec<crate::PadMode> {
|
||||
unsafe {
|
||||
let n = ffi::gst_query_get_n_scheduling_modes(self.as_mut_ptr());
|
||||
let mut res = Vec::with_capacity(n as usize);
|
||||
for i in 0..n {
|
||||
res.push(from_glib(ffi::gst_query_parse_nth_scheduling_mode(
|
||||
self.as_mut_ptr(),
|
||||
i,
|
||||
)));
|
||||
}
|
||||
|
||||
res
|
||||
}
|
||||
pub fn scheduling_modes(&self) -> PadModesIter<'_> {
|
||||
PadModesIter::new(self)
|
||||
}
|
||||
|
||||
#[doc(alias = "get_result")]
|
||||
|
|
@ -1546,9 +1603,9 @@ impl Scheduling {
|
|||
}
|
||||
|
||||
#[doc(alias = "gst_query_add_scheduling_mode")]
|
||||
pub fn add_scheduling_modes(&mut self, modes: &[crate::PadMode]) {
|
||||
pub fn add_scheduling_modes(&mut self, modes: impl IntoIterator<Item = crate::PadMode>) {
|
||||
unsafe {
|
||||
for mode in modes {
|
||||
for mode in modes.into_iter() {
|
||||
ffi::gst_query_add_scheduling_mode(self.as_mut_ptr(), mode.into_glib());
|
||||
}
|
||||
}
|
||||
|
|
@ -1570,10 +1627,18 @@ impl Scheduling {
|
|||
|
||||
impl std::fmt::Debug for Scheduling {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
struct PadModesDebug<'a>(&'a Scheduling);
|
||||
|
||||
impl std::fmt::Debug for PadModesDebug<'_> {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
f.debug_list().entries(self.0.scheduling_modes()).finish()
|
||||
}
|
||||
}
|
||||
|
||||
f.debug_struct("Scheduling")
|
||||
.field("structure", &self.query().structure())
|
||||
.field("result", &self.result())
|
||||
.field("scheduling-modes", &self.scheduling_modes())
|
||||
.field("scheduling-modes", &PadModesDebug(self))
|
||||
.finish()
|
||||
}
|
||||
}
|
||||
|
|
@ -1584,6 +1649,21 @@ impl std::fmt::Debug for Scheduling<Query> {
|
|||
}
|
||||
}
|
||||
|
||||
crate::utils::define_fixed_size_iter!(
|
||||
PadModesIter,
|
||||
&'a Scheduling,
|
||||
crate::PadMode,
|
||||
|collection: &Scheduling| unsafe {
|
||||
ffi::gst_query_get_n_scheduling_modes(collection.as_mut_ptr()) as usize
|
||||
},
|
||||
|collection: &Scheduling, idx: usize| unsafe {
|
||||
from_glib(ffi::gst_query_parse_nth_scheduling_mode(
|
||||
collection.as_mut_ptr(),
|
||||
idx as u32,
|
||||
))
|
||||
}
|
||||
);
|
||||
|
||||
declare_concrete_query!(AcceptCaps, T);
|
||||
impl AcceptCaps<Query> {
|
||||
#[doc(alias = "gst_query_new_accept_caps")]
|
||||
|
|
|
|||
|
|
@ -121,10 +121,7 @@ fn tutorial_main() -> Result<(), Error> {
|
|||
let mut graph = vec![b' '; GRAPH_LENGTH];
|
||||
let mut buffering = gst::query::Buffering::new(gst::Format::Percent);
|
||||
if pipeline.query(&mut buffering) {
|
||||
let ranges = buffering.ranges();
|
||||
for range in &ranges {
|
||||
let start = range.0;
|
||||
let stop = range.1;
|
||||
for (start, stop) in buffering.ranges() {
|
||||
let start = if let GFV::Percent(start) = start {
|
||||
start.unwrap()
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Reference in a new issue