Skip to content

Commit 69aafc5

Browse files
SibrasSibras
committed
project: Update for recent upstream merge.
1 parent 40cda7c commit 69aafc5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+582
-140
lines changed

‎SMP/SMP.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/fftools/opt_common.c b/fftools/opt_common.c
2-
index f6fe9815e1..d5d32cb89e 100644
2+
index f5b73c9f2f..672326999b 100644
33
--- a/fftools/opt_common.c
44
+++ b/fftools/opt_common.c
55
@@ -48,6 +48,9 @@
@@ -13,7 +13,7 @@ index f6fe9815e1..d5d32cb89e 100644
1313
#include "libavdevice/version.h"
1414

1515
diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c
16-
index 8d950a3109..43ca0ead31 100644
16+
index 8bb6f1d38d..a9ca24443d 100644
1717
--- a/libavcodec/mfenc.c
1818
+++ b/libavcodec/mfenc.c
1919
@@ -59,6 +59,10 @@ typedef struct MFContext {

‎SMP/config.asm‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
%define HAVE_POWER8 0
7272
%define HAVE_PPC4XX 0
7373
%define HAVE_VSX 0
74+
%define HAVE_RV 0
7475
%define HAVE_RVV 0
7576
%define HAVE_AESNI 1
7677
%define HAVE_AMD3DNOW 1
@@ -122,6 +123,7 @@
122123
%define HAVE_POWER8_EXTERNAL 0
123124
%define HAVE_PPC4XX_EXTERNAL 0
124125
%define HAVE_VSX_EXTERNAL 0
126+
%define HAVE_RV_EXTERNAL 0
125127
%define HAVE_RVV_EXTERNAL 0
126128
%define HAVE_AESNI_EXTERNAL 1
127129
%define HAVE_AMD3DNOW_EXTERNAL 1
@@ -173,6 +175,7 @@
173175
%define HAVE_POWER8_INLINE 0
174176
%define HAVE_PPC4XX_INLINE 0
175177
%define HAVE_VSX_INLINE 0
178+
%define HAVE_RV_INLINE 0
176179
%define HAVE_RVV_INLINE 0
177180
%define HAVE_AESNI_INLINE 1
178181
%define HAVE_AMD3DNOW_INLINE 1
@@ -238,7 +241,6 @@
238241
%define HAVE_BIGENDIAN 0
239242
%define HAVE_FAST_UNALIGNED 1
240243
%define HAVE_ARPA_INET_H 0
241-
%define HAVE_ASM_HWCAP_H 0
242244
%define HAVE_ASM_TYPES_H 0
243245
%define HAVE_CDIO_PARANOIA_H 0
244246
%define HAVE_CDIO_PARANOIA_PARANOIA_H 1
@@ -569,6 +571,8 @@
569571
%define CONFIG_LIBVORBIS 1
570572
%define CONFIG_LIBVPX 1
571573
%define CONFIG_LIBWEBP 0
574+
%define CONFIG_LIBXEVD 0
575+
%define CONFIG_LIBXEVE 0
572576
%define CONFIG_LIBXML2 1
573577
%define CONFIG_LIBZIMG 0
574578
%define CONFIG_LIBZMQ 0
@@ -614,6 +618,7 @@
614618
%define CONFIG_CUDA_LLVM 0
615619
%define CONFIG_CUVID 1
616620
%define CONFIG_D3D11VA 1
621+
%define CONFIG_D3D12VA 1
617622
%define CONFIG_DXVA2 1
618623
%define CONFIG_FFNVCODEC 1
619624
%define CONFIG_NVDEC 1
@@ -647,17 +652,13 @@
647652
%define CONFIG_FFPLAY 1
648653
%define CONFIG_FFPROBE 1
649654
%define CONFIG_FFMPEG 1
650-
%define CONFIG_DCT 1
651655
%define CONFIG_DWT 1
652656
%define CONFIG_ERROR_RESILIENCE 1
653657
%define CONFIG_FAAN 1
654658
%define CONFIG_FAST_UNALIGNED 1
655-
%define CONFIG_FFT 1
656659
%define CONFIG_LSP 1
657-
%define CONFIG_MDCT 1
658660
%define CONFIG_PIXELUTILS 1
659661
%define CONFIG_NETWORK 1
660-
%define CONFIG_RDFT 1
661662
%define CONFIG_AUTODETECT 1
662663
%define CONFIG_FONTCONFIG 1
663664
%define CONFIG_LARGE_TESTS 0
@@ -698,6 +699,7 @@
698699
%define CONFIG_CBS_H266 1
699700
%define CONFIG_CBS_JPEG 0
700701
%define CONFIG_CBS_MPEG2 1
702+
%define CONFIG_CBS_VP8 1
701703
%define CONFIG_CBS_VP9 1
702704
%define CONFIG_DEFLATE_WRAPPER 1
703705
%define CONFIG_DIRAC_PARSE 1

‎SMP/config.h‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
#define HAVE_POWER8 0
108108
#define HAVE_PPC4XX 0
109109
#define HAVE_VSX 0
110+
#define HAVE_RV 0
110111
#define HAVE_RVV 0
111112
#define HAVE_AESNI 1
112113
#define HAVE_AMD3DNOW 1
@@ -158,6 +159,7 @@
158159
#define HAVE_POWER8_EXTERNAL 0
159160
#define HAVE_PPC4XX_EXTERNAL 0
160161
#define HAVE_VSX_EXTERNAL 0
162+
#define HAVE_RV_EXTERNAL 0
161163
#define HAVE_RVV_EXTERNAL 0
162164
#define HAVE_AESNI_EXTERNAL 1
163165
#define HAVE_AMD3DNOW_EXTERNAL 1
@@ -209,6 +211,7 @@
209211
#define HAVE_POWER8_INLINE 0
210212
#define HAVE_PPC4XX_INLINE 0
211213
#define HAVE_VSX_INLINE 0
214+
#define HAVE_RV_INLINE 0
212215
#define HAVE_RVV_INLINE 0
213216
#define HAVE_AESNI_INLINE ARCH_X86 && HAVE_INLINE_ASM
214217
#define HAVE_AMD3DNOW_INLINE ARCH_X86 && HAVE_INLINE_ASM
@@ -282,7 +285,6 @@
282285
#define HAVE_BIGENDIAN 0
283286
#define HAVE_FAST_UNALIGNED 1
284287
#define HAVE_ARPA_INET_H 0
285-
#define HAVE_ASM_HWCAP_H 0
286288
#define HAVE_ASM_TYPES_H 0
287289
#define HAVE_CDIO_PARANOIA_H 0
288290
#define HAVE_CDIO_PARANOIA_PARANOIA_H 1
@@ -669,6 +671,8 @@
669671
#define CONFIG_LIBVORBIS 1
670672
#define CONFIG_LIBVPX 1
671673
#define CONFIG_LIBWEBP 0
674+
#define CONFIG_LIBXEVD 0
675+
#define CONFIG_LIBXEVE 0
672676
#define CONFIG_LIBXML2 1
673677
#define CONFIG_LIBZIMG 0
674678
#define CONFIG_LIBZMQ 0
@@ -738,6 +742,11 @@
738742
#else
739743
# define CONFIG_D3D11VA 0
740744
#endif
745+
#if defined(NTDDI_WIN10_TH2)
746+
# define CONFIG_D3D12VA 1
747+
#else
748+
# define CONFIG_D3D12VA 0
749+
#endif
741750
#if !HAVE_WINRT && !HAVE_UWP
742751
# define CONFIG_DXVA2 1
743752
#else
@@ -795,17 +804,13 @@
795804
#define CONFIG_FFPLAY 1
796805
#define CONFIG_FFPROBE 1
797806
#define CONFIG_FFMPEG 1
798-
#define CONFIG_DCT 1
799807
#define CONFIG_DWT 1
800808
#define CONFIG_ERROR_RESILIENCE 1
801809
#define CONFIG_FAAN 1
802810
#define CONFIG_FAST_UNALIGNED 1
803-
#define CONFIG_FFT 1
804811
#define CONFIG_LSP 1
805-
#define CONFIG_MDCT 1
806812
#define CONFIG_PIXELUTILS 1
807813
#define CONFIG_NETWORK 1
808-
#define CONFIG_RDFT 1
809814
#define CONFIG_AUTODETECT 1
810815
#define CONFIG_FONTCONFIG 1
811816
#define CONFIG_LARGE_TESTS 0
@@ -846,6 +851,7 @@
846851
#define CONFIG_CBS_H266 1
847852
#define CONFIG_CBS_JPEG 0
848853
#define CONFIG_CBS_MPEG2 1
854+
#define CONFIG_CBS_VP8 1
849855
#define CONFIG_CBS_VP9 1
850856
#define CONFIG_DEFLATE_WRAPPER 1
851857
#define CONFIG_DIRAC_PARSE 1

‎SMP/config_components.h‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@
191191
#define CONFIG_KGV1_DECODER 1
192192
#define CONFIG_KMVC_DECODER 1
193193
#define CONFIG_LAGARITH_DECODER 1
194+
#define CONFIG_LEAD_DECODER 1
194195
#define CONFIG_LOCO_DECODER 1
195196
#define CONFIG_LSCR_DECODER 1
196197
#define CONFIG_M101_DECODER 1
@@ -455,6 +456,7 @@
455456
#define CONFIG_QCELP_DECODER 1
456457
#define CONFIG_QDM2_DECODER 1
457458
#define CONFIG_QDMC_DECODER 1
459+
#define CONFIG_QOA_DECODER 1
458460
#define CONFIG_RA_144_DECODER 1
459461
#define CONFIG_RA_288_DECODER 1
460462
#define CONFIG_RALF_DECODER 1
@@ -634,6 +636,7 @@
634636
#define CONFIG_LIBVORBIS_DECODER 1
635637
#define CONFIG_LIBVPX_VP8_DECODER 1
636638
#define CONFIG_LIBVPX_VP9_DECODER 1
639+
#define CONFIG_LIBXEVD_DECODER 0
637640
#define CONFIG_LIBZVBI_TELETEXT_DECODER 0
638641
#define CONFIG_BINTEXT_DECODER 1
639642
#define CONFIG_XBIN_DECODER 1
@@ -928,6 +931,7 @@
928931
#define CONFIG_LIBX264_ENCODER 1
929932
#define CONFIG_LIBX264RGB_ENCODER 1
930933
#define CONFIG_LIBX265_ENCODER 1
934+
#define CONFIG_LIBXEVE_ENCODER 0
931935
#define CONFIG_LIBXAVS_ENCODER 0
932936
#define CONFIG_LIBXAVS2_ENCODER 0
933937
#define CONFIG_LIBXVID_ENCODER 1
@@ -1029,6 +1033,11 @@
10291033
# define CONFIG_AV1_D3D11VA2_HWACCEL 0
10301034
#endif
10311035
#if defined(NTDDI_WIN10_FE)
1036+
# define CONFIG_AV1_D3D12VA_HWACCEL 1
1037+
#else
1038+
# define CONFIG_AV1_D3D12VA_HWACCEL 0
1039+
#endif
1040+
#if defined(NTDDI_WIN10_FE)
10321041
# define CONFIG_AV1_DXVA2_HWACCEL 1
10331042
#else
10341043
# define CONFIG_AV1_DXVA2_HWACCEL 0
@@ -1053,6 +1062,11 @@
10531062
#else
10541063
# define CONFIG_H264_D3D11VA2_HWACCEL 0
10551064
#endif
1065+
#if CONFIG_D3D12VA
1066+
# define CONFIG_H264_D3D12VA_HWACCEL 1
1067+
#else
1068+
# define CONFIG_H264_D3D12VA_HWACCEL 0
1069+
#endif
10561070
#if CONFIG_DXVA2
10571071
# define CONFIG_H264_DXVA2_HWACCEL 1
10581072
#else
@@ -1077,6 +1091,11 @@
10771091
#else
10781092
# define CONFIG_HEVC_D3D11VA2_HWACCEL 0
10791093
#endif
1094+
#if CONFIG_D3D12VA
1095+
# define CONFIG_HEVC_D3D12VA_HWACCEL 1
1096+
#else
1097+
# define CONFIG_HEVC_D3D12VA_HWACCEL 0
1098+
#endif
10801099
#if CONFIG_DXVA2
10811100
# define CONFIG_HEVC_DXVA2_HWACCEL 1
10821101
#else
@@ -1114,6 +1133,11 @@
11141133
#else
11151134
# define CONFIG_MPEG2_D3D11VA2_HWACCEL 0
11161135
#endif
1136+
#if CONFIG_D3D12VA
1137+
# define CONFIG_MPEG2_D3D12VA_HWACCEL 1
1138+
#else
1139+
# define CONFIG_MPEG2_D3D12VA_HWACCEL 0
1140+
#endif
11171141
#if CONFIG_DXVA2
11181142
# define CONFIG_MPEG2_DXVA2_HWACCEL 1
11191143
#else
@@ -1146,6 +1170,11 @@
11461170
#else
11471171
# define CONFIG_VC1_D3D11VA2_HWACCEL 0
11481172
#endif
1173+
#if CONFIG_D3D12VA
1174+
# define CONFIG_VC1_D3D12VA_HWACCEL 1
1175+
#else
1176+
# define CONFIG_VC1_D3D12VA_HWACCEL 0
1177+
#endif
11491178
#if CONFIG_DXVA2
11501179
# define CONFIG_VC1_DXVA2_HWACCEL 1
11511180
#else
@@ -1174,6 +1203,11 @@
11741203
#else
11751204
# define CONFIG_VP9_D3D11VA2_HWACCEL 0
11761205
#endif
1206+
#if CONFIG_D3D12VA
1207+
# define CONFIG_VP9_D3D12VA_HWACCEL 1
1208+
#else
1209+
# define CONFIG_VP9_D3D12VA_HWACCEL 0
1210+
#endif
11771211
#if defined(NTDDI_WIN10_TH2)
11781212
# define CONFIG_VP9_DXVA2_HWACCEL 1
11791213
#else
@@ -1197,6 +1231,11 @@
11971231
#else
11981232
# define CONFIG_WMV3_D3D11VA2_HWACCEL 0
11991233
#endif
1234+
#if CONFIG_D3D12VA
1235+
# define CONFIG_WMV3_D3D12VA_HWACCEL 1
1236+
#else
1237+
# define CONFIG_WMV3_D3D12VA_HWACCEL 0
1238+
#endif
12001239
#if CONFIG_DXVA2
12011240
# define CONFIG_WMV3_DXVA2_HWACCEL 1
12021241
#else
@@ -1318,6 +1357,7 @@
13181357
#define CONFIG_SNDIO_OUTDEV 0
13191358
#define CONFIG_V4L2_OUTDEV 0
13201359
#define CONFIG_XV_OUTDEV 0
1360+
#define CONFIG_AAP_FILTER 1
13211361
#define CONFIG_ABENCH_FILTER 1
13221362
#define CONFIG_ACOMPRESSOR_FILTER 1
13231363
#define CONFIG_ACONTRAST_FILTER 1
@@ -1641,6 +1681,7 @@
16411681
#define CONFIG_LENSFUN_FILTER 0
16421682
#define CONFIG_LIBPLACEBO_FILTER 0
16431683
#define CONFIG_LIBVMAF_FILTER 0
1684+
#define CONFIG_LIBVMAF_CUDA_FILTER 0
16441685
#define CONFIG_LIMITDIFF_FILTER 1
16451686
#define CONFIG_LIMITER_FILTER 1
16461687
#define CONFIG_LOOP_FILTER 1
@@ -1791,6 +1832,7 @@
17911832
#define CONFIG_THUMBNAIL_FILTER 1
17921833
#define CONFIG_THUMBNAIL_CUDA_FILTER 0
17931834
#define CONFIG_TILE_FILTER 1
1835+
#define CONFIG_TILTANDSHIFT_FILTER 1
17941836
#define CONFIG_TINTERLACE_FILTER 1
17951837
#define CONFIG_TLUT2_FILTER 1
17961838
#define CONFIG_TMEDIAN_FILTER 1
@@ -2039,6 +2081,7 @@
20392081
#define CONFIG_HEVC_DEMUXER 1
20402082
#define CONFIG_HLS_DEMUXER 1
20412083
#define CONFIG_HNM_DEMUXER 1
2084+
#define CONFIG_IAMF_DEMUXER 1
20422085
#define CONFIG_ICO_DEMUXER 1
20432086
#define CONFIG_IDCIN_DEMUXER 1
20442087
#define CONFIG_IDF_DEMUXER 1
@@ -2144,6 +2187,7 @@
21442187
#define CONFIG_PVA_DEMUXER 1
21452188
#define CONFIG_PVF_DEMUXER 1
21462189
#define CONFIG_QCP_DEMUXER 1
2190+
#define CONFIG_QOA_DEMUXER 1
21472191
#define CONFIG_R3D_DEMUXER 1
21482192
#define CONFIG_RAWVIDEO_DEMUXER 1
21492193
#define CONFIG_REALTEXT_DEMUXER 1
@@ -2344,6 +2388,7 @@
23442388
#define CONFIG_HDS_MUXER 1
23452389
#define CONFIG_HEVC_MUXER 1
23462390
#define CONFIG_HLS_MUXER 1
2391+
#define CONFIG_IAMF_MUXER 1
23472392
#define CONFIG_ICO_MUXER 1
23482393
#define CONFIG_ILBC_MUXER 1
23492394
#define CONFIG_IMAGE2_MUXER 1

‎SMP/ffmpeg.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
<ClCompile Include="..\fftools\ffmpeg_mux.c" />
5252
<ClCompile Include="..\fftools\ffmpeg_mux_init.c" />
5353
<ClCompile Include="..\fftools\ffmpeg_opt.c" />
54+
<ClCompile Include="..\fftools\ffmpeg_sched.c" />
5455
<ClCompile Include="..\fftools\objpool.c" />
5556
<ClCompile Include="..\fftools\sync_queue.c" />
5657
<ClCompile Include="..\fftools\thread_queue.c" />

‎SMP/ffmpeg.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@
5050
<ClCompile Include="..\fftools\ffmpeg_opt.c">
5151
<Filter>Source Files\fftools</Filter>
5252
</ClCompile>
53+
<ClCompile Include="..\fftools\ffmpeg_sched.c">
54+
<Filter>Source Files\fftools</Filter>
55+
</ClCompile>
5356
<ClCompile Include="..\fftools\objpool.c">
5457
<Filter>Source Files\fftools</Filter>
5558
</ClCompile>

‎SMP/ffplay.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
</ResourceCompile>
4444
</ItemGroup>
4545
<ItemGroup>
46+
<ClCompile Include="..\fftools\ffplay_renderer.c" />
4647
<ClCompile Include="..\fftools\cmdutils.c" />
4748
<ClCompile Include="..\fftools\opt_common.c" />
4849
<ClCompile Include="..\fftools\ffplay.c" />

‎SMP/ffplay.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
</ResourceCompile>
2727
</ItemGroup>
2828
<ItemGroup>
29+
<ClCompile Include="..\fftools\ffplay_renderer.c">
30+
<Filter>Source Files\fftools</Filter>
31+
</ClCompile>
2932
<ClCompile Include="..\fftools\cmdutils.c">
3033
<Filter>Source Files\fftools</Filter>
3134
</ClCompile>

‎SMP/libavcodec.def‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,12 @@ EXPORTS
7373
av_packet_ref
7474
av_packet_rescale_ts
7575
av_packet_shrink_side_data
76+
av_packet_side_data_add
77+
av_packet_side_data_free
78+
av_packet_side_data_get
7679
av_packet_side_data_name
80+
av_packet_side_data_new
81+
av_packet_side_data_remove
7782
av_packet_unpack_dictionary
7883
av_packet_unref
7984
av_parser_close

0 commit comments

Comments
 (0)