From 9b5fe3bfd6a3028f4961686f3a42ebca31da6d01 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 23 Aug 2024 00:17:33 +0200 Subject: [PATCH] GstEnginePipeline: Rename PlaybinProbe to PadProbe --- src/engine/gstenginepipeline.cpp | 6 +++--- src/engine/gstenginepipeline.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/engine/gstenginepipeline.cpp b/src/engine/gstenginepipeline.cpp index c1fb5536..36b238b4 100644 --- a/src/engine/gstenginepipeline.cpp +++ b/src/engine/gstenginepipeline.cpp @@ -141,7 +141,7 @@ GstEnginePipeline::GstEnginePipeline(QObject *parent) eventprobe_(nullptr), upstream_events_probe_cb_id_(0), buffer_probe_cb_id_(0), - playbin_probe_cb_id_(0), + pad_probe_cb_id_(0), element_added_cb_id_(-1), element_removed_cb_id_(-1), pad_added_cb_id_(-1), @@ -1131,7 +1131,7 @@ void GstEnginePipeline::PadAddedCallback(GstElement *element, GstPad *pad, gpoin gst_pad_set_offset(pad, static_cast(running_time)); // Add a probe to the pad so we can update last_playbin_segment_. - instance->playbin_probe_cb_id_ = gst_pad_add_probe(pad, static_cast(GST_PAD_PROBE_TYPE_BUFFER | GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM | GST_PAD_PROBE_TYPE_EVENT_FLUSH), PlaybinProbeCallback, instance, nullptr); + instance->pad_probe_cb_id_ = gst_pad_add_probe(pad, static_cast(GST_PAD_PROBE_TYPE_BUFFER | GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM | GST_PAD_PROBE_TYPE_EVENT_FLUSH), PadProbeCallback, instance, nullptr); instance->pipeline_connected_ = true; if (instance->pending_seek_nanosec_ != -1 && instance->pipeline_active_) { @@ -1141,7 +1141,7 @@ void GstEnginePipeline::PadAddedCallback(GstElement *element, GstPad *pad, gpoin } -GstPadProbeReturn GstEnginePipeline::PlaybinProbeCallback(GstPad *pad, GstPadProbeInfo *info, gpointer self) { +GstPadProbeReturn GstEnginePipeline::PadProbeCallback(GstPad *pad, GstPadProbeInfo *info, gpointer self) { GstEnginePipeline *instance = reinterpret_cast(self); diff --git a/src/engine/gstenginepipeline.h b/src/engine/gstenginepipeline.h index b2868ff4..376bcb7b 100644 --- a/src/engine/gstenginepipeline.h +++ b/src/engine/gstenginepipeline.h @@ -172,7 +172,7 @@ class GstEnginePipeline : public QObject { // Static callbacks. The GstEnginePipeline instance is passed in the last argument. static GstPadProbeReturn UpstreamEventsProbeCallback(GstPad *pad, GstPadProbeInfo *info, gpointer self); static GstPadProbeReturn BufferProbeCallback(GstPad *pad, GstPadProbeInfo *info, gpointer self); - static GstPadProbeReturn PlaybinProbeCallback(GstPad *pad, GstPadProbeInfo *info, gpointer self); + static GstPadProbeReturn PadProbeCallback(GstPad *pad, GstPadProbeInfo *info, gpointer self); static void ElementAddedCallback(GstBin *bin, GstBin *sub_bin, GstElement *element, gpointer self); static void ElementRemovedCallback(GstBin *bin, GstBin *sub_bin, GstElement *element, gpointer self); static void PadAddedCallback(GstElement *element, GstPad *pad, gpointer self); @@ -343,7 +343,7 @@ class GstEnginePipeline : public QObject { gulong upstream_events_probe_cb_id_; gulong buffer_probe_cb_id_; - gulong playbin_probe_cb_id_; + gulong pad_probe_cb_id_; glong element_added_cb_id_; glong element_removed_cb_id_; glong pad_added_cb_id_;