Merge pull request #304 from basilgello/ffmpeg7.0-Piers

Port FFmpeg 7.0 to ffmpegdirect Piers

Author: phunkyfish

FindFFMPEG.cmake

@@ -33,14 +33,14 @@
 #
 
 # required ffmpeg library versions
-set(REQUIRED_FFMPEG_VERSION 5.0.0)
-set(_avcodec_ver ">=59.18.100")
-set(_avfilter_ver ">=8.24.100")
-set(_avformat_ver ">=59.16.100")
-set(_avutil_ver ">=57.17.100")
-set(_postproc_ver ">=56.3.100")
-set(_swresample_ver ">=4.3.100")
-set(_swscale_ver ">=6.4.100")
+set(REQUIRED_FFMPEG_VERSION 7.0.0)
+set(_avcodec_ver ">=61.3.100")
+set(_avfilter_ver ">=10.1.100")
+set(_avformat_ver ">=61.1.100")
+set(_avutil_ver ">=59.8.100")
+set(_postproc_ver ">=58.1.100")
+set(_swresample_ver ">=5.1.100")
+set(_swscale_ver ">=8.1.100")
 
 # Allows building with external ffmpeg not found in system paths,
 # without library version checks

depends/common/ffmpeg/0001-ffmpeg-windows-configure-detect-openssl.patch

@@ -1,17 +1,17 @@
-From 08ae41e824e04ab48eafde763c72d1ff3e878a41 Mon Sep 17 00:00:00 2001
+From 6b0296b657b281cf326b96ab6cf3b8e1e6e620d2 Mon Sep 17 00:00:00 2001
 From: Lukas Rusak <[email protected]>
 Date: Sat, 10 Apr 2021 08:16:11 -0700
-Subject: [PATCH 1/4] ffmpeg: windows: configure: detect openssl
+Subject: [PATCH 1/3] ffmpeg: windows: configure: detect openssl
 
 ---
  configure | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/configure b/configure
-index d7a3f507e8..4b85e881b1 100755
+index 8642513..84d0fa4 100755
 --- a/configure
 +++ b/configure
-@@ -6728,6 +6728,8 @@ enabled openssl           && { check_pkg_config openssl openssl openssl/ssl.h OP
+@@ -7060,6 +7060,8 @@ enabled openssl           && { { check_pkg_config openssl "openssl >= 3.0.0" ope
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
@@ -21,5 +21,5 @@ index d7a3f507e8..4b85e881b1 100755
  enabled pocketsphinx      && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init
  enabled rkmpp             && { require_pkg_config rkmpp rockchip_mpp  rockchip/rk_mpi.h mpp_create &&
 -- 
-2.29.2
+2.39.2
 

depends/common/ffmpeg/0002-ffmpeg-windows-configure-fix-zlib-conflict.patch

@@ -1,17 +1,17 @@
-From 1e57e7f49f1a74ee11d3c8dd5d407f35eecd5167 Mon Sep 17 00:00:00 2001
+From 500820158d64749311c243e7af599077ad68085e Mon Sep 17 00:00:00 2001
 From: Lukas Rusak <[email protected]>
 Date: Sat, 10 Apr 2021 08:16:48 -0700
-Subject: [PATCH 2/4] ffmpeg: windows: configure: fix zlib conflict
+Subject: [PATCH 2/3] ffmpeg: windows: configure: fix zlib conflict
 
 ---
  configure | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/configure b/configure
-index 4b85e881b1..da457705d1 100755
+index 84d0fa4..2fcde55 100755
 --- a/configure
 +++ b/configure
-@@ -7825,6 +7825,9 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST       \
+@@ -8188,6 +8188,9 @@ print_config HAVE_   "$config_files" $HAVE_LIST
  print_config CONFIG_ "$config_files" $CONFIG_LIST       \
                                       $CONFIG_EXTRA      \
 
@@ -22,5 +22,5 @@ index 4b85e881b1..da457705d1 100755
 
  # Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
 -- 
-2.29.2
+2.39.2
 

depends/common/ffmpeg/0003-ffmpeg-windows-configure-allow-building-static.patch

@@ -1,34 +1,34 @@
-From efb771d944e96bcbb24635bcae99a43dffab262e Mon Sep 17 00:00:00 2001
+From 3563feddaf8a3f473999fca61e12624def63eba4 Mon Sep 17 00:00:00 2001
 From: Lukas Rusak <[email protected]>
 Date: Sat, 10 Apr 2021 08:17:11 -0700
-Subject: [PATCH 3/4] ffmpeg: windows: configure: allow building static
+Subject: [PATCH 3/3] ffmpeg: windows: configure: allow building static
 
 ---
  configure | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/configure b/configure
-index da457705d1..e3a8f45ff4 100755
+index 2fcde55..598439a 100755
 --- a/configure
 +++ b/configure
-@@ -5566,6 +5566,8 @@ case $target_os in
-         enabled shared && ! enabled small && test_cmd $windres --version && enable gnu_windres
+@@ -5784,6 +5784,8 @@ case $target_os in
          enabled x86_32 && check_ldflags -Wl,--large-address-aware
+         add_cppflags -DWIN32_LEAN_AND_MEAN
          shlibdir_default="$bindir_default"
 +        LIBPREF=""
 +        LIBSUF=".lib"
          SLIBPREF=""
          SLIBSUF=".dll"
          SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
-@@ -5615,6 +5617,8 @@ case $target_os in
-         fi
+@@ -5835,6 +5837,8 @@ case $target_os in
          enabled x86_32 && check_ldflags -LARGEADDRESSAWARE
+         add_cppflags -DWIN32_LEAN_AND_MEAN
          shlibdir_default="$bindir_default"
 +        LIBPREF=""
 +        LIBSUF=".lib"
          SLIBPREF=""
          SLIBSUF=".dll"
          SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
 -- 
-2.29.2
+2.39.2
 

depends/common/ffmpeg/0004-ffmpeg-linux-fix-asm-binutil-since-2.41.patch

@@ -1,7 +1,8 @@
 diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c
+index 5902563..33dceec 100644
 --- a/libavcodec/dxva2.c
 +++ b/libavcodec/dxva2.c
-@@ -777,7 +777,7 @@ unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx,
+@@ -782,7 +782,7 @@ unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx,
  #if CONFIG_D3D11VA
      if (avctx->pix_fmt == AV_PIX_FMT_D3D11)
          return (intptr_t)frame->data[1];

depends/common/ffmpeg/0005-ffmpeg-windows-dxva2-check-nullptr-surface.patch depends/common/ffmpeg/0004-ffmpeg-windows-dxva2-check-nullptr-surface.patch

@@ -117,10 +117,10 @@ if(NOT WIN32)
       list(APPEND EXTRA_CONF --arch=aarch64)
       list(APPEND EXTRA_CONF --disable-filter=yadif_videotoolbox)
     endif()
-    list(APPEND EXTRA_CONF --disable-decoder=mpeg_xvmc --disable-crystalhd --enable-videotoolbox
+    list(APPEND EXTRA_CONF --disable-decoder=mpeg_xvmc --enable-videotoolbox
                            --target-os=darwin)
   elseif(CORE_SYSTEM_NAME STREQUAL osx)
-    list(APPEND EXTRA_CONF --disable-decoder=mpeg_xvmc --disable-crystalhd --enable-videotoolbox
+    list(APPEND EXTRA_CONF --disable-decoder=mpeg_xvmc --enable-videotoolbox
                            --target-os=darwin
                            --disable-securetransport)
   endif()
@@ -150,6 +150,12 @@ if(NOT WIN32)
                             COMMAND echo "Setting HAVE_CLOCK_GETTIME to 0 for darwin_embedded using sed"
                             COMMAND sed -i -- "s/HAVE_CLOCK_GETTIME 1/HAVE_CLOCK_GETTIME 0/g" ${CMAKE_CURRENT_BINARY_DIR}/ffmpeg-prefix/src/ffmpeg-build/config.h
                             DEPENDEES configure)
+    externalproject_add_step(ffmpeg
+                            DisableVVCDecoderOnAArch64
+                            COMMAND echo "Disabling AArch64 implementation of VVC (H.266) on darwin_embedded using sed"
+                            COMMAND rm ${CMAKE_SOURCE_DIR}/libavcodec/aarch64/vvc/Makefile
+                            COMMAND sed -i -- "/ff_vvc_dsp_init_aarch64/d" ${CMAKE_SOURCE_DIR}/libavcodec/vvc/dsp.c
+                            DEPENDERS configure)
   endif()
 else()
   find_package(MinGW REQUIRED)

depends/common/ffmpeg/CMakeLists.txt

@@ -1 +1 @@
-9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e
+7ddad2d992bd250a6c56053c26029f7e728bebf0f37f80cf3f8a0e6ec706431a

depends/common/ffmpeg/ffmpeg.sha256

@@ -1 +1 @@
-ffmpeg https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n6.0.tar.gz
+ffmpeg https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n7.1.tar.gz

depends/common/ffmpeg/ffmpeg.txt

@@ -2,4 +2,4 @@ All patches are required for windows and allow both static building
 and openssl. Note there is no impact to applying these to other platforms
 as openssl is not used (gnutls is used for non-windows).
 
-Last update and patches refreshed for FFmpeg-n4.4
+Last update and patches refreshed for FFmpeg-n7.1

depends/common/ffmpeg/readme

@@ -1,17 +1,20 @@
 --- a/src/gl/fpending.c
 +++ b/src/gl/fpending.c
-@@ -40,8 +40,14 @@ __fpending (FILE *fp)
+@@ -40,8 +40,17 @@ __fpending (FILE *fp)
    /* GNU libc, BeOS, Haiku, Linux libc5 */
    return fp->_IO_write_ptr - fp->_IO_write_base;
  #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-+#if defined ANDROID && __ANDROID_API__ < 23
++#ifdef __ANDROID__
++# include <android/api-level.h>
++# if __ANDROID_API__ < 23
 +  /* Hack fix for Kodi as it still use Android API 21 */
 +  #warning "ANDROID API to low, no __fpending usable"
 +  return 1;
++# endif
 +#else
    /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin < 1.7.34, Minix 3, Android */
    return fp_->_p - fp_->_bf._base;
 +#endif
  #elif defined __EMX__                /* emx+gcc */
-   return fp_->_ptr - fp_->_buffer;
+   return fp->_ptr - fp->_buffer;
  #elif defined __minix                /* Minix */

depends/common/gnutls/0001-android-hackfix-fpending_c.patch

@@ -18,7 +18,7 @@ diff -ur gnutls/lib/gnutls.pc.in gnutls-patched/lib/gnutls.pc.in
  URL: https://www.gnutls.org/
  Version: @VERSION@
  Libs: -L${libdir} -lgnutls
--Libs.private: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ @GNUTLS_LIBS_PRIVATE@
-+Libs.private: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ @GNUTLS_LIBS_PRIVATE@ @LIBDL@
+-Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ @GNUTLS_LIBS_PRIVATE@
++Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ @GNUTLS_LIBS_PRIVATE@ @LIBDL@
  @GNUTLS_REQUIRES_PRIVATE@
  Cflags: -I${includedir}