diff -Nru libvdpau-1.3/debian/changelog libvdpau-1.4/debian/changelog --- libvdpau-1.3/debian/changelog 2020-03-25 17:48:08.000000000 +0000 +++ libvdpau-1.4/debian/changelog 2020-10-11 23:39:19.000000000 +0000 @@ -1,16 +1,23 @@ -libvdpau (1.3-1ubuntu2) focal; urgency=medium +libvdpau (1.4-2~ubuntu20.04.1) focal-backports; urgency=medium - * No-change rebuild for libgcc-s1 package name change. + * No-change backport to focal - -- Matthias Klose Wed, 25 Mar 2020 18:48:08 +0100 + -- Saikrishna Arcot Sun, 11 Oct 2020 16:39:19 -0700 -libvdpau (1.3-1ubuntu1) focal; urgency=medium +libvdpau (1.4-2) unstable; urgency=medium - * Resynchronize with Debian (LP: #1839111), remaining changes: - - control: Demote libvdpau-va-gl1 from vdpau-driver-all Depends to - Suggests. + * Switch to debhelper-compat (= 13). + * vdpau-driver-all: Use vendor-specific substitutions for Depends/Suggests. - -- Sebastien Bacher Fri, 17 Jan 2020 09:41:17 +0100 + -- Andreas Beckmann Wed, 08 Jul 2020 11:09:30 +0200 + +libvdpau (1.4-1) unstable; urgency=medium + + * New upstream release. + * The bullseye toolchain defaults to linking with --as-needed. + * Bump Standards-Version to 4.5.0. No changes needed. + + -- Andreas Beckmann Fri, 17 Apr 2020 17:45:20 +0200 libvdpau (1.3-1) unstable; urgency=medium diff -Nru libvdpau-1.3/debian/control libvdpau-1.4/debian/control --- libvdpau-1.3/debian/control 2020-01-17 08:42:14.000000000 +0000 +++ libvdpau-1.4/debian/control 2020-10-11 23:39:19.000000000 +0000 @@ -18,7 +18,7 @@ graphviz , ghostscript , Rules-Requires-Root: no -Standards-Version: 4.4.1 +Standards-Version: 4.5.0 Homepage: https://gitlab.freedesktop.org/vdpau/libvdpau Vcs-Browser: https://salsa.debian.org/nvidia-team/libvdpau Vcs-Git: https://salsa.debian.org/nvidia-team/libvdpau.git @@ -80,13 +80,10 @@ Architecture: any Multi-Arch: same Depends: - mesa-vdpau-drivers [linux-any kfreebsd-any], + ${driver:Depends}, ${misc:Depends} Suggests: - libvdpau-va-gl1 [linux-any], - nvidia-vdpau-driver [amd64 i386], - nvidia-legacy-340xx-vdpau-driver [amd64 i386], - nvidia-legacy-304xx-vdpau-driver [amd64 i386], + ${driver:Suggests}, Description: Video Decode and Presentation API for Unix (driver metapackage) VDPAU (Video Decode and Presentation API for Unix) is an open source library (libvdpau) and API designed by NVIDIA originally for its GeForce diff -Nru libvdpau-1.3/debian/gbp.conf libvdpau-1.4/debian/gbp.conf --- libvdpau-1.3/debian/gbp.conf 2019-12-04 01:50:32.000000000 +0000 +++ libvdpau-1.4/debian/gbp.conf 2020-07-08 09:09:30.000000000 +0000 @@ -5,7 +5,7 @@ debian-tag = debian/%(version)s pristine-tar = True -[git-import-orig] +[import-orig] upstream-branch = tarball upstream-tag = tarball/%(version)s merge = False diff -Nru libvdpau-1.3/debian/not-installed libvdpau-1.4/debian/not-installed --- libvdpau-1.3/debian/not-installed 1970-01-01 00:00:00.000000000 +0000 +++ libvdpau-1.4/debian/not-installed 2020-07-08 09:09:30.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/${DEB_HOST_MULTIARCH}/vdpau/libvdpau_trace.so diff -Nru libvdpau-1.3/debian/patches/0001-doc-Use-to-close-Doxygen-groups.patch libvdpau-1.4/debian/patches/0001-doc-Use-to-close-Doxygen-groups.patch --- libvdpau-1.3/debian/patches/0001-doc-Use-to-close-Doxygen-groups.patch 2019-12-04 01:50:32.000000000 +0000 +++ libvdpau-1.4/debian/patches/0001-doc-Use-to-close-Doxygen-groups.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,192 +0,0 @@ -From 385116a9adb6cb1987ac2c6e6d933610e074b710 Mon Sep 17 00:00:00 2001 -From: Aaron Plattner -Date: Tue, 3 Sep 2019 11:10:23 -0700 -Subject: [PATCH 1/3] doc: Use /** @} */ to close Doxygen groups - -Doxygen looks for the sequence /**, so the existing group closing markers that -use the pattern /*@}*/ are ignored. Use /** @} */ instead. - -Fixes a Doxygen warning: - - libvdpau/include/vdpau/vdpau.h:4870: warning: end of file while inside a group - libvdpau/include/vdpau/vdpau_x11.h:179: warning: end of file while inside a group - -Also fixes an imbalance in the Doxgen generated module list. From - - * Core API - * Basic Types - * Miscellaneous Types - * Error Handling - * [etc.] - -to - - * Core API - * Basic Types - * Miscellaneous Types - * Error Handling - * [etc.] ---- - include/vdpau/vdpau.h | 32 ++++++++++++++++---------------- - include/vdpau/vdpau_x11.h | 4 ++-- - 2 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/include/vdpau/vdpau.h b/include/vdpau/vdpau.h -index 68a814d..a56643e 100644 ---- a/include/vdpau/vdpau.h -+++ b/include/vdpau/vdpau.h -@@ -812,7 +812,7 @@ extern "C" { - */ - typedef int VdpBool; - --/*@}*/ -+/** @} */ - - /** - * \defgroup misc_types Miscellaneous Types -@@ -1183,7 +1183,7 @@ typedef struct { - float alpha; - } VdpColor; - --/*@}*/ -+/** @} */ - - /** - * \defgroup error_handling Error Handling -@@ -1342,7 +1342,7 @@ typedef char const * VdpGetErrorString( - VdpStatus status - ); - --/*@}*/ -+/** @} */ - - /** - * \defgroup versioning Versioning -@@ -1413,7 +1413,7 @@ typedef VdpStatus VdpGetInformationString( - char const * * information_string - ); - --/*@}*/ -+/** @} */ - - /** - * \defgroup VdpDevice VdpDevice; Primary API object -@@ -1443,7 +1443,7 @@ typedef VdpStatus VdpDeviceDestroy( - VdpDevice device - ); - --/*@}*/ -+/** @} */ - - /** - * \defgroup VdpCSCMatrix VdpCSCMatrix; CSC Matrix Manipulation -@@ -1550,7 +1550,7 @@ typedef VdpStatus VdpGenerateCSCMatrix( - VdpCSCMatrix * csc_matrix - ); - --/*@}*/ -+/** @} */ - - /** - * \defgroup VdpVideoSurface VdpVideoSurface; Video Surface object -@@ -1758,7 +1758,7 @@ typedef VdpStatus VdpVideoSurfacePutBitsYCbCr( - uint32_t const * source_pitches - ); - --/*@}*/ -+/** @} */ - - /** - * \defgroup VdpOutputSurface VdpOutputSurface; Output Surface object -@@ -2063,7 +2063,7 @@ typedef VdpStatus VdpOutputSurfacePutBitsYCbCr( - VdpCSCMatrix const * csc_matrix - ); - --/*@}*/ -+/** @} */ - - /** - * \defgroup VdpBitmapSurface VdpBitmapSurface; Bitmap Surface object -@@ -2210,7 +2210,7 @@ typedef VdpStatus VdpBitmapSurfacePutBitsNative( - VdpRect const * destination_rect - ); - --/*@}*/ -+/** @} */ - - /** - * \defgroup VdpOutputSurfaceRender VdpOutputSurface Rendering Functionality -@@ -2487,7 +2487,7 @@ typedef VdpStatus VdpOutputSurfaceRenderBitmapSurface( - uint32_t flags - ); - --/*@}*/ -+/** @} */ - - /** - * \defgroup VdpDecoder VdpDecoder; Video Decoding object -@@ -3570,7 +3570,7 @@ typedef VdpStatus VdpDecoderRender( - VdpBitstreamBuffer const * bitstream_buffers - ); - --/*@}*/ -+/** @} */ - - /** - * \defgroup VdpVideoMixer VdpVideoMixer; Video Post-processing and Compositing object -@@ -4371,7 +4371,7 @@ typedef VdpStatus VdpVideoMixerRender( - VdpLayer const * layers - ); - --/*@}*/ -+/** @} */ - - /** - * \defgroup VdpPresentationQueue VdpPresentationQueue; Video presentation (display) object -@@ -4614,7 +4614,7 @@ typedef VdpStatus VdpPresentationQueueQuerySurfaceStatus( - VdpTime * first_presentation_time - ); - --/*@}*/ -+/** @} */ - - /** - * \defgroup display_preemption Display Preemption -@@ -4689,7 +4689,7 @@ typedef VdpStatus VdpPreemptionCallbackRegister( - void * context - ); - --/*@}*/ -+/** @} */ - - /** - * \defgroup get_proc_address Entry Point Retrieval -@@ -4851,8 +4851,8 @@ typedef VdpStatus VdpGetProcAddress( - void * * function_pointer - ); - --/*@}*/ --/*@}*/ -+/** @} */ -+/** @} */ - - /** - * \defgroup api_winsys Window System Integration Layer -diff --git a/include/vdpau/vdpau_x11.h b/include/vdpau/vdpau_x11.h -index edbc275..26b6090 100644 ---- a/include/vdpau/vdpau_x11.h -+++ b/include/vdpau/vdpau_x11.h -@@ -167,8 +167,8 @@ typedef VdpStatus VdpPresentationQueueTargetCreateX11( - /** \hideinitializer */ - #define VDP_FUNC_ID_PRESENTATION_QUEUE_TARGET_CREATE_X11 (VdpFuncId)(VDP_FUNC_ID_BASE_WINSYS + 0) - --/*@}*/ --/*@}*/ -+/** @} */ -+/** @} */ - - #ifdef __cplusplus - } --- -2.11.0 - diff -Nru libvdpau-1.3/debian/patches/0002-doc-Add-missing-HEVC-Picture-Parameter-Set-group-clo.patch libvdpau-1.4/debian/patches/0002-doc-Add-missing-HEVC-Picture-Parameter-Set-group-clo.patch --- libvdpau-1.3/debian/patches/0002-doc-Add-missing-HEVC-Picture-Parameter-Set-group-clo.patch 2019-12-04 01:50:32.000000000 +0000 +++ libvdpau-1.4/debian/patches/0002-doc-Add-missing-HEVC-Picture-Parameter-Set-group-clo.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -From a58a1207420093044a7fe3e3cab0e9ac045b97d6 Mon Sep 17 00:00:00 2001 -From: Aaron Plattner -Date: Tue, 3 Sep 2019 11:17:43 -0700 -Subject: [PATCH 2/3] doc: Add missing "HEVC Picture Parameter Set" group close - marker - -Fixing this imbalance doesn't cause any major changes to the generated -documentation. ---- - include/vdpau/vdpau.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/vdpau/vdpau.h b/include/vdpau/vdpau.h -index a56643e..3533bbe 100644 ---- a/include/vdpau/vdpau.h -+++ b/include/vdpau/vdpau.h -@@ -3415,6 +3415,7 @@ typedef struct { - uint8_t lists_modification_present_flag; - uint8_t log2_parallel_merge_level_minus2; - uint8_t slice_segment_header_extension_present_flag; -+ /** @} */ - - /** \name HEVC Slice Segment Header - * --- -2.11.0 - diff -Nru libvdpau-1.3/debian/patches/0003-meson-respect-prefix-for-includedir.patch libvdpau-1.4/debian/patches/0003-meson-respect-prefix-for-includedir.patch --- libvdpau-1.3/debian/patches/0003-meson-respect-prefix-for-includedir.patch 2019-12-04 01:50:32.000000000 +0000 +++ libvdpau-1.4/debian/patches/0003-meson-respect-prefix-for-includedir.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -From f1fa72e9be216bbe7e7af3c11e9f2aed5524dce2 Mon Sep 17 00:00:00 2001 -From: Timo Gurr -Date: Wed, 4 Sep 2019 19:51:50 +0000 -Subject: [PATCH 3/3] meson: respect prefix for includedir - ---- - include/meson.build | 2 +- - include/vdpau/meson.build | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletion(-) - create mode 100644 include/vdpau/meson.build - -diff --git a/include/meson.build b/include/meson.build -index 40c5c75..6b2af9c 100644 ---- a/include/meson.build -+++ b/include/meson.build -@@ -1 +1 @@ --install_subdir('vdpau', install_dir : 'include') -+subdir('vdpau') -diff --git a/include/vdpau/meson.build b/include/vdpau/meson.build -new file mode 100644 -index 0000000..4b600d6 ---- /dev/null -+++ b/include/vdpau/meson.build -@@ -0,0 +1,4 @@ -+# install headers -+install_headers('vdpau.h', -+ 'vdpau_x11.h', -+ subdir : 'vdpau') --- -2.11.0 - diff -Nru libvdpau-1.3/debian/patches/series libvdpau-1.4/debian/patches/series --- libvdpau-1.3/debian/patches/series 2019-12-04 01:50:32.000000000 +0000 +++ libvdpau-1.4/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -0001-doc-Use-to-close-Doxygen-groups.patch -0002-doc-Add-missing-HEVC-Picture-Parameter-Set-group-clo.patch -0003-meson-respect-prefix-for-includedir.patch diff -Nru libvdpau-1.3/debian/rules libvdpau-1.4/debian/rules --- libvdpau-1.3/debian/rules 2019-12-04 01:50:32.000000000 +0000 +++ libvdpau-1.4/debian/rules 2020-07-08 09:09:30.000000000 +0000 @@ -2,15 +2,22 @@ #export DH_VERBOSE=1 +driver_depends_Debian += libvdpau-va-gl1 [linux-any], +driver_depends += mesa-vdpau-drivers [linux-any kfreebsd-any], + +driver_suggests_Debian += nvidia-vdpau-driver [amd64 i386 arm64], +driver_suggests_Debian += nvidia-tesla-440-vdpau-driver [amd64 i386 ppc64el], +driver_suggests_Debian += nvidia-tesla-418-vdpau-driver [amd64 i386 ppc64el], +driver_suggests_Debian += nvidia-legacy-390xx-vdpau-driver [amd64 i386 armhf], +driver_suggests_Debian += nvidia-legacy-340xx-vdpau-driver [amd64 i386 armhf], +driver_suggests_Ubuntu += libvdpau-va-gl1 [linux-any], +driver_suggests += vdpau-driver, + +VENDOR := $(shell dpkg-vendor --derives-from Ubuntu && echo Ubuntu || echo Debian) + # see FEATURE AREAS in dpkg-buildflags(1) export DEB_BUILD_MAINT_OPTIONS = hardening=+all -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - # Disable if dependencies are not available, like on buildd # arch-dependent builds, as they are Build-Depends-Indep define DOCS_CONF @@ -45,3 +52,8 @@ # ignore the plugin override_dh_makeshlibs: dh_makeshlibs -Xvdpau/libvdpau_trace.so.1 + +override_dh_gencontrol: + dh_gencontrol -- \ + -V'driver:Depends=$(driver_depends_$(VENDOR)), $(driver_depends)' \ + -V'driver:Suggests=$(driver_suggests_$(VENDOR)), $(driver_suggests)' diff -Nru libvdpau-1.3/debian/upstream/metadata libvdpau-1.4/debian/upstream/metadata --- libvdpau-1.3/debian/upstream/metadata 2019-12-04 01:50:32.000000000 +0000 +++ libvdpau-1.4/debian/upstream/metadata 2020-07-08 09:09:30.000000000 +0000 @@ -1,3 +1,3 @@ -Name: libvdpau +Bug-Database: https://gitlab.freedesktop.org/vdpau/libvdpau/-/issues Repository: https://gitlab.freedesktop.org/vdpau/libvdpau.git Repository-Browse: https://gitlab.freedesktop.org/vdpau/libvdpau diff -Nru libvdpau-1.3/.gitlab-ci.yml libvdpau-1.4/.gitlab-ci.yml --- libvdpau-1.3/.gitlab-ci.yml 2019-08-28 17:57:55.000000000 +0000 +++ libvdpau-1.4/.gitlab-ci.yml 2020-04-09 14:45:23.000000000 +0000 @@ -7,7 +7,7 @@ build: stage: build script: - - pacman --noconfirm -Sy gcc meson ninja pkg-config doxygen graphviz texlive-bin + - pacman --noconfirm -Sy gcc meson ninja pkg-config doxygen graphviz texlive-bin xorgproto - ./test/gitlab-ci.sh artifacts: paths: diff -Nru libvdpau-1.3/include/meson.build libvdpau-1.4/include/meson.build --- libvdpau-1.3/include/meson.build 2019-08-28 17:57:55.000000000 +0000 +++ libvdpau-1.4/include/meson.build 2020-04-09 14:45:23.000000000 +0000 @@ -1 +1 @@ -install_subdir('vdpau', install_dir : 'include') +subdir('vdpau') diff -Nru libvdpau-1.3/include/vdpau/meson.build libvdpau-1.4/include/vdpau/meson.build --- libvdpau-1.3/include/vdpau/meson.build 1970-01-01 00:00:00.000000000 +0000 +++ libvdpau-1.4/include/vdpau/meson.build 2020-04-09 14:45:23.000000000 +0000 @@ -0,0 +1,4 @@ +# install headers +install_headers('vdpau.h', + 'vdpau_x11.h', + subdir : 'vdpau') diff -Nru libvdpau-1.3/include/vdpau/vdpau.h libvdpau-1.4/include/vdpau/vdpau.h --- libvdpau-1.3/include/vdpau/vdpau.h 2019-08-28 17:57:55.000000000 +0000 +++ libvdpau-1.4/include/vdpau/vdpau.h 2020-04-09 14:45:23.000000000 +0000 @@ -812,7 +812,7 @@ */ typedef int VdpBool; -/*@}*/ +/** @} */ /** * \defgroup misc_types Miscellaneous Types @@ -897,6 +897,65 @@ * interoped with OpenGL if the matching field/frame structure is * specified in the OpenGL API */ #define VDP_CHROMA_TYPE_444_FRAME ((VdpChromaType)8) +/** \hideinitializer \brief 4:2:0 chroma format. Undefined field/frame based + * Video surfaces allocated with this chroma type have undefined + * field/frame structure. The implementation is free to internally morph + * the surface between frame/field as required by VdpVideoDecoder operation. + * Interop with OpenGL allows registration of these surfaces for either + * field- or frame-based interop. But, an implicit field/frame structure + * conversion may be performed. + */ +#define VDP_CHROMA_TYPE_420_16 ((VdpChromaType)9) +/** \hideinitializer \brief 4:2:2 chroma format. Undefined field/frame based + * Video surfaces allocated with this chroma type have undefined + * field/frame structure. The implementation is free to internally morph + * the surface between frame/field as required by VdpVideoDecoder operation. + * Interop with OpenGL allows registration of these surfaces for either + * field- or frame-based interop. But, an implicit field/frame structure + * conversion may be performed. + */ +#define VDP_CHROMA_TYPE_422_16 ((VdpChromaType)10) +/** \hideinitializer \brief 4:4:4 chroma format. Undefined field/frame based + * Video surfaces allocated with this chroma type have undefined + * field/frame structure. The implementation is free to internally morph + * the surface between frame/field as required by VdpVideoDecoder operation. + * Interop with OpenGL allows registration of these surfaces for either + * field- or frame-based interop. But, an implicit field/frame structure + * conversion may be performed. + */ +#define VDP_CHROMA_TYPE_444_16 ((VdpChromaType)11) + +/** \hideinitializer \brief 4:2:0 chroma format. Field based. + * Video surfaces allocated with this chroma type can only be + * interoped with OpenGL if the matching field/frame structure is + * specified in the OpenGL API */ +#define VDP_CHROMA_TYPE_420_FIELD_16 ((VdpChromaType)12) +/** \hideinitializer \brief 4:2:2 chroma format. Field based. + * Video surfaces allocated with this chroma type can only be + * interoped with OpenGL if the matching field/frame structure is + * specified in the OpenGL API */ +#define VDP_CHROMA_TYPE_422_FIELD_16 ((VdpChromaType)13) +/** \hideinitializer \brief 4:4:4 chroma format. Field based. + * Video surfaces allocated with this chroma type can only be + * interoped with OpenGL if the matching field/frame structure is + * specified in the OpenGL API */ +#define VDP_CHROMA_TYPE_444_FIELD_16 ((VdpChromaType)14) + +/** \hideinitializer \brief 4:2:0 chroma format. Frame based. + * Video surfaces allocated with this chroma type can only be + * interoped with OpenGL if the matching field/frame structure is + * specified in the OpenGL API */ +#define VDP_CHROMA_TYPE_420_FRAME_16 ((VdpChromaType)15) +/** \hideinitializer \brief 4:2:2 chroma format. Frame based. + * Video surfaces allocated with this chroma type can only be + * interoped with OpenGL if the matching field/frame structure is + * specified in the OpenGL API */ +#define VDP_CHROMA_TYPE_422_FRAME_16 ((VdpChromaType)16) +/** \hideinitializer \brief 4:4:4 chroma format. Frame based. + * Video surfaces allocated with this chroma type can only be + * interoped with OpenGL if the matching field/frame structure is + * specified in the OpenGL API */ +#define VDP_CHROMA_TYPE_444_FRAME_16 ((VdpChromaType)17) /** * \brief The set of all known YCbCr surface formats. @@ -1009,6 +1068,50 @@ * Applications should access this data via a uint8_t pointer. */ #define VDP_YCBCR_FORMAT_Y_U_V_444 ((VdpYCbCrFormat)7) +/** + * \hideinitializer + * \brief The P010 surface format. + * + * This format has two planes, a Y plane and a UV plane. + * + * The Y plane is an array of two byte sized Y components. + * Applications should access this data via a uint16_t pointer. + * + * The UV plane is an array of interleaved two byte sized U and V + * components, in the order U, V, U, V. Applications should + * access this data via a uint8_t pointer. + * + * Note that the P010 surface format has an identical memory + * layout as the P016 surface format, with bits 0 through 5 + * set to zero. + */ +#define VDP_YCBCR_FORMAT_P010 ((VdpYCbCrFormat)8) +/** + * \hideinitializer + * \brief The P016 surface format. + * + * This format has two planes, a Y plane and a UV plane. + * + * The Y plane is an array of two byte sized Y components. + * Applications should access this data via a uint16_t pointer. + * + * The UV plane is an array of interleaved two byte sized U and V + * components, in the order U, V, U, V. Applications should + * access this data via a uint8_t pointer. + */ +#define VDP_YCBCR_FORMAT_P016 ((VdpYCbCrFormat)9) + /** + * \hideinitializer + * \brief The "Y_U_V_444_16" YCbCr surface format. + * + * This format has three planes, a Y plane, a V plane, and a U + * plane. + * + * Each of the planes is an array of two byte-sized components. + * + * Applications should access this data via a uint16_t pointer. + */ + #define VDP_YCBCR_FORMAT_Y_U_V_444_16 ((VdpYCbCrFormat)11) /** * \brief The set of all known RGB surface formats. @@ -1183,7 +1286,7 @@ float alpha; } VdpColor; -/*@}*/ +/** @} */ /** * \defgroup error_handling Error Handling @@ -1342,7 +1445,7 @@ VdpStatus status ); -/*@}*/ +/** @} */ /** * \defgroup versioning Versioning @@ -1413,7 +1516,7 @@ char const * * information_string ); -/*@}*/ +/** @} */ /** * \defgroup VdpDevice VdpDevice; Primary API object @@ -1443,7 +1546,7 @@ VdpDevice device ); -/*@}*/ +/** @} */ /** * \defgroup VdpCSCMatrix VdpCSCMatrix; CSC Matrix Manipulation @@ -1550,7 +1653,7 @@ VdpCSCMatrix * csc_matrix ); -/*@}*/ +/** @} */ /** * \defgroup VdpVideoSurface VdpVideoSurface; Video Surface object @@ -1758,7 +1861,7 @@ uint32_t const * source_pitches ); -/*@}*/ +/** @} */ /** * \defgroup VdpOutputSurface VdpOutputSurface; Output Surface object @@ -2063,7 +2166,7 @@ VdpCSCMatrix const * csc_matrix ); -/*@}*/ +/** @} */ /** * \defgroup VdpBitmapSurface VdpBitmapSurface; Bitmap Surface object @@ -2210,7 +2313,7 @@ VdpRect const * destination_rect ); -/*@}*/ +/** @} */ /** * \defgroup VdpOutputSurfaceRender VdpOutputSurface Rendering Functionality @@ -2487,7 +2590,7 @@ uint32_t flags ); -/*@}*/ +/** @} */ /** * \defgroup VdpDecoder VdpDecoder; Video Decoding object @@ -2578,6 +2681,10 @@ #define VDP_DECODER_PROFILE_HEVC_MAIN_12 ((VdpDecoderProfile)103) /** \hideinitializer */ #define VDP_DECODER_PROFILE_HEVC_MAIN_444 ((VdpDecoderProfile)104) +/** \hideinitializer */ +#define VDP_DECODER_PROFILE_HEVC_MAIN_444_10 ((VdpDecoderProfile)105) +/** \hideinitializer */ +#define VDP_DECODER_PROFILE_HEVC_MAIN_444_12 ((VdpDecoderProfile)106) /** \hideinitializer */ #define VDP_DECODER_LEVEL_MPEG1_NA 0 @@ -3415,6 +3522,7 @@ uint8_t lists_modification_present_flag; uint8_t log2_parallel_merge_level_minus2; uint8_t slice_segment_header_extension_present_flag; + /** @} */ /** \name HEVC Slice Segment Header * @@ -3545,6 +3653,16 @@ } VdpPictureInfoHEVC444; /** + * \brief Picture parameter information for HEVC FormatRangeExtensions picture. + * + * HEVC Main 444 Profile is part of Format Range Extensions profiles, + * Due to similarities between Format Range Extensions profiles, the picture + * parameter structure is re-used for Format Range Extensions profiles + * supported. + */ +typedef VdpPictureInfoHEVC444 VdpPictureInfoHEVCRangeExt; + +/** * \brief Decode a compressed field/frame and render the result * into a \ref VdpVideoSurface "VdpVideoSurface". * \param[in] decoder The decoder object that will perform the @@ -3570,7 +3688,7 @@ VdpBitstreamBuffer const * bitstream_buffers ); -/*@}*/ +/** @} */ /** * \defgroup VdpVideoMixer VdpVideoMixer; Video Post-processing and Compositing object @@ -4371,7 +4489,7 @@ VdpLayer const * layers ); -/*@}*/ +/** @} */ /** * \defgroup VdpPresentationQueue VdpPresentationQueue; Video presentation (display) object @@ -4614,7 +4732,7 @@ VdpTime * first_presentation_time ); -/*@}*/ +/** @} */ /** * \defgroup display_preemption Display Preemption @@ -4689,7 +4807,7 @@ void * context ); -/*@}*/ +/** @} */ /** * \defgroup get_proc_address Entry Point Retrieval @@ -4851,8 +4969,8 @@ void * * function_pointer ); -/*@}*/ -/*@}*/ +/** @} */ +/** @} */ /** * \defgroup api_winsys Window System Integration Layer diff -Nru libvdpau-1.3/include/vdpau/vdpau_x11.h libvdpau-1.4/include/vdpau/vdpau_x11.h --- libvdpau-1.3/include/vdpau/vdpau_x11.h 2019-08-28 17:57:55.000000000 +0000 +++ libvdpau-1.4/include/vdpau/vdpau_x11.h 2020-04-09 14:45:23.000000000 +0000 @@ -167,8 +167,8 @@ /** \hideinitializer */ #define VDP_FUNC_ID_PRESENTATION_QUEUE_TARGET_CREATE_X11 (VdpFuncId)(VDP_FUNC_ID_BASE_WINSYS + 0) -/*@}*/ -/*@}*/ +/** @} */ +/** @} */ #ifdef __cplusplus } diff -Nru libvdpau-1.3/meson.build libvdpau-1.4/meson.build --- libvdpau-1.3/meson.build 2019-08-28 17:57:55.000000000 +0000 +++ libvdpau-1.4/meson.build 2020-04-09 14:45:23.000000000 +0000 @@ -51,7 +51,7 @@ import('pkgconfig').generate( name : 'VDPAU', filebase : 'vdpau', - version : '1.3', + version : '1.4', description : 'The Video Decode and Presentation API for UNIX', libraries : '-L${libdir} -lvdpau', variables : 'moduledir=' + moduledir, diff -Nru libvdpau-1.3/test/dlclose.c libvdpau-1.4/test/dlclose.c --- libvdpau-1.3/test/dlclose.c 2019-08-28 17:57:55.000000000 +0000 +++ libvdpau-1.4/test/dlclose.c 2020-04-09 14:45:23.000000000 +0000 @@ -28,13 +28,19 @@ return count; } +#if defined(__sun) +static const char libXext_so[] = "libXext.so.0"; +#else +static const char libXext_so[] = "libXext.so.6"; +#endif + int main(void) { // Work around a bug in libXext: dlclosing it after it has registered the // Generic Event Extension causes an identical bug to the one this program // is trying to test for. int nOpenFDs = countOpenFDs(); - void *libXext = dlopen("libXext.so.6", RTLD_LAZY); + void *libXext = dlopen(libXext_so, RTLD_LAZY); void *libvdpau = dlopen("src/libvdpau.so", RTLD_LAZY); Display *dpy = XOpenDisplay(NULL); VdpDeviceCreateX11 *pvdp_device_create_x11; @@ -43,7 +49,7 @@ VdpStatus status; if (!libXext) { - fprintf(stderr, "Failed to open libXext.so.6: %s", dlerror()); + fprintf(stderr, "Failed to open %s: %s", libXext_so, dlerror()); return SKIP; }