rafaelcaricio/gstreamer-rs
1
0
Fork 0
forked from mirrors/gstreamer-rs
Code Pull requests Activity

gstreamer: tracer: Pass &QueryRef instead of &Query to the functions

Browse source 
To make it impossible for implementor to keep around a reference to the
query as that would break element code that actually tries to answer the
query.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1152>
This commit is contained in:
Sebastian Dröge 2022-11-21 11:19:38 +02:00
parent 1264eb10ac
commit 5a0152b469
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gstreamer/src/subclass/tracer.rs
View file

@ -3,7 +3,7 @@
use super::prelude::*; use super::prelude::*;
use crate::{ use crate::{
ffi, Bin, Buffer, BufferList, Element, Event, FlowError, FlowSuccess, Message, MiniObject, ffi, Bin, Buffer, BufferList, Element, Event, FlowError, FlowSuccess, Message, MiniObject,
Object, Pad, PadLinkError, PadLinkSuccess, Query, StateChange, StateChangeError, Object, Pad, PadLinkError, PadLinkSuccess, QueryRef, StateChange, StateChangeError,
StateChangeSuccess, Tracer, StateChangeSuccess, Tracer,
}; };
use glib::{prelude::*, subclass::prelude::*, translate::*}; use glib::{prelude::*, subclass::prelude::*, translate::*};
@ -28,8 +28,8 @@ pub trait TracerImpl: TracerImplExt + GstObjectImpl + Send + Sync {
fn element_change_state_pre(&self, ts: u64, element: &Element, change: StateChange) {} fn element_change_state_pre(&self, ts: u64, element: &Element, change: StateChange) {}
fn element_post_message_post(&self, ts: u64, element: &Element, success: bool) {} fn element_post_message_post(&self, ts: u64, element: &Element, success: bool) {}
fn element_post_message_pre(&self, ts: u64, element: &Element, message: &Message) {} fn element_post_message_pre(&self, ts: u64, element: &Element, message: &Message) {}
fn element_query_post(&self, ts: u64, element: &Element, query: &Query, success: bool) {} fn element_query_post(&self, ts: u64, element: &Element, query: &QueryRef, success: bool) {}
fn element_query_pre(&self, ts: u64, element: &Element, query: &Query) {} fn element_query_pre(&self, ts: u64, element: &Element, query: &QueryRef) {}
// rustdoc-stripper-ignore-next // rustdoc-stripper-ignore-next
/// Hook to be called before the GstMiniObject has been fully initialized. /// Hook to be called before the GstMiniObject has been fully initialized.
fn mini_object_created(&self, ts: u64, object: std::ptr::NonNull<ffi::GstMiniObject>) {} fn mini_object_created(&self, ts: u64, object: std::ptr::NonNull<ffi::GstMiniObject>) {}
@ -73,8 +73,8 @@ pub trait TracerImpl: TracerImplExt + GstObjectImpl + Send + Sync {
fn pad_push_list_pre(&self, ts: u64, pad: &Pad, buffer_list: &BufferList) {} fn pad_push_list_pre(&self, ts: u64, pad: &Pad, buffer_list: &BufferList) {}
fn pad_push_post(&self, ts: u64, pad: &Pad, result: Result<FlowSuccess, FlowError>) {} fn pad_push_post(&self, ts: u64, pad: &Pad, result: Result<FlowSuccess, FlowError>) {}
fn pad_push_pre(&self, ts: u64, pad: &Pad, buffer: &Buffer) {} fn pad_push_pre(&self, ts: u64, pad: &Pad, buffer: &Buffer) {}
fn pad_query_post(&self, ts: u64, pad: &Pad, query: &Query, success: bool) {} fn pad_query_post(&self, ts: u64, pad: &Pad, query: &QueryRef, success: bool) {}
fn pad_query_pre(&self, ts: u64, pad: &Pad, query: &Query) {} fn pad_query_pre(&self, ts: u64, pad: &Pad, query: &QueryRef) {}
fn pad_unlink_post(&self, ts: u64, src: &Pad, sink: &Pad, success: bool) {} fn pad_unlink_post(&self, ts: u64, src: &Pad, sink: &Pad, success: bool) {}
fn pad_unlink_pre(&self, ts: u64, src: &Pad, sink: &Pad) {} fn pad_unlink_pre(&self, ts: u64, src: &Pad, sink: &Pad) {}
#[cfg(any(feature = "v1_20", feature = "dox"))] #[cfg(any(feature = "v1_20", feature = "dox"))]
@ -184,13 +184,13 @@ define_tracer_hooks! {
}; };
ElementQueryPost("element-query-post") = |this, ts, e: *mut ffi::GstElement, q: *mut ffi::GstQuery, r: glib::ffi::gboolean| { ElementQueryPost("element-query-post") = |this, ts, e: *mut ffi::GstElement, q: *mut ffi::GstQuery, r: glib::ffi::gboolean| {
let e = Element::from_glib_borrow(e); let e = Element::from_glib_borrow(e);
let q = Query::from_glib_borrow(q); let q = QueryRef::from_ptr(q);
this.element_query_post(ts, &e, &q, bool::from_glib(r)) this.element_query_post(ts, &e, q, bool::from_glib(r))
}; };
ElementQueryPre("element-query-pre") = |this, ts, e: *mut ffi::GstElement, q: *mut ffi::GstQuery| { ElementQueryPre("element-query-pre") = |this, ts, e: *mut ffi::GstElement, q: *mut ffi::GstQuery| {
let e = Element::from_glib_borrow(e); let e = Element::from_glib_borrow(e);
let q = Query::from_glib_borrow(q); let q = QueryRef::from_ptr(q);
this.element_query_pre(ts, &e, &q) this.element_query_pre(ts, &e, q)
}; };
// TODO: unclear what to do here as the `GstMiniObject` here is not fully initialized yet… // TODO: unclear what to do here as the `GstMiniObject` here is not fully initialized yet…
MiniObjectCreated("mini-object-created") = |this, ts, o: *mut ffi::GstMiniObject| { MiniObjectCreated("mini-object-created") = |this, ts, o: *mut ffi::GstMiniObject| {
@ -305,13 +305,13 @@ define_tracer_hooks! {
}; };
PadQueryPost("pad-query-post") = |this, ts, p: *mut ffi::GstPad, q: *mut ffi::GstQuery, r: glib::ffi::gboolean| { PadQueryPost("pad-query-post") = |this, ts, p: *mut ffi::GstPad, q: *mut ffi::GstQuery, r: glib::ffi::gboolean| {
let p = Pad::from_glib_borrow(p); let p = Pad::from_glib_borrow(p);
let q = Query::from_glib_borrow(q); let q = QueryRef::from_ptr(q);
this.pad_query_post(ts, &p, &q, bool::from_glib(r)) this.pad_query_post(ts, &p, q, bool::from_glib(r))
}; };
PadQueryPre("pad-query-pre") = |this, ts, p: *mut ffi::GstPad, q: *mut ffi::GstQuery| { PadQueryPre("pad-query-pre") = |this, ts, p: *mut ffi::GstPad, q: *mut ffi::GstQuery| {
let p = Pad::from_glib_borrow(p); let p = Pad::from_glib_borrow(p);
let q = Query::from_glib_borrow(q); let q = QueryRef::from_ptr(q);
this.pad_query_pre(ts, &p, &q) this.pad_query_pre(ts, &p, q)
}; };
PadUnlinkPost("pad-unlink-post") = |this, ts, src: *mut ffi::GstPad, sink: *mut ffi::GstPad, r: glib::ffi::gboolean| { PadUnlinkPost("pad-unlink-post") = |this, ts, src: *mut ffi::GstPad, sink: *mut ffi::GstPad, r: glib::ffi::gboolean| {
let src = Pad::from_glib_borrow(src); let src = Pad::from_glib_borrow(src);