Skip to content

Commit

Permalink
project: Update for upstream merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sibras committed Nov 6, 2022
1 parent a049f4c commit d1a7dfa
Show file tree
Hide file tree
Showing 22 changed files with 231 additions and 56 deletions.
4 changes: 2 additions & 2 deletions SMP/SMP.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/fftools/opt_common.c b/fftools/opt_common.c
index 7cd8b1c66e..0f7955fb15 100644
index 8a06df82df..9a31622bb4 100644
--- a/fftools/opt_common.c
+++ b/fftools/opt_common.c
@@ -48,6 +48,9 @@
Expand All @@ -13,7 +13,7 @@ index 7cd8b1c66e..0f7955fb15 100644
#include "libavdevice/version.h"

diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c
index d5c241d169..6d4006726b 100644
index 36a6d8482d..bcb42d47fc 100644
--- a/libavcodec/mfenc.c
+++ b/libavcodec/mfenc.c
@@ -59,6 +59,10 @@ typedef struct MFContext {
Expand Down
4 changes: 4 additions & 0 deletions SMP/config.asm
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
%define HAVE_POWER8 0
%define HAVE_PPC4XX 0
%define HAVE_VSX 0
%define HAVE_RVV 0
%define HAVE_AESNI 1
%define HAVE_AMD3DNOW 1
%define HAVE_AMD3DNOWEXT 1
Expand Down Expand Up @@ -118,6 +119,7 @@
%define HAVE_POWER8_EXTERNAL 0
%define HAVE_PPC4XX_EXTERNAL 0
%define HAVE_VSX_EXTERNAL 0
%define HAVE_RVV_EXTERNAL 0
%define HAVE_AESNI_EXTERNAL 1
%define HAVE_AMD3DNOW_EXTERNAL 1
%define HAVE_AMD3DNOWEXT_EXTERNAL 1
Expand Down Expand Up @@ -166,6 +168,7 @@
%define HAVE_POWER8_INLINE 0
%define HAVE_PPC4XX_INLINE 0
%define HAVE_VSX_INLINE 0
%define HAVE_RVV_INLINE 0
%define HAVE_AESNI_INLINE 1
%define HAVE_AMD3DNOW_INLINE 1
%define HAVE_AMD3DNOWEXT_INLINE 1
Expand Down Expand Up @@ -345,6 +348,7 @@
%define HAVE_NANOSLEEP 0
%define HAVE_PEEKNAMEDPIPE 1
%define HAVE_POSIX_MEMALIGN 0
%define HAVE_PRCTL 0
%define HAVE_PTHREAD_CANCEL 0
%define HAVE_SCHED_GETAFFINITY 0
%define HAVE_SECITEMIMPORT 0
Expand Down
4 changes: 4 additions & 0 deletions SMP/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
#define HAVE_POWER8 0
#define HAVE_PPC4XX 0
#define HAVE_VSX 0
#define HAVE_RVV 0
#define HAVE_AESNI 1
#define HAVE_AMD3DNOW 1
#define HAVE_AMD3DNOWEXT 1
Expand Down Expand Up @@ -154,6 +155,7 @@
#define HAVE_POWER8_EXTERNAL 0
#define HAVE_PPC4XX_EXTERNAL 0
#define HAVE_VSX_EXTERNAL 0
#define HAVE_RVV_EXTERNAL 0
#define HAVE_AESNI_EXTERNAL 1
#define HAVE_AMD3DNOW_EXTERNAL 1
#define HAVE_AMD3DNOWEXT_EXTERNAL 1
Expand Down Expand Up @@ -202,6 +204,7 @@
#define HAVE_POWER8_INLINE 0
#define HAVE_PPC4XX_INLINE 0
#define HAVE_VSX_INLINE 0
#define HAVE_RVV_INLINE 0
#define HAVE_AESNI_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_AMD3DNOW_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_AMD3DNOWEXT_INLINE ARCH_X86 && HAVE_INLINE_ASM
Expand Down Expand Up @@ -409,6 +412,7 @@
#define HAVE_NANOSLEEP 0
#define HAVE_PEEKNAMEDPIPE 1
#define HAVE_POSIX_MEMALIGN 0
#define HAVE_PRCTL 0
#define HAVE_PTHREAD_CANCEL 0
#define HAVE_SCHED_GETAFFINITY 0
#define HAVE_SECITEMIMPORT 0
Expand Down
19 changes: 19 additions & 0 deletions SMP/config_components.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#define CONFIG_CHOMP_BSF 1
#define CONFIG_DUMP_EXTRADATA_BSF 1
#define CONFIG_DCA_CORE_BSF 1
#define CONFIG_DTS2PTS_BSF 1
#define CONFIG_DV_ERROR_MARKER_BSF 1
#define CONFIG_EAC3_CORE_BSF 1
#define CONFIG_EXTRACT_EXTRADATA_BSF 1
Expand Down Expand Up @@ -191,6 +192,7 @@
#define CONFIG_M101_DECODER 1
#define CONFIG_MAGICYUV_DECODER 1
#define CONFIG_MDEC_DECODER 1
#define CONFIG_MEDIA100_DECODER 1
#define CONFIG_MIMIC_DECODER 1
#define CONFIG_MJPEG_DECODER 1
#define CONFIG_MJPEGB_DECODER 1
Expand Down Expand Up @@ -341,6 +343,7 @@
#define CONFIG_VP9_RKMPP_DECODER 0
#define CONFIG_VP9_V4L2M2M_DECODER 0
#define CONFIG_VQA_DECODER 1
#define CONFIG_VQC_DECODER 1
#define CONFIG_WBMP_DECODER 1
#define CONFIG_WEBP_DECODER 1
#define CONFIG_WCMV_DECODER 1
Expand Down Expand Up @@ -376,6 +379,7 @@
#define CONFIG_ALS_DECODER 1
#define CONFIG_AMRNB_DECODER 1
#define CONFIG_AMRWB_DECODER 1
#define CONFIG_APAC_DECODER 1
#define CONFIG_APE_DECODER 1
#define CONFIG_APTX_DECODER 1
#define CONFIG_APTX_HD_DECODER 1
Expand All @@ -388,6 +392,7 @@
#define CONFIG_BINKAUDIO_DCT_DECODER 1
#define CONFIG_BINKAUDIO_RDFT_DECODER 1
#define CONFIG_BMV_AUDIO_DECODER 1
#define CONFIG_BONK_DECODER 1
#define CONFIG_COOK_DECODER 1
#define CONFIG_DCA_DECODER 1
#define CONFIG_DFPWM_DECODER 1
Expand All @@ -404,6 +409,7 @@
#define CONFIG_FASTAUDIO_DECODER 1
#define CONFIG_FFWAVESYNTH_DECODER 1
#define CONFIG_FLAC_DECODER 1
#define CONFIG_FTR_DECODER 1
#define CONFIG_G723_1_DECODER 1
#define CONFIG_G729_DECODER 1
#define CONFIG_GSM_DECODER 1
Expand All @@ -418,6 +424,7 @@
#define CONFIG_MACE3_DECODER 1
#define CONFIG_MACE6_DECODER 1
#define CONFIG_METASOUND_DECODER 1
#define CONFIG_MISC4_DECODER 1
#define CONFIG_MLP_DECODER 1
#define CONFIG_MP1_DECODER 1
#define CONFIG_MP1FLOAT_DECODER 1
Expand Down Expand Up @@ -909,6 +916,8 @@
#define CONFIG_AAC_MF_ENCODER 1
#define CONFIG_AC3_MF_ENCODER 1
#define CONFIG_H263_V4L2M2M_ENCODER 0
#define CONFIG_AV1_NVENC_ENCODER 0
#define CONFIG_AV1_QSV_ENCODER 0
#define CONFIG_LIBOPENH264_ENCODER 0
#if CONFIG_AMF
# define CONFIG_H264_AMF_ENCODER 1
Expand Down Expand Up @@ -1184,6 +1193,7 @@
#define CONFIG_DVDSUB_PARSER 1
#define CONFIG_DVD_NAV_PARSER 1
#define CONFIG_FLAC_PARSER 1
#define CONFIG_FTR_PARSER 1
#define CONFIG_G723_1_PARSER 1
#define CONFIG_G729_PARSER 1
#define CONFIG_GIF_PARSER 1
Expand All @@ -1195,6 +1205,7 @@
#define CONFIG_HDR_PARSER 1
#define CONFIG_IPU_PARSER 1
#define CONFIG_JPEG2000_PARSER 1
#define CONFIG_MISC4_PARSER 1
#define CONFIG_MJPEG_PARSER 1
#define CONFIG_MLP_PARSER 1
#define CONFIG_MPEG4VIDEO_PARSER 1
Expand All @@ -1217,6 +1228,7 @@
#define CONFIG_WEBP_PARSER 1
#define CONFIG_XBM_PARSER 1
#define CONFIG_XMA_PARSER 1
#define CONFIG_XWD_PARSER 1
#define CONFIG_ALSA_INDEV 0
#define CONFIG_ANDROID_CAMERA_INDEV 0
#define CONFIG_AVFOUNDATION_INDEV 0
Expand Down Expand Up @@ -1419,9 +1431,11 @@
#define CONFIG_AVGBLUR_FILTER 1
#define CONFIG_AVGBLUR_OPENCL_FILTER 0
#define CONFIG_AVGBLUR_VULKAN_FILTER 0
#define CONFIG_BACKGROUNDKEY_FILTER 1
#define CONFIG_BBOX_FILTER 1
#define CONFIG_BENCH_FILTER 1
#define CONFIG_BILATERAL_FILTER 1
#define CONFIG_BILATERAL_CUDA_FILTER 0
#define CONFIG_BITPLANENOISE_FILTER 1
#define CONFIG_BLACKDETECT_FILTER 1
#define CONFIG_BLACKFRAME_FILTER 1
Expand Down Expand Up @@ -1454,6 +1468,7 @@
#define CONFIG_COLORMAP_FILTER 1
#define CONFIG_COLORMATRIX_FILTER 1
#define CONFIG_COLORSPACE_FILTER 1
#define CONFIG_COLORSPACE_CUDA_FILTER 0
#define CONFIG_COLORTEMPERATURE_FILTER 1
#define CONFIG_CONVOLUTION_FILTER 1
#define CONFIG_CONVOLUTION_OPENCL_FILTER 0
Expand Down Expand Up @@ -1808,6 +1823,7 @@
#define CONFIG_TESTSRC2_FILTER 1
#define CONFIG_YUVTESTSRC_FILTER 1
#define CONFIG_NULLSINK_FILTER 1
#define CONFIG_A3DSCOPE_FILTER 1
#define CONFIG_ABITSCOPE_FILTER 1
#define CONFIG_ADRAWGRAPH_FILTER 1
#define CONFIG_AGRAPHMONITOR_FILTER 1
Expand Down Expand Up @@ -1849,6 +1865,7 @@
#define CONFIG_AMRNB_DEMUXER 1
#define CONFIG_AMRWB_DEMUXER 1
#define CONFIG_ANM_DEMUXER 1
#define CONFIG_APAC_DEMUXER 1
#define CONFIG_APC_DEMUXER 1
#define CONFIG_APE_DEMUXER 1
#define CONFIG_APM_DEMUXER 1
Expand Down Expand Up @@ -1882,6 +1899,7 @@
#define CONFIG_BFSTM_DEMUXER 1
#define CONFIG_BRSTM_DEMUXER 1
#define CONFIG_BOA_DEMUXER 1
#define CONFIG_BONK_DEMUXER 1
#define CONFIG_C93_DEMUXER 1
#define CONFIG_CAF_DEMUXER 1
#define CONFIG_CAVSVIDEO_DEMUXER 1
Expand Down Expand Up @@ -1966,6 +1984,7 @@
#define CONFIG_JV_DEMUXER 1
#define CONFIG_KUX_DEMUXER 1
#define CONFIG_KVAG_DEMUXER 1
#define CONFIG_LAF_DEMUXER 1
#define CONFIG_LMLM4_DEMUXER 1
#define CONFIG_LOAS_DEMUXER 1
#define CONFIG_LUODAT_DEMUXER 1
Expand Down
1 change: 1 addition & 0 deletions SMP/ffmpeg.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
<ClCompile Include="..\fftools\ffmpeg_filter.c" />
<ClCompile Include="..\fftools\ffmpeg_hw.c" />
<ClCompile Include="..\fftools\ffmpeg_mux.c" />
<ClCompile Include="..\fftools\ffmpeg_mux_init.c" />
<ClCompile Include="..\fftools\ffmpeg_opt.c" />
<ClCompile Include="..\fftools\objpool.c" />
<ClCompile Include="..\fftools\sync_queue.c" />
Expand Down
3 changes: 3 additions & 0 deletions SMP/ffmpeg.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
<ClCompile Include="..\fftools\ffmpeg_mux.c">
<Filter>Source Files\fftools</Filter>
</ClCompile>
<ClCompile Include="..\fftools\ffmpeg_mux_init.c">
<Filter>Source Files\fftools</Filter>
</ClCompile>
<ClCompile Include="..\fftools\ffmpeg_opt.c">
<Filter>Source Files\fftools</Filter>
</ClCompile>
Expand Down
Loading

0 comments on commit d1a7dfa

Please sign in to comment.