New upstream version 0.18.0

3 files changed, 35 insertions, 25 deletions

diff --git a/tests/block_utils.cc b/tests/block_utils.cc
index 07337c4..a68ae64 100644
--- a/tests/block_utils.cc
+++ b/tests/block_utils.cc
@@ -55,7 +55,6 @@ void PrintBlockDiff(const Pixel* block1, const Pixel* block2, int width,
     block2 += stride2;
   }
 }
-#undef LIBGAV1_DEBUG_FORMAT_CODE
 
 }  // namespace
 
@@ -68,15 +67,16 @@ void PrintBlock(const Pixel* block, int width, int height, int stride,
     printf("[%2d] ", y);
     for (int x = 0; x < print_width; ++x) {
       if (x >= width) {
-        printf("[%*d] ", field_width, block[x]);
+        printf("[%*" LIBGAV1_DEBUG_FORMAT_CODE "] ", field_width, block[x]);
       } else {
-        printf("%*d ", field_width, block[x]);
+        printf("%*" LIBGAV1_DEBUG_FORMAT_CODE " ", field_width, block[x]);
       }
     }
     printf("\n");
     block += stride;
   }
 }
+#undef LIBGAV1_DEBUG_FORMAT_CODE
 
 template void PrintBlock(const uint8_t* block, int width, int height,
                          int stride, bool print_padding /*= false*/);
diff --git a/tests/libgav1_tests.cmake b/tests/libgav1_tests.cmake
index 2b3f41c..c759d4f 100644
--- a/tests/libgav1_tests.cmake
+++ b/tests/libgav1_tests.cmake
@@ -96,9 +96,13 @@ list(APPEND libgav1_common_sse4_test_sources
 list(APPEND libgav1_convolve_test_sources
             "${libgav1_source}/dsp/convolve_test.cc")
 list(APPEND libgav1_cpu_test_sources "${libgav1_source}/utils/cpu_test.cc")
-list(APPEND libgav1_c_decoder_test_sources "${libgav1_source}/c_decoder_test.c")
+list(APPEND libgav1_c_decoder_test_sources
+            "${libgav1_source}/c_decoder_test.c"
+            "${libgav1_source}/decoder_test_data.h")
 list(APPEND libgav1_c_version_test_sources "${libgav1_source}/c_version_test.c")
-list(APPEND libgav1_decoder_test_sources "${libgav1_source}/decoder_test.cc")
+list(APPEND libgav1_decoder_test_sources
+            "${libgav1_source}/decoder_test.cc"
+            "${libgav1_source}/decoder_test_data.h")
 list(APPEND libgav1_decoder_buffer_test_sources
             "${libgav1_source}/decoder_buffer_test.cc")
 list(APPEND libgav1_distance_weighted_blend_test_sources
@@ -217,18 +221,6 @@ macro(libgav1_add_tests_targets)
                       ${libgav1_gtest_include_paths}
                       ${libgav1_include_paths})
 
-  if(ANDROID OR IOS)
-    if(DEFINED LIBGAV1_THREADPOOL_USE_STD_MUTEX
-       AND NOT LIBGAV1_THREADPOOL_USE_STD_MUTEX)
-      set(use_absl_threading TRUE)
-    endif()
-  elseif(NOT
-         (DEFINED
-          LIBGAV1_THREADPOOL_USE_STD_MUTEX
-          AND LIBGAV1_THREADPOOL_USE_STD_MUTEX))
-    set(use_absl_threading TRUE)
-  endif()
-
   if(use_absl_threading)
     list(APPEND libgav1_common_test_absl_deps absl::synchronization)
   endif()
diff --git a/tests/utils.h b/tests/utils.h
index 4d73070..3394d64 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -25,6 +25,7 @@
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "src/gav1/decoder_buffer.h"
+#include "src/utils/compiler_attributes.h"
 #include "src/utils/memory.h"
 #include "tests/third_party/libvpx/acm_random.h"
 
@@ -42,9 +43,22 @@ static_assert(kAlternateDeterministicSeed !=
 
 // Similar to libgav1::MaxAlignedAllocable, but retains the throwing versions
 // of new to support googletest allocations.
+// Note when building the source as C++17 or greater, gcc 11.2.0 may issue a
+// warning of the form:
+//   warning: 'void operator delete [](void*, std::align_val_t)' called on
+//     pointer returned from a mismatched allocation function
+//   note: returned from 'static void*
+//     libgav1::test_utils::MaxAlignedAllocable::operator new [](size_t)'
+// This is a false positive as this function calls
+// libgav1::MaxAlignedAllocable::operator new[](size, std::nothrow) which in
+// turn calls
+// void* operator new[](std::size_t, std::align_val_t, const std::nothrow_t&).
+// This is due to unbalanced inlining of the functions, so we force them to be
+// inlined.
+// See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103993
 struct MaxAlignedAllocable {
   // Class-specific allocation functions.
-  static void* operator new(size_t size) {
+  static LIBGAV1_ALWAYS_INLINE void* operator new(size_t size) {
     void* const p =
         libgav1::MaxAlignedAllocable::operator new(size, std::nothrow);
 #ifdef ABSL_HAVE_EXCEPTIONS
@@ -52,7 +66,7 @@ struct MaxAlignedAllocable {
 #endif
     return p;
   }
-  static void* operator new[](size_t size) {
+  static LIBGAV1_ALWAYS_INLINE void* operator new[](size_t size) {
     void* const p =
         libgav1::MaxAlignedAllocable::operator new[](size, std::nothrow);
 #ifdef ABSL_HAVE_EXCEPTIONS
@@ -62,29 +76,33 @@ struct MaxAlignedAllocable {
   }
 
   // Class-specific non-throwing allocation functions
-  static void* operator new(size_t size, const std::nothrow_t& tag) noexcept {
+  static LIBGAV1_ALWAYS_INLINE void* operator new(
+      size_t size, const std::nothrow_t& tag) noexcept {
     return libgav1::MaxAlignedAllocable::operator new(size, tag);
   }
-  static void* operator new[](size_t size, const std::nothrow_t& tag) noexcept {
+  static LIBGAV1_ALWAYS_INLINE void* operator new[](
+      size_t size, const std::nothrow_t& tag) noexcept {
     return libgav1::MaxAlignedAllocable::operator new[](size, tag);
   }
 
   // Class-specific deallocation functions.
-  static void operator delete(void* ptr) noexcept {
+  static LIBGAV1_ALWAYS_INLINE void operator delete(void* ptr) noexcept {
     libgav1::MaxAlignedAllocable::operator delete(ptr);
   }
-  static void operator delete[](void* ptr) noexcept {
+  static LIBGAV1_ALWAYS_INLINE void operator delete[](void* ptr) noexcept {
     libgav1::MaxAlignedAllocable::operator delete[](ptr);
   }
 
   // Only called if new (std::nothrow) is used and the constructor throws an
   // exception.
-  static void operator delete(void* ptr, const std::nothrow_t& tag) noexcept {
+  static LIBGAV1_ALWAYS_INLINE void operator delete(
+      void* ptr, const std::nothrow_t& tag) noexcept {
     libgav1::MaxAlignedAllocable::operator delete(ptr, tag);
   }
   // Only called if new[] (std::nothrow) is used and the constructor throws an
   // exception.
-  static void operator delete[](void* ptr, const std::nothrow_t& tag) noexcept {
+  static LIBGAV1_ALWAYS_INLINE void operator delete[](
+      void* ptr, const std::nothrow_t& tag) noexcept {
     libgav1::MaxAlignedAllocable::operator delete[](ptr, tag);
   }
 };