update FFmpeg to version 5.1

mythplugins/mytharchive/mytharchive/remoteavformatcontext.h

@@ -64,7 +64,7 @@ class RemoteAVFormatContext
             probe_data.buf_size = m_rf->Read(m_buffer, BUFFER_SIZE);
             probe_data.buf = m_buffer;
 
-            AVInputFormat *fmt = av_probe_input_format(&probe_data, 1);
+            const AVInputFormat *fmt = av_probe_input_format(&probe_data, 1);
             if (!fmt)
                 return false;
 

mythplugins/mytharchive/mytharchive/thumbfinder.h

@@ -79,7 +79,7 @@ class ThumbFinder : public MythScreenType
     RemoteAVFormatContext m_inputFC      {nullptr};
     AVCodecContext  *m_codecCtx          {nullptr};
     MythCodecMap     m_codecMap          {};
-    AVCodec         *m_codec             {nullptr};
+    const AVCodec   *m_codec             {nullptr};
     MythAVFrame      m_frame;
     MythAVCopy       m_copy;
 

mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.cpp

@@ -1608,7 +1608,7 @@ static int grabThumbnail(const QString& inFile, const QString& thumbList, const
     AVCodecContext *codecCtx = codecmap.GetCodecContext(inputFC->streams[videostream]);
 
     // get decoder for video stream
-    AVCodec * codec = avcodec_find_decoder(codecCtx->codec_id);
+    const AVCodec * codec = avcodec_find_decoder(codecCtx->codec_id);
 
     if (codec == nullptr)
     {

mythplugins/mythmusic/mythmusic/avfdecoder.cpp

@@ -330,7 +330,7 @@ bool avfDecoder::initialize()
 
     // let FFmpeg finds the best audio stream (should only be one), also catter
     // should the file/stream not be an audio one
-    AVCodec *codec = nullptr;
+    const AVCodec *codec = nullptr;
     int selTrack = av_find_best_stream(m_inputContext->getContext(), AVMEDIA_TYPE_AUDIO,
                                        -1, -1, &codec, 0);
 

mythplugins/mythmusic/mythmusic/avfdecoder.h

@@ -51,7 +51,7 @@ class avfDecoder : public QObject, public Decoder
 
     QString m_devicename;
 
-    AVInputFormat *m_inputFormat          {nullptr};
+    const AVInputFormat *m_inputFormat    {nullptr};
     RemoteAVFormatContext *m_inputContext {nullptr};
     AVCodecContext *m_audioDec            {nullptr};
     MythCodecMap m_codecMap               {};

mythplugins/mythmusic/mythmusic/remoteavformatcontext.h

@@ -73,7 +73,7 @@ class RemoteAVFormatContext
             probe_data.buf_size = m_rf->Read(m_buffer, BUFFER_SIZE);
             probe_data.buf = m_buffer;
 
-            AVInputFormat *fmt = av_probe_input_format(&probe_data, 1);
+            const AVInputFormat *fmt = av_probe_input_format(&probe_data, 1);
             if (!fmt)
             {
                 LOG(VB_GENERAL, LOG_ERR,  QString("RemoteAVFormatContext::Open: Failed to probe file: %1").arg(filename));

mythtv/configure

@@ -1434,7 +1434,6 @@ LIBRARY_LIST="
     avdevice
     avfilter
     avformat
-    avresample
     avutil
     postproc
     swresample
@@ -2531,7 +2530,6 @@ pp_filter_deps="gpl postproc"
 pullup_filter_deps="gpl"
 removelogo_filter_deps="avcodec avformat swscale"
 repeatfields_filter_deps="gpl"
-resample_filter_deps="avresample"
 sab_filter_deps="gpl swscale"
 scale2ref_filter_deps="swscale"
 scale_filter_deps="swscale"
@@ -2592,7 +2590,6 @@ avdevice_deps="avformat avcodec avutil"
 avfilter_deps="avutil"
 avformat_deps="avcodec avutil"
 avformat_suggest="network"
-avresample_deps="avutil"
 postproc_deps="avutil gpl"
 swresample_deps="avutil"
 swscale_deps="avutil"
@@ -2723,7 +2720,7 @@ intrinsics="none"
 
 # configurable options
 enable $PROGRAM_LIST
-enable $(filter_out avresample $LIBRARY_LIST)
+enable $LIBRARY_LIST
 enable stripping
 
 enable asm
@@ -6287,7 +6284,7 @@ fi
 
 # add some linker flags
 check_ldflags -Wl,--warn-common
-check_ldflags '-Wl,-rpath-link,\$\${SRC_PATH_BARE}/external/FFmpeg/libpostproc:\$\${SRC_PATH_BARE}/external/FFmpeg/libswresample:\$\${SRC_PATH_BARE}/external/FFmpeg/libswscale:\$\${SRC_PATH_BARE}/external/FFmpeg/libavfilter:\$\${SRC_PATH_BARE}/external/FFmpeg/libavdevice:\$\${SRC_PATH_BARE}/external/FFmpeg/libavformat:\$\${SRC_PATH_BARE}/external/FFmpeg/libavcodec:\$\${SRC_PATH_BARE}/external/FFmpeg/libavutil:\$\${SRC_PATH_BARE}/external/FFmpeg/libavresample'
+check_ldflags '-Wl,-rpath-link,\$\${SRC_PATH_BARE}/external/FFmpeg/libpostproc:\$\${SRC_PATH_BARE}/external/FFmpeg/libswresample:\$\${SRC_PATH_BARE}/external/FFmpeg/libswscale:\$\${SRC_PATH_BARE}/external/FFmpeg/libavfilter:\$\${SRC_PATH_BARE}/external/FFmpeg/libavdevice:\$\${SRC_PATH_BARE}/external/FFmpeg/libavformat:\$\${SRC_PATH_BARE}/external/FFmpeg/libavcodec:\$\${SRC_PATH_BARE}/external/FFmpeg/libavutil'
 enabled rpath && add_ldexeflags -Wl,-rpath,$libdir
 enabled rpath && add_ldlibflags -Wl,-rpath,$libdir
 test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
@@ -6307,8 +6304,7 @@ enabled neon_clobber_test &&
                   -Wl,--wrap,avcodec_receive_packet     \
                   -Wl,--wrap,avcodec_send_frame         \
                   -Wl,--wrap,avcodec_receive_frame      \
-                  -Wl,--wrap,swr_convert                \
-                  -Wl,--wrap,avresample_convert ||
+                  -Wl,--wrap,swr_convert        ||
     disable neon_clobber_test
 
 enabled xmm_clobber_test &&
@@ -6324,7 +6320,6 @@ enabled xmm_clobber_test &&
                   -Wl,--wrap,avcodec_send_frame         \
                   -Wl,--wrap,avcodec_receive_frame      \
                   -Wl,--wrap,swr_convert                \
-                  -Wl,--wrap,avresample_convert         \
                   -Wl,--wrap,sws_scale ||
     disable xmm_clobber_test
 
@@ -7166,7 +7161,6 @@ enabled movie_filter    && prepend avfilter_deps "avformat avcodec"
 enabled pan_filter          && prepend avfilter_deps "swresample"
 enabled pp_filter           && prepend avfilter_deps "postproc"
 enabled removelogo_filter   && prepend avfilter_deps "avformat avcodec swscale"
-enabled resample_filter && prepend avfilter_deps "avresample"
 enabled sab_filter          && prepend avfilter_deps "swscale"
 enabled scale_filter    && prepend avfilter_deps "swscale"
 enabled scale2ref_filter    && prepend avfilter_deps "swscale"
@@ -7746,11 +7740,19 @@ JAVA_ARCH=$java_arch
 JAVA_CODE_VERSION=$java_code_version
 EOF
 
+# Parse the FFmpeg version headers for linking to the correct shared object file
 get_version(){
     lcname=lib${1}
     name=$(toupper $lcname)
+    # FFmpeg split its version.h into version_major.h and version.h.
+    # Of note, libavutil's version_major.h is empty, so we need to parse both
+    # version.h AND version_major.h regardless of whether or not we only need
+    # the major version number.
+    # So, to keep the prior behavior of parsing the entire version number,
+    # pass both files to awk, which will test each file line by line.
     file=$source_path/external/FFmpeg/$lcname/version.h
-    eval $(awk "/#define ${name}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file")
+    file_major=$source_path/external/FFmpeg/$lcname/version_major.h
+    eval $(awk "/#define ${name}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file_major" "$file")
     enabled raise_major && eval ${name}_VERSION_MAJOR=$((${name}_VERSION_MAJOR+100))
     eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
     eval echo "${lcname}_VERSION=\$${name}_VERSION" >> $TMPMAK

mythtv/external/FFmpeg/.gitignore

@@ -19,8 +19,12 @@
 *.swp
 *.ver
 *.version
+*.metal.air
+*.metallib
+*.metallib.c
 *.ptx
 *.ptx.c
+*.ptx.gz
 *_g
 \#*
 .\#*
@@ -31,8 +35,8 @@
 /ffprobe
 /config.asm
 /config.h
+/config_components.h
 /coverage.info
-/avversion.h
 /lcov/
 /src
 /mapfile