Skip to content

Commit a0878f6

Browse files
SibrasSibras
committed
project: Update for 7.1 merge.
1 parent 13c7d66 commit a0878f6

Some content is hidden

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

49 files changed

+1316
-883
lines changed

‎SMP/SMP.patch

Lines changed: 80 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,83 @@
1-
diff --git a/fftools/opt_common.c b/fftools/opt_common.c
2-
index 9d2d5184a0..4f0a8d59ce 100644
3-
--- a/fftools/opt_common.c
4-
+++ b/fftools/opt_common.c
5-
@@ -48,6 +48,9 @@
6-
#include "libavformat/avformat.h"
7-
#include "libavformat/version.h"
1+
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
2+
index 733d551fa4..24800ab676 100644
3+
--- a/fftools/ffmpeg.h
4+
+++ b/fftools/ffmpeg.h
5+
@@ -831,7 +831,7 @@ int dec_create(const OptionsContext *o, const char *arg, Scheduler *sch);
6+
* @retval ">=0" non-negative scheduler index on success
7+
* @retval "<0" an error code on failure
8+
*/
9+
-int dec_init(Decoder **pdec, Scheduler *sch,
10+
+int dec_open(Decoder **pdec, Scheduler *sch,
11+
AVDictionary **dec_opts, const DecoderOpts *o,
12+
AVFrame *param_out);
13+
void dec_free(Decoder **pdec);
14+
diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c
15+
index 2723a0312e..bd8c5c2ee4 100644
16+
--- a/fftools/ffmpeg_dec.c
17+
+++ b/fftools/ffmpeg_dec.c
18+
@@ -829,7 +829,7 @@ static int packet_decode(DecoderPriv *dp, AVPacket *pkt, AVFrame *frame)
19+
}
20+
}
821

9-
+#include "libavfilter/avfilter.h"
10-
+#include "libavfilter/version.h"
11-
+
12-
#include "libavdevice/avdevice.h"
13-
#include "libavdevice/version.h"
22+
-static int dec_open(DecoderPriv *dp, AVDictionary **dec_opts,
23+
+static int dec_open2(DecoderPriv *dp, AVDictionary **dec_opts,
24+
const DecoderOpts *o, AVFrame *param_out);
25+
26+
static int dec_standalone_open(DecoderPriv *dp, const AVPacket *pkt)
27+
@@ -864,7 +864,7 @@ static int dec_standalone_open(DecoderPriv *dp, const AVPacket *pkt)
28+
snprintf(name, sizeof(name), "dec%d", dp->index);
29+
o.name = name;
30+
31+
- return dec_open(dp, &dp->standalone_init.opts, &o, NULL);
32+
+ return dec_open2(dp, &dp->standalone_init.opts, &o, NULL);
33+
}
34+
35+
static void dec_thread_set_name(const DecoderPriv *dp)
36+
@@ -1519,7 +1519,7 @@ static int hw_device_setup_for_decode(DecoderPriv *dp,
37+
return 0;
38+
}
39+
40+
-static int dec_open(DecoderPriv *dp, AVDictionary **dec_opts,
41+
+static int dec_open2(DecoderPriv *dp, AVDictionary **dec_opts,
42+
const DecoderOpts *o, AVFrame *param_out)
43+
{
44+
const AVCodec *codec = o->codec;
45+
@@ -1644,7 +1644,7 @@ static int dec_open(DecoderPriv *dp, AVDictionary **dec_opts,
46+
return 0;
47+
}
48+
49+
-int dec_init(Decoder **pdec, Scheduler *sch,
50+
+int dec_open(Decoder **pdec, Scheduler *sch,
51+
AVDictionary **dec_opts, const DecoderOpts *o,
52+
AVFrame *param_out)
53+
{
54+
@@ -1659,7 +1659,7 @@ int dec_init(Decoder **pdec, Scheduler *sch,
55+
56+
multiview_check_manual(dp, *dec_opts);
57+
58+
- ret = dec_open(dp, dec_opts, o, param_out);
59+
+ ret = dec_open2(dp, dec_opts, o, param_out);
60+
if (ret < 0)
61+
goto fail;
62+
63+
diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c
64+
index 13aef15eab..5b3c3b588a 100644
65+
--- a/fftools/ffmpeg_demux.c
66+
+++ b/fftools/ffmpeg_demux.c
67+
@@ -948,7 +948,7 @@ static int ist_use(InputStream *ist, int decoding_needed,
68+
if (!ds->decoded_params)
69+
return AVERROR(ENOMEM);
1470

71+
- ret = dec_init(&ist->decoder, d->sch,
72+
+ ret = dec_open(&ist->decoder, d->sch,
73+
&ds->decoder_opts, &ds->dec_opts, ds->decoded_params);
74+
if (ret < 0)
75+
return ret;
1576
diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c
16-
index a674a35aa4..d7a52378b5 100644
77+
index b8f8a25f43..323b39267d 100644
1778
--- a/libavcodec/mfenc.c
1879
+++ b/libavcodec/mfenc.c
19-
@@ -59,6 +59,10 @@ typedef struct MFContext {
80+
@@ -60,6 +60,10 @@ typedef struct MFContext {
2081
static int mf_choose_output_type(AVCodecContext *avctx);
2182
static int mf_setup_context(AVCodecContext *avctx);
2283

@@ -28,18 +89,18 @@ index a674a35aa4..d7a52378b5 100644
2889
// Sentinel value only used by us.
2990
#define MF_INVALID_TIME AV_NOPTS_VALUE
3091
diff --git a/libavfilter/textutils.c b/libavfilter/textutils.c
31-
index ef658d04a2..3ecce972f2 100644
92+
index e6b5239b20..1693b04678 100644
3293
--- a/libavfilter/textutils.c
3394
+++ b/libavfilter/textutils.c
34-
@@ -30,6 +30,7 @@
35-
#include "libavutil/error.h"
95+
@@ -31,6 +31,7 @@
3696
#include "libavutil/file.h"
97+
#include "libavutil/mem.h"
3798
#include "libavutil/time.h"
3899
+#include "libavutil/time_internal.h"
39100

40101
static int ff_expand_text_function_internal(FFExpandTextContext *expand_text, AVBPrint *bp,
41102
char *name, unsigned argc, char **argv)
42-
@@ -189,7 +190,7 @@ int ff_print_pts(void *log_ctx, AVBPrint *bp, double pts, const char *delta,
103+
@@ -190,7 +191,7 @@ int ff_print_pts(void *log_ctx, AVBPrint *bp, double pts, const char *delta,
43104
if (!strcmp(fmt, "localtime"))
44105
localtime_r(&ms, &tm);
45106
else
@@ -48,7 +109,7 @@ index ef658d04a2..3ecce972f2 100644
48109
av_bprint_strftime(bp, av_x_if_null(strftime_fmt, "%Y-%m-%d %H:%M:%S"), &tm);
49110
} else {
50111
av_log(log_ctx, AV_LOG_ERROR, "Invalid format '%s'\n", fmt);
51-
@@ -219,7 +220,7 @@ int ff_print_time(void *log_ctx, AVBPrint *bp,
112+
@@ -220,7 +221,7 @@ int ff_print_time(void *log_ctx, AVBPrint *bp,
52113
if (localtime)
53114
localtime_r(&now, &tm);
54115
else

‎SMP/appveyor.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ environment:
1616
GITHUBTOKEN:
1717
secure: c9Sads7Y16h7FP+LrR3IjVygYAgh8GByE8TtazxDg7jpPVxc+XDV81z7MoUc2Ada
1818
matrix:
19-
- MSVC_VER: 15
20-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
2119
- MSVC_VER: 16
2220
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
2321
- MSVC_VER: 17

‎SMP/config.asm

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,7 @@
2020
;******
2121

2222
%define ARCH_AARCH64 0
23-
%define ARCH_ALPHA 0
2423
%define ARCH_ARM 0
25-
%define ARCH_AVR32 0
26-
%define ARCH_AVR32_AP 0
27-
%define ARCH_AVR32_UC 0
28-
%define ARCH_BFIN 0
2924
%define ARCH_IA64 0
3025
%define ARCH_LOONGARCH 0
3126
%define ARCH_LOONGARCH32 0
@@ -38,7 +33,6 @@
3833
%define ARCH_PPC64 0
3934
%define ARCH_RISCV 0
4035
%define ARCH_S390 0
41-
%define ARCH_SH4 0
4236
%define ARCH_SPARC 0
4337
%define ARCH_SPARC64 0
4438
%define ARCH_TILEGX 0
@@ -73,6 +67,8 @@
7367
%define HAVE_VSX 0
7468
%define HAVE_RV 0
7569
%define HAVE_RVV 0
70+
%define HAVE_RV_ZICBOP 0
71+
%define HAVE_RV_ZVBB 0
7672
%define HAVE_AESNI 1
7773
%define HAVE_AMD3DNOW 1
7874
%define HAVE_AMD3DNOWEXT 1
@@ -124,6 +120,8 @@
124120
%define HAVE_VSX_EXTERNAL 0
125121
%define HAVE_RV_EXTERNAL 0
126122
%define HAVE_RVV_EXTERNAL 0
123+
%define HAVE_RV_ZICBOP_EXTERNAL 0
124+
%define HAVE_RV_ZVBB_EXTERNAL 0
127125
%define HAVE_AESNI_EXTERNAL 1
128126
%define HAVE_AMD3DNOW_EXTERNAL 1
129127
%define HAVE_AMD3DNOWEXT_EXTERNAL 1
@@ -175,6 +173,8 @@
175173
%define HAVE_VSX_INLINE 0
176174
%define HAVE_RV_INLINE 0
177175
%define HAVE_RVV_INLINE 0
176+
%define HAVE_RV_ZICBOP_INLINE 0
177+
%define HAVE_RV_ZVBB_INLINE 0
178178
%define HAVE_AESNI_INLINE 1
179179
%define HAVE_AMD3DNOW_INLINE 1
180180
%define HAVE_AMD3DNOWEXT_INLINE 1
@@ -225,19 +225,17 @@
225225
%define HAVE_SIMD_ALIGN_16 1
226226
%define HAVE_SIMD_ALIGN_32 1
227227
%define HAVE_SIMD_ALIGN_64 1
228-
%define HAVE_ATOMIC_CAS_PTR 0
229-
%define HAVE_MACHINE_RW_BARRIER 0
230228
%define HAVE_MEMORYBARRIER 1
231229
%define HAVE_MM_EMPTY 1
232230
%define HAVE_RDTSC 1
233231
%define HAVE_SEM_TIMEDWAIT 0
234-
%define HAVE_SYNC_VAL_COMPARE_AND_SWAP 0
235232
%define HAVE_INLINE_ASM 1
236233
%define HAVE_SYMVER 0
237234
%define HAVE_X86ASM 1
238235
%define HAVE_BIGENDIAN 0
239236
%define HAVE_FAST_UNALIGNED 1
240237
%define HAVE_ARPA_INET_H 0
238+
%define HAVE_ASM_HWPROBE_H 0
241239
%define HAVE_ASM_TYPES_H 0
242240
%define HAVE_CDIO_PARANOIA_H 0
243241
%define HAVE_CDIO_PARANOIA_PARANOIA_H 1
@@ -264,6 +262,7 @@
264262
%define HAVE_OPENGL_GL3_H 0
265263
%define HAVE_POLL_H 0
266264
%define HAVE_PTHREAD_NP_H 0
265+
%define HAVE_SYS_HWPROBE_H 0
267266
%define HAVE_SYS_PARAM_H 0
268267
%define HAVE_SYS_RESOURCE_H 0
269268
%define HAVE_SYS_SELECT_H 0
@@ -278,6 +277,7 @@
278277
%define HAVE_WINDOWS_H 1
279278
%define HAVE_WINSOCK2_H 1
280279
%define HAVE_INTRINSICS_NEON 0
280+
%define HAVE_INTRINSICS_SSE2 0
281281
%define HAVE_ATANF 1
282282
%define HAVE_ATAN2F 1
283283
%define HAVE_CBRT 1
@@ -320,6 +320,7 @@
320320
%define HAVE_CLOCK_GETTIME 0
321321
%define HAVE_CLOSESOCKET 1
322322
%define HAVE_COMMANDLINETOARGVW 1
323+
%define HAVE_ELF_AUX_INFO 0
323324
%define HAVE_FCNTL 0
324325
%define HAVE_GETADDRINFO 1
325326
%define HAVE_GETAUXVAL 0
@@ -368,6 +369,7 @@
368369
%define HAVE_SYSCONF 0
369370
%define HAVE_SYSCTL 0
370371
%define HAVE_SYSCTLBYNAME 0
372+
%define HAVE_TEMPNAM 0
371373
%define HAVE_USLEEP 0
372374
%define HAVE_UTGETOSTYPEFROMSTRING 0
373375
%define HAVE_VIRTUALALLOC 1
@@ -437,6 +439,7 @@
437439
%define HAVE_STRUCT_SOCKADDR_STORAGE 1
438440
%define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
439441
%define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
442+
%define HAVE_STRUCT_MFXCONFIGINTERFACE 0
440443
%define HAVE_GZIP 0
441444
%define HAVE_LIBDRM_GETFB2 0
442445
%define HAVE_MAKEINFO 0
@@ -450,6 +453,7 @@
450453
%define HAVE_OPENCL_VIDEOTOOLBOX 0
451454
%define HAVE_PERL 0
452455
%define HAVE_POD2MAN 0
456+
%define HAVE_POSIX_IOCTL 0
453457
%define HAVE_TEXI2HTML 0
454458
%define HAVE_XMLLINT 0
455459
%define HAVE_ZLIB_GZIP 0
@@ -538,6 +542,8 @@
538542
%define CONFIG_LIBJXL 0
539543
%define CONFIG_LIBKLVANC 0
540544
%define CONFIG_LIBKVAZAAR 0
545+
%define CONFIG_LIBLC3 0
546+
%define CONFIG_LIBLCEVC_DEC 0
541547
%define CONFIG_LIBMODPLUG 1
542548
%define CONFIG_LIBMP3LAME 1
543549
%define CONFIG_LIBMYSOFA 0
@@ -575,6 +581,7 @@
575581
%define CONFIG_LIBVMAF 0
576582
%define CONFIG_LIBVORBIS 1
577583
%define CONFIG_LIBVPX 1
584+
%define CONFIG_LIBVVENC 0
578585
%define CONFIG_LIBWEBP 0
579586
%define CONFIG_LIBXEVD 0
580587
%define CONFIG_LIBXEVE 0
@@ -661,6 +668,7 @@
661668
%define CONFIG_ERROR_RESILIENCE 1
662669
%define CONFIG_FAAN 1
663670
%define CONFIG_FAST_UNALIGNED 1
671+
%define CONFIG_IAMF 0
664672
%define CONFIG_LSP 1
665673
%define CONFIG_PIXELUTILS 1
666674
%define CONFIG_NETWORK 1
@@ -706,10 +714,12 @@
706714
%define CONFIG_CBS_MPEG2 1
707715
%define CONFIG_CBS_VP8 1
708716
%define CONFIG_CBS_VP9 1
717+
%define CONFIG_D3D12VA_ENCODE 1
709718
%define CONFIG_DEFLATE_WRAPPER 1
710719
%define CONFIG_DIRAC_PARSE 1
711-
%define CONFIG_DNN 1
712-
%define CONFIG_DOVI_RPU 1
720+
%define CONFIG_DNN 0
721+
%define CONFIG_DOVI_RPUDEC 1
722+
%define CONFIG_DOVI_RPUENC 1
713723
%define CONFIG_DVPROFILE 1
714724
%define CONFIG_EVCPARSE 1
715725
%define CONFIG_EXIF 1
@@ -734,13 +744,14 @@
734744
%define CONFIG_HUFFMAN 1
735745
%define CONFIG_HUFFYUVDSP 1
736746
%define CONFIG_HUFFYUVENCDSP 1
737-
%define CONFIG_IAMFDEC 1
738-
%define CONFIG_IAMFENC 1
747+
%define CONFIG_IAMFDEC 0
748+
%define CONFIG_IAMFENC 0
739749
%define CONFIG_IDCTDSP 1
740750
%define CONFIG_IIRFILTER 1
741751
%define CONFIG_INFLATE_WRAPPER 1
742752
%define CONFIG_INTRAX8 1
743753
%define CONFIG_ISO_MEDIA 1
754+
%define CONFIG_ISO_WRITER 1
744755
%define CONFIG_IVIDSP 1
745756
%define CONFIG_JPEGTABLES 1
746757
%define CONFIG_LGPLV3 0
@@ -790,5 +801,6 @@
790801
%define CONFIG_VP3DSP 1
791802
%define CONFIG_VP56DSP 1
792803
%define CONFIG_VP8DSP 1
804+
%define CONFIG_VULKAN_ENCODE 0
793805
%define CONFIG_WMA_FREQS 1
794806
%define CONFIG_WMV2DSP 1

0 commit comments

Comments
 (0)