project: Update for upstream merge.

ShiftMediaProject · Mar 12, 2023 · 2fbe1f7 · 2fbe1f7
1 parent 18d8be0
commit 2fbe1f7
Show file tree

Hide file tree

Showing 53 changed files with 507 additions and 470 deletions.
diff --git a/SMP/SMP.patch b/SMP/SMP.patch
@@ -13,7 +13,7 @@ index 8a06df82df..9a31622bb4 100644
  #include "libavdevice/version.h"
 
 diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c
-index 36a6d8482d..bcb42d47fc 100644
+index f3415df10b..42f36b77bb 100644
 --- a/libavcodec/mfenc.c
 +++ b/libavcodec/mfenc.c
 @@ -59,6 +59,10 @@ typedef struct MFContext {

diff --git a/SMP/config.asm b/SMP/config.asm
@@ -445,27 +445,27 @@
 %define CONFIG_MANPAGES 0
 %define CONFIG_PODPAGES 0
 %define CONFIG_TXTPAGES 0
+%define CONFIG_AVIO_HTTP_SERVE_FILES_EXAMPLE 0
 %define CONFIG_AVIO_LIST_DIR_EXAMPLE 0
-%define CONFIG_AVIO_READING_EXAMPLE 0
+%define CONFIG_AVIO_READ_CALLBACK_EXAMPLE 0
 %define CONFIG_DECODE_AUDIO_EXAMPLE 0
+%define CONFIG_DECODE_FILTER_AUDIO_EXAMPLE 0
+%define CONFIG_DECODE_FILTER_VIDEO_EXAMPLE 0
 %define CONFIG_DECODE_VIDEO_EXAMPLE 0
-%define CONFIG_DEMUXING_DECODING_EXAMPLE 0
+%define CONFIG_DEMUX_DECODE_EXAMPLE 0
 %define CONFIG_ENCODE_AUDIO_EXAMPLE 0
 %define CONFIG_ENCODE_VIDEO_EXAMPLE 0
 %define CONFIG_EXTRACT_MVS_EXAMPLE 0
 %define CONFIG_FILTER_AUDIO_EXAMPLE 0
-%define CONFIG_FILTERING_AUDIO_EXAMPLE 0
-%define CONFIG_FILTERING_VIDEO_EXAMPLE 0
-%define CONFIG_HTTP_MULTICLIENT_EXAMPLE 0
 %define CONFIG_HW_DECODE_EXAMPLE 0
-%define CONFIG_METADATA_EXAMPLE 0
-%define CONFIG_MUXING_EXAMPLE 0
-%define CONFIG_QSVDEC_EXAMPLE 0
-%define CONFIG_REMUXING_EXAMPLE 0
-%define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
-%define CONFIG_SCALING_VIDEO_EXAMPLE 0
+%define CONFIG_MUX_EXAMPLE 0
+%define CONFIG_QSV_DECODE_EXAMPLE 0
+%define CONFIG_REMUX_EXAMPLE 0
+%define CONFIG_RESAMPLE_AUDIO_EXAMPLE 0
+%define CONFIG_SCALE_VIDEO_EXAMPLE 0
+%define CONFIG_SHOW_METADATA_EXAMPLE 0
 %define CONFIG_TRANSCODE_AAC_EXAMPLE 0
-%define CONFIG_TRANSCODING_EXAMPLE 0
+%define CONFIG_TRANSCODE_EXAMPLE 0
 %define CONFIG_VAAPI_ENCODE_EXAMPLE 0
 %define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
 %define CONFIG_QSV_TRANSCODE_EXAMPLE 0

diff --git a/SMP/config.h b/SMP/config.h
@@ -28,7 +28,7 @@
 #endif
 #define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-bzlib --enable-iconv --enable-lzma --enable-sdl2 --enable-zlib --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-libxml2 --enable-gnutls --disable-schannel --enable-gcrypt --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-libmfx --enable-ffnvcodec --enable-cuda --enable-amf"
 #define FFMPEG_LICENSE "GPL version 3 or later"
-#define CONFIG_THIS_YEAR 2022
+#define CONFIG_THIS_YEAR 2023
 #define FFMPEG_DATADIR "."
 #define AVCONV_DATADIR "."
 #if defined(__INTEL_COMPILER)
@@ -545,27 +545,27 @@
 #define CONFIG_MANPAGES 0
 #define CONFIG_PODPAGES 0
 #define CONFIG_TXTPAGES 0
+#define CONFIG_AVIO_HTTP_SERVE_FILES_EXAMPLE 0
 #define CONFIG_AVIO_LIST_DIR_EXAMPLE 0
-#define CONFIG_AVIO_READING_EXAMPLE 0
+#define CONFIG_AVIO_READ_CALLBACK_EXAMPLE 0
 #define CONFIG_DECODE_AUDIO_EXAMPLE 0
+#define CONFIG_DECODE_FILTER_AUDIO_EXAMPLE 0
+#define CONFIG_DECODE_FILTER_VIDEO_EXAMPLE 0
 #define CONFIG_DECODE_VIDEO_EXAMPLE 0
-#define CONFIG_DEMUXING_DECODING_EXAMPLE 0
+#define CONFIG_DEMUX_DECODE_EXAMPLE 0
 #define CONFIG_ENCODE_AUDIO_EXAMPLE 0
 #define CONFIG_ENCODE_VIDEO_EXAMPLE 0
 #define CONFIG_EXTRACT_MVS_EXAMPLE 0
 #define CONFIG_FILTER_AUDIO_EXAMPLE 0
-#define CONFIG_FILTERING_AUDIO_EXAMPLE 0
-#define CONFIG_FILTERING_VIDEO_EXAMPLE 0
-#define CONFIG_HTTP_MULTICLIENT_EXAMPLE 0
 #define CONFIG_HW_DECODE_EXAMPLE 0
-#define CONFIG_METADATA_EXAMPLE 0
-#define CONFIG_MUXING_EXAMPLE 0
-#define CONFIG_QSVDEC_EXAMPLE 0
-#define CONFIG_REMUXING_EXAMPLE 0
-#define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
-#define CONFIG_SCALING_VIDEO_EXAMPLE 0
+#define CONFIG_MUX_EXAMPLE 0
+#define CONFIG_QSV_DECODE_EXAMPLE 0
+#define CONFIG_REMUX_EXAMPLE 0
+#define CONFIG_RESAMPLE_AUDIO_EXAMPLE 0
+#define CONFIG_SCALE_VIDEO_EXAMPLE 0
+#define CONFIG_SHOW_METADATA_EXAMPLE 0
 #define CONFIG_TRANSCODE_AAC_EXAMPLE 0
-#define CONFIG_TRANSCODING_EXAMPLE 0
+#define CONFIG_TRANSCODE_EXAMPLE 0
 #define CONFIG_VAAPI_ENCODE_EXAMPLE 0
 #define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
 #define CONFIG_QSV_TRANSCODE_EXAMPLE 0

diff --git a/SMP/config_components.h b/SMP/config_components.h
@@ -41,6 +41,7 @@
 #define CONFIG_HEVC_METADATA_BSF 1
 #define CONFIG_HEVC_MP4TOANNEXB_BSF 1
 #define CONFIG_IMX_DUMP_HEADER_BSF 1
+#define CONFIG_MEDIA100_TO_MJPEGB_BSF 1
 #define CONFIG_MJPEG2JPEG_BSF 1
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 1
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 1
@@ -264,6 +265,7 @@
 #define CONFIG_R210_DECODER 1
 #define CONFIG_RASC_DECODER 1
 #define CONFIG_RAWVIDEO_DECODER 1
+#define CONFIG_RKA_DECODER 1
 #define CONFIG_RL2_DECODER 1
 #define CONFIG_ROQ_DECODER 1
 #define CONFIG_RPZA_DECODER 1
@@ -462,6 +464,7 @@
 #define CONFIG_TWINVQ_DECODER 1
 #define CONFIG_VMDAUDIO_DECODER 1
 #define CONFIG_VORBIS_DECODER 1
+#define CONFIG_WAVARC_DECODER 1
 #define CONFIG_WAVPACK_DECODER 1
 #define CONFIG_WMALOSSLESS_DECODER 1
 #define CONFIG_WMAPRO_DECODER 1
@@ -506,13 +509,15 @@
 #define CONFIG_PCM_U32BE_DECODER 1
 #define CONFIG_PCM_U32LE_DECODER 1
 #define CONFIG_PCM_VIDC_DECODER 1
+#define CONFIG_CBD2_DPCM_DECODER 1
 #define CONFIG_DERF_DPCM_DECODER 1
 #define CONFIG_GREMLIN_DPCM_DECODER 1
 #define CONFIG_INTERPLAY_DPCM_DECODER 1
 #define CONFIG_ROQ_DPCM_DECODER 1
 #define CONFIG_SDX2_DPCM_DECODER 1
 #define CONFIG_SOL_DPCM_DECODER 1
 #define CONFIG_XAN_DPCM_DECODER 1
+#define CONFIG_WADY_DPCM_DECODER 1
 #define CONFIG_ADPCM_4XM_DECODER 1
 #define CONFIG_ADPCM_ADX_DECODER 1
 #define CONFIG_ADPCM_AFC_DECODER 1
@@ -562,6 +567,7 @@
 #define CONFIG_ADPCM_THP_LE_DECODER 1
 #define CONFIG_ADPCM_VIMA_DECODER 1
 #define CONFIG_ADPCM_XA_DECODER 1
+#define CONFIG_ADPCM_XMD_DECODER 1
 #define CONFIG_ADPCM_YAMAHA_DECODER 1
 #define CONFIG_ADPCM_ZORK_DECODER 1
 #define CONFIG_SSA_DECODER 1
@@ -632,6 +638,7 @@
 #else
 #   define CONFIG_AV1_CUVID_DECODER 0
 #endif
+#define CONFIG_AV1_MEDIACODEC_DECODER 0
 #if CONFIG_LIBMFX
 #   define CONFIG_AV1_QSV_DECODER 1
 #else
@@ -702,6 +709,8 @@
 #else
 #   define CONFIG_VP9_QSV_DECODER 0
 #endif
+#define CONFIG_VNULL_DECODER 1
+#define CONFIG_ANULL_DECODER 1
 #define CONFIG_A64MULTI_ENCODER 1
 #define CONFIG_A64MULTI5_ENCODER 1
 #define CONFIG_ALIAS_PIX_ENCODER 1
@@ -917,8 +926,17 @@
 #define CONFIG_AAC_MF_ENCODER 1
 #define CONFIG_AC3_MF_ENCODER 1
 #define CONFIG_H263_V4L2M2M_ENCODER 0
-#define CONFIG_AV1_NVENC_ENCODER 0
+#if CONFIG_NVENC
+#   define CONFIG_AV1_NVENC_ENCODER 1
+#else
+#   define CONFIG_AV1_NVENC_ENCODER 0
+#endif
 #define CONFIG_AV1_QSV_ENCODER 0
+#if CONFIG_AMF
+#   define CONFIG_AV1_AMF_ENCODER 1
+#else
+#   define CONFIG_AV1_AMF_ENCODER 0
+#endif
 #define CONFIG_LIBOPENH264_ENCODER 0
 #if CONFIG_AMF
 #   define CONFIG_H264_AMF_ENCODER 1
@@ -985,6 +1003,8 @@
 #else
 #   define CONFIG_VP9_QSV_ENCODER 0
 #endif
+#define CONFIG_VNULL_ENCODER 1
+#define CONFIG_ANULL_ENCODER 1
 #if defined(NTDDI_WIN10_FE)
 #   define CONFIG_AV1_D3D11VA_HWACCEL 1
 #else
@@ -1417,6 +1437,7 @@
 #define CONFIG_VOLUME_FILTER 1
 #define CONFIG_VOLUMEDETECT_FILTER 1
 #define CONFIG_AEVALSRC_FILTER 1
+#define CONFIG_AFDELAYSRC_FILTER 1
 #define CONFIG_AFIRSRC_FILTER 1
 #define CONFIG_ANOISESRC_FILTER 1
 #define CONFIG_ANULLSRC_FILTER 1
@@ -1729,6 +1750,7 @@
 #define CONFIG_SPP_FILTER 1
 #define CONFIG_SR_FILTER 1
 #define CONFIG_SSIM_FILTER 1
+#define CONFIG_SSIM360_FILTER 1
 #define CONFIG_STEREO3D_FILTER 1
 #define CONFIG_STREAMSELECT_FILTER 1
 #define CONFIG_SUBTITLES_FILTER 1
@@ -1797,6 +1819,24 @@
 #define CONFIG_ZMQ_FILTER 0
 #define CONFIG_ZOOMPAN_FILTER 1
 #define CONFIG_ZSCALE_FILTER 0
+#define CONFIG_HSTACK_VAAPI_FILTER 0
+#define CONFIG_VSTACK_VAAPI_FILTER 0
+#define CONFIG_XSTACK_VAAPI_FILTER 0
+#if CONFIG_LIBMFX
+#   define CONFIG_HSTACK_QSV_FILTER 1
+#else
+#   define CONFIG_HSTACK_QSV_FILTER 0
+#endif
+#if CONFIG_LIBMFX
+#   define CONFIG_VSTACK_QSV_FILTER 1
+#else
+#   define CONFIG_VSTACK_QSV_FILTER 0
+#endif
+#if CONFIG_LIBMFX
+#   define CONFIG_XSTACK_QSV_FILTER 1
+#else
+#   define CONFIG_XSTACK_QSV_FILTER 0
+#endif
 #define CONFIG_ALLRGB_FILTER 1
 #define CONFIG_ALLYUV_FILTER 1
 #define CONFIG_CELLAUTO_FILTER 1
@@ -2072,6 +2112,7 @@
 #define CONFIG_RAWVIDEO_DEMUXER 1
 #define CONFIG_REALTEXT_DEMUXER 1
 #define CONFIG_REDSPARK_DEMUXER 1
+#define CONFIG_RKA_DEMUXER 1
 #define CONFIG_RL2_DEMUXER 1
 #define CONFIG_RM_DEMUXER 1
 #define CONFIG_ROQ_DEMUXER 1
@@ -2087,6 +2128,7 @@
 #define CONFIG_SBG_DEMUXER 1
 #define CONFIG_SCC_DEMUXER 1
 #define CONFIG_SCD_DEMUXER 1
+#define CONFIG_SDNS_DEMUXER 1
 #define CONFIG_SDP_DEMUXER 1
 #define CONFIG_SDR2_DEMUXER 1
 #define CONFIG_SDS_DEMUXER 1
@@ -2138,6 +2180,8 @@
 #define CONFIG_VPLAYER_DEMUXER 1
 #define CONFIG_VQF_DEMUXER 1
 #define CONFIG_W64_DEMUXER 1
+#define CONFIG_WADY_DEMUXER 1
+#define CONFIG_WAVARC_DEMUXER 1
 #define CONFIG_WAV_DEMUXER 1
 #define CONFIG_WC3_DEMUXER 1
 #define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 1
@@ -2150,6 +2194,7 @@
 #define CONFIG_WV_DEMUXER 1
 #define CONFIG_XA_DEMUXER 1
 #define CONFIG_XBIN_DEMUXER 1
+#define CONFIG_XMD_DEMUXER 1
 #define CONFIG_XMV_DEMUXER 1
 #define CONFIG_XVAG_DEMUXER 1
 #define CONFIG_XWMA_DEMUXER 1
@@ -2377,6 +2422,7 @@
 #define CONFIG_CONCATF_PROTOCOL 1
 #define CONFIG_CRYPTO_PROTOCOL 1
 #define CONFIG_DATA_PROTOCOL 1
+#define CONFIG_FD_PROTOCOL 1
 #define CONFIG_FFRTMPCRYPT_PROTOCOL 1
 #define CONFIG_FFRTMPHTTP_PROTOCOL 1
 #define CONFIG_FILE_PROTOCOL 1
@@ -2420,6 +2466,6 @@
 #define CONFIG_LIBSSH_PROTOCOL 1
 #define CONFIG_LIBSMBCLIENT_PROTOCOL 0
 #define CONFIG_LIBZMQ_PROTOCOL 0
-#define CONFIG_IPFS_PROTOCOL 1
-#define CONFIG_IPNS_PROTOCOL 1
+#define CONFIG_IPFS_GATEWAY_PROTOCOL 1
+#define CONFIG_IPNS_GATEWAY_PROTOCOL 1
 #endif /* FFMPEG_CONFIG_COMPONENTS_H */
diff --git a/SMP/libavcodec.def b/SMP/libavcodec.def
@@ -120,7 +120,6 @@ EXPORTS
     avcodec_flush_buffers
     avcodec_free_context
     avcodec_get_class
-    avcodec_get_frame_class
     avcodec_get_hw_config
     avcodec_get_hw_frames_parameters
     avcodec_get_name