lavu: Add OpenCL hardware pixfmt

diff --git a/doc/APIchanges b/doc/APIchanges
index d336f6ce222b323faa9582f22af7f70b78c1be5d..2464cc2e5f68b62885ee6b2ef02ae317f9f6a3d9 100644 (file)
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@ libavutil:     2017-10-21
 
 API changes, most recent first:
 
+2017-11-xx - xxxxxxx - lavu 55.1.0 - pixfmt.h
+  Add AV_PIX_FMT_OPENCL.
+
 2017-xx-xx - xxxxxxx - lavc 58.3.100 - avcodec.h
   Add avcodec_get_hw_frames_parameters().
 

diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index 3d21e67a785ba67d9379144efd9f5112866b8595..e77d5f44b9cae4a8806acb0ca291c925bb46aa06 100644 (file)
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -2181,6 +2181,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
         .name = "drm_prime",
         .flags = AV_PIX_FMT_FLAG_HWACCEL,
     },
+    [AV_PIX_FMT_OPENCL] = {
+        .name  = "opencl",
+        .flags = AV_PIX_FMT_FLAG_HWACCEL,
+    },
 };
 #if FF_API_PLUS1_MINUS1
 FF_ENABLE_DEPRECATION_WARNINGS

diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index a520028962872b5e8e56c871fec67dd14a4fc9b1..4c530fead3eb7b0d976498576c6faae7a0a9b736 100644 (file)
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -322,6 +322,13 @@ enum AVPixelFormat {
      * data[0] points to an AVDRMFrameDescriptor.
      */
     AV_PIX_FMT_DRM_PRIME,
+    /**
+     * Hardware surfaces for OpenCL.
+     *
+     * data[i] contain 2D image objects (typed in C as cl_mem, used
+     * in OpenCL as image2d_t) for each plane of the surface.
+     */
+    AV_PIX_FMT_OPENCL,
 
     AV_PIX_FMT_NB         ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
 };

diff --git a/libavutil/version.h b/libavutil/version.h
index 1bc4b2a6cbea907d86f1d944179a1cc5149e7a0c..cf8ec498e4a28706f29b9c6aca1774c998e52d26 100644 (file)
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -80,7 +80,7 @@
 
 
 #define LIBAVUTIL_VERSION_MAJOR  56
-#define LIBAVUTIL_VERSION_MINOR   0
+#define LIBAVUTIL_VERSION_MINOR   1
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \