opencv
diff --git a/‎CMakeLists.txt
Copy file name to clipboard
+10Lines changed: 10 additions & 0 deletions b/‎CMakeLists.txt
Copy file name to clipboard
+10Lines changed: 10 additions & 0 deletions
diff --git a/‎cmake/OpenCVFindAVIF.cmake
Copy file name to clipboard
+46Lines changed: 46 additions & 0 deletions b/‎cmake/OpenCVFindAVIF.cmake
Copy file name to clipboard
+46Lines changed: 46 additions & 0 deletions
diff --git a/‎cmake/OpenCVFindLibsGrfmt.cmake
Copy file name to clipboard
+10Lines changed: 10 additions & 0 deletions b/‎cmake/OpenCVFindLibsGrfmt.cmake
Copy file name to clipboard
+10Lines changed: 10 additions & 0 deletions
diff --git a/‎cmake/templates/cvconfig.h.in
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎cmake/templates/cvconfig.h.in
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎modules/imgcodecs/CMakeLists.txt
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎modules/imgcodecs/CMakeLists.txt
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎modules/imgcodecs/include/opencv2/imgcodecs.hpp
Copy file name to clipboard
+5-1Lines changed: 5 additions & 1 deletion b/‎modules/imgcodecs/include/opencv2/imgcodecs.hpp
Copy file name to clipboard
+5-1Lines changed: 5 additions & 1 deletion
@@ -240,6 +240,8 @@ OCV_OPTION(WITH_1394 "Include IEEE1394 support" ON
 OCV_OPTION(WITH_AVFOUNDATION "Use AVFoundation for Video I/O (iOS/Mac)" ON
   VISIBLE_IF APPLE
   VERIFY HAVE_AVFOUNDATION)
+OCV_OPTION(WITH_AVIF "Enable AVIF support" OFF
+  VERIFY HAVE_AVIF)
 OCV_OPTION(WITH_CAP_IOS "Enable iOS video capture" ON
   VISIBLE_IF IOS
   VERIFY HAVE_CAP_IOS)
@@ -1379,6 +1381,14 @@ if(WITH_WEBP OR HAVE_WEBP)
   status("    WEBP:" WEBP_FOUND THEN "${WEBP_LIBRARY} (ver ${WEBP_VERSION})" ELSE "build (ver ${WEBP_VERSION})")
 endif()
 
+if(WITH_AVIF OR HAVE_AVIF)
+  if(AVIF_VERSION)
+    status("    AVIF:" AVIF_FOUND THEN "${AVIF_LIBRARY} (ver ${AVIF_VERSION})" ELSE "NO")
+  else()
+    status("    AVIF:" AVIF_FOUND THEN "${AVIF_LIBRARY}" ELSE "NO")
+  endif()
+endif()
+
 if(WITH_PNG OR HAVE_PNG OR WITH_SPNG)
   if(WITH_SPNG)
     status("    PNG:" "build-${SPNG_LIBRARY} (ver ${SPNG_VERSION})")
 
@@ -0,0 +1,46 @@
+#=============================================================================
+# Find AVIF library
+#=============================================================================
+# Find the native AVIF headers and libraries.
+#
+#  AVIF_INCLUDE_DIRS - where to find avif/avif.h, etc.
+#  AVIF_LIBRARIES    - List of libraries when using AVIF.
+#  AVIF_FOUND        - True if AVIF is found.
+#=============================================================================
+
+# Look for the header file.
+
+unset(AVIF_FOUND)
+
+find_package(libavif QUIET)
+
+if(TARGET avif)
+    MARK_AS_ADVANCED(AVIF_INCLUDE_DIR)
+    MARK_AS_ADVANCED(AVIF_LIBRARY)
+
+    SET(AVIF_FOUND TRUE)
+    GET_TARGET_PROPERTY(AVIF_LIBRARY avif LOCATION)
+    GET_TARGET_PROPERTY(AVIF_INCLUDE_DIR1 avif INCLUDE_DIRECTORIES)
+    GET_TARGET_PROPERTY(AVIF_INCLUDE_DIR2 avif INTERFACE_INCLUDE_DIRECTORIES)
+    set(AVIF_INCLUDE_DIR)
+    if(AVIF_INCLUDE_DIR1)
+        LIST(APPEND AVIF_INCLUDE_DIR ${AVIF_INCLUDE_DIR1})
+    endif()
+    if(AVIF_INCLUDE_DIR2)
+        LIST(APPEND AVIF_INCLUDE_DIR ${AVIF_INCLUDE_DIR2})
+    endif()
+else()
+    FIND_PATH(AVIF_INCLUDE_DIR NAMES avif/avif.h)
+
+     # Look for the library.
+    FIND_LIBRARY(AVIF_LIBRARY NAMES avif)
+    MARK_AS_ADVANCED(AVIF_LIBRARY)
+
+    # handle the QUIETLY and REQUIRED arguments and set AVIF_FOUND to TRUE if
+    # all listed variables are TRUE
+    INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(AVIF DEFAULT_MSG AVIF_LIBRARY AVIF_INCLUDE_DIR)
+
+    SET(AVIF_LIBRARIES ${AVIF_LIBRARY})
+    SET(AVIF_INCLUDE_DIRS ${AVIF_INCLUDE_DIR})
+endif()
@@ -37,6 +37,16 @@ if(NOT ZLIB_FOUND)
   ocv_parse_header2(ZLIB "${${ZLIB_LIBRARY}_SOURCE_DIR}/zlib.h" ZLIB_VERSION)
 endif()
 
+# --- libavif (optional) ---
+
+if(WITH_AVIF)
+  ocv_clear_internal_cache_vars(AVIF_LIBRARY AVIF_INCLUDE_DIR)
+  include(cmake/OpenCVFindAVIF.cmake)
+  if(AVIF_FOUND)
+    set(HAVE_AVIF 1)
+  endif()
+endif()
+
 # --- libjpeg (optional) ---
 if(WITH_JPEG)
   if(BUILD_JPEG)
 
@@ -72,6 +72,9 @@
 #cmakedefine HAVE_OPENJPEG
 #cmakedefine HAVE_JASPER
 
+/* AVIF codec */
+#cmakedefine HAVE_AVIF
+
 /* IJG JPEG codec */
 #cmakedefine HAVE_JPEG
 
 
@@ -13,6 +13,11 @@ if(HAVE_WINRT_CX AND NOT WINRT)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW")
 endif()
 
+if (HAVE_AVIF)
+  ocv_include_directories(${AVIF_INCLUDE_DIR})
+  list(APPEND GRFMT_LIBS ${AVIF_LIBRARY})
+endif()
+
 if(HAVE_JPEG)
   ocv_include_directories(${JPEG_INCLUDE_DIR} ${${JPEG_LIBRARY}_BINARY_DIR})
   list(APPEND GRFMT_LIBS ${JPEG_LIBRARIES})
 
@@ -105,7 +105,10 @@ enum ImwriteFlags {
        IMWRITE_TIFF_XDPI           = 257,//!< For TIFF, use to specify the X direction DPI
        IMWRITE_TIFF_YDPI           = 258,//!< For TIFF, use to specify the Y direction DPI
        IMWRITE_TIFF_COMPRESSION    = 259,//!< For TIFF, use to specify the image compression scheme. See libtiff for integer constants corresponding to compression formats. Note, for images whose depth is CV_32F, only libtiff's SGILOG compression scheme is used. For other supported depths, the compression scheme can be specified by this flag; LZW compression is the default.
-       IMWRITE_JPEG2000_COMPRESSION_X1000 = 272 //!< For JPEG2000, use to specify the target compression rate (multiplied by 1000). The value can be from 0 to 1000. Default is 1000.
+       IMWRITE_JPEG2000_COMPRESSION_X1000 = 272,//!< For JPEG2000, use to specify the target compression rate (multiplied by 1000). The value can be from 0 to 1000. Default is 1000.
+       IMWRITE_AVIF_QUALITY        = 512,//!< For AVIF, it can be a quality between 0 and 100 (the higher the better). Default is 95.
+       IMWRITE_AVIF_DEPTH          = 513,//!< For AVIF, it can be 8, 10 or 12. If >8, it is stored/read as CV_32F. Default is 8.
+       IMWRITE_AVIF_SPEED          = 514 //!< For AVIF, it is between 0 (slowest) and (fastest). Default is 9.
      };
 
 enum ImwriteJPEGSamplingFactorParams {
@@ -185,6 +188,7 @@ Currently, the following file formats are supported:
 -   JPEG 2000 files - \*.jp2 (see the *Note* section)
 -   Portable Network Graphics - \*.png (see the *Note* section)
 -   WebP - \*.webp (see the *Note* section)
+-   AVIF - \*.avif (see the *Note* section)
 -   Portable image format - \*.pbm, \*.pgm, \*.ppm \*.pxm, \*.pnm (always supported)
 -   PFM files - \*.pfm (see the *Note* section)
 -   Sun rasters - \*.sr, \*.ras (always supported)