Update FFmpeg to version 7.1

cmake/CheckExternalLibraries.cmake

@@ -191,12 +191,6 @@ if(ENABLE_DRM)
   endif()
 endif()
 
-# Needed to pass right config option to FFmpeg
-#
-# crystalhd: fedora:libcrystalhd-devel debian:libcrystalhd-dev
-find_library(CRYSTALHD crystalhd)
-add_build_config(CRYSTALHD "crystalhd")
-
 #
 # See if there is a system libbluray for FFmpeg.
 #

cmake/embeddedlibs/FindOrBuildFFmpeg.cmake

@@ -99,7 +99,6 @@ function(find_or_build_ffmpeg)
       ${CMAKE_COMMAND} -E env ${_PROGS} PKG_CONFIG_PATH=${PKG_CONFIG_PATH_STR}
       ${CMAKE_CURRENT_SOURCE_DIR}/mythtv/external/FFmpeg/configure ${FF_ARGS}
       "${FF_PLATFORM_ARGS}"
-      $<IF:$<BOOL:${CRYSTALHD_FOUND}>,--enable-crystalhd,--disable-crystalhd>
       $<IF:$<BOOL:${SYSTEM_LIBBLURAY_FOUND}>,--enable-libbluray,--disable-libbluray>
       $<IF:$<TARGET_EXISTS:Fontconfig::Fontconfig::LIBXVID>,--enable-libfontconfig,--disable-libfontconfig>
       $<IF:$<TARGET_EXISTS:LibX264::LibX264>,--enable-libx264,--disable-libx264>
@@ -136,26 +135,6 @@ function(find_or_build_ffmpeg)
     WORKING_DIRECTORY <BINARY_DIR>
     COMMAND ${MAKE_EXECUTABLE} install-pkgconfig)
 
-  #
-  # Install internal headers that are used by MythTV.  This must go away if
-  # MythTV is ever want to use the distribution supplied FFmpeg.
-  #
-  set(FFMPEG_INSTALL_INCLUDEDIR ${FFMPEG_INSTALL_PREFIX}/include/mythtv/)
-  ExternalProject_Add_Step(
-    FFmpeg expose_internal_headers_hack
-    DEPENDEES install
-    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/mythtv/external/FFmpeg
-    COMMAND ${CMAKE_COMMAND} -E make_directory
-            ${FFMPEG_INSTALL_INCLUDEDIR}/compat/cuda
-    COMMAND ${CMAKE_COMMAND} -E copy libavformat/url.h
-            ${FFMPEG_INSTALL_INCLUDEDIR}/libavformat/
-    COMMAND ${CMAKE_COMMAND} -E copy libavutil/wchar_filename.h
-            ${FFMPEG_INSTALL_INCLUDEDIR}/libavutil/
-    COMMAND ${CMAKE_COMMAND} -E copy compat/w32dlfcn.h
-            ${FFMPEG_INSTALL_INCLUDEDIR}/compat/
-    COMMAND ${CMAKE_COMMAND} -E copy compat/cuda/dynlink_loader.h
-            ${FFMPEG_INSTALL_INCLUDEDIR}/compat/cuda/)
-
 endfunction()
 
 find_or_build_ffmpeg()

mythplugins/mytharchive/mytharchive/remoteavformatcontext.h

@@ -118,7 +118,7 @@ class ArchiveRemoteAVFormatContext
         return rf->Read(buf, buf_size);
     }
 
-    static int WriteFunc(void */*opaque*/, uint8_t */*buf*/, int /*buf_size*/)
+    static int WriteFunc(void */*opaque*/, const uint8_t */*buf*/, int /*buf_size*/)
         {  return -1; }
 
     static int64_t SeekFunc(void *opaque, int64_t offset, int whence)

mythplugins/mytharchive/mytharchive/thumbfinder.h

@@ -12,6 +12,7 @@ extern "C" {
 #include <QScopedPointer>
 
 // mythtv
+#include <libmyth/mythavframe.h>
 #include <libmythbase/programtypes.h>
 #include <libmythtv/mythavutil.h>
 #include <libmythui/mythscreentype.h>

mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.cpp

@@ -50,6 +50,7 @@
 
 // MythTV headers
 #include <mythconfig.h>
+#include <libmyth/mythavframe.h>
 #include <libmyth/mythcontext.h>
 #include <libmythbase/exitcodes.h>
 #include <libmythbase/mythcommandlineparser.h>
@@ -1653,7 +1654,7 @@ static int grabThumbnail(const QString& inFile, const QString& thumbList, const
                     frameFinished = true;
                 if (ret == 0 || ret == AVERROR(EAGAIN))
                     avcodec_send_packet(codecCtx, &pkt);
-                int keyFrame = frame->key_frame;
+                bool keyFrame = (frame->flags & AV_FRAME_FLAG_KEY) != 0;
 
                 while (!frameFinished || !keyFrame)
                 {
@@ -1670,7 +1671,7 @@ static int grabThumbnail(const QString& inFile, const QString& thumbList, const
                             frameFinished = true;
                         if (ret == 0 || ret == AVERROR(EAGAIN))
                             avcodec_send_packet(codecCtx, &pkt);
-                        keyFrame = frame->key_frame;
+                        keyFrame = (frame->flags & AV_FRAME_FLAG_KEY) != 0;
                     }
                 }
 

mythplugins/mythmusic/mythmusic/remoteavformatcontext.h

@@ -141,7 +141,7 @@ class RemoteAVFormatContext
         return ret;
     }
 
-    static int WriteFunc(void */*opaque*/, uint8_t */*buf*/, int/*buf_size*/)
+    static int WriteFunc(void */*opaque*/, const uint8_t */*buf*/, int/*buf_size*/)
     {  return -1; }
 
     static int64_t SeekFunc(void *opaque, int64_t offset, int whence)

mythplugins/mythmusic/mythmusic/visualize.cpp

@@ -38,6 +38,11 @@
 #include "musicplayer.h"
 #include "visualize.h"
 
+extern "C" {
+    #include <libavutil/mem.h>
+    #include <libavutil/tx.h>
+}
+
 VisFactory* VisFactory::g_pVisFactories = nullptr;
 
 VisualBase::VisualBase(bool screensaverenable)
@@ -986,10 +991,12 @@ Spectrogram::Spectrogram(bool hist)
         m_image->fill(Qt::black);
     }
 
-    m_dftL = static_cast<FFTSample*>(av_malloc(sizeof(FFTSample) * m_fftlen));
-    m_dftR = static_cast<FFTSample*>(av_malloc(sizeof(FFTSample) * m_fftlen));
+    m_dftL = static_cast<float*>(av_malloc(sizeof(float) * m_fftlen));
+    m_dftR = static_cast<float*>(av_malloc(sizeof(float) * m_fftlen));
+    m_rdftTmp = static_cast<float*>(av_malloc(sizeof(float) * (m_fftlen + 2)));
 
-    m_rdftContext = av_rdft_init(std::log2(m_fftlen), DFT_R2C);
+    // should probably check that this succeeds
+    av_tx_init(&m_rdftContext, &m_rdft, AV_TX_FLOAT_RDFT, 0, m_fftlen, &k_txScale, 0x0);
 
     // hack!!! Should 44100 sample rate be queried or measured?
     // Likely close enough for most audio recordings...
@@ -1041,7 +1048,8 @@ Spectrogram::~Spectrogram()
 {
     av_freep(reinterpret_cast<void*>(&m_dftL));
     av_freep(reinterpret_cast<void*>(&m_dftR));
-    av_rdft_end(m_rdftContext);
+    av_freep(reinterpret_cast<void*>(&m_rdftTmp));
+    av_tx_uninit(&m_rdftContext);
 }
 
 void Spectrogram::resize(const QSize &newsize)
@@ -1174,8 +1182,13 @@ bool Spectrogram::processUndisplayed(VisualNode *node)
             m_dftR[k] = m_sigR[k] * mult;
         }
     }
-    av_rdft_calc(m_rdftContext, m_dftL); // run the real FFT!
-    av_rdft_calc(m_rdftContext, m_dftR);
+    // run the real FFT!
+    m_rdft(m_rdftContext, m_rdftTmp, m_dftL, sizeof(float));
+    m_rdftTmp[1] = m_rdftTmp[m_fftlen];
+    memcpy(m_dftL, m_rdftTmp, m_fftlen * sizeof(float));
+    m_rdft(m_rdftContext, m_rdftTmp, m_dftR, sizeof(float));
+    m_rdftTmp[1] = m_rdftTmp[m_fftlen];
+    memcpy(m_dftR, m_rdftTmp, m_fftlen * sizeof(float));
 
     QPainter painter(m_image);
     painter.setPen(Qt::black);  // clear prior content
@@ -1390,17 +1403,20 @@ Spectrum::Spectrum()
 
     m_fps = 40;         // getting 1152 samples / 44100 = 38.28125 fps
 
-    m_dftL = static_cast<FFTSample*>(av_malloc(sizeof(FFTSample) * m_fftlen));
-    m_dftR = static_cast<FFTSample*>(av_malloc(sizeof(FFTSample) * m_fftlen));
+    m_dftL = static_cast<float*>(av_malloc(sizeof(float) * m_fftlen));
+    m_dftR = static_cast<float*>(av_malloc(sizeof(float) * m_fftlen));
+    m_rdftTmp = static_cast<float*>(av_malloc(sizeof(float) * (m_fftlen + 2)));
 
-    m_rdftContext = av_rdft_init(std::log2(m_fftlen), DFT_R2C);
+    // should probably check that this succeeds
+    av_tx_init(&m_rdftContext, &m_rdft, AV_TX_FLOAT_RDFT, 0, m_fftlen, &k_txScale, 0x0);
 }
 
 Spectrum::~Spectrum()
 {
     av_freep(reinterpret_cast<void*>(&m_dftL));
     av_freep(reinterpret_cast<void*>(&m_dftR));
-    av_rdft_end(m_rdftContext);
+    av_freep(reinterpret_cast<void*>(&m_rdftTmp));
+    av_tx_uninit(&m_rdftContext);
 }
 
 void Spectrum::resize(const QSize &newsize)
@@ -1488,8 +1504,13 @@ bool Spectrum::processUndisplayed(VisualNode *node)
             m_dftR[k] = m_sigR[k] * mult;
         }
     }
-    av_rdft_calc(m_rdftContext, m_dftL); // run the real FFT!
-    av_rdft_calc(m_rdftContext, m_dftR);
+    // run the real FFT!
+    m_rdft(m_rdftContext, m_rdftTmp, m_dftL, sizeof(float));
+    m_rdftTmp[1] = m_rdftTmp[m_fftlen];
+    memcpy(m_dftL, m_rdftTmp, m_fftlen * sizeof(float));
+    m_rdft(m_rdftContext, m_rdftTmp, m_dftR, sizeof(float));
+    m_rdftTmp[1] = m_rdftTmp[m_fftlen];
+    memcpy(m_dftR, m_rdftTmp, m_fftlen * sizeof(float));
 
     long w = 0;
     QRect *rectspL = m_rectsL.data();

mythplugins/mythmusic/mythmusic/visualize.h

@@ -29,8 +29,7 @@
 
 #include <complex>
 extern "C" {
-    #include <libavutil/mem.h>
-    #include <libavcodec/avfft.h>
+    #include <libavutil/tx.h>
 }
 
 static constexpr uint16_t SAMPLES_DEFAULT_SIZE { 512 };
@@ -253,9 +252,13 @@ class Spectrogram : public VisualBase
     int            m_color {0};          // color or grayscale
     QVector<float> m_sigL;               // decaying signal window
     QVector<float> m_sigR;
-    FFTSample*     m_dftL { nullptr }; // real in, complex out
-    FFTSample*     m_dftR { nullptr };
-    RDFTContext*   m_rdftContext { nullptr };
+    float*         m_dftL { nullptr }; // real in, complex out
+    float*         m_dftR { nullptr };
+    float*         m_rdftTmp { nullptr };
+    static constexpr float k_txScale { 1.0F };
+    AVTXContext*   m_rdftContext { nullptr };
+    av_tx_fn       m_rdft        { nullptr };
+
     std::array<int,256*6> m_red   {0}; // continuous color spectrum
     std::array<int,256*6> m_green {0};
     std::array<int,256*6> m_blue  {0};
@@ -299,9 +302,12 @@ class Spectrum : public VisualBase
     int            m_fftlen {16 * 1024}; // window width
     QVector<float> m_sigL;               // decaying signal window
     QVector<float> m_sigR;
-    FFTSample*     m_dftL { nullptr }; // real in, complex out
-    FFTSample*     m_dftR { nullptr };
-    RDFTContext*   m_rdftContext { nullptr };
+    float*         m_dftL { nullptr }; // real in, complex out
+    float*         m_dftR { nullptr };
+    float*         m_rdftTmp { nullptr };
+    static constexpr float k_txScale { 1.0F };
+    AVTXContext*   m_rdftContext { nullptr };
+    av_tx_fn       m_rdft        { nullptr };
 };
 
 class Squares : public Spectrum

mythtv/configure

@@ -6761,7 +6761,7 @@ ffmpeg_optset ar nm ranlib
 ffmpeg_optenable cross_compile libmp3lame libx264 libx265 libvpx libxvid
 ffmpeg_optenable vdpau libxml2 libass dxva2
 ffmpeg_optenable libbluray libfontconfig libfreetype libiec61883
-ffmpeg_optenable crystalhd sdl2 ffplay
+ffmpeg_optenable sdl2 ffplay
 
 if test $target_os = "android"; then
     enabled mediacodec && enable jni

mythtv/external/FFmpeg/.gitattributes

@@ -1,2 +1 @@
 *.pnm -diff -text
-tests/ref/fate/sub-scc eol=crlf

mythtv/external/FFmpeg/.mailmap

@@ -1,9 +1,8 @@
-<[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
-<zhilizhao@tencent.com> <quinkblack@foxmail.com>
-<zhilizhao@tencent.com> <wantlamy@gmail.com>
+<quinkblack@foxmail.com> <wantlamy@gmail.com>
+<quinkblack@foxmail.com> <zhilizhao@tencent.com>
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
@@ -18,8 +17,12 @@
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
-<[email protected]> <[email protected]>
+<[email protected]> <[email protected]>
+<[email protected]> <[email protected]>
 rcombs <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
-<[email protected]> <[email protected]>
+<[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
+Cosmin Stejerean <[email protected]> Cosmin Stejerean via ffmpeg-devel <[email protected]>
+<[email protected]> <[email protected]>
+<[email protected]> <[email protected]>