Bug 1841624 - Update dav1d to 616bfd1506a8a75c6a358e578cbec9ca1193150…

…2 r=chunmin Differential Revision: https://phabricator.services.mozilla.com/D182716
dothq · Jul 7, 2023 · 1f101a7 · 1f101a7
1 parent 115775c
commit 1f101a7
Show file tree

Hide file tree

Showing 33 changed files with 3,210 additions and 1,329 deletions.
diff --git a/media/libdav1d/moz.yaml b/media/libdav1d/moz.yaml
@@ -20,11 +20,11 @@ origin:
 
   # Human-readable identifier for this version/release
   # Generally "version NNN", "tag SSS", "bookmark SSS"
-  release: 8b419c16bf1e37bc98044089da58f06824462cb9 (2023-06-02T00:00:12.000+02:00).
+  release: 616bfd1506a8a75c6a358e578cbec9ca11931502 (2023-07-01T11:36:39.000+03:00).
 
   # Revision to pull in
   # Must be a long or short commit SHA (long preferred)
-  revision: 8b419c16bf1e37bc98044089da58f06824462cb9
+  revision: 616bfd1506a8a75c6a358e578cbec9ca11931502
 
   # The package's license, where possible using the mnemonic from
   # https://spdx.org/licenses/

diff --git a/media/libdav1d/vcs_version.h b/media/libdav1d/vcs_version.h
@@ -1,2 +1,2 @@
 /* auto-generated, do not edit */
-#define DAV1D_VERSION "8b419c16bf1e37bc98044089da58f06824462cb9"
+#define DAV1D_VERSION "616bfd1506a8a75c6a358e578cbec9ca11931502"
diff --git a/media/libdav1d/version.h b/media/libdav1d/version.h
@@ -27,8 +27,8 @@
 #ifndef DAV1D_VERSION_H
 #define DAV1D_VERSION_H
 
-#define DAV1D_API_VERSION_MAJOR 6
-#define DAV1D_API_VERSION_MINOR 9
+#define DAV1D_API_VERSION_MAJOR 7
+#define DAV1D_API_VERSION_MINOR 0
 #define DAV1D_API_VERSION_PATCH 0
 
 #endif /* DAV1D_VERSION_H */
diff --git a/third_party/dav1d/include/common/validate.h b/third_party/dav1d/include/common/validate.h
@@ -32,24 +32,26 @@
 #include <stdlib.h>
 
 #if defined(NDEBUG)
-#define debug_abort()
+#define debug_print(...) do {} while (0)
+#define debug_abort() do {} while (0)
 #else
+#define debug_print(...) fprintf(stderr, __VA_ARGS__)
 #define debug_abort abort
 #endif
 
 #define validate_input_or_ret_with_msg(x, r, ...) \
     if (!(x)) { \
-        fprintf(stderr, "Input validation check \'%s\' failed in %s!\n", \
-                #x, __func__); \
-        fprintf(stderr, __VA_ARGS__); \
+        debug_print("Input validation check \'%s\' failed in %s!\n", \
+                    #x, __func__); \
+        debug_print(__VA_ARGS__); \
         debug_abort(); \
         return r; \
     }
 
 #define validate_input_or_ret(x, r) \
     if (!(x)) { \
-        fprintf(stderr, "Input validation check \'%s\' failed in %s!\n", \
-                #x, __func__); \
+        debug_print("Input validation check \'%s\' failed in %s!\n", \
+                    #x, __func__); \
         debug_abort(); \
         return r; \
     }

diff --git a/third_party/dav1d/include/dav1d/dav1d.h b/third_party/dav1d/include/dav1d/dav1d.h
@@ -103,6 +103,15 @@ typedef struct Dav1dSettings {
  */
 DAV1D_API const char *dav1d_version(void);
 
+/**
+ * Get library API version.
+ *
+ * @return A value in the format 0x00XXYYZZ, where XX is the major version,
+ *         YY the minor version, and ZZ the patch version.
+ * @see DAV1D_API_MAJOR, DAV1D_API_MINOR, DAV1D_API_PATCH
+ */
+DAV1D_API unsigned dav1d_version_api(void);
+
 /**
  * Initialize settings to default values.
  *