vdpau: helper library for VDPAU and VDPAU-X11 function calls

This provides a more traditional set of library function calls than the
VDPAU specification defines. Furthermore, this has libvdpau.so as a
conditional run-time linking dependency.

Note that this requires libvdpau 0.6 or later (0.4.1-8 on Debian) at
run-time due to a bug in libvdpau versions 0.4 through 0.5.

configure.ac

@@ -4223,6 +4223,7 @@ AC_CONFIG_FILES([
   modules/sse2/Makefile
   modules/altivec/Makefile
   modules/arm_neon/Makefile
+  modules/hw/vdpau/Makefile
 ])
 
 AM_COND_IF([HAVE_WIN32], [

modules/Makefile.am

@@ -27,6 +27,7 @@ EXTRA_SUBDIRS = \
 	sse2 \
 	altivec \
 	arm_neon \
+	hw/vdpau \
 	lua \
 	$(NULL)
 
@@ -47,6 +48,9 @@ endif
 if HAVE_NEON
 SUBDIRS += arm_neon
 endif
+if HAVE_VDPAU
+SUBDIRS += hw/vdpau
+endif
 if BUILD_LUA
 SUBDIRS += lua
 endif

modules/hw/.gitignore

+Makefile.am

modules/hw/vdpau/Makefile.am

+basedir = vdpau
+include $(top_srcdir)/modules/common.am
+
+AM_CFLAGS += $(VDPAU_CFLAGS)
+
+libvlc_vdpau_la_SOURCES = vlc_vdpau.c vlc_vdpau.h
+libvlc_vdpau_la_CPPFLAGS =
+libvlc_vdpau_la_LIBADD = $(X_LIBS) $(X_PRE_LIBS) -lX11 \
+	$(LIBDL) $(LIBPTHREAD)
+libvlc_vdpau_la_LDFLAGS = \
+	-no-undefined \
+	-export-symbols-regex ^vdp_ \
+	-version-info 0:0:0
+pkglib_LTLIBRARIES = libvlc_vdpau.la

modules/hw/vdpau/vlc_vdpau.h

+/*****************************************************************************
+ * vlc_vdpau.h: VDPAU helper for VLC
+ *****************************************************************************
+ * Copyright (C) 2013 Rémi Denis-Courmont
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifndef VLC_VDPAU_H
+# include <stdint.h>
+# include <vdpau/vdpau.h>
+
+typedef struct vdp_s vdp_t;
+
+const char *vdp_get_error_string(const vdp_t *, VdpStatus);
+VdpStatus vdp_get_proc_address(const vdp_t *, VdpDevice, VdpFuncId, void **);
+VdpStatus vdp_get_api_version(const vdp_t *, uint32_t *);
+VdpStatus vdp_get_information_string(const vdp_t *, const char **);
+VdpStatus vdp_device_destroy(const vdp_t *, VdpDevice);
+VdpStatus vdp_generate_csc_matrix(const vdp_t *, const VdpProcamp *,
+                                  VdpColorStandard, VdpCSCMatrix *);
+VdpStatus vdp_video_surface_query_capabilities(const vdp_t *, VdpDevice,
+                             VdpChromaType, VdpBool *, uint32_t *, uint32_t *);
+VdpStatus vdp_video_surface_query_get_put_bits_y_cb_cr_capabilities(
+    const vdp_t *, VdpDevice, VdpChromaType, VdpYCbCrFormat, VdpBool *);
+VdpStatus vdp_video_surface_create(const vdp_t *, VdpDevice, VdpChromaType,
+                                   uint32_t, uint32_t, VdpVideoSurface *);
+VdpStatus vdp_video_surface_destroy(const vdp_t *, VdpVideoSurface);
+VdpStatus vdp_video_surface_get_parameters(const vdp_t *, VdpVideoSurface,
+                                      VdpChromaType *, uint32_t *, uint32_t *);
+VdpStatus vdp_video_surface_get_bits_y_cb_cr(const vdp_t *, VdpVideoSurface,
+                              VdpYCbCrFormat, void *const *, uint32_t const *);
+VdpStatus vdp_video_surface_put_bits_y_cb_cr(const vdp_t *, VdpVideoSurface,
+                        VdpYCbCrFormat, const void *const *, uint32_t const *);
+VdpStatus vdp_output_surface_query_capabilities(const vdp_t *, VdpDevice,
+    VdpRGBAFormat, VdpBool *, uint32_t *, uint32_t *);
+VdpStatus vdp_output_surface_query_get_put_bits_native_capabilities(
+    const vdp_t *, VdpDevice, VdpRGBAFormat, VdpBool *);
+VdpStatus vdp_output_surface_query_put_bits_indexed_capabilities(const vdp_t *,
+    VdpDevice, VdpRGBAFormat, VdpIndexedFormat, VdpColorTableFormat,
+    VdpBool *);
+VdpStatus vdp_output_surface_query_put_bits_y_cb_cr_capabilities(const vdp_t *,
+    VdpDevice, VdpRGBAFormat, VdpYCbCrFormat, VdpBool *);
+VdpStatus vdp_output_surface_create(const vdp_t *, VdpDevice, VdpRGBAFormat,
+    uint32_t, uint32_t, VdpOutputSurface *);
+VdpStatus vdp_output_surface_destroy(const vdp_t *, VdpOutputSurface);
+VdpStatus vdp_output_surface_get_parameters(const vdp_t *, VdpOutputSurface,
+    VdpRGBAFormat *, uint32_t *, uint32_t *);
+VdpStatus vdp_output_surface_get_bits_native(const vdp_t *, VdpOutputSurface,
+    const VdpRect *, void *const *, uint32_t const *);
+VdpStatus vdp_output_surface_put_bits_native(const vdp_t *, VdpOutputSurface,
+    const void *const *, uint32_t const *, const VdpRect *);
+VdpStatus vdp_output_surface_put_bits_indexed(const vdp_t *, VdpOutputSurface,
+    VdpIndexedFormat, const void *const *, const uint32_t *, const VdpRect *,
+    VdpColorTableFormat, const void *);
+VdpStatus vdp_output_surface_put_bits_y_cb_cr(const vdp_t *, VdpOutputSurface,
+    VdpYCbCrFormat, const void *const *, const uint32_t *, const VdpRect *,
+    const VdpCSCMatrix *);
+VdpStatus vdp_bitmap_surface_query_capabilities(const vdp_t *, VdpDevice,
+    VdpRGBAFormat, VdpBool *, uint32_t *, uint32_t *);
+VdpStatus vdp_bitmap_surface_create(const vdp_t *, VdpDevice, VdpRGBAFormat,
+    uint32_t, uint32_t, VdpBool, VdpBitmapSurface *);
+VdpStatus vdp_bitmap_surface_destroy(const vdp_t *, VdpBitmapSurface);
+VdpStatus vdp_bitmap_surface_get_parameters(const vdp_t *, VdpBitmapSurface,
+    VdpRGBAFormat *, uint32_t *, uint32_t *, VdpBool *);
+VdpStatus vdp_bitmap_surface_put_bits_native(const vdp_t *, VdpBitmapSurface,
+    const void *const *, const uint32_t *, const VdpRect *);
+VdpStatus vdp_output_surface_render_output_surface(const vdp_t *,
+    VdpOutputSurface, const VdpRect *, VdpOutputSurface, const VdpRect *,
+    const VdpColor *, const VdpOutputSurfaceRenderBlendState const *,
+    uint32_t);
+VdpStatus vdp_output_surface_render_bitmap_surface(const vdp_t *,
+    VdpOutputSurface, const VdpRect *, VdpBitmapSurface, const VdpRect *,
+    const VdpColor *, const VdpOutputSurfaceRenderBlendState *, uint32_t);
+VdpStatus vdp_decoder_query_capabilities(const vdp_t *, VdpDevice,
+    VdpDecoderProfile, VdpBool *,
+    uint32_t *, uint32_t *, uint32_t *, uint32_t *);
+VdpStatus vdp_decoder_create(const vdp_t *, VdpDevice, VdpDecoderProfile,
+    uint32_t, uint32_t, uint32_t, VdpDecoder *);
+VdpStatus vdp_decoder_destroy(const vdp_t *, VdpDecoder);
+VdpStatus vdp_decoder_get_parameters(const vdp_t *, VdpDecoder,
+    VdpDecoderProfile *, uint32_t *, uint32_t *);
+VdpStatus vdp_decoder_render(const vdp_t *, VdpDecoder, VdpVideoSurface,
+    const VdpPictureInfo *, uint32_t, const VdpBitstreamBuffer *);
+VdpStatus vdp_video_mixer_query_feature_support(const vdp_t *, VdpDevice,
+    VdpVideoMixerFeature, VdpBool *);
+VdpStatus vdp_video_mixer_query_parameter_support(const vdp_t *, VdpDevice,
+    VdpVideoMixerParameter, VdpBool *);
+VdpStatus vdp_video_mixer_query_attribute_support(const vdp_t *, VdpDevice,
+    VdpVideoMixerAttribute, VdpBool *);
+VdpStatus vdp_video_mixer_query_parameter_value_range(const vdp_t *, VdpDevice,
+    VdpVideoMixerParameter, void *, void *);
+VdpStatus vdp_video_mixer_query_attribute_value_range(const vdp_t *, VdpDevice,
+    VdpVideoMixerAttribute, void *, void *);
+VdpStatus vdp_video_mixer_create(const vdp_t *, VdpDevice, uint32_t,
+    const VdpVideoMixerFeature *, uint32_t, const VdpVideoMixerParameter *,
+    const void *const *, VdpVideoMixer *);
+VdpStatus vdp_video_mixer_set_feature_enables(const vdp_t *, VdpVideoMixer,
+    uint32_t, const VdpVideoMixerFeature *, const VdpBool *);
+VdpStatus vdp_video_mixer_set_attribute_values(const vdp_t *, VdpVideoMixer,
+    uint32_t, const VdpVideoMixerAttribute const *, const void *const *);
+VdpStatus vdp_video_mixer_get_feature_support(const vdp_t *, VdpVideoMixer,
+    uint32_t, const VdpVideoMixerFeature *, VdpBool *);
+VdpStatus vdp_video_mixer_get_feature_enables(const vdp_t *, VdpVideoMixer,
+    uint32_t, const VdpVideoMixerFeature *, VdpBool *);
+VdpStatus vdp_video_mixer_get_parameter_values(const vdp_t *, VdpVideoMixer,
+    uint32_t, const VdpVideoMixerParameter *, void *const *);
+VdpStatus vdp_video_mixer_get_attribute_values(const vdp_t *, VdpVideoMixer,
+    uint32_t, const VdpVideoMixerAttribute *, void *const *);
+VdpStatus vdp_video_mixer_destroy(const vdp_t *, VdpVideoMixer);
+VdpStatus vdp_video_mixer_render(const vdp_t *, VdpVideoMixer,
+    VdpOutputSurface, const VdpRect *, VdpVideoMixerPictureStructure, uint32_t,
+    const VdpVideoSurface *, VdpVideoSurface, uint32_t,
+    const VdpVideoSurface *, const VdpRect *, VdpOutputSurface,
+    const VdpRect *, const VdpRect *, uint32_t, const VdpLayer *);
+VdpStatus vdp_presentation_queue_target_destroy(const vdp_t *,
+    VdpPresentationQueueTarget);
+VdpStatus vdp_presentation_queue_create(const vdp_t *, VdpDevice,
+    VdpPresentationQueueTarget, VdpPresentationQueue *);
+VdpStatus vdp_presentation_queue_destroy(const vdp_t *, VdpPresentationQueue);
+VdpStatus vdp_presentation_queue_set_background_color(const vdp_t *,
+    VdpPresentationQueue, const VdpColor *);
+VdpStatus vdp_presentation_queue_get_background_color(const vdp_t *,
+    VdpPresentationQueue, VdpColor *);
+VdpStatus vdp_presentation_queue_get_time(const vdp_t *,
+    VdpPresentationQueue, VdpTime *);
+VdpStatus vdp_presentation_queue_display(const vdp_t *, VdpPresentationQueue,
+    VdpOutputSurface, uint32_t, uint32_t, VdpTime);
+VdpStatus vdp_presentation_queue_block_until_surface_idle(const vdp_t *,
+    VdpPresentationQueue, VdpOutputSurface, VdpTime *);
+VdpStatus vdp_presentation_queue_query_surface_status(const vdp_t *,
+    VdpPresentationQueue, VdpOutputSurface, VdpPresentationQueueStatus *,
+    VdpTime *);
+VdpStatus vdp_preemption_callback_register(const vdp_t *vdp, VdpDevice,
+                                           VdpPreemptionCallback, void *);
+
+VdpStatus vdp_presentation_queue_target_create_x11(const vdp_t *,
+                            VdpDevice, uint32_t, VdpPresentationQueueTarget *);
+
+/**
+ * Loads a VDPAU instance and creates a VDPAU device using X11.
+ * @param dpy X11 display handle (Xlib Display pointer) [IN]
+ * @param snum X11 screen number
+ * @param vdpp memory location to hold the VDPAU instance pointer [OUT]
+ * @param devp memory location to hold the VDPAU device handle [OUT]
+ * @note The X11 display connection must remain valid until after the VDPAU
+ * device has been destroyed with vdp_device_destroy().
+ * @return VDP_STATUS_OK on success, otherwise a VDPAU error code.
+ */
+VdpStatus vdp_create_x11(void *dpy, int snum, vdp_t **vdpp, VdpDevice *devp);
+
+
+/**
+ * Destroys a VDPAU instance created with vdp_create_x11().
+ * @note The corresponding VDPAU device shall have been destroyed with
+ * vdp_device_destroy() first.
+ */
+void vdp_destroy_x11(vdp_t *);
+#endif