File gst-1.19.patch of Package libqt5-qtwebkit
From cbcea3d0c041fcd3dc397f79eb448b49ae453ac9 Mon Sep 17 00:00:00 2001
From: Philippe Normand <pnormand@igalia.com>
Date: Fri, 23 Jul 2021 15:38:29 +0000
Subject: [PATCH] [GStreamer][1.19] Warnings due to AppSinkCallbacks struct
growth https://bugs.webkit.org/show_bug.cgi?id=228229
Patch by Philippe Normand <pnormand@igalia.com> on 2021-07-23
Reviewed by Xabier Rodriguez-Calvar.
A new callback was added, for event notifications.
* platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
(WebCore::AudioFileReader::handleNewDeinterleavePad):
* platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp:
(WebCore::AudioSourceProviderGStreamer::handleNewDeinterleavePad):
* platform/graphics/gstreamer/ImageDecoderGStreamer.cpp:
(WebCore::ImageDecoderGStreamer::InnerDecoder::connectDecoderPad):
Canonical link: https://commits.webkit.org/239911@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280243 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Basically redone from scratch for qtwebkit-5.212.0-alpha4 by fvogt@suse.de.
---
Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp | 4 ++++
Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp | 4 +---
2 files changed, 5 insertions(+), 3 deletions(-)
Index: qtwebkit-5.212.0-alpha4/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp
===================================================================
--- qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp
+++ qtwebkit-5.212.0-alpha4/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp
@@ -230,6 +230,10 @@ void AudioFileReader::handleNewDeinterle
[](GstAppSink* sink, gpointer userData) -> GstFlowReturn {
return static_cast<AudioFileReader*>(userData)->handleSample(sink);
},
+#if GST_CHECK_VERSION(1, 19, 1)
+ // new_event
+ nullptr,
+#endif
{ nullptr }
};
gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, this, 0);
Index: qtwebkit-5.212.0-alpha4/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
===================================================================
--- qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
+++ qtwebkit-5.212.0-alpha4/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
@@ -280,9 +280,7 @@ void AudioSourceProviderGStreamer::handl
GstElement* queue = gst_element_factory_make("queue", 0);
GstElement* sink = gst_element_factory_make("appsink", 0);
- GstAppSinkCallbacks callbacks;
- callbacks.eos = 0;
- callbacks.new_preroll = 0;
+ GstAppSinkCallbacks callbacks{};
callbacks.new_sample = onAppsinkNewBufferCallback;
gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, this, 0);