Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP2:Update
webkit2gtk3.26886
webkit2gtk3-gstreamer1.8.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File webkit2gtk3-gstreamer1.8.patch of Package webkit2gtk3.26886
diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/cmake/GStreamerChecks.cmake webkitgtk-2.38.2.gstreamer1.8/Source/cmake/GStreamerChecks.cmake --- webkitgtk-2.38.2.gstreamer1.12/Source/cmake/GStreamerChecks.cmake 2022-11-08 15:02:04.153338370 -0600 +++ webkitgtk-2.38.2.gstreamer1.8/Source/cmake/GStreamerChecks.cmake 2022-11-08 15:02:40.329529333 -0600 @@ -36,7 +36,7 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO) list(APPEND GSTREAMER_COMPONENTS webrtc) endif () - find_package(GStreamer 1.10.0 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS}) + find_package(GStreamer 1.8.3 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS}) if (ENABLE_WEB_AUDIO) if (NOT PC_GSTREAMER_AUDIO_FOUND OR NOT PC_GSTREAMER_FFT_FOUND) diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2022-09-14 06:58:10.488863000 -0500 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2022-11-08 15:02:40.329529333 -0600 @@ -178,7 +178,7 @@ static inline std::optional<int> channel GstFlowReturn AudioFileReader::handleSample(GstAppSink* sink) { - auto sample = adoptGRef(gst_app_sink_try_pull_sample(sink, 0)); + auto sample = adoptGRef(gst_app_sink_pull_sample(sink)); if (!sample) return gst_app_sink_is_eos(sink) ? GST_FLOW_EOS : GST_FLOW_ERROR; diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp 2022-08-31 02:59:56.166519000 -0500 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp 2022-11-08 15:02:40.329529333 -0600 @@ -217,7 +217,7 @@ void AudioSourceProviderGStreamer::provi GstFlowReturn AudioSourceProviderGStreamer::handleSample(GstAppSink* sink, bool isPreroll) { GST_TRACE("Pulling audio sample from the sink"); - auto sample = adoptGRef(isPreroll ? gst_app_sink_try_pull_preroll(sink, 0) : gst_app_sink_try_pull_sample(sink, 0)); + auto sample = adoptGRef(isPreroll ? gst_app_sink_pull_preroll(sink) : gst_app_sink_pull_sample(sink)); if (!sample) return gst_app_sink_is_eos(sink) ? GST_FLOW_EOS : GST_FLOW_ERROR; diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp 2022-11-08 15:02:04.153338370 -0600 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp 2022-11-08 15:02:40.329529333 -0600 @@ -210,7 +210,6 @@ static void webKitWebAudioSrcConstructed ASSERT(priv->sampleRate); GST_OBJECT_FLAG_SET(GST_OBJECT_CAST(src), GST_ELEMENT_FLAG_SOURCE); - gst_bin_set_suppressed_flags(GST_BIN_CAST(src), static_cast<GstElementFlags>(GST_ELEMENT_FLAG_SOURCE | GST_ELEMENT_FLAG_SINK)); gst_element_add_pad(GST_ELEMENT(src), priv->sourcePad); diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp 2022-09-14 06:58:10.496863100 -0500 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp 2022-11-08 15:02:40.329529333 -0600 @@ -40,6 +40,7 @@ AudioTrackPrivateGStreamer::AudioTrackPr { } +#if GST_CHECK_VERSION(1, 10, 0) AudioTrackPrivateGStreamer::AudioTrackPrivateGStreamer(WeakPtr<MediaPlayerPrivateGStreamer> player, unsigned index, GstStream* stream) : TrackPrivateBaseGStreamer(TrackPrivateBaseGStreamer::TrackType::Audio, this, index, stream) , m_player(player) @@ -66,7 +67,9 @@ AudioTrackPrivateGStreamer::AudioTrackPr updateConfigurationFromCaps(); updateConfigurationFromTags(); } +#endif +#if GST_CHECK_VERSION(1, 10, 0) void AudioTrackPrivateGStreamer::updateConfigurationFromTags() { ASSERT(isMainThread()); @@ -82,7 +85,9 @@ void AudioTrackPrivateGStreamer::updateC configuration.bitrate = bitrate; setConfiguration(WTFMove(configuration)); } +#endif +#if GST_CHECK_VERSION(1, 10, 0) void AudioTrackPrivateGStreamer::updateConfigurationFromCaps() { ASSERT(isMainThread()); @@ -107,11 +112,14 @@ void AudioTrackPrivateGStreamer::updateC setConfiguration(WTFMove(configuration)); } +#endif AudioTrackPrivate::Kind AudioTrackPrivateGStreamer::kind() const { +#if GST_CHECK_VERSION(1, 10, 0) if (m_stream && gst_stream_get_stream_flags(m_stream.get()) & GST_STREAM_FLAG_SELECT) return AudioTrackPrivate::Kind::Main; +#endif return AudioTrackPrivate::kind(); } @@ -120,8 +128,10 @@ void AudioTrackPrivateGStreamer::disconn { m_taskQueue.startAborting(); +#if GST_CHECK_VERSION(1, 10, 0) if (m_stream) g_signal_handlers_disconnect_matched(m_stream.get(), G_SIGNAL_MATCH_DATA, 0, 0, nullptr, nullptr, this); +#endif m_player = nullptr; TrackPrivateBaseGStreamer::disconnect(); diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.h webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.h --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.h 2022-08-31 02:59:56.270519500 -0500 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.h 2022-11-08 15:02:40.329529333 -0600 @@ -43,10 +43,12 @@ public: return adoptRef(*new AudioTrackPrivateGStreamer(player, index, WTFMove(pad), shouldHandleStreamStartEvent)); } +#if GST_CHECK_VERSION(1, 10, 0) static Ref<AudioTrackPrivateGStreamer> create(WeakPtr<MediaPlayerPrivateGStreamer> player, unsigned index, GstStream* stream) { return adoptRef(*new AudioTrackPrivateGStreamer(player, index, stream)); } +#endif Kind kind() const final; @@ -68,7 +70,9 @@ protected: private: AudioTrackPrivateGStreamer(WeakPtr<MediaPlayerPrivateGStreamer>, unsigned index, GRefPtr<GstPad>&&, bool shouldHandleStreamStartEvent); +#if GST_CHECK_VERSION(1, 10, 0) AudioTrackPrivateGStreamer(WeakPtr<MediaPlayerPrivateGStreamer>, unsigned index, GstStream*); +#endif WeakPtr<MediaPlayerPrivateGStreamer> m_player; }; diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp 2022-09-14 06:58:10.500863000 -0500 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp 2022-11-08 15:02:40.329529333 -0600 @@ -404,6 +404,7 @@ template <> void derefGPtr<GstQuery>(Gst gst_query_unref(ptr); } +#if GST_CHECK_VERSION(1, 10, 0) template <> GRefPtr<GstStream> adoptGRef(GstStream* ptr) { return GRefPtr<GstStream>(ptr, GRefPtrAdopt); @@ -441,6 +442,7 @@ template <> void derefGPtr<GstStreamColl if (ptr) gst_object_unref(ptr); } +#endif template <> GRefPtr<GstClock> adoptGRef(GstClock* ptr) diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h 2022-09-14 06:58:10.500863000 -0500 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h 2022-11-08 15:02:40.329529333 -0600 @@ -132,6 +132,7 @@ GRefPtr<WebKitWebSrc> ensureGRef(WebKitW template<> WebKitWebSrc* refGPtr<WebKitWebSrc>(WebKitWebSrc* ptr); template<> void derefGPtr<WebKitWebSrc>(WebKitWebSrc* ptr); +#if GST_CHECK_VERSION(1, 10, 0) template<> GRefPtr<GstStream> adoptGRef(GstStream*); template<> GstStream* refGPtr<GstStream>(GstStream*); template<> void derefGPtr<GstStream>(GstStream*); @@ -139,6 +140,7 @@ template<> void derefGPtr<GstStream>(Gst template<> GRefPtr<GstStreamCollection> adoptGRef(GstStreamCollection*); template<> GstStreamCollection* refGPtr<GstStreamCollection>(GstStreamCollection*); template<> void derefGPtr<GstStreamCollection>(GstStreamCollection*); +#endif template<> GRefPtr<GstClock> adoptGRef(GstClock*); template<> GstClock* refGPtr<GstClock>(GstClock*); diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp 2022-11-08 15:02:04.157338391 -0600 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp 2022-11-08 15:02:40.329529333 -0600 @@ -54,7 +54,7 @@ #include "WebKitMediaSourceGStreamer.h" #endif -#if ENABLE(MEDIA_STREAM) +#if ENABLE(MEDIA_STREAM) && GST_CHECK_VERSION(1, 10, 0) #include "GStreamerMediaStreamSource.h" #include "GStreamerVideoEncoder.h" #endif @@ -352,7 +352,7 @@ void registerWebKitGStreamerElements() #endif -#if ENABLE(MEDIA_STREAM) +#if ENABLE(MEDIA_STREAM) && GST_CHECK_VERSION(1, 10, 0) gst_element_register(nullptr, "mediastreamsrc", GST_RANK_PRIMARY, WEBKIT_TYPE_MEDIA_STREAM_SRC); gst_element_register(nullptr, "webrtcvideoencoder", GST_RANK_PRIMARY + 100, WEBKIT_TYPE_WEBRTC_VIDEO_ENCODER); #endif @@ -363,7 +363,6 @@ void registerWebKitGStreamerElements() #if ENABLE(VIDEO) gst_element_register(0, "webkitwebsrc", GST_RANK_PRIMARY + 100, WEBKIT_TYPE_WEB_SRC); - gst_element_register(0, "webkitdmabufvideosink", GST_RANK_NONE, WEBKIT_TYPE_DMABUF_VIDEO_SINK); #if USE(GSTREAMER_GL) gst_element_register(0, "webkitglvideosink", GST_RANK_NONE, WEBKIT_TYPE_GL_VIDEO_SINK); #endif diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.cpp webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.cpp --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.cpp 2022-08-31 02:59:56.270519500 -0500 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.cpp 2022-11-08 15:02:40.329529333 -0600 @@ -252,12 +252,12 @@ void ImageDecoderGStreamer::InnerDecoder static GstAppSinkCallbacks callbacks = { nullptr, [](GstAppSink* sink, gpointer userData) -> GstFlowReturn { - auto sample = adoptGRef(gst_app_sink_try_pull_preroll(sink, 0)); + auto sample = adoptGRef(gst_app_sink_pull_preroll(sink)); static_cast<ImageDecoderGStreamer*>(userData)->notifySample(WTFMove(sample)); return GST_FLOW_OK; }, [](GstAppSink* sink, gpointer userData) -> GstFlowReturn { - auto sample = adoptGRef(gst_app_sink_try_pull_sample(sink, 0)); + auto sample = adoptGRef(gst_app_sink_pull_sample(sink)); static_cast<ImageDecoderGStreamer*>(userData)->notifySample(WTFMove(sample)); return GST_FLOW_OK; }, @@ -337,6 +337,7 @@ void ImageDecoderGStreamer::InnerDecoder g_warning("Error: %d, %s. Debug output: %s", error->code, error->message, debug.get()); m_decoder.setHasEOS(); break; +#if GST_CHECK_VERSION(1, 10, 0) case GST_MESSAGE_STREAM_COLLECTION: { GRefPtr<GstStreamCollection> collection; gst_message_parse_stream_collection(message, &collection.outPtr()); @@ -349,6 +350,7 @@ void ImageDecoderGStreamer::InnerDecoder if (streamType == GST_STREAM_TYPE_VIDEO) { streams = g_list_append(streams, const_cast<char*>(gst_stream_get_stream_id(stream))); break; +#endif } } if (streams) { diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp 2022-09-14 06:58:10.500863000 -0500 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp 2022-11-08 15:02:40.333529354 -0600 @@ -43,6 +43,7 @@ InbandTextTrackPrivateGStreamer::InbandT { } +#if GST_CHECK_VERSION(1, 10, 0) InbandTextTrackPrivateGStreamer::InbandTextTrackPrivateGStreamer(unsigned index, GstStream* stream) : InbandTextTrackPrivate(CueFormat::WebVTT) , TrackPrivateBaseGStreamer(TrackPrivateBaseGStreamer::TrackType::Text, this, index, stream) @@ -55,6 +56,7 @@ InbandTextTrackPrivateGStreamer::InbandT const char* mediaType = capsMediaType(caps.get()); m_kind = g_str_has_prefix(mediaType, "closedcaption/") ? Kind::Captions : Kind::Subtitles; } +#endif void InbandTextTrackPrivateGStreamer::handleSample(GRefPtr<GstSample> sample) { diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h 2022-08-31 02:59:56.270519500 -0500 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h 2022-11-08 15:02:40.333529354 -0600 @@ -47,10 +47,12 @@ public: return create(index, WTFMove(pad)); } +#if GST_CHECK_VERSION(1, 10, 0) static Ref<InbandTextTrackPrivateGStreamer> create(WeakPtr<MediaPlayerPrivateGStreamer>, unsigned index, GstStream* stream) { return adoptRef(*new InbandTextTrackPrivateGStreamer(index, stream)); } +#endif Kind kind() const final { return m_kind; } AtomString id() const final { return m_id; } @@ -62,7 +64,9 @@ public: private: InbandTextTrackPrivateGStreamer(unsigned index, GRefPtr<GstPad>&&, bool shouldHandleStreamStartEvent); +#if GST_CHECK_VERSION(1, 10, 0) InbandTextTrackPrivateGStreamer(unsigned index, GstStream*); +#endif void notifyTrackOfSample(); diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2022-11-08 15:02:04.161338413 -0600 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2022-11-09 13:59:14.357602077 -0600 @@ -53,7 +53,7 @@ #include "TextSinkGStreamer.h" #include "VideoTrackPrivateGStreamer.h" -#if ENABLE(MEDIA_STREAM) +#if ENABLE(MEDIA_STREAM) && GST_CHECK_VERSION(1, 10, 0) #include "GStreamerMediaStreamSource.h" #include "MediaStreamPrivate.h" #endif @@ -375,7 +375,9 @@ void MediaPlayerPrivateGStreamer::load(c #if ENABLE(MEDIA_STREAM) void MediaPlayerPrivateGStreamer::load(MediaStreamPrivate& stream) { +#if ENABLE(MEDIA_STREAM) m_streamPrivate = &stream; +#endif load(makeString("mediastream://", stream.id())); syncOnClock(false); @@ -891,7 +893,7 @@ void MediaPlayerPrivateGStreamer::source if (WEBKIT_IS_WEB_SRC(m_source.get())) { webKitWebSrcSetMediaPlayer(WEBKIT_WEB_SRC_CAST(m_source.get()), m_player, m_referrer); -#if ENABLE(MEDIA_STREAM) +#if ENABLE(MEDIA_STREAM) && GST_CHECK_VERSION(1, 10, 0) } else if (WEBKIT_IS_MEDIA_STREAM_SRC(sourceElement)) { auto stream = m_streamPrivate.get(); ASSERT(stream); @@ -1400,6 +1402,7 @@ void MediaPlayerPrivateGStreamer::update void MediaPlayerPrivateGStreamer::playbin3SendSelectStreamsIfAppropriate() { +#if GST_CHECK_VERSION(1, 10, 0) ASSERT(!m_isLegacyPlaybin); bool haveDifferentStreamIds = (m_wantedAudioStreamId != m_currentAudioStreamId || m_wantedVideoStreamId != m_currentVideoStreamId); @@ -1429,8 +1432,10 @@ void MediaPlayerPrivateGStreamer::playbi m_waitingForStreamsSelectedEvent = true; gst_element_send_event(m_pipeline.get(), gst_event_new_select_streams(streams)); g_list_free_full(streams, reinterpret_cast<GDestroyNotify>(g_free)); +#endif } +#if GST_CHECK_VERSION(1, 10, 0) void MediaPlayerPrivateGStreamer::updateTracks(const GRefPtr<GstObject>& collectionOwner) { ASSERT(!m_isLegacyPlaybin); @@ -1510,6 +1515,7 @@ void MediaPlayerPrivateGStreamer::update GST_WARNING("Unknown track type found for stream %s", streamId); } } +#endif // GST_CHECK_VERSION(1, 10, 0) void MediaPlayerPrivateGStreamer::videoChangedCallback(MediaPlayerPrivateGStreamer* player) { @@ -1518,6 +1524,7 @@ void MediaPlayerPrivateGStreamer::videoC }); } +#if GST_CHECK_VERSION(1, 10, 0) void MediaPlayerPrivateGStreamer::handleStreamCollectionMessage(GstMessage* message) { if (m_isLegacyPlaybin) @@ -1545,6 +1552,7 @@ void MediaPlayerPrivateGStreamer::handle else callOnMainThread(WTFMove(callback)); } +#endif bool MediaPlayerPrivateGStreamer::handleNeedContextMessage(GstMessage* message) { @@ -1986,6 +1994,7 @@ void MediaPlayerPrivateGStreamer::handle case GST_MESSAGE_TOC: processTableOfContents(message); break; +#if GST_CHECK_VERSION(1, 10, 0) case GST_MESSAGE_STREAMS_SELECTED: { if (m_isLegacyPlaybin) break; @@ -2014,6 +2023,7 @@ void MediaPlayerPrivateGStreamer::handle playbin3SendSelectStreamsIfAppropriate(); break; } +#endif default: GST_DEBUG_OBJECT(pipeline(), "Unhandled GStreamer message type: %s", GST_MESSAGE_TYPE_NAME(message)); break; @@ -2645,7 +2655,7 @@ MediaPlayer::SupportsType MediaPlayerPri #endif if (parameters.isMediaStream) { -#if ENABLE(MEDIA_STREAM) +#if ENABLE(MEDIA_STREAM) && GST_CHECK_VERSION (1, 10, 0) return MediaPlayer::SupportsType::IsSupported; #else return result; @@ -2773,8 +2783,10 @@ void MediaPlayerPrivateGStreamer::create // WEBKIT_GST_USE_PLAYBIN3 environment variable. const char* usePlaybin3 = g_getenv("WEBKIT_GST_USE_PLAYBIN3"); bool isMediaStream = url.protocolIs("mediastream"_s); +#if GST_CHECK_VERSION(1, 10, 0) if (isMediaSource() || isMediaStream || (usePlaybin3 && !strcmp(usePlaybin3, "1"))) playbinName = "playbin3"; +#endif ASSERT(!m_pipeline); @@ -2817,10 +2829,12 @@ void MediaPlayerPrivateGStreamer::create // synchronously in the same main thread tick to make the tracks information available to JS no // later than "updateend". There is no such limitation otherwise (if playbin3 is enabled or in // MediaStream cases). +#if GST_CHECK_VERSION(1, 10, 0) auto streamCollectionSignalName = makeString(isMediaSource() ? "sync-" : "", "message::stream-collection"); g_signal_connect_swapped(bus.get(), streamCollectionSignalName.ascii().data(), G_CALLBACK(+[](MediaPlayerPrivateGStreamer* player, GstMessage* message) { player->handleStreamCollectionMessage(message); }), this); +#endif g_object_set(m_pipeline.get(), "mute", m_player->muted(), nullptr); diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2022-11-08 15:02:04.161338413 -0600 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2022-11-08 15:02:40.333529354 -0600 @@ -269,8 +269,12 @@ protected: AudioChanged = 1 << 2, VolumeChanged = 1 << 3, MuteChanged = 1 << 4, +#if GST_CHECK_VERSION (1, 10, 0) TextChanged = 1 << 5, StreamCollectionChanged = 1 << 7 +#else + TextChanged = 1 << 5 +#endif }; static bool isAvailable(); @@ -502,7 +506,9 @@ private: void setPlaybinURL(const URL& urlString); +#if GST_CHECK_VERSION(1, 10, 0) void updateTracks(const GRefPtr<GstObject>& collectionOwner); +#endif void videoSinkCapsChanged(GstPad*); void updateVideoSizeAndOrientationFromCaps(const GstCaps*); bool hasFirstVideoSampleReachedSink() const; @@ -613,7 +619,9 @@ private: RefPtr<GBMBufferSwapchain> m_swapchain; #endif +#if GST_CHECK_VERSION (1, 10, 0) GRefPtr<GstStreamCollection> m_streamCollection; +#endif AbortableTaskQueue m_sinkTaskQueue; }; diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2022-09-14 06:58:10.500863000 -0500 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2022-11-08 15:02:40.333529354 -0600 @@ -85,6 +85,7 @@ TrackPrivateBaseGStreamer::TrackPrivateB tagsChanged(); } +#if GST_CHECK_VERSION(1, 10, 0) TrackPrivateBaseGStreamer::TrackPrivateBaseGStreamer(TrackType type, TrackPrivateBase* owner, unsigned index, GstStream* stream) : m_notifier(MainThreadNotifier<MainThreadNotification>::create()) , m_index(index) @@ -98,6 +99,7 @@ TrackPrivateBaseGStreamer::TrackPrivateB // We can't call notifyTrackOfTagsChanged() directly, because we need tagsChanged() to setup m_tags. tagsChanged(); } +#endif void TrackPrivateBaseGStreamer::setPad(GRefPtr<GstPad>&& pad) { @@ -171,8 +173,11 @@ void TrackPrivateBaseGStreamer::tagsChan } i++; } while (tagEvent); - } else if (m_stream) + } +#if GST_CHECK_VERSION(1, 10, 0) + else if (m_stream) tags = adoptGRef(gst_stream_get_tags(m_stream.get())); +#endif if (!tags) tags = adoptGRef(gst_tag_list_new_empty()); diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h 2022-09-14 06:58:10.504863300 -0500 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h 2022-11-08 15:02:40.333529354 -0600 @@ -59,7 +59,9 @@ public: void setIndex(unsigned index) { m_index = index; } +#if GST_CHECK_VERSION(1, 10, 0) GstStream* stream() const { return m_stream.get(); } +#endif // Used for MSE, where the initial caps of the pad are relevant for initializing the matching pad in the // playback pipeline. @@ -68,7 +70,9 @@ public: protected: TrackPrivateBaseGStreamer(TrackType, TrackPrivateBase*, unsigned index, GRefPtr<GstPad>&&, bool shouldHandleStreamStartEvent); +#if GST_CHECK_VERSION(1, 10, 0) TrackPrivateBaseGStreamer(TrackType, TrackPrivateBase*, unsigned index, GstStream*); +#endif void notifyTrackOfTagsChanged(); void notifyTrackOfStreamChanged(); @@ -86,7 +90,9 @@ protected: AtomString m_id; GRefPtr<GstPad> m_pad; GRefPtr<GstPad> m_bestUpstreamPad; +#if GST_CHECK_VERSION(1, 10, 0) GRefPtr<GstStream> m_stream; +#endif unsigned long m_eventProbe { 0 }; GRefPtr<GstCaps> m_initialCaps; diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp 2022-09-14 06:58:10.504863300 -0500 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp 2022-11-08 15:02:40.333529354 -0600 @@ -41,6 +41,7 @@ VideoTrackPrivateGStreamer::VideoTrackPr { } +#if GST_CHECK_VERSION(1, 10, 0) VideoTrackPrivateGStreamer::VideoTrackPrivateGStreamer(WeakPtr<MediaPlayerPrivateGStreamer> player, unsigned index, GstStream* stream) : TrackPrivateBaseGStreamer(TrackPrivateBaseGStreamer::TrackType::Video, this, index, stream) , m_player(player) @@ -180,11 +181,14 @@ void VideoTrackPrivateGStreamer::updateC setConfiguration(WTFMove(configuration)); } +#endif VideoTrackPrivate::Kind VideoTrackPrivateGStreamer::kind() const { +#if GST_CHECK_VERSION(1, 10, 0) if (m_stream && gst_stream_get_stream_flags(m_stream.get()) & GST_STREAM_FLAG_SELECT) return VideoTrackPrivate::Kind::Main; +#endif return VideoTrackPrivate::kind(); } @@ -193,8 +197,10 @@ void VideoTrackPrivateGStreamer::disconn { m_taskQueue.startAborting(); +#if GST_CHECK_VERSION(1, 10, 0) if (m_stream) g_signal_handlers_disconnect_matched(m_stream.get(), G_SIGNAL_MATCH_DATA, 0, 0, nullptr, nullptr, this); +#endif m_player = nullptr; TrackPrivateBaseGStreamer::disconnect(); diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.h webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.h --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.h 2022-08-31 02:59:56.274519400 -0500 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.h 2022-11-08 15:02:40.333529354 -0600 @@ -44,10 +44,12 @@ public: return adoptRef(*new VideoTrackPrivateGStreamer(player, index, WTFMove(pad), shouldHandleStreamStartEvent)); } +#if GST_CHECK_VERSION(1, 10, 0) static Ref<VideoTrackPrivateGStreamer> create(WeakPtr<MediaPlayerPrivateGStreamer> player, unsigned index, GstStream* stream) { return adoptRef(*new VideoTrackPrivateGStreamer(player, index, stream)); } +#endif Kind kind() const final; @@ -64,12 +66,16 @@ public: AbortableTaskQueue m_taskQueue; protected: +#if GST_CHECK_VERSION(1, 10, 0) void updateConfigurationFromCaps(); void updateConfigurationFromTags(); +#endif private: VideoTrackPrivateGStreamer(WeakPtr<MediaPlayerPrivateGStreamer>, unsigned index, GRefPtr<GstPad>&&, bool shouldHandleStreamStartEvent); +#if GST_CHECK_VERSION(1, 10, 0) VideoTrackPrivateGStreamer(WeakPtr<MediaPlayerPrivateGStreamer>, unsigned index, GstStream*); +#endif WeakPtr<MediaPlayerPrivateGStreamer> m_player; }; diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/WebKitAudioSinkGStreamer.cpp webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/WebKitAudioSinkGStreamer.cpp --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/gstreamer/WebKitAudioSinkGStreamer.cpp 2022-11-08 15:02:04.165338435 -0600 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/gstreamer/WebKitAudioSinkGStreamer.cpp 2022-11-08 15:02:40.333529354 -0600 @@ -300,7 +300,6 @@ static void webKitAudioSinkConstructed(G GST_CALL_PARENT(G_OBJECT_CLASS, constructed, (object)); GST_OBJECT_FLAG_SET(GST_OBJECT_CAST(object), GST_ELEMENT_FLAG_SINK); - gst_bin_set_suppressed_flags(GST_BIN_CAST(object), static_cast<GstElementFlags>(GST_ELEMENT_FLAG_SOURCE | GST_ELEMENT_FLAG_SINK)); } static void webkit_audio_sink_class_init(WebKitAudioSinkClass* klass) diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/ImageDecoder.cpp webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/ImageDecoder.cpp --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/graphics/ImageDecoder.cpp 2022-08-31 02:59:56.210519000 -0500 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/graphics/ImageDecoder.cpp 2022-11-08 15:02:40.337529376 -0600 @@ -38,10 +38,6 @@ #include "ImageDecoderAVFObjC.h" #endif -#if USE(GSTREAMER) && ENABLE(VIDEO) -#include "ImageDecoderGStreamer.h" -#endif - namespace WebCore { #if ENABLE(GPU_PROCESS) && HAVE(AVASSETREADER) @@ -98,11 +94,6 @@ RefPtr<ImageDecoder> ImageDecoder::creat } #endif -#if USE(GSTREAMER) && ENABLE(VIDEO) - if (ImageDecoderGStreamer::canDecodeType(mimeType)) - return ImageDecoderGStreamer::create(data, mimeType, alphaOption, gammaAndColorProfileOption); -#endif - #if USE(CG) return ImageDecoderCG::create(data, alphaOption, gammaAndColorProfileOption); #else @@ -132,11 +123,6 @@ bool ImageDecoder::supportsMediaType(Med #endif #endif -#if USE(GSTREAMER) && ENABLE(VIDEO) - if (ImageDecoderGStreamer::supportsMediaType(type)) - return true; -#endif - return false; } diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/GStreamer.cmake webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/GStreamer.cmake --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/GStreamer.cmake 2022-10-19 03:11:34.522284300 -0500 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/GStreamer.cmake 2022-11-08 15:02:40.337529376 -0600 @@ -27,7 +27,6 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO) platform/graphics/gstreamer/AppSinkWorkaround.cpp platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp - platform/graphics/gstreamer/DMABufVideoSinkGStreamer.cpp platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp platform/graphics/gstreamer/GRefPtrGStreamer.cpp platform/graphics/gstreamer/GStreamerAudioMixer.cpp @@ -36,7 +35,6 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO) platform/graphics/gstreamer/GStreamerRegistryScanner.cpp platform/graphics/gstreamer/GStreamerVideoFrameHolder.cpp platform/graphics/gstreamer/GStreamerVideoSinkCommon.cpp - platform/graphics/gstreamer/ImageDecoderGStreamer.cpp platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp platform/graphics/gstreamer/MediaEngineConfigurationFactoryGStreamer.cpp platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/mediastream/gstreamer/GStreamerCapturer.cpp webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/mediastream/gstreamer/GStreamerCapturer.cpp --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/mediastream/gstreamer/GStreamerCapturer.cpp 2022-11-08 15:02:04.165338435 -0600 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/mediastream/gstreamer/GStreamerCapturer.cpp 2022-11-08 15:02:40.337529376 -0600 @@ -22,7 +22,8 @@ #include "config.h" -#if ENABLE(VIDEO) && ENABLE(MEDIA_STREAM) && USE(GSTREAMER) +#if 0 + #include "GStreamerCapturer.h" #include <gst/app/gstappsink.h> @@ -239,4 +240,4 @@ void GStreamerCapturer::setInterrupted(b } // namespace WebCore -#endif // ENABLE(VIDEO) && ENABLE(MEDIA_STREAM) && USE(GSTREAMER) +#endif // ENABLE(VIDEO) && ENABLE(MEDIA_STREAM) && USE(GSTREAMER) && GST_CHECK_VERSION(1, 10, 0) diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/mediastream/gstreamer/GStreamerMediaStreamSource.cpp webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/mediastream/gstreamer/GStreamerMediaStreamSource.cpp --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/mediastream/gstreamer/GStreamerMediaStreamSource.cpp 2022-11-08 15:02:04.169338455 -0600 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/mediastream/gstreamer/GStreamerMediaStreamSource.cpp 2022-11-08 15:02:40.337529376 -0600 @@ -24,7 +24,7 @@ #include "config.h" #include "GStreamerMediaStreamSource.h" -#if ENABLE(VIDEO) && ENABLE(MEDIA_STREAM) && USE(GSTREAMER) +#if 0 #include "AudioTrackPrivateMediaStream.h" #include "GStreamerAudioData.h" @@ -606,7 +606,9 @@ static void webkitMediaStreamSrcDispose( static GstStateChangeReturn webkitMediaStreamSrcChangeState(GstElement* element, GstStateChange transition) { +#if GST_CHECK_VERSION(1, 14, 0) GST_DEBUG_OBJECT(element, "%s", gst_state_change_get_name(transition)); +#endif WebKitMediaStreamSrc* self = WEBKIT_MEDIA_STREAM_SRC_CAST(element); GstStateChangeReturn result = GST_ELEMENT_CLASS(webkit_media_stream_src_parent_class)->change_state(element, transition); @@ -898,4 +900,4 @@ GstElement* webkitMediaStreamSrcNew() return GST_ELEMENT_CAST(g_object_new(webkit_media_stream_src_get_type(), nullptr)); } -#endif // ENABLE(VIDEO) && ENABLE(MEDIA_STREAM) && USE(GSTREAMER) +#endif // ENABLE(VIDEO) && ENABLE(MEDIA_STREAM) && USE(GSTREAMER) && GST_CHECK_VERSION(1, 10, 0) diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/MIMETypeRegistry.cpp webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/MIMETypeRegistry.cpp --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/MIMETypeRegistry.cpp 2022-10-19 03:11:34.522284300 -0500 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/MIMETypeRegistry.cpp 2022-11-08 15:02:40.337529376 -0600 @@ -63,10 +63,6 @@ #include "PreviewConverter.h" #endif -#if USE(GSTREAMER) && ENABLE(VIDEO) -#include "ImageDecoderGStreamer.h" -#endif - namespace WebCore { static String normalizedImageMIMEType(const String&); @@ -440,11 +436,6 @@ bool MIMETypeRegistry::isSupportedImageV return true; #endif -#if USE(GSTREAMER) && ENABLE(VIDEO) - if (ImageDecoderGStreamer::supportsContainerType(mimeType)) - return true; -#endif - return false; } diff -urp webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/VideoFrameMetadata.h webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/VideoFrameMetadata.h --- webkitgtk-2.38.2.gstreamer1.12/Source/WebCore/platform/VideoFrameMetadata.h 2022-08-31 02:59:56.154518800 -0500 +++ webkitgtk-2.38.2.gstreamer1.8/Source/WebCore/platform/VideoFrameMetadata.h 2022-11-08 15:02:40.337529376 -0600 @@ -27,8 +27,6 @@ #if ENABLE(VIDEO) -#include <optional> - namespace WebCore { struct VideoFrameMetadata {
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
