eponomar · aukhina · Feb 3, 2020 · Jan 2, 2020 · Feb 14, 2020 · Feb 10, 2020
diff --git a/.travis.yml b/.travis.yml
@@ -28,7 +28,7 @@ before_install:
   - sudo apt-get install -y autoconf
   - sudo apt-get install -y automake
   - sudo apt-get install -y libtool
-  - sudo apt-get install -y m4 
+  - sudo apt-get install -y m4
   - sudo apt-get install -y lcov
   - sudo apt-get install -y perl
   - sudo apt-get install -y pkg-config
@@ -57,6 +57,12 @@ script:
         echo "Don't build on coverty_scan branch.";
         exit 0;
     fi
+  - if [[ -n "$(find -name '*.[ch]' -executable)" ]];
+      then
+        echo "Error, a source code file(s) has the execute bit set:" >&2;
+        find -name '*.[ch]' -executable;
+        exit 1;
+    fi
   - ./autogen.sh
   - ./configure --prefix=/usr
   - make -j4 ; sudo make install

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -53,7 +53,7 @@ Please mail to [email protected] directly for security issue
 
 If you have a problem, please let us know.  IRC is a perfectly fine place
 to quickly informally bring something up, if you get a response.  The
-[mailing list](https://lists.01.org/mailman/listinfo/intel-vaapi-media)
+[mailing list](https://lists.01.org/postorius/lists/intel-vaapi-media.lists.01.org)
 is a more durable communication channel.
 
 If it's a bug not already documented, by all means please [open an

diff --git a/NEWS b/NEWS
@@ -1,5 +1,38 @@
-libva NEWS -- summary of user visible changes.  2019-12-25
-Copyright (C) 2009-2019 Intel Corporation
+libva NEWS -- summary of user visible changes.  2020-06-18
+Copyright (C) 2009-2020 Intel Corporation
+
+version 2.8.0 - 18.Jun.2020
+* trace: enable return value trace for successful function call
+* trace: divide va_TraceEndPicture to two seperate function
+* trace: add support for VAProfileHEVCSccMain444_10
+* fix:Fixes file descriptor leak
+* add fourcc code for P012 format
+* travis: Add a test that code files don't have the exec bit set
+* Remove the execute bit from all source code files
+* meson: Allow for libdir and includedir to be absolute paths
+* trace: Fix format string warnings
+* fix:Fix clang warning (reading garbage)
+* add definition to enforce both reflist not empty
+* trace: List correct field names in va_TraceVAPictureParameterBufferHEVC
+* change the return value to be UNIMPLEMENTED when the function pointer is NULL
+* remove check of vaPutSurface implementation
+* Add new slice structure flag for CAPS reporting
+* VA/X11: VAAPI driver mapping for iris DRI driver
+* VA/X11: enable driver candidate selection for DRI2
+* Add SCC flags to enable/disable features
+* fix: Fix HDR10 MaxCLL and MaxFALL documentation
+* Add VAProfileHEVCSccMain444_10 for HEVC
+* change the compatible list to be dynamic one
+* trace:Convert VAProfileAV1Profile0 VAProfileAV1Profile1 to string
+
+version 2.7.0 - 26.Mar.2020
+* trace: av1 decode buffers trace
+* trace: Add HEVC REXT and SCC trace for decoding.
+* Add av1 decode interfaces
+* Fix crashes on system without supported hardware by PR #369.
+* Add 2 FourCC for 10bit RGB(without Alpha) format: X2R10G10B10 and X2B10G10R10.
+* Fix android build issue #365 and remove some trailing whitespace
+* Adjust call sequence to ensure authenticate operation is executed to fix #355
 
 version 2.6.0 - 15.Dec.2019
 * enable the mutiple driver selection logic and enable it for DRM.

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ be accessed directly through [github pages
 libva](http://intel.github.io/libva/)
 
 The libva development team can be reached via our [mailing
-list](https://lists.01.org/mailman/listinfo/intel-vaapi-media) and on IRC
+list](https://lists.01.org/postorius/lists/intel-vaapi-media.lists.01.org) and on IRC
 in channel ##intel-media on [Freenode](https://freenode.net/kb/answer/chat).
 
 We also use [#Slack](https://slack.com) and host [VAAPI Media Slack

diff --git a/configure.ac b/configure.ac
@@ -27,7 +27,7 @@
 # - reset micro version to zero when minor version is incremented
 # - reset minor version to zero when major version is incremented
 m4_define([va_api_major_version], [1])
-m4_define([va_api_minor_version], [6])
+m4_define([va_api_minor_version], [9])
 m4_define([va_api_micro_version], [0])
 
 m4_define([va_api_version],

diff --git a/meson.build b/meson.build
@@ -7,7 +7,7 @@
 # - reset micro version to zero when VA-API major or minor version is changed
 project(
   'libva', 'c',
-  version : '2.6.0.1',
+  version : '2.9.0.1',
   meson_version : '>= 0.37.0',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])
@@ -19,7 +19,7 @@ project(
 # - reset micro version to zero when minor version is incremented
 # - reset minor version to zero when major version is incremented
 va_api_major_version = 1
-va_api_minor_version = 6
+va_api_minor_version = 9
 va_api_micro_version = 0
 
 va_api_version = '@0@.@1@.@2@'.format(va_api_major_version,
@@ -65,7 +65,7 @@ libva_lt_version = '@0@.@1@.@2@'.format(libva_lt_current,
 
 driverdir = get_option('driverdir')
 if driverdir == ''
-  driverdir = '@0@/@1@/@2@'.format(get_option('prefix'), get_option('libdir'), 'dri')
+  driverdir = join_paths(get_option('prefix'), get_option('libdir'), 'dri')
 endif
 
 configinc = include_directories('.')

diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
@@ -2,8 +2,8 @@ pkgconf = configuration_data()
 
 pkgconf.set('prefix', get_option('prefix'))
 pkgconf.set('exec_prefix', '${prefix}')
-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
 pkgconf.set('LIBVA_VERSION', libva_version)
 pkgconf.set('VA_API_VERSION', va_api_version)
 pkgconf.set('LIBVA_DRIVERS_PATH', driverdir)

diff --git a/test.txt b/test.txt
@@ -0,0 +1 @@
+Hello world
diff --git a/va/Makefile.am b/va/Makefile.am
@@ -42,6 +42,7 @@ libva_source_h = \
 	va_backend.h		\
 	va_backend_vpp.h	\
 	va_compat.h		\
+	va_dec_av1.h		\
 	va_dec_hevc.h		\
 	va_dec_jpeg.h		\
 	va_dec_vp8.h		\

diff --git a/va/android/va_android.cpp b/va/android/va_android.cpp
@@ -100,7 +100,6 @@ static void va_DisplayContextDestroy (
     free(pDisplayContext);
 }
 
-}
 static VAStatus va_DisplayContextGetNumCandidates(
     VADisplayContextP pDisplayContext,
     int *num_candidates

diff --git a/va/drm/va_drm_utils.c b/va/drm/va_drm_utils.c
@@ -54,7 +54,7 @@ VA_DRM_GetNumCandidates(VADriverContextP ctx, int * num_candidates)
 {
     struct drm_state * const drm_state = ctx->drm_state;
     drmVersionPtr drm_version;
-    int num_of_candidate = 0;
+    int count = 0;
     const struct driver_name_map *m = NULL;
     if (!drm_state || drm_state->fd < 0)
         return VA_STATUS_ERROR_INVALID_DISPLAY;
@@ -64,12 +64,12 @@ VA_DRM_GetNumCandidates(VADriverContextP ctx, int * num_candidates)
     for (m = g_driver_name_map; m->key != NULL; m++) {
         if (drm_version->name_len >= m->key_len &&
             strncmp(drm_version->name, m->key, m->key_len) == 0) {
-            num_of_candidate ++;
+            count ++;
         }
     }
     drmFreeVersion(drm_version);
-    *num_candidates = num_of_candidate;
-    return VA_STATUS_SUCCESS;
+    *num_candidates = count;
+    return count ? VA_STATUS_SUCCESS : VA_STATUS_ERROR_UNKNOWN;
 }
 
 /* Returns the VA driver name for the active display */

diff --git a/va/glx/va_glx_impl.c b/va/glx/va_glx_impl.c
@@ -939,7 +939,7 @@ static VAStatus
 vaDestroySurfaceGLX_impl_libva(VADriverContextP ctx, void *gl_surface)
 {
     VASurfaceGLXP pSurfaceGLX;
-    struct OpenGLContextState old_cs, *new_cs;
+    struct OpenGLContextState old_cs = {0}, *new_cs;
 
     INIT_SURFACE(pSurfaceGLX, gl_surface);
 
@@ -1072,7 +1072,7 @@ vaCopySurfaceGLX_impl_libva(
 {
     VASurfaceGLXP pSurfaceGLX;
     VAStatus status;
-    struct OpenGLContextState old_cs;
+    struct OpenGLContextState old_cs = {0};
 
     INIT_SURFACE(pSurfaceGLX, gl_surface);
 

diff --git a/va/meson.build b/va/meson.build
@@ -26,6 +26,7 @@ libva_headers = [
   'va_dec_jpeg.h',
   'va_dec_vp8.h',
   'va_dec_vp9.h',
+  'va_dec_av1.h',
   'va_drmcommon.h',
   'va_egl.h',
   'va_enc_hevc.h',

diff --git a/va/va.c b/va/va.c
@@ -52,7 +52,7 @@
 #define DRIVER_EXTENSION	"_drv_video.so"
 
 #define ASSERT		assert
-#define CHECK_VTABLE(s, ctx, func) if (!va_checkVtable(dpy, ctx->vtable->va##func, #func)) s = VA_STATUS_ERROR_UNKNOWN;
+#define CHECK_VTABLE(s, ctx, func) if (!va_checkVtable(dpy, ctx->vtable->va##func, #func)) s = VA_STATUS_ERROR_UNIMPLEMENTED;
 #define CHECK_MAXIMUM(s, ctx, var) if (!va_checkMaximum(dpy, ctx->max_##var, #var)) s = VA_STATUS_ERROR_UNKNOWN;
 #define CHECK_STRING(s, ctx, var) if (!va_checkString(dpy, ctx->str_##var, #var)) s = VA_STATUS_ERROR_UNKNOWN;
 
@@ -378,7 +378,7 @@ static VAStatus va_getDriverNameByIndex(VADisplay dpy, char **driver_name, int c
             status = pDisplayContext->vaGetDriverName(pDisplayContext, driver_name);
         else
             status = VA_STATUS_ERROR_INVALID_PARAMETER;
-    }    
+    }
     driver_name_env = getenv("LIBVA_DRIVER_NAME");
     /*if user set driver name by vaSetDriverName */
     if (ctx->override_driver_name){
@@ -398,7 +398,7 @@ static VAStatus va_getDriverNameByIndex(VADisplay dpy, char **driver_name, int c
         *driver_name = strdup(driver_name_env);
         va_infoMessage(dpy, "User environment variable requested driver '%s'\n", *driver_name);
         return VA_STATUS_SUCCESS;
-    } 
+    }
     return status;
 }
 
@@ -465,19 +465,16 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
             char init_func_s[256];
             int i;
 
-            static const struct {
+            struct {
                 int major;
                 int minor;
-            } compatible_versions[] = {
-                { VA_MAJOR_VERSION, VA_MINOR_VERSION },
-                { VA_MAJOR_VERSION, 5 },
-                { VA_MAJOR_VERSION, 4 },
-                { VA_MAJOR_VERSION, 3 },
-                { VA_MAJOR_VERSION, 2 },
-                { VA_MAJOR_VERSION, 1 },
-                { VA_MAJOR_VERSION, 0 },
-                { -1, -1}
-            };
+            } compatible_versions[VA_MINOR_VERSION + 2];
+            for (i = 0; i <= VA_MINOR_VERSION; i ++) {
+                compatible_versions[i].major = VA_MAJOR_VERSION;
+                compatible_versions[i].minor = VA_MINOR_VERSION - i;
+            }
+            compatible_versions[i].major = -1;
+            compatible_versions[i].minor = -1;
 
             for (i = 0; compatible_versions[i].major >= 0; i++) {
                 if (va_getDriverInitName(init_func_s, sizeof(init_func_s),
@@ -547,7 +544,6 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
                     CHECK_VTABLE(vaStatus, ctx, EndPicture);
                     CHECK_VTABLE(vaStatus, ctx, SyncSurface);
                     CHECK_VTABLE(vaStatus, ctx, QuerySurfaceStatus);
-                    CHECK_VTABLE(vaStatus, ctx, PutSurface);
                     CHECK_VTABLE(vaStatus, ctx, QueryImageFormats);
                     CHECK_VTABLE(vaStatus, ctx, CreateImage);
                     CHECK_VTABLE(vaStatus, ctx, DeriveImage);
@@ -744,7 +740,7 @@ VAStatus vaInitialize (
         if (vaStatus == VA_STATUS_SUCCESS) {
             break;
        }
-        
+
     }
 
     *major_version = VA_MAJOR_VERSION;
@@ -1616,12 +1612,11 @@ VAStatus vaEndPicture (
   ctx = CTX(dpy);
 
   VA_FOOL_FUNC(va_FoolCheckContinuity, dpy);
-
+  VA_TRACE_ALL(va_TraceEndPicture, dpy, context, 0);
   va_status = ctx->vtable->vaEndPicture( ctx, context );
-
-  /* dump surface content */
-  VA_TRACE_ALL(va_TraceEndPicture, dpy, context, 1);
   VA_TRACE_RET(dpy, va_status);
+  /* dump surface content */
+  VA_TRACE_ALL(va_TraceEndPictureExt, dpy, context, 1);
 
   return va_status;
 }
@@ -1644,6 +1639,28 @@ VAStatus vaSyncSurface (
   return va_status;
 }
 
+VAStatus vaSyncSurface2 (
+    VADisplay dpy,
+    VASurfaceID surface,
+    uint64_t timeout_ns
+)
+{
+  VAStatus va_status;
+  VADriverContextP ctx;
+
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  if (ctx->vtable->vaSyncSurface2)
+      va_status = ctx->vtable->vaSyncSurface2( ctx, surface, timeout_ns );
+  else
+      va_status = VA_STATUS_ERROR_UNIMPLEMENTED;
+  VA_TRACE_LOG(va_TraceSyncSurface2, dpy, surface, timeout_ns);
+  VA_TRACE_RET(dpy, va_status);
+
+  return va_status;
+}
+
 VAStatus vaQuerySurfaceStatus (
     VADisplay dpy,
     VASurfaceID render_target,
@@ -1683,6 +1700,29 @@ VAStatus vaQuerySurfaceError (
   return va_status;
 }
 
+VAStatus vaSyncBuffer (
+    VADisplay dpy,
+    VABufferID buf_id,
+    uint64_t timeout_ns
+)
+{
+  VAStatus va_status;
+  VADriverContextP ctx;
+
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  VA_TRACE_LOG(va_TraceSyncBuffer, dpy, buf_id, timeout_ns);
+
+  if (ctx->vtable->vaSyncBuffer)
+      va_status = ctx->vtable->vaSyncBuffer( ctx, buf_id, timeout_ns );
+  else
+      va_status = VA_STATUS_ERROR_UNIMPLEMENTED;
+  VA_TRACE_RET(dpy, va_status);
+
+  return va_status;
+}
+
 /* Get maximum number of image formats supported by the implementation */
 int vaMaxNumImageFormats (
     VADisplay dpy