Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Step:15
webkit2gtk3.31973
webkit2gtk3-gstreamer-1.16.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File webkit2gtk3-gstreamer-1.16.patch of Package webkit2gtk3.31973
diff -urp webkitgtk-2.42.1.orig/Source/cmake/GStreamerChecks.cmake webkitgtk-2.42.1.gstreamer1.16/Source/cmake/GStreamerChecks.cmake --- webkitgtk-2.42.1.orig/Source/cmake/GStreamerChecks.cmake 2023-09-19 03:27:51.003668500 -0500 +++ webkitgtk-2.42.1.gstreamer1.16/Source/cmake/GStreamerChecks.cmake 2023-10-09 16:57:58.866182263 -0500 @@ -36,7 +36,7 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO) list(APPEND GSTREAMER_COMPONENTS webrtc) endif () - find_package(GStreamer 1.18.4 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS}) + find_package(GStreamer 1.16.2 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS}) if (ENABLE_WEB_AUDIO) if (NOT PC_GSTREAMER_AUDIO_FOUND OR NOT PC_GSTREAMER_FFT_FOUND) diff -urp webkitgtk-2.42.1.orig/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp webkitgtk-2.42.1.gstreamer1.16/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp --- webkitgtk-2.42.1.orig/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp 2023-09-19 03:27:49.763694000 -0500 +++ webkitgtk-2.42.1.gstreamer1.16/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp 2023-10-09 16:57:58.866182263 -0500 @@ -122,7 +122,10 @@ AudioSourceProviderGStreamer::AudioSourc g_signal_connect_swapped(decodebin, "pad-added", G_CALLBACK(+[](AudioSourceProviderGStreamer* provider, GstPad* pad) { auto padCaps = adoptGRef(gst_pad_query_caps(pad, nullptr)); bool isAudio = doCapsHaveType(padCaps.get(), "audio"); - RELEASE_ASSERT(isAudio); + if (webkitGstCheckVersion(1, 18, 0)) + RELEASE_ASSERT(isAudio); + else if (!isAudio) + return; auto sinkPad = adoptGRef(gst_element_get_static_pad(provider->m_audioSinkBin.get(), "sink")); gst_pad_link(pad, sinkPad.get()); diff -urp webkitgtk-2.42.1.orig/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp webkitgtk-2.42.1.gstreamer1.16/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp --- webkitgtk-2.42.1.orig/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp 2023-09-19 03:27:49.851692200 -0500 +++ webkitgtk-2.42.1.gstreamer1.16/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp 2023-10-09 16:57:58.866182263 -0500 @@ -186,12 +186,13 @@ static void webKitGLVideoSinkGetProperty WebKitGLVideoSink* sink = WEBKIT_GL_VIDEO_SINK(object); switch (propertyId) { - case PROP_STATS: { - GUniqueOutPtr<GstStructure> stats; - g_object_get(sink->priv->appSink.get(), "stats", &stats.outPtr(), nullptr); - gst_value_set_structure(value, stats.get()); + case PROP_STATS: + if (webkitGstCheckVersion(1, 18, 0)) { + GUniqueOutPtr<GstStructure> stats; + g_object_get(sink->priv->appSink.get(), "stats", &stats.outPtr(), nullptr); + gst_value_set_structure(value, stats.get()); + } break; - } default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, paramSpec); RELEASE_ASSERT_NOT_REACHED(); diff -urp webkitgtk-2.42.1.orig/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp webkitgtk-2.42.1.gstreamer1.16/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp --- webkitgtk-2.42.1.orig/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp 2023-09-19 03:27:49.851692200 -0500 +++ webkitgtk-2.42.1.gstreamer1.16/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp 2023-10-09 16:57:58.866182263 -0500 @@ -32,7 +32,7 @@ GST_DEBUG_CATEGORY_STATIC(webkit_media_g bool GStreamerAudioMixer::isAvailable() { - return isGStreamerPluginAvailable("inter") && isGStreamerPluginAvailable("audiomixer"); + return webkitGstCheckVersion(1, 18, 0) && isGStreamerPluginAvailable("inter") && isGStreamerPluginAvailable("audiomixer"); } GStreamerAudioMixer& GStreamerAudioMixer::singleton() diff -urp webkitgtk-2.42.1.orig/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp webkitgtk-2.42.1.gstreamer1.16/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp --- webkitgtk-2.42.1.orig/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp 2023-09-19 03:27:49.851692200 -0500 +++ webkitgtk-2.42.1.gstreamer1.16/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp 2023-10-09 16:57:58.866182263 -0500 @@ -105,6 +105,24 @@ GstPad* webkitGstGhostPadFromStaticTempl return pad; } +#if !GST_CHECK_VERSION(1, 18, 0) +void webkitGstVideoFormatInfoComponent(const GstVideoFormatInfo* info, guint plane, gint components[GST_VIDEO_MAX_COMPONENTS]) +{ + guint c, i = 0; + + /* Reverse mapping of info->plane. */ + for (c = 0; c < GST_VIDEO_FORMAT_INFO_N_COMPONENTS(info); c++) { + if (GST_VIDEO_FORMAT_INFO_PLANE(info, c) == plane) { + components[i] = c; + i++; + } + } + + for (c = i; c < GST_VIDEO_MAX_COMPONENTS; c++) + components[c] = -1; +} +#endif + #if ENABLE(VIDEO) bool getVideoSizeAndFormatFromCaps(const GstCaps* caps, WebCore::IntSize& size, GstVideoFormat& format, int& pixelAspectRatioNumerator, int& pixelAspectRatioDenominator, int& stride) { @@ -748,6 +766,36 @@ String gstStructureToJSONString(const Gs return value->toJSONString(); } +#if !GST_CHECK_VERSION(1, 18, 0) +GstClockTime webkitGstElementGetCurrentRunningTime(GstElement* element) +{ + g_return_val_if_fail(GST_IS_ELEMENT(element), GST_CLOCK_TIME_NONE); + + auto baseTime = gst_element_get_base_time(element); + if (!GST_CLOCK_TIME_IS_VALID(baseTime)) { + GST_DEBUG_OBJECT(element, "Could not determine base time"); + return GST_CLOCK_TIME_NONE; + } + + auto clock = adoptGRef(gst_element_get_clock(element)); + if (!clock) { + GST_DEBUG_OBJECT(element, "Element has no clock"); + return GST_CLOCK_TIME_NONE; + } + + auto clockTime = gst_clock_get_time(clock.get()); + if (!GST_CLOCK_TIME_IS_VALID(clockTime)) + return GST_CLOCK_TIME_NONE; + + if (clockTime < baseTime) { + GST_DEBUG_OBJECT(element, "Got negative current running time"); + return GST_CLOCK_TIME_NONE; + } + + return clockTime - baseTime; +} +#endif + GstClockTime webkitGstInitTime() { return s_webkitGstInitTime; @@ -805,6 +853,7 @@ PlatformVideoColorSpace videoColorSpaceF case GST_VIDEO_TRANSFER_BT709: colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt709; break; +#if GST_CHECK_VERSION(1, 18, 0) case GST_VIDEO_TRANSFER_BT601: colorSpace.transfer = PlatformVideoTransferCharacteristics::Smpte170m; break; @@ -817,6 +866,7 @@ PlatformVideoColorSpace videoColorSpaceF case GST_VIDEO_TRANSFER_BT2020_10: colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt2020_10bit; break; +#endif case GST_VIDEO_TRANSFER_BT2020_12: colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt2020_12bit; break; @@ -935,6 +985,7 @@ void fillVideoInfoColorimetryFromColorSp case PlatformVideoTransferCharacteristics::Bt709: GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT709; break; +#if GST_CHECK_VERSION(1, 18, 0) case PlatformVideoTransferCharacteristics::Smpte170m: GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT601; break; @@ -947,6 +998,7 @@ void fillVideoInfoColorimetryFromColorSp case PlatformVideoTransferCharacteristics::Bt2020_10bit: GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT2020_10; break; +#endif case PlatformVideoTransferCharacteristics::Bt2020_12bit: GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT2020_12; break; diff -urp webkitgtk-2.42.1.orig/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h webkitgtk-2.42.1.gstreamer1.16/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h --- webkitgtk-2.42.1.orig/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h 2023-09-19 03:27:49.851692200 -0500 +++ webkitgtk-2.42.1.gstreamer1.16/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h 2023-10-09 16:57:58.866182263 -0500 @@ -56,6 +56,15 @@ inline bool webkitGstCheckVersion(guint return true; } +// gst_video_format_info_component() is GStreamer 1.18 API, so for older versions we use a local +// vendored copy of the function. +#if !GST_CHECK_VERSION(1, 18, 0) +#define GST_VIDEO_MAX_COMPONENTS 4 +void webkitGstVideoFormatInfoComponent(const GstVideoFormatInfo*, guint, gint components[GST_VIDEO_MAX_COMPONENTS]); + +#define gst_video_format_info_component webkitGstVideoFormatInfoComponent +#endif + #define GST_VIDEO_CAPS_TYPE_PREFIX "video/" #define GST_AUDIO_CAPS_TYPE_PREFIX "audio/" #define GST_TEXT_CAPS_TYPE_PREFIX "text/" @@ -323,6 +332,13 @@ GstElement* makeGStreamerBin(const char* String gstStructureToJSONString(const GstStructure*); +// gst_element_get_current_running_time() is GStreamer 1.18 API, so for older versions we use a local +// vendored copy of the function. +#if !GST_CHECK_VERSION(1, 18, 0) +GstClockTime webkitGstElementGetCurrentRunningTime(GstElement*); +#define gst_element_get_current_running_time webkitGstElementGetCurrentRunningTime +#endif + GstClockTime webkitGstInitTime(); PlatformVideoColorSpace videoColorSpaceFromCaps(const GstCaps*); diff -urp webkitgtk-2.42.1.orig/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp webkitgtk-2.42.1.gstreamer1.16/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp --- webkitgtk-2.42.1.orig/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp 2023-09-19 03:27:49.851692200 -0500 +++ webkitgtk-2.42.1.gstreamer1.16/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp 2023-10-09 16:57:58.866182263 -0500 @@ -900,8 +900,13 @@ GStreamerRegistryScanner::CodecLookupRes return checkH264Caps(makeString("video/x-h264, level=(string)", maxLevelString).utf8().data()); } - GST_DEBUG("Checking video decoders for constrained caps"); - return checkH264Caps(makeString("video/x-h264, level=(string)", level, ", profile=(string)", profile).utf8().data()); + if (webkitGstCheckVersion(1, 18, 0)) { + GST_DEBUG("Checking video decoders for constrained caps"); + return checkH264Caps(makeString("video/x-h264, level=(string)", level, ", profile=(string)", profile).utf8().data()); + } + + GST_DEBUG("Falling back to unconstrained caps"); + return checkH264Caps("video/x-h264"); } const char* GStreamerRegistryScanner::configurationNameForLogging(Configuration configuration) const diff -urp webkitgtk-2.42.1.orig/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp webkitgtk-2.42.1.gstreamer1.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp --- webkitgtk-2.42.1.orig/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2023-09-19 03:27:49.855692100 -0500 +++ webkitgtk-2.42.1.gstreamer1.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2023-10-09 16:57:58.866182263 -0500 @@ -479,7 +479,6 @@ bool MediaPlayerPrivateGStreamer::doSeek auto seekStart = toGstClockTime(startTime); auto seekStop = toGstClockTime(endTime); - GST_DEBUG_OBJECT(pipeline(), "[Seek] Performing actual seek to %" GST_TIMEP_FORMAT " (endTime: %" GST_TIMEP_FORMAT ") at rate %f", &seekStart, &seekStop, rate); return gst_element_seek(m_pipeline.get(), rate, GST_FORMAT_TIME, m_seekFlags, GST_SEEK_TYPE_SET, seekStart, GST_SEEK_TYPE_SET, seekStop); } @@ -3296,9 +3295,11 @@ static uint32_t fourccValue(GstVideoForm case GST_VIDEO_FORMAT_P010_10LE: case GST_VIDEO_FORMAT_P010_10BE: return uint32_t(DMABufFormat::FourCC::P010); +#if GST_CHECK_VERSION(1, 18, 0) case GST_VIDEO_FORMAT_P016_LE: case GST_VIDEO_FORMAT_P016_BE: return uint32_t(DMABufFormat::FourCC::P016); +#endif default: break; } @@ -4114,7 +4115,29 @@ GstElement* MediaPlayerPrivateGStreamer: g_signal_connect_swapped(m_videoSink.get(), "repaint-cancelled", G_CALLBACK(repaintCancelledCallback), this); } - return m_videoSink.get(); + GstElement* videoSink = nullptr; + if (!webkitGstCheckVersion(1, 18, 0)) { + m_fpsSink = makeGStreamerElement("fpsdisplaysink", "sink"); + if (m_fpsSink) { + g_object_set(m_fpsSink.get(), "silent", TRUE , nullptr); + + // Turn off text overlay unless tracing is enabled. + if (gst_debug_category_get_threshold(webkit_media_player_debug) < GST_LEVEL_TRACE) + g_object_set(m_fpsSink.get(), "text-overlay", FALSE , nullptr); + + if (gstObjectHasProperty(m_fpsSink.get(), "video-sink")) { + g_object_set(m_fpsSink.get(), "video-sink", m_videoSink.get(), nullptr); + videoSink = m_fpsSink.get(); + } else + m_fpsSink = nullptr; + } + } + + if (!m_fpsSink) + videoSink = m_videoSink.get(); + + ASSERT(videoSink); + return videoSink; } void MediaPlayerPrivateGStreamer::setStreamVolumeElement(GstStreamVolume* volume) @@ -4144,19 +4167,29 @@ void MediaPlayerPrivateGStreamer::setStr bool MediaPlayerPrivateGStreamer::updateVideoSinkStatistics() { + if (!webkitGstCheckVersion(1, 18, 0) && !m_fpsSink) + return false; + if (!m_videoSink) return false; uint64_t totalVideoFrames = 0; uint64_t droppedVideoFrames = 0; - GUniqueOutPtr<GstStructure> stats; - g_object_get(m_videoSink.get(), "stats", &stats.outPtr(), nullptr); + if (webkitGstCheckVersion(1, 18, 0)) { + GUniqueOutPtr<GstStructure> stats; + g_object_get(m_videoSink.get(), "stats", &stats.outPtr(), nullptr); - if (!gst_structure_get_uint64(stats.get(), "rendered", &totalVideoFrames)) - return false; + if (!gst_structure_get_uint64(stats.get(), "rendered", &totalVideoFrames)) + return false; - if (!gst_structure_get_uint64(stats.get(), "dropped", &droppedVideoFrames)) - return false; + if (!gst_structure_get_uint64(stats.get(), "dropped", &droppedVideoFrames)) + return false; + } else if (m_fpsSink) { + unsigned renderedFrames, droppedFrames; + g_object_get(m_fpsSink.get(), "frames-rendered", &renderedFrames, "frames-dropped", &droppedFrames, nullptr); + totalVideoFrames = renderedFrames; + droppedVideoFrames = droppedFrames; + } // Caching is required so that metrics queries performed after EOS still return valid values. if (totalVideoFrames) diff -urp webkitgtk-2.42.1.orig/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h webkitgtk-2.42.1.gstreamer1.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h --- webkitgtk-2.42.1.orig/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2023-09-19 03:27:49.855692100 -0500 +++ webkitgtk-2.42.1.gstreamer1.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2023-10-09 16:57:58.869515615 -0500 @@ -578,6 +578,7 @@ private: uint64_t m_networkReadPosition { 0 }; mutable uint64_t m_readPositionAtLastDidLoadingProgress { 0 }; + GRefPtr<GstElement> m_fpsSink { nullptr }; uint64_t m_totalVideoFrames { 0 }; uint64_t m_droppedVideoFrames { 0 }; uint64_t m_decodedVideoFrames { 0 }; diff -urp webkitgtk-2.42.1.orig/Source/WebCore/platform/graphics/gstreamer/VideoFrameGStreamer.cpp webkitgtk-2.42.1.gstreamer1.16/Source/WebCore/platform/graphics/gstreamer/VideoFrameGStreamer.cpp --- webkitgtk-2.42.1.orig/Source/WebCore/platform/graphics/gstreamer/VideoFrameGStreamer.cpp 2023-09-19 03:27:49.855692100 -0500 +++ webkitgtk-2.42.1.gstreamer1.16/Source/WebCore/platform/graphics/gstreamer/VideoFrameGStreamer.cpp 2023-10-09 17:00:24.553622318 -0500 @@ -312,15 +312,11 @@ VideoFrameGStreamer::VideoFrameGStreamer { ensureVideoFrameDebugCategoryInitialized(); ASSERT(m_sample); - - if (!metadata) - return; - GstBuffer* buffer = gst_sample_get_buffer(m_sample.get()); RELEASE_ASSERT(buffer); - buffer = webkitGstBufferSetVideoFrameTimeMetadata(buffer, WTFMove(metadata)); - m_sample = adoptGRef(gst_sample_make_writable(m_sample.leakRef())); - gst_sample_set_buffer(m_sample.get(), buffer); + + if (metadata) + buffer = webkitGstBufferSetVideoFrameTimeMetadata(buffer, WTFMove(metadata)); } VideoFrameGStreamer::VideoFrameGStreamer(const GRefPtr<GstSample>& sample, const FloatSize& presentationSize, const MediaTime& presentationTime, Rotation videoRotation, PlatformVideoColorSpace&& colorSpace)
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
