diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2011-11-04 20:07:52 -0400 |
|---|---|---|
| committer | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2011-12-08 15:13:42 +0100 |
| commit | bb22317e3939a78e7d2de3d716f2d6954fe22137 (patch) | |
| tree | adbef158ac7145e64ffcc8298cf2449f3d95b0a0 /gst | |
| parent | c5b18c27d53f3adaf5c81d829a180ef2a9451a0b (diff) | |
vaapiplugin: allocate GLX buffers when supported.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/vaapi/gstvaapiconvert.c | 8 | ||||
| -rw-r--r-- | gst/vaapi/gstvaapidecode.c | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/gst/vaapi/gstvaapiconvert.c b/gst/vaapi/gstvaapiconvert.c index 1574de78..043a6ba7 100644 --- a/gst/vaapi/gstvaapiconvert.c +++ b/gst/vaapi/gstvaapiconvert.c @@ -36,6 +36,14 @@ #include <gst/vaapi/gstvaapivideosink.h> #include <gst/vaapi/gstvaapivideobuffer.h> +#if USE_VAAPI_GLX +#include <gst/vaapi/gstvaapivideobuffer_glx.h> +#define gst_vaapi_video_buffer_new_from_pool(pool) \ + gst_vaapi_video_buffer_glx_new_from_pool(pool) +#define gst_vaapi_video_buffer_new_from_buffer(buffer) \ + gst_vaapi_video_buffer_glx_new_from_buffer(buffer) +#endif + #include "gstvaapipluginutil.h" #include "gstvaapiconvert.h" diff --git a/gst/vaapi/gstvaapidecode.c b/gst/vaapi/gstvaapidecode.c index f267d0ff..dff200bd 100644 --- a/gst/vaapi/gstvaapidecode.c +++ b/gst/vaapi/gstvaapidecode.c @@ -36,6 +36,12 @@ #include <gst/vaapi/gstvaapidecoder_ffmpeg.h> #include <gst/video/videocontext.h> +#if USE_VAAPI_GLX +#include <gst/vaapi/gstvaapivideobuffer_glx.h> +#define gst_vaapi_video_buffer_new(display) \ + gst_vaapi_video_buffer_glx_new(GST_VAAPI_DISPLAY_GLX(display)) +#endif + #include "gstvaapidecode.h" #include "gstvaapipluginutil.h" |