Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gstreamer-plugins-vaapi for
openSUSE:Factory checked in at 2022-12-25 15:14:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-vaapi (Old)
and /work/SRC/openSUSE:Factory/.gstreamer-plugins-vaapi.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gstreamer-plugins-vaapi"
Sun Dec 25 15:14:42 2022 rev:54 rq:1045102 version:1.20.5
Changes:
--------
---
/work/SRC/openSUSE:Factory/gstreamer-plugins-vaapi/gstreamer-plugins-vaapi.changes
2022-11-04 17:36:33.845311710 +0100
+++
/work/SRC/openSUSE:Factory/.gstreamer-plugins-vaapi.new.1563/gstreamer-plugins-vaapi.changes
2022-12-25 15:14:58.041411938 +0100
@@ -1,0 +2,9 @@
+Fri Dec 23 19:34:55 UTC 2022 - Bjørn Lie <[email protected]>
+
+- Update to version 1.20.5:
+ + vaapi:
+ - Prefix internal USE_X11 define to fix build with mesa 22.3.0
+ - libs: context: use queried value for attrib
+ + gstreamer-vaapi cannot be built without X11 with recent mesa
+
+-------------------------------------------------------------------
Old:
----
gstreamer-vaapi-1.20.4.tar.xz
New:
----
gstreamer-vaapi-1.20.5.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gstreamer-plugins-vaapi.spec ++++++
--- /var/tmp/diff_new_pack.VSpSm5/_old 2022-12-25 15:14:58.477414405 +0100
+++ /var/tmp/diff_new_pack.VSpSm5/_new 2022-12-25 15:14:58.485414450 +0100
@@ -19,7 +19,7 @@
%define gst_branch 1.0
Name: gstreamer-plugins-vaapi
-Version: 1.20.4
+Version: 1.20.5
Release: 0
Summary: Gstreamer VA-API plugins
License: LGPL-2.1-or-later
++++++ gstreamer-vaapi-1.20.4.tar.xz -> gstreamer-vaapi-1.20.5.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gstreamer-vaapi-1.20.4/ChangeLog
new/gstreamer-vaapi-1.20.5/ChangeLog
--- old/gstreamer-vaapi-1.20.4/ChangeLog 2022-10-12 17:39:51.000000000
+0200
+++ new/gstreamer-vaapi-1.20.5/ChangeLog 2022-12-20 00:34:46.000000000
+0100
@@ -1,7 +1,74 @@
+=== release 1.20.5 ===
+
+2022-12-19 23:34:42 +0000 Tim-Philipp Müller <[email protected]>
+
+ * NEWS:
+ * RELEASE:
+ * gstreamer-vaapi.doap:
+ * meson.build:
+ Release 1.20.5
+
+2022-12-19 23:34:34 +0000 Tim-Philipp Müller <[email protected]>
+
+ * ChangeLog:
+ Update ChangeLogs for 1.20.5
+
+2022-12-10 13:11:08 +0000 Tim-Philipp Müller <[email protected]>
+
+ * gst-libs/gst/vaapi/gstvaapicontext.c:
+ * gst-libs/gst/vaapi/gstvaapidisplay.c:
+ * gst-libs/gst/vaapi/gstvaapidisplay_egl.c:
+ * gst-libs/gst/vaapi/gstvaapisurface_egl.c:
+ * gst-libs/gst/vaapi/video-format.c:
+ * gst/vaapi/gstvaapi.c:
+ * gst/vaapi/gstvaapidecode.c:
+ * gst/vaapi/gstvaapidecodebin.c:
+ * gst/vaapi/gstvaapipluginbase.c:
+ * gst/vaapi/gstvaapipluginutil.c:
+ * gst/vaapi/gstvaapipostproc.c:
+ * gst/vaapi/gstvaapisink.c:
+ * gst/vaapi/gstvaapivideobufferpool.c:
+ * gst/vaapi/gstvaapivideocontext.c:
+ * gst/vaapi/gstvaapivideometa_texture.c:
+ * meson.build:
+ * tests/internal/output.c:
+ * tests/internal/test-display.c:
+ * tests/internal/test-windows.c:
+ vaapi: prefix USE_FOO defines to fix build with mesa 22.3.0
+ Apparently mesa 22.3.0 has updated the egl headers, and eglplatform.h
now
+ contains commit
+
https://github.com/KhronosGroup/EGL-Registry/pull/130/commits/3670d645f4a26a0a9e87e7f3a8608e7cc1d53b5b
+ after which xlib headers don't get included by default anymore but are
+ dependent upon whether USE_X11 was defined.
+ This breaks headless builds of gstreamer-vaapi because we always
define
+ an internal define USE_X11 as either 1 or 0.
+ Change these defines to GST_VAAPI_USE_XYZ instead to avoid this.
+ Fixes #1634
+ Part-of:
<https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3558>
+
+2022-11-02 17:23:04 -0400 Boyuan Zhang <[email protected]>
+
+ * gst-libs/gst/vaapi/gstvaapicontext.c:
+ libs: context: use queried value for attrib
+ Attribute's value should use returned value from get_attribute for
+ VAConfigAttribRTFormat, since VAProfileHEVCMain10, in AMD Mesa
Gallium,
+ can process either VA_RT_FORMAT_420 and VA_RT_FORMAT_420_10, which
isn't
+ considered in gstreamer-vaapi design, where encoder's src pads will
+ expose only 4:2:0 color formats but no 4:2:0 10bit. So, this is a
workaround
+ for this issue while new vah265enc is released.
+ Signed-off-by: Boyuan Zhang <[email protected]>
+ Part-of:
<https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3435>
+
+2022-10-12 18:40:25 +0100 Tim-Philipp Müller <[email protected]>
+
+ * meson.build:
+ Back to development
+
=== release 1.20.4 ===
2022-10-12 16:39:47 +0100 Tim-Philipp Müller <[email protected]>
+ * ChangeLog:
* NEWS:
* RELEASE:
* gstreamer-vaapi.doap:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gstreamer-vaapi-1.20.4/NEWS
new/gstreamer-vaapi-1.20.5/NEWS
--- old/gstreamer-vaapi-1.20.4/NEWS 2022-10-12 17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/NEWS 2022-12-20 00:34:46.000000000 +0100
@@ -2,13 +2,13 @@
GStreamer 1.20.0 was originally released on 3 February 2022.
-The latest bug-fix release in the 1.20 series is 1.20.4 and was released
-on 12 October 2022.
+The latest bug-fix release in the 1.20 series is 1.20.5 and was released
+on 19 December 2022.
See https://gstreamer.freedesktop.org/releases/1.20/ for the latest
version of this document.
-Last updated: Wednesday 12 October 2022, 15:00 UTC (log)
+Last updated: Monday 19 December 2022, 19:00 UTC (log)
Introduction
@@ -1791,6 +1791,13 @@
Known Issues
+- GStreamer may fail to build the hotdoc documentation with the Meson
+ 0.64.0 release owing to a Meson bug. This should only affect systems
+ where hotdoc is installed, and will be fixed in Meson 0.64.1 by this
+ Meson PR in combination with this GStreamer MR. In the meantime,
+ users can pass -Ddoc=disabledor downgrade to an older Meson version
+ (< 0.64.0).
+
- nothing in particular at this point (but also see possibly breaking
changes section above)
@@ -2530,6 +2537,7 @@
chroma (Y41B, YUV9, YVU9 and IYU9)
- macOS build and packaging fixes, in particular fix finding of gio
modules on macOS for https/TLS support
+- Fix consuming of the macOS package as a framework in XCode
- Performance improvements
- Miscellaneous bug fixes, memory leak fixes, and other stability and
reliability improvements
@@ -2783,6 +2791,252 @@
- List of Merge Requests applied in 1.20.4
- List of Issues fixed in 1.20.4
+1.20.5
+
+The fifth 1.20 bug-fix release (1.20.5) was released on 19 December
+2022.
+
+This release only contains bugfixes and it should be safe to upgrade
+from 1.20.x.
+
+Highlighted bugfixes in 1.20.5
+
+- systemclock waiting fixes for certain 32-bit platforms/libcs
+- alphacombine: robustness improvements for corner case scenarios
+- avfvideosrc: Report latency when doing screen capture
+- d3d11videosink: various thread-safety and stability fixes
+- decklink: fix performance issue when HDMI signal has been lost for a
+ long time
+- flacparse: Fix handling of headers advertising 32 bits per sample
+- mpegts: Handle when iconv doesnât support ISO 6937 (e.g. musl libc)
+- opengl: fix automatic dispmanx detection for rpi4 and fix usage of
+ eglCreate/DestroyImage
+- opusdec: Various channel-related fixes
+- textrender: event handling fixes, esp. for GAP event
+- subparse: Fix non-closed tag handling
+- videoscale: fix handling of unknown buffer metas
+- videosink: reverse playback handling fixes
+- qtmux: Prefill mode fixes, especially for raw audio
+- multiudpsink: allow binding to IPv6 address
+- rtspsrc: Fix usage of IPv6 connections in SETUP
+- rtspsrc: Only EOS on timeout if all streams are timed out/EOS
+- splitmuxsrc: fix playback stall if there are unlinked pads
+- v4l2: Fix SIGSEGV on state change during format changes
+- wavparse robustness fixes
+- Fix static linking on macOS (opengl, vulkan)
+- gstreamer-vaapi: fix headless build against mesa >= 22.3.0
+- GStreamer Editing Services library: Fix build with tools disabled
+- webrtc example/demo fixes
+- unit test fixes for aesdec and rtpjitterbuffer
+- Cerbero: Fix ios cross-compile with cmake on M1; some recipe updates
+ and other build fixes
+- Binary packages: pkg-config file fixes for various recipes (ffmpeg,
+ taglib, gstreamer)
+- Binary packages: Enable high bitdepth support for libvpx (VP8/VP9
+ encoding/decoding)
+- Binary packages: ship aes plugin
+- Miscellaneous bug fixes, memory leak fixes, and other stability and
+ reliability improvements
+- Performance improvements
+
+gstreamer
+
+- allocator: Copy allocator name in gst_allocator_register()
+- miniobject: support higher refcount values
+- pads: Fix non-serialized sticky event push, e.g. instant change rate
+ events
+- padtemplate: Fix annotations
+- systemclock: Use futex_time64 syscall on x32 and other platforms
+ that alwaysâ¦
+- Fix build of 1.20 branch with Meson 0.64.1 for those who have hotdoc
+ installed on their system.
+- meson: fix check for pthread_setname_np()
+- -Wimplicit-function-declaration in pthread_setname_np check (missing
+ _GNU_SOURCE)
+- gst-inspect: Donât leak list
+
+Core Elements
+
+- concat: Properly propagate EOS seqnum
+- fakesrc: avoid time overflow with datarate
+
+gst-plugins-base
+
+- audioconvert, audioresample, audiofilter: fix divide by 0 for input
+ buffer without caps
+- cdparanoia: Ignore compiler warning coming from the cdparanoia
+ header
+- oggdemux, parsebin: More leak fixes
+- opengl: fix automatic dispmanx detection for rpi4
+- opengl: Fix usage of eglCreate/DestroyImage
+- opengl: Fix static linking on macOS
+- opusdec: Various channel-related fixes
+- textrender: Negotiate caps on a GAP event if none were negotiated
+ yet
+- textrender: Donât blindly forward all events and donât blindly
+ forward all events
+- timeoverlay: fix pad leak
+- oggdemux: Donât leak incoming EOS event
+- subparse: Fix non-closed tag handling.
+- videodecoder: Only post latency message if it changed
+- videoscale: buffer meta handling fixes (NULL-terminate array of
+ valid meta tags)
+- videosink: Donât return unknown end-time from get_times()
+- Bump core requirement in 1.20 branch to 1.20.4
+
+Tools
+
+- gst-play: Donât leak the stream collection
+
+gst-plugins-good
+
+- flacparse: Fix handling of headers advertising 32bps
+- qt5: deactivate context if fill_info fails
+- qt5: initialize GError properly in gst_qt_get_gl_wrapcontext()
+- qtdemux: check return value from gst_structure_get in PIFF box
+- qtdemux: use unsigned int types to store result of QT_UINT32
+- qtmux: Prefill mode fixes
+- oss4: Fix debug category initialization
+- multiudpsink: allow binding to IPv6 address
+- rtpjitterbuffer tests: Cast drop-messages-interval type properly
+ (fixing it on 32-bit architectures)
+- rtspsrc: fix seek event leaks
+- rtspsrc: Donât replace 404 errors with âno auth protocol foundâ
+- rtspsrc: Only EOS on timeout if all streams are timed out/EOS
+- rtspsrc: Fix usage of IPv6 connections in SETUP
+- splitmuxsrc: donât queue data on unlinked pads
+- v4l2: Fix SIGSEGV on âchange stateâ during âformat changeâ
+- v4l2videodec: Fix activation of internal pool
+- wavparse: Avoid occasional crash due to referencing freed buffer.
+- wavparse: Fix crash that occurs in push mode when header chunks are
+ corrupted in certain ways.
+
+gst-plugins-bad
+
+- aesdec: Fix padding removal for per-buffer-padding=FALSE
+- aesdec test failing in gst-plugins-bad
+- alphacombine: Add missing query handler for gaps
+- avfdeviceprovider: do not leak the properties
+- avfvideosrc: Report latency when doing screen capture
+- d3d11screencapturesrc: Specify PAR 1/1 to template caps
+- d3d11videosink: Fixing focus lost on desktop layout change
+- d3d11videosink: Call ShowWindow() from window thread
+- d3d11videosink: Fix deadlock when parent window is busy
+- d3d11videosink: Always clear back buffer on resize
+- decklink: reset calculation of time_mapping to fix clipping HDMI
+ video
+- directshow: Fix build error with glib 2.75 and newer
+- dvbsubenc: Forward GAP events as-is if we wouldnât produce an end
+ packet andâ¦
+- dvbsubenc: Write Display Definition Segment if a non-default
+ width/height is used
+- h265decoder: Do not abort when failed to prepare ref pic set
+- h264parser: Fix a typo in pred_weight_table parsing.
+- mediafoundation, d3d11: Fix memory leak and make leak tracer happy
+- mpegts: Handle when iconv doesnât support ISO 6937 (e.g. musl libc)
+- mpegts: Check continuity counter on section streams
+- mpegts: Revert âmpegtspacketizer: memcmp potentially seen_before
+ dataâ
+- mpegtspacketizer: memcmp potentially seen_before data
+- mpegtsdemux: Always clear packetizer on DISCONT push mode
+- srt: various fixes - improve stats and error handling
+- rtmp2: Improve error messages
+- rtmp2sink: Correctly return GST_FLOW_ERROR on error
+- vulkan: Fix static linking on macOS
+- webrtcbin: also add rtcp-fb ccm fir for video mlines by default
+- webrtc/nice: fix small leak of split strings
+
+gst-plugins-ugly
+
+- No changes
+
+gst-libav
+
+- avdec_h265: Fix endless renegotiation with alternate interlacing
+- avviddec: Avoid flushing on framerate changes
+
+gst-rtsp-server
+
+- rtsp-server: Free client if no connection could be created
+
+gstreamer-vaapi
+
+- vaapi: prefix internal USE_X11 define to fix build with mesa 22.3.0
+- vaapi: libs: context: use queried value for attrib
+- gstreamer-vaapi cannot be built without X11 with recent mesa
+
+gstreamer-sharp
+
+- No changes
+
+gst-omx
+
+- No changes
+
+gst-python
+
+- No changes
+
+gst-editing-services
+
+- Fix building ges with tools disabled
+- Fix leaks and minor races in GES
+
+gst-examples:
+
+- webrtc: Fix double free in webrtc-recvonly-h264 demo
+- webrtc: Fix critical in webrtc-recvonly-h264 example
+- webrtc/signalling examples: Fix compatibility with Python 3.10
+
+Development build environment + gst-full build
+
+- No major changes
+
+Cerbero build tool and packaging changes in 1.20.5
+
+- oven: output status line at least every minute
+- Unconditionally set CMAKE_SYSTEM_NAME on Windows
+- Fix ios cross-compile with cmake on M1
+- Speed up downloads on Windows drastically
+- Fix tar usage on bsdtar and print progress while compressing
+- Actually print the sha for which the cache was not found
+
+Recipes
+
+- ffmpeg: add patch to generate the pc files properly
+- taglib: add patch to generate the pc files properly
+- fontconfig: update to 2.14.1
+- Windows: Crash on GStreamer 1.20.x x86_64 MSVC + MS-Windows due to
+ libfontconfig fonts.conf file invalid.
+- openssl: Fix compile errors on upgrades
+- moltenvk: Also ship the static library on macOS
+- gstreamer: Add some missing pkgconfig files
+- gst-plugins-good: Fix post_install failure when qt5 is enabled
+- gst-plugins-bad: Ship AES plugin
+- libvpx: Enable high bitdepth support
+- openssl: update to 1.1.1s
+- glib: Update patch to auto-detect modules on macOS
+
+Contributors to 1.20.5
+
+Aleksandr Slobodeniuk, Arun Raghavan, A. Wilcox, Bo Elmgreen, Boyuan
+Zhang, Bunio FH, Célestin Marot, Devin Anderson, Edward Hervey, He
+Junyan, Ignacio Casal Quinteiro, Jacek Skiba, Jan Alexander Steffens
+(heftig), Jan Schmidt, Jonas Bonn, Jordan Petridis, Justin Chadwell,
+Linus Svensson, Marek Olejnik, Mathieu Duponchelle, Matthew Waters,
+Nicolas Dufresne, Nirbheek Chauhan, Patrick Griffis, Pawel Stawicki,
+Philippe Normand, Ruben Gonzalez, Sam Van Den Berge, Sebastian Dröge,
+Seungha Yang, Stéphane Cerveau, Tim-Philipp Müller, Vivia Nikolaidou,
+Wojciech Kapsa, Xavier Claessens,
+
+⦠and many others who have contributed bug reports, translations, sent
+suggestions or helped testing. Thank you all!
+
+List of merge requests and issues fixed in 1.20.5
+
+- List of Merge Requests applied in 1.20.5
+- List of Issues fixed in 1.20.5
+
Schedule for 1.22
Our next major feature release will be 1.22, and 1.21 will be the
@@ -2790,7 +3044,7 @@
development of 1.21/1.22 will happen in the git main branch.
The plan for the 1.22 development cycle is now confirmed, and we aim for
-a 1.22.0 release in December 2022.
+a 1.22.0 release in December 2022 or early January 2023.
1.22 will be backwards-compatible to the stable 1.20, 1.18, 1.16, 1.14,
1.12, 1.10, 1.8, 1.6, 1.4, 1.2 and 1.0 release series.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gstreamer-vaapi-1.20.4/RELEASE
new/gstreamer-vaapi-1.20.5/RELEASE
--- old/gstreamer-vaapi-1.20.4/RELEASE 2022-10-12 17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/RELEASE 2022-12-20 00:34:46.000000000 +0100
@@ -1,4 +1,4 @@
-This is GStreamer gstreamer-vaapi 1.20.4.
+This is GStreamer gstreamer-vaapi 1.20.5.
The GStreamer team is thrilled to announce a new major feature release
of your favourite cross-platform multimedia framework!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapi.c
new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapi.c
--- old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapi.c 2022-10-12
17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapi.c 2022-12-20
00:34:46.000000000 +0100
@@ -29,14 +29,14 @@
#include "gstvaapisink.h"
#include "gstvaapidecodebin.h"
-#if USE_ENCODERS
+#if GST_VAAPI_USE_ENCODERS
#include "gstvaapiencode_h264.h"
#include "gstvaapiencode_mpeg2.h"
#include "gstvaapiencode_jpeg.h"
#include "gstvaapiencode_vp8.h"
#include "gstvaapiencode_h265.h"
-#if USE_VP9_ENCODER
+#if GST_VAAPI_USE_VP9_ENCODER
#include "gstvaapiencode_vp9.h"
#endif
#endif
@@ -109,7 +109,7 @@
return codecs;
}
-#if USE_ENCODERS
+#if GST_VAAPI_USE_ENCODERS
static GArray *
display_get_encoder_codecs (GstVaapiDisplay * display)
{
@@ -144,7 +144,7 @@
DEF_ENC (MPEG2, mpeg2),
DEF_ENC (JPEG, jpeg),
DEF_ENC (VP8, vp8),
-#if USE_VP9_ENCODER
+#if GST_VAAPI_USE_VP9_ENCODER
DEF_ENC (VP9, vp9),
#endif
DEF_ENC (H265, h265),
@@ -217,7 +217,7 @@
rank = GST_RANK_MARGINAL;
gst_element_register (plugin, "vaapisink", rank, GST_TYPE_VAAPISINK);
-#if USE_ENCODERS
+#if GST_VAAPI_USE_ENCODERS
gst_vaapiencode_register (plugin, display);
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapidecode.c
new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapidecode.c
--- old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapidecode.c 2022-10-12
17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapidecode.c 2022-12-20
00:34:46.000000000 +0100
@@ -30,7 +30,7 @@
#include "gstvaapidecode_props.h"
#include "gstvaapipluginutil.h"
#include "gstvaapivideobuffer.h"
-#if (USE_GLX || USE_EGL)
+#if (GST_VAAPI_USE_GLX || GST_VAAPI_USE_EGL)
#include "gstvaapivideometa_texture.h"
#endif
#include "gstvaapivideobufferpool.h"
@@ -44,7 +44,7 @@
#include <gst/vaapi/gstvaapidecoder_vp8.h>
#include <gst/vaapi/gstvaapidecoder_h265.h>
#include <gst/vaapi/gstvaapidecoder_vp9.h>
-#if USE_AV1_DECODER
+#if GST_VAAPI_USE_AV1_DECODER
#include <gst/vaapi/gstvaapidecoder_av1.h>
#endif
@@ -71,7 +71,7 @@
static const char gst_vaapidecode_src_caps_str[] =
GST_VAAPI_MAKE_SURFACE_CAPS "; "
-#if (USE_GLX || USE_EGL)
+#if (GST_VAAPI_USE_GLX || GST_VAAPI_USE_EGL)
GST_VAAPI_MAKE_GLTEXUPLOAD_CAPS "; "
#endif
GST_VIDEO_CAPS_MAKE(GST_VAAPI_FORMATS_ALL);
@@ -260,7 +260,7 @@
gst_caps_set_features_simple (va_caps,
gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE));
-#if (USE_GLX || USE_EGL)
+#if (GST_VAAPI_USE_GLX || GST_VAAPI_USE_EGL)
if (!GST_VAAPI_PLUGIN_BASE_SRC_PAD_CAN_DMABUF (decode)
&& gst_vaapi_display_has_opengl (GST_VAAPI_PLUGIN_BASE_DISPLAY
(decode))) {
gltexup_caps = gst_caps_from_string (GST_VAAPI_MAKE_GLTEXUPLOAD_CAPS);
@@ -332,7 +332,7 @@
if (feature == GST_VAAPI_CAPS_FEATURE_NOT_NEGOTIATED)
return FALSE;
-#if (!USE_GLX && !USE_EGL)
+#if (!GST_VAAPI_USE_GLX && !GST_VAAPI_USE_EGL)
/* This is a very pathological situation. Should not happen. */
if (feature == GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META)
return FALSE;
@@ -623,7 +623,7 @@
GST_BUFFER_FLAG_SET (out_frame->output_buffer,
GST_VIDEO_BUFFER_FLAG_FIRST_IN_BUNDLE);
}
-#if (USE_GLX || USE_EGL)
+#if (GST_VAAPI_USE_GLX || GST_VAAPI_USE_EGL)
if (decode->has_texture_upload_meta)
gst_buffer_ensure_texture_upload_meta (out_frame->output_buffer);
#endif
@@ -851,7 +851,7 @@
decode->has_texture_upload_meta = FALSE;
-#if (USE_GLX || USE_EGL)
+#if (GST_VAAPI_USE_GLX || GST_VAAPI_USE_EGL)
decode->has_texture_upload_meta =
gst_query_find_allocation_meta (query,
GST_VIDEO_GL_TEXTURE_UPLOAD_META_API_TYPE, NULL) &&
@@ -963,7 +963,7 @@
case GST_VAAPI_CODEC_VP9:
decode->decoder = gst_vaapi_decoder_vp9_new (dpy, caps);
break;
-#if USE_AV1_DECODER
+#if GST_VAAPI_USE_AV1_DECODER
case GST_VAAPI_CODEC_AV1:
decode->decoder = gst_vaapi_decoder_av1_new (dpy, caps);
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapidecodebin.c
new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapidecodebin.c
--- old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapidecodebin.c 2022-10-12
17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapidecodebin.c 2022-12-20
00:34:46.000000000 +0100
@@ -96,7 +96,7 @@
static const char gst_vaapi_decode_bin_src_caps_str[] =
GST_VAAPI_MAKE_SURFACE_CAPS ", "
GST_CAPS_INTERLACED_FALSE "; "
-#if (USE_GLX || USE_EGL)
+#if (GST_VAAPI_USE_GLX || GST_VAAPI_USE_EGL)
GST_VAAPI_MAKE_GLTEXUPLOAD_CAPS ", "
GST_CAPS_INTERLACED_FALSE "; "
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapipluginbase.c
new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapipluginbase.c
--- old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapipluginbase.c 2022-10-12
17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapipluginbase.c 2022-12-20
00:34:46.000000000 +0100
@@ -698,7 +698,7 @@
gst_buffer_pool_config_add_option (config,
GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
}
-#if (USE_GLX || USE_EGL)
+#if (GST_VAAPI_USE_GLX || GST_VAAPI_USE_EGL)
if (options & GST_VAAPI_VIDEO_BUFFER_POOL_OPTION_GL_TEXTURE_UPLOAD) {
gst_buffer_pool_config_add_option (config,
GST_BUFFER_POOL_OPTION_VIDEO_GL_TEXTURE_UPLOAD_META);
@@ -987,7 +987,7 @@
guint i, size, min, max, pool_options, num_allocators;
gint index_allocator;
gboolean update_pool = FALSE;
-#if (USE_GLX || USE_EGL)
+#if (GST_VAAPI_USE_GLX || GST_VAAPI_USE_EGL)
guint idx;
#endif
@@ -999,7 +999,7 @@
if (gst_query_find_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL))
pool_options |= GST_VAAPI_VIDEO_BUFFER_POOL_OPTION_VIDEO_META;
-#if (USE_GLX || USE_EGL)
+#if (GST_VAAPI_USE_GLX || GST_VAAPI_USE_EGL)
if (gst_query_find_allocation_meta (query,
GST_VIDEO_GL_TEXTURE_UPLOAD_META_API_TYPE, &idx) &&
gst_vaapi_caps_feature_contains (caps,
@@ -1328,13 +1328,13 @@
gst_object_replace (&plugin->gl_context, object);
switch (gst_gl_context_get_gl_platform (gl_context)) {
-#if USE_GLX
+#if GST_VAAPI_USE_GLX
case GST_GL_PLATFORM_GLX:
display_type = GST_VAAPI_DISPLAY_TYPE_GLX;
break;
#endif
case GST_GL_PLATFORM_EGL:
-#if USE_EGL
+#if GST_VAAPI_USE_EGL
display_type = GST_VAAPI_DISPLAY_TYPE_EGL;
break;
#endif
@@ -1531,7 +1531,7 @@
gst_vaapi_plugin_base_set_srcpad_can_dmabuf (GstVaapiPluginBase * plugin,
GstObject * object)
{
-#if USE_EGL && USE_GST_GL_HELPERS
+#if GST_VAAPI_USE_EGL && USE_GST_GL_HELPERS
GstVaapiPadPrivate *srcpriv = GST_VAAPI_PAD_PRIVATE (plugin->srcpad);
GstGLContext *const gl_context = GST_GL_CONTEXT (object);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapipluginutil.c
new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapipluginutil.c
--- old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapipluginutil.c 2022-10-12
17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapipluginutil.c 2022-12-20
00:34:46.000000000 +0100
@@ -26,24 +26,24 @@
#include "gstvaapivideocontext.h"
#include <gst/vaapi/gstvaapiprofilecaps.h>
#include <gst/vaapi/gstvaapiutils.h>
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
# include <gst/vaapi/gstvaapidisplay_drm.h>
#endif
-#if USE_X11
+#if GST_VAAPI_USE_X11
# include <gst/vaapi/gstvaapidisplay_x11.h>
#endif
-#if USE_GLX
+#if GST_VAAPI_USE_GLX
# include <gst/vaapi/gstvaapidisplay_glx.h>
#endif
-#if USE_EGL
+#if GST_VAAPI_USE_EGL
# include <gst/vaapi/gstvaapidisplay_egl.h>
#endif
-#if USE_WAYLAND
+#if GST_VAAPI_USE_WAYLAND
# include <gst/vaapi/gstvaapidisplay_wayland.h>
#endif
#if USE_GST_GL_HELPERS
# include <gst/gl/gl.h>
-#if USE_EGL && GST_GL_HAVE_PLATFORM_EGL
+#if GST_VAAPI_USE_EGL && GST_GL_HAVE_PLATFORM_EGL
# include <gst/gl/egl/gstgldisplay_egl.h>
#endif
#endif
@@ -66,28 +66,28 @@
/* *INDENT-OFF* */
static const DisplayMap g_display_map[] = {
-#if USE_WAYLAND
+#if GST_VAAPI_USE_WAYLAND
{"wayland",
GST_VAAPI_DISPLAY_TYPE_WAYLAND,
gst_vaapi_display_wayland_new,
(GstVaapiDisplayCreateFromHandleFunc)
gst_vaapi_display_wayland_new_with_display},
#endif
-#if USE_GLX
+#if GST_VAAPI_USE_GLX
{"glx",
GST_VAAPI_DISPLAY_TYPE_GLX,
gst_vaapi_display_glx_new,
(GstVaapiDisplayCreateFromHandleFunc)
gst_vaapi_display_glx_new_with_display},
#endif
-#if USE_X11
+#if GST_VAAPI_USE_X11
{"x11",
GST_VAAPI_DISPLAY_TYPE_X11,
gst_vaapi_display_x11_new,
(GstVaapiDisplayCreateFromHandleFunc)
gst_vaapi_display_x11_new_with_display},
#endif
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
{"drm",
GST_VAAPI_DISPLAY_TYPE_DRM,
gst_vaapi_display_drm_new},
@@ -140,26 +140,26 @@
GstGLPlatform gl_platform)
{
switch (gl_display_type) {
-#if USE_X11
+#if GST_VAAPI_USE_X11
case GST_GL_DISPLAY_TYPE_X11:{
-#if USE_GLX
+#if GST_VAAPI_USE_GLX
if (gl_platform == GST_GL_PLATFORM_GLX)
return GST_VAAPI_DISPLAY_TYPE_GLX;
#endif
return GST_VAAPI_DISPLAY_TYPE_X11;
}
#endif
-#if USE_WAYLAND
+#if GST_VAAPI_USE_WAYLAND
case GST_GL_DISPLAY_TYPE_WAYLAND:{
return GST_VAAPI_DISPLAY_TYPE_WAYLAND;
}
#endif
-#if USE_EGL
+#if GST_VAAPI_USE_EGL
case GST_GL_DISPLAY_TYPE_EGL:{
return GST_VAAPI_DISPLAY_TYPE_EGL;
}
#endif
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
case GST_GL_DISPLAY_TYPE_GBM:{
return GST_VAAPI_DISPLAY_TYPE_DRM;
}
@@ -178,23 +178,23 @@
const gchar *const gl_window_type = g_getenv ("GST_GL_WINDOW");
if (!gl_window_type) {
-#if USE_X11 && GST_GL_HAVE_WINDOW_X11
+#if GST_VAAPI_USE_X11 && GST_GL_HAVE_WINDOW_X11
return GST_VAAPI_DISPLAY_TYPE_X11;
-#elif USE_WAYLAND && GST_GL_HAVE_WINDOW_WAYLAND
+#elif GST_VAAPI_USE_WAYLAND && GST_GL_HAVE_WINDOW_WAYLAND
return GST_VAAPI_DISPLAY_TYPE_WAYLAND;
-#elif USE_EGL && GST_GL_HAVE_PLATFORM_EGL
+#elif GST_VAAPI_USE_EGL && GST_GL_HAVE_PLATFORM_EGL
return GST_VAAPI_DISPLAY_TYPE_EGL;
#endif
}
-#if USE_X11
+#if GST_VAAPI_USE_X11
if (g_strcmp0 (gl_window_type, "x11") == 0)
return GST_VAAPI_DISPLAY_TYPE_X11;
#endif
-#if USE_WAYLAND
+#if GST_VAAPI_USE_WAYLAND
if (g_strcmp0 (gl_window_type, "wayland") == 0)
return GST_VAAPI_DISPLAY_TYPE_WAYLAND;
#endif
-#if USE_EGL
+#if GST_VAAPI_USE_EGL
{
const gchar *const gl_platform_type = g_getenv ("GST_GL_PLATFORM");
if (g_strcmp0 (gl_platform_type, "egl") == 0)
@@ -205,7 +205,7 @@
return GST_VAAPI_DISPLAY_TYPE_ANY;
}
-#if USE_EGL
+#if GST_VAAPI_USE_EGL
static gint
gst_vaapi_get_gles_version_from_gl_api (GstGLAPI gl_api)
{
@@ -236,7 +236,7 @@
}
return egl_handle;
}
-#endif /* USE_EGL */
+#endif /* GST_VAAPI_USE_EGL */
static GstVaapiDisplay *
gst_vaapi_create_display_from_egl (GstGLDisplay * gl_display,
@@ -244,7 +244,7 @@
gpointer native_display)
{
GstVaapiDisplay *display = NULL;
-#if USE_EGL
+#if GST_VAAPI_USE_EGL
GstGLAPI gl_api;
gint gles_version;
guintptr egl_handler;
@@ -917,10 +917,10 @@
guint i;
GstVaapiDisplay *display = NULL;
const GstVaapiDisplayType test_display_map[] = {
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
GST_VAAPI_DISPLAY_TYPE_DRM,
#endif
-#if USE_X11
+#if GST_VAAPI_USE_X11
GST_VAAPI_DISPLAY_TYPE_X11,
#endif
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapipostproc.c
new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapipostproc.c
--- old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapipostproc.c 2022-10-12
17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapipostproc.c 2022-12-20
00:34:46.000000000 +0100
@@ -69,7 +69,7 @@
static const char gst_vaapipostproc_src_caps_str[] =
GST_VAAPI_MAKE_SURFACE_CAPS ", "
GST_CAPS_INTERLACED_FALSE "; "
-#if (USE_GLX || USE_EGL)
+#if (GST_VAAPI_USE_GLX || GST_VAAPI_USE_EGL)
GST_VAAPI_MAKE_GLTEXUPLOAD_CAPS "; "
#endif
GST_VIDEO_CAPS_MAKE (GST_VAAPI_FORMATS_ALL) ", "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapisink.c
new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapisink.c
--- old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapisink.c 2022-10-12
17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapisink.c 2022-12-20
00:34:46.000000000 +0100
@@ -177,7 +177,7 @@
/* --- DRM Backend --- */
/* ------------------------------------------------------------------------ */
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
#include <gst/vaapi/gstvaapidisplay_drm.h>
static gboolean
@@ -212,7 +212,7 @@
/* --- X11 Backend --- */
/* ------------------------------------------------------------------------ */
-#if USE_X11
+#if GST_VAAPI_USE_X11
#include <gst/vaapi/gstvaapidisplay_x11.h>
#include <gst/vaapi/gstvaapiwindow_x11.h>
@@ -528,7 +528,7 @@
/* --- Wayland Backend --- */
/* ------------------------------------------------------------------------ */
-#if USE_WAYLAND
+#if GST_VAAPI_USE_WAYLAND
#include <gst/vaapi/gstvaapidisplay_wayland.h>
#include <gst/vaapi/gstvaapiwindow_wayland.h>
@@ -1027,22 +1027,22 @@
gst_vaapisink_ensure_backend (GstVaapiSink * sink)
{
switch (GST_VAAPI_PLUGIN_BASE_DISPLAY_TYPE (sink)) {
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
case GST_VAAPI_DISPLAY_TYPE_DRM:
sink->backend = gst_vaapisink_backend_drm ();
break;
#endif
-#if USE_X11
+#if GST_VAAPI_USE_X11
case GST_VAAPI_DISPLAY_TYPE_X11:
sink->backend = gst_vaapisink_backend_x11 ();
break;
#endif
-#if USE_GLX
+#if GST_VAAPI_USE_GLX
case GST_VAAPI_DISPLAY_TYPE_GLX:
sink->backend = gst_vaapisink_backend_x11 ();
break;
#endif
-#if USE_WAYLAND
+#if GST_VAAPI_USE_WAYLAND
case GST_VAAPI_DISPLAY_TYPE_WAYLAND:
sink->backend = gst_vaapisink_backend_wayland ();
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapivideobufferpool.c
new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapivideobufferpool.c
--- old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapivideobufferpool.c
2022-10-12 17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapivideobufferpool.c
2022-12-20 00:34:46.000000000 +0100
@@ -25,7 +25,7 @@
#include "gstvaapivideobuffer.h"
#include "gstvaapivideomemory.h"
#include "gstvaapipluginutil.h"
-#if (USE_GLX || USE_EGL)
+#if (GST_VAAPI_USE_GLX || GST_VAAPI_USE_EGL)
#include "gstvaapivideometa_texture.h"
#endif
@@ -431,7 +431,7 @@
GST_META_FLAG_SET (vmeta, GST_META_FLAG_POOLED);
}
-#if (USE_GLX || USE_EGL)
+#if (GST_VAAPI_USE_GLX || GST_VAAPI_USE_EGL)
if (priv->options & GST_VAAPI_VIDEO_BUFFER_POOL_OPTION_GL_TEXTURE_UPLOAD) {
GstMeta *tex_meta = gst_buffer_add_texture_upload_meta (buffer);
if (tex_meta)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapivideocontext.c
new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapivideocontext.c
--- old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapivideocontext.c 2022-10-12
17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapivideocontext.c 2022-12-20
00:34:46.000000000 +0100
@@ -28,13 +28,13 @@
#if USE_GST_GL_HELPERS
# include <gst/gl/gl.h>
#endif
-#if USE_X11
+#if GST_VAAPI_USE_X11
#include <gst/vaapi/gstvaapidisplay_x11.h>
#endif
-#if USE_WAYLAND
+#if GST_VAAPI_USE_WAYLAND
#include <gst/vaapi/gstvaapidisplay_wayland.h>
#endif
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
#include <gst/vaapi/gstvaapidisplay_drm.h>
#endif
@@ -104,7 +104,7 @@
if (gst_structure_get (structure, "va-display", G_TYPE_POINTER,
&va_display,
NULL)) {
-#if USE_X11
+#if GST_VAAPI_USE_X11
Display *x11_display = NULL;
if (gst_structure_get (structure, "x11-display", G_TYPE_POINTER,
&x11_display, NULL)) {
@@ -112,7 +112,7 @@
gst_vaapi_display_x11_new_with_va_display (va_display,
x11_display);
}
#endif
-#if USE_WAYLAND
+#if GST_VAAPI_USE_WAYLAND
if (!display) {
struct wl_display *wl_display = NULL;
if (gst_structure_get (structure, "wl-display", G_TYPE_POINTER,
@@ -123,7 +123,7 @@
}
}
#endif
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
if (!display) {
gint fd = -1;
if (gst_structure_get (structure, "drm-device-fd", G_TYPE_INT, &fd,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapivideometa_texture.c
new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapivideometa_texture.c
--- old/gstreamer-vaapi-1.20.4/gst/vaapi/gstvaapivideometa_texture.c
2022-10-12 17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/gst/vaapi/gstvaapivideometa_texture.c
2022-12-20 00:34:46.000000000 +0100
@@ -30,13 +30,13 @@
#include "gstvaapivideometa_texture.h"
#include "gstvaapipluginutil.h"
-#if USE_GLX
+#if GST_VAAPI_USE_GLX
#include <gst/vaapi/gstvaapitexture_glx.h>
#endif
#define DEFAULT_FORMAT GST_VIDEO_FORMAT_RGBA
-#if (USE_GLX || USE_EGL)
+#if (GST_VAAPI_USE_GLX || GST_VAAPI_USE_EGL)
struct _GstVaapiVideoMetaTexture
{
GstVaapiTexture *texture;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapicontext.c
new/gstreamer-vaapi-1.20.5/gst-libs/gst/vaapi/gstvaapicontext.c
--- old/gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapicontext.c
2022-10-12 17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/gst-libs/gst/vaapi/gstvaapicontext.c
2022-12-20 00:34:46.000000000 +0100
@@ -333,12 +333,12 @@
string_of_va_chroma_format (va_chroma_format));
goto cleanup;
}
- attrib->value = va_chroma_format;
+ attrib->value = value;
attrib = &attribs[++attrib_index];
g_assert (attrib_index < G_N_ELEMENTS (attribs));
switch (cip->usage) {
-#if USE_ENCODERS
+#if GST_VAAPI_USE_ENCODERS
case GST_VAAPI_CONTEXT_USAGE_ENCODE:
{
const GstVaapiConfigInfoEncoder *const config = &cip->config.encoder;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay.c
new/gstreamer-vaapi-1.20.5/gst-libs/gst/vaapi/gstvaapidisplay.c
--- old/gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay.c
2022-10-12 17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/gst-libs/gst/vaapi/gstvaapidisplay.c
2022-12-20 00:34:46.000000000 +0100
@@ -115,23 +115,23 @@
static const GEnumValue display_types[] = {
{GST_VAAPI_DISPLAY_TYPE_ANY,
"Auto detection", "any"},
-#if USE_X11
+#if GST_VAAPI_USE_X11
{GST_VAAPI_DISPLAY_TYPE_X11,
"VA/X11 display", "x11"},
#endif
-#if USE_GLX
+#if GST_VAAPI_USE_GLX
{GST_VAAPI_DISPLAY_TYPE_GLX,
"VA/GLX display", "glx"},
#endif
-#if USE_EGL
+#if GST_VAAPI_USE_EGL
{GST_VAAPI_DISPLAY_TYPE_EGL,
"VA/EGL display", "egl"},
#endif
-#if USE_WAYLAND
+#if GST_VAAPI_USE_WAYLAND
{GST_VAAPI_DISPLAY_TYPE_WAYLAND,
"VA/Wayland display", "wayland"},
#endif
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
{GST_VAAPI_DISPLAY_TYPE_DRM,
"VA/DRM display", "drm"},
#endif
@@ -1896,13 +1896,13 @@
get_render_mode_default (GstVaapiDisplay * display, GstVaapiRenderMode * pmode)
{
switch (GST_VAAPI_DISPLAY_VADISPLAY_TYPE (display)) {
-#if USE_WAYLAND
+#if GST_VAAPI_USE_WAYLAND
case GST_VAAPI_DISPLAY_TYPE_WAYLAND:
/* wl_buffer mapped from VA surface through vaGetSurfaceBufferWl() */
*pmode = GST_VAAPI_RENDER_MODE_OVERLAY;
break;
#endif
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
case GST_VAAPI_DISPLAY_TYPE_DRM:
/* vaGetSurfaceBufferDRM() returns the underlying DRM buffer handle */
*pmode = GST_VAAPI_RENDER_MODE_OVERLAY;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay_egl.c
new/gstreamer-vaapi-1.20.5/gst-libs/gst/vaapi/gstvaapidisplay_egl.c
--- old/gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapidisplay_egl.c
2022-10-12 17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/gst-libs/gst/vaapi/gstvaapidisplay_egl.c
2022-12-20 00:34:46.000000000 +0100
@@ -28,10 +28,10 @@
#include "gstvaapiwindow_priv.h"
#include "gstvaapitexture_egl.h"
-#if USE_X11
+#if GST_VAAPI_USE_X11
#include "gstvaapidisplay_x11.h"
#endif
-#if USE_WAYLAND
+#if GST_VAAPI_USE_WAYLAND
#include "gstvaapidisplay_wayland.h"
#endif
@@ -110,13 +110,13 @@
native_egl_display = params->gl_display;
if (!native_vaapi_display) {
-#if USE_X11
+#if GST_VAAPI_USE_X11
if (params->display_type == GST_VAAPI_DISPLAY_TYPE_ANY
|| params->display_type == GST_VAAPI_DISPLAY_TYPE_X11
|| params->display_type == GST_VAAPI_DISPLAY_TYPE_EGL)
native_vaapi_display = gst_vaapi_display_x11_new (NULL);
#endif
-#if USE_WAYLAND
+#if GST_VAAPI_USE_WAYLAND
if (!native_vaapi_display)
native_vaapi_display = gst_vaapi_display_wayland_new (NULL);
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapisurface_egl.c
new/gstreamer-vaapi-1.20.5/gst-libs/gst/vaapi/gstvaapisurface_egl.c
--- old/gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/gstvaapisurface_egl.c
2022-10-12 17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/gst-libs/gst/vaapi/gstvaapisurface_egl.c
2022-12-20 00:34:46.000000000 +0100
@@ -32,7 +32,7 @@
#include "gstvaapisurface_drm.h"
#include "gstvaapisurface_priv.h"
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
#include <drm_fourcc.h>
#else
#define DRM_FORMAT_MOD_LINEAR 0ULL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/video-format.c
new/gstreamer-vaapi-1.20.5/gst-libs/gst/vaapi/video-format.c
--- old/gstreamer-vaapi-1.20.4/gst-libs/gst/vaapi/video-format.c
2022-10-12 17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/gst-libs/gst/vaapi/video-format.c
2022-12-20 00:34:46.000000000 +0100
@@ -35,7 +35,7 @@
#define DEBUG 1
#include "gst/vaapi/gstvaapidebug.h"
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
#include <drm_fourcc.h>
#endif
@@ -49,7 +49,7 @@
#define VA_BYTE_ORDER_NOT_CARE 0
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
#define MAKE_DRM_FORMAT(DRM_FORMAT) G_PASTE(DRM_FORMAT_,DRM_FORMAT)
#else
#define MAKE_DRM_FORMAT(DRM_FORMAT) 0
@@ -643,7 +643,7 @@
guint
gst_vaapi_drm_format_from_va_fourcc (guint32 fourcc)
{
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
const GArray *map = gst_vaapi_video_formats_map;
const GstVideoFormatMap *m;
guint i;
@@ -679,7 +679,7 @@
GstVideoFormat
gst_vaapi_video_format_from_drm_format (guint drm_format)
{
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
const GArray *map = gst_vaapi_video_formats_map;
const GstVideoFormatMap *m;
guint i;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gstreamer-vaapi-1.20.4/gstreamer-vaapi.doap
new/gstreamer-vaapi-1.20.5/gstreamer-vaapi.doap
--- old/gstreamer-vaapi-1.20.4/gstreamer-vaapi.doap 2022-10-12
17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/gstreamer-vaapi.doap 2022-12-20
00:34:46.000000000 +0100
@@ -27,6 +27,16 @@
<release>
<Version>
+ <revision>1.20.5</revision>
+ <branch>1.20</branch>
+ <name></name>
+ <created>2022-12-19</created>
+ <file-release
rdf:resource="https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.5.tar.xz";
/>
+ </Version>
+ </release>
+
+ <release>
+ <Version>
<revision>1.20.4</revision>
<branch>1.20</branch>
<name></name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gstreamer-vaapi-1.20.4/meson.build
new/gstreamer-vaapi-1.20.5/meson.build
--- old/gstreamer-vaapi-1.20.4/meson.build 2022-10-12 17:39:51.000000000
+0200
+++ new/gstreamer-vaapi-1.20.5/meson.build 2022-12-20 00:34:46.000000000
+0100
@@ -1,5 +1,5 @@
project('gstreamer-vaapi', 'c',
- version : '1.20.4',
+ version : '1.20.5',
meson_version : '>= 0.59',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
@@ -171,14 +171,14 @@
cdata.set_quoted('PACKAGE_STRING', 'GStreamer VA-API Plug-ins
@0@'.format(gst_version))
cdata.set_quoted('PACKAGE_BUGREPORT', get_option('package-origin'))
cdata.set_quoted('VA_DRIVERS_PATH', '@0@'.format(driverdir))
-cdata.set10('USE_DRM', USE_DRM)
-cdata.set10('USE_EGL', USE_EGL)
-cdata.set10('USE_ENCODERS', USE_ENCODERS)
-cdata.set10('USE_GLX', USE_GLX)
-cdata.set10('USE_VP9_ENCODER', USE_VP9_ENCODER)
-cdata.set10('USE_AV1_DECODER', USE_AV1_DECODER)
-cdata.set10('USE_WAYLAND', USE_WAYLAND)
-cdata.set10('USE_X11', USE_X11)
+cdata.set10('GST_VAAPI_USE_DRM', USE_DRM)
+cdata.set10('GST_VAAPI_USE_EGL', USE_EGL)
+cdata.set10('GST_VAAPI_USE_ENCODERS', USE_ENCODERS)
+cdata.set10('GST_VAAPI_USE_GLX', USE_GLX)
+cdata.set10('GST_VAAPI_USE_VP9_ENCODER', USE_VP9_ENCODER)
+cdata.set10('GST_VAAPI_USE_AV1_DECODER', USE_AV1_DECODER)
+cdata.set10('GST_VAAPI_USE_WAYLAND', USE_WAYLAND)
+cdata.set10('GST_VAAPI_USE_X11', USE_X11)
cdata.set10('HAVE_XKBLIB', cc.has_header('X11/XKBlib.h', dependencies:
x11_dep))
cdata.set10('HAVE_XRANDR', xrandr_dep.found())
cdata.set10('USE_GST_GL_HELPERS', gstgl_dep.found())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gstreamer-vaapi-1.20.4/tests/internal/output.c
new/gstreamer-vaapi-1.20.5/tests/internal/output.c
--- old/gstreamer-vaapi-1.20.4/tests/internal/output.c 2022-10-12
17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/tests/internal/output.c 2022-12-20
00:34:46.000000000 +0100
@@ -22,23 +22,23 @@
#include "gst/vaapi/sysdeps.h"
#include <gst/gst.h>
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
# include <gst/vaapi/gstvaapidisplay_drm.h>
# include <gst/vaapi/gstvaapiwindow_drm.h>
#endif
-#if USE_X11
+#if GST_VAAPI_USE_X11
# include <gst/vaapi/gstvaapidisplay_x11.h>
# include <gst/vaapi/gstvaapiwindow_x11.h>
#endif
-#if USE_GLX
+#if GST_VAAPI_USE_GLX
# include <gst/vaapi/gstvaapidisplay_glx.h>
# include <gst/vaapi/gstvaapiwindow_glx.h>
#endif
-#if USE_EGL
+#if GST_VAAPI_USE_EGL
# include <gst/vaapi/gstvaapidisplay_egl.h>
# include <gst/vaapi/gstvaapiwindow_egl.h>
#endif
-#if USE_WAYLAND
+#if GST_VAAPI_USE_WAYLAND
# include <gst/vaapi/gstvaapidisplay_wayland.h>
# include <gst/vaapi/gstvaapiwindow_wayland.h>
#endif
@@ -47,22 +47,22 @@
static const VideoOutputInfo *g_video_output;
static const VideoOutputInfo g_video_outputs[] = {
/* Video outputs are sorted in test order for automatic characterisation */
-#if USE_WAYLAND
+#if GST_VAAPI_USE_WAYLAND
{"wayland",
gst_vaapi_display_wayland_new,
gst_vaapi_window_wayland_new},
#endif
-#if USE_X11
+#if GST_VAAPI_USE_X11
{"x11",
gst_vaapi_display_x11_new,
gst_vaapi_window_x11_new},
#endif
-#if USE_GLX
+#if GST_VAAPI_USE_GLX
{"glx",
gst_vaapi_display_glx_new,
gst_vaapi_window_glx_new},
#endif
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
{"drm",
gst_vaapi_display_drm_new,
gst_vaapi_window_drm_new},
@@ -188,7 +188,7 @@
display = o->create_display (display_name);
if (g_egl_mode) {
-#if USE_EGL
+#if GST_VAAPI_USE_EGL
egl_display = gst_vaapi_display_egl_new (display, g_gles_version);
#else
egl_display = NULL;
@@ -211,7 +211,7 @@
if (!g_video_output)
return NULL;
-#if USE_EGL
+#if GST_VAAPI_USE_EGL
if (g_egl_mode)
window = gst_vaapi_window_egl_new (display, width, height);
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gstreamer-vaapi-1.20.4/tests/internal/test-display.c
new/gstreamer-vaapi-1.20.5/tests/internal/test-display.c
--- old/gstreamer-vaapi-1.20.4/tests/internal/test-display.c 2022-10-12
17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/tests/internal/test-display.c 2022-12-20
00:34:46.000000000 +0100
@@ -25,7 +25,7 @@
#define _GNU_SOURCE
#include "gst/vaapi/sysdeps.h"
#include <gst/video/video.h>
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
# include <gst/vaapi/gstvaapidisplay_drm.h>
# include <va/va_drm.h>
# include <fcntl.h>
@@ -34,16 +34,16 @@
# define DRM_DEVICE_PATH "/dev/dri/card0"
# endif
#endif
-#if USE_X11
+#if GST_VAAPI_USE_X11
# include <gst/vaapi/gstvaapidisplay_x11.h>
#endif
-#if USE_GLX
+#if GST_VAAPI_USE_GLX
# include <gst/vaapi/gstvaapidisplay_glx.h>
#endif
-#if USE_WAYLAND
+#if GST_VAAPI_USE_WAYLAND
# include <gst/vaapi/gstvaapidisplay_wayland.h>
#endif
-#if USE_EGL
+#if GST_VAAPI_USE_EGL
# include <gst/vaapi/gstvaapidisplay_egl.h>
#endif
@@ -205,14 +205,14 @@
main (int argc, char *argv[])
{
GstVaapiDisplay *display;
-#if USE_GLX || USE_WAYLAND
+#if GST_VAAPI_USE_GLX || GST_VAAPI_USE_WAYLAND
guint width, height;
guint par_n, par_d;
#endif
gst_init (&argc, &argv);
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
g_print ("#\n");
g_print ("# Create display with gst_vaapi_display_drm_new()\n");
g_print ("#\n");
@@ -273,7 +273,7 @@
g_print ("\n");
#endif
-#if USE_X11
+#if GST_VAAPI_USE_X11
g_print ("#\n");
g_print ("# Create display with gst_vaapi_display_x11_new()\n");
g_print ("#\n");
@@ -331,7 +331,7 @@
g_print ("\n");
#endif
-#if USE_GLX
+#if GST_VAAPI_USE_GLX
g_print ("#\n");
g_print ("# Create display with gst_vaapi_display_glx_new()\n");
g_print ("#\n");
@@ -400,7 +400,7 @@
#endif
#endif
-#if USE_WAYLAND
+#if GST_VAAPI_USE_WAYLAND
g_print ("#\n");
g_print ("# Create display with gst_vaapi_display_wayland_new()\n");
g_print ("#\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gstreamer-vaapi-1.20.4/tests/internal/test-windows.c
new/gstreamer-vaapi-1.20.5/tests/internal/test-windows.c
--- old/gstreamer-vaapi-1.20.4/tests/internal/test-windows.c 2022-10-12
17:39:51.000000000 +0200
+++ new/gstreamer-vaapi-1.20.5/tests/internal/test-windows.c 2022-12-20
00:34:46.000000000 +0100
@@ -25,19 +25,19 @@
#include "gst/vaapi/sysdeps.h"
#include <gst/vaapi/gstvaapisurface.h>
#include <gst/vaapi/gstvaapiimage.h>
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
# include <gst/vaapi/gstvaapidisplay_drm.h>
# include <gst/vaapi/gstvaapiwindow_drm.h>
#endif
-#if USE_X11
+#if GST_VAAPI_USE_X11
# include <gst/vaapi/gstvaapidisplay_x11.h>
# include <gst/vaapi/gstvaapiwindow_x11.h>
#endif
-#if USE_WAYLAND
+#if GST_VAAPI_USE_WAYLAND
# include <gst/vaapi/gstvaapidisplay_wayland.h>
# include <gst/vaapi/gstvaapiwindow_wayland.h>
#endif
-#if USE_EGL
+#if GST_VAAPI_USE_EGL
# include <gst/vaapi/gstvaapidisplay_egl.h>
# include <gst/vaapi/gstvaapiwindow_egl.h>
#endif
@@ -108,7 +108,7 @@
gst_init (&argc, &argv);
-#if USE_DRM
+#if GST_VAAPI_USE_DRM
display = gst_vaapi_display_drm_new (NULL);
if (!display)
g_error ("could not create Gst/VA (DRM) display");
@@ -138,7 +138,7 @@
gst_object_unref (display);
#endif
-#if USE_X11
+#if GST_VAAPI_USE_X11
display = gst_vaapi_display_x11_new (NULL);
if (!display)
g_error ("could not create Gst/VA display");
@@ -203,7 +203,7 @@
gst_object_unref (display);
#endif
-#if USE_WAYLAND
+#if GST_VAAPI_USE_WAYLAND
display = gst_vaapi_display_wayland_new (NULL);
if (!display)
g_error ("could not create Gst/VA (Wayland) display");
