projects: Update for recent merge.

ShiftMediaProject · Aug 6, 2022 · ebf8d5f · ebf8d5f
1 parent 9bbac78
commit ebf8d5f
Show file tree

Hide file tree

Showing 19 changed files with 1,282 additions and 1,126 deletions.
diff --git a/SMP/SMP.patch b/SMP/SMP.patch
@@ -13,7 +13,7 @@ index ae5e28a5af..bbe86950b9 100644
  #include "libavdevice/version.h"
 
 diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c
-index bbe78605a9..680ffa01a6 100644
+index d5c241d169..6d4006726b 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
@@ -389,6 +389,8 @@
 %define HAVE_VFP_ARGS 0
 %define HAVE_XFORM_ASM 0
 %define HAVE_XMM_CLOBBERS 1
+%define HAVE_DPI_AWARENESS_CONTEXT 1
+%define HAVE_IDXGIOUTPUT5 1
 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0
 %define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0
 %define HAVE_KCMVIDEOCODECTYPE_VP9 0
@@ -687,7 +689,6 @@
 %define CONFIG_FAANDCT 1
 %define CONFIG_FAANIDCT 1
 %define CONFIG_FDCTDSP 1
-%define CONFIG_FLACDSP 1
 %define CONFIG_FMTCONVERT 1
 %define CONFIG_FRAME_THREAD_ENCODER 1
 %define CONFIG_G722DSP 1
@@ -728,6 +729,8 @@
 %define CONFIG_MPEGVIDEO 1
 %define CONFIG_MPEGVIDEODEC 1
 %define CONFIG_MPEGVIDEOENC 1
+%define CONFIG_MSMPEG4DEC 1
+%define CONFIG_MSMPEG4ENC 1
 %define CONFIG_MSS34DSP 1
 %define CONFIG_PIXBLOCKDSP 1
 %define CONFIG_QPELDSP 1

diff --git a/SMP/config.h b/SMP/config.h
@@ -476,6 +476,16 @@
 #define HAVE_VFP_ARGS 0
 #define HAVE_XFORM_ASM 0
 #define HAVE_XMM_CLOBBERS 1
+#if defined(NTDDI_WIN10_RS1)
+#   define HAVE_DPI_AWARENESS_CONTEXT 1
+#else
+#   define HAVE_DPI_AWARENESS_CONTEXT 0
+#endif
+#if defined(NTDDI_WIN10)
+#   define HAVE_IDXGIOUTPUT5 1
+#else
+#   define HAVE_IDXGIOUTPUT5 0
+#endif
 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0
 #define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0
 #define HAVE_KCMVIDEOCODECTYPE_VP9 0
@@ -826,7 +836,6 @@
 #define CONFIG_FAANDCT 1
 #define CONFIG_FAANIDCT 1
 #define CONFIG_FDCTDSP 1
-#define CONFIG_FLACDSP 1
 #define CONFIG_FMTCONVERT 1
 #define CONFIG_FRAME_THREAD_ENCODER 1
 #define CONFIG_G722DSP 1
@@ -867,6 +876,8 @@
 #define CONFIG_MPEGVIDEO 1
 #define CONFIG_MPEGVIDEODEC 1
 #define CONFIG_MPEGVIDEOENC 1
+#define CONFIG_MSMPEG4DEC 1
+#define CONFIG_MSMPEG4ENC 1
 #define CONFIG_MSS34DSP 1
 #define CONFIG_PIXBLOCKDSP 1
 #define CONFIG_QPELDSP 1

diff --git a/SMP/config_components.h b/SMP/config_components.h
@@ -21,6 +21,7 @@
 
 #ifndef FFMPEG_CONFIG_COMPONENTS_H
 #define FFMPEG_CONFIG_COMPONENTS_H
+#include "config.h"
 #define CONFIG_AAC_ADTSTOASC_BSF 1
 #define CONFIG_AV1_FRAME_MERGE_BSF 1
 #define CONFIG_AV1_FRAME_SPLIT_BSF 1
@@ -408,6 +409,7 @@
 #define CONFIG_GSM_MS_DECODER 1
 #define CONFIG_HCA_DECODER 1
 #define CONFIG_HCOM_DECODER 1
+#define CONFIG_HDR_DECODER 1
 #define CONFIG_IAC_DECODER 1
 #define CONFIG_ILBC_DECODER 1
 #define CONFIG_IMC_DECODER 1
@@ -793,6 +795,7 @@
 #define CONFIG_EAC3_ENCODER 1
 #define CONFIG_FLAC_ENCODER 1
 #define CONFIG_G723_1_ENCODER 1
+#define CONFIG_HDR_ENCODER 1
 #define CONFIG_MLP_ENCODER 1
 #define CONFIG_MP2_ENCODER 1
 #define CONFIG_MP2FIXED_ENCODER 1
@@ -969,9 +972,21 @@
 #else
 #   define CONFIG_VP9_QSV_ENCODER 0
 #endif
-#define CONFIG_AV1_D3D11VA_HWACCEL 0
-#define CONFIG_AV1_D3D11VA2_HWACCEL 0
-#define CONFIG_AV1_DXVA2_HWACCEL 0
+#if defined(NTDDI_WIN10_FE)
+#   define CONFIG_AV1_D3D11VA_HWACCEL 1
+#else
+#   define CONFIG_AV1_D3D11VA_HWACCEL 0
+#endif
+#if defined(NTDDI_WIN10_FE)
+#   define CONFIG_AV1_D3D11VA2_HWACCEL 1
+#else
+#   define CONFIG_AV1_D3D11VA2_HWACCEL 0
+#endif
+#if defined(NTDDI_WIN10_FE)
+#   define CONFIG_AV1_DXVA2_HWACCEL 1
+#else
+#   define CONFIG_AV1_DXVA2_HWACCEL 0
+#endif
 #if CONFIG_NVDEC
 #   define CONFIG_AV1_NVDEC_HWACCEL 1
 #else
@@ -1175,6 +1190,7 @@
 #define CONFIG_H263_PARSER 1
 #define CONFIG_H264_PARSER 1
 #define CONFIG_HEVC_PARSER 1
+#define CONFIG_HDR_PARSER 1
 #define CONFIG_IPU_PARSER 1
 #define CONFIG_JPEG2000_PARSER 1
 #define CONFIG_MJPEG_PARSER 1
@@ -1767,6 +1783,11 @@
 #define CONFIG_COLORCHART_FILTER 1
 #define CONFIG_COLORSPECTRUM_FILTER 1
 #define CONFIG_COREIMAGESRC_FILTER 0
+#if CONFIG_D3D11VA
+#   define CONFIG_DDAGRAB_FILTER 1
+#else
+#   define CONFIG_DDAGRAB_FILTER 0
+#endif
 #define CONFIG_FREI0R_SRC_FILTER 0
 #define CONFIG_GRADIENTS_FILTER 1
 #define CONFIG_HALDCLUTSRC_FILTER 1
@@ -2115,6 +2136,7 @@
 #define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_GEM_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_GIF_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_HDR_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1

diff --git a/SMP/ffmpeg.vcxproj b/SMP/ffmpeg.vcxproj
@@ -39,6 +39,9 @@
     <ClCompile Include="..\fftools\ffmpeg_hw.c" />
     <ClCompile Include="..\fftools\ffmpeg_mux.c" />
     <ClCompile Include="..\fftools\ffmpeg_opt.c" />
+    <ClCompile Include="..\fftools\objpool.c" />
+    <ClCompile Include="..\fftools\sync_queue.c" />
+    <ClCompile Include="..\fftools\thread_queue.c" />
     <ClCompile Include="..\fftools\cmdutils.c" />
     <ClCompile Include="..\fftools\opt_common.c" />
     <ClCompile Include="..\fftools\ffmpeg.c" />

diff --git a/SMP/ffmpeg.vcxproj.filters b/SMP/ffmpeg.vcxproj.filters
@@ -30,6 +30,15 @@
     <ClCompile Include="..\fftools\ffmpeg_opt.c">
       <Filter>Source Files\fftools</Filter>
     </ClCompile>
+    <ClCompile Include="..\fftools\objpool.c">
+      <Filter>Source Files\fftools</Filter>
+    </ClCompile>
+    <ClCompile Include="..\fftools\sync_queue.c">
+      <Filter>Source Files\fftools</Filter>
+    </ClCompile>
+    <ClCompile Include="..\fftools\thread_queue.c">
+      <Filter>Source Files\fftools</Filter>
+    </ClCompile>
     <ClCompile Include="..\fftools\cmdutils.c">
       <Filter>Source Files\fftools</Filter>
     </ClCompile>

diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
@@ -672,6 +672,15 @@
     <ClCompile Include="..\libavcodec\ratecontrol.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\msmpeg4dec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\msmpeg4.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\msmpeg4enc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\mss34dsp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1332,6 +1341,9 @@
     <ClCompile Include="..\libavcodec\flacenc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\flacencdsp.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\flashsv.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1491,6 +1503,12 @@
     <ClCompile Include="..\libavcodec\hcom.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\hdrdec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\hdrenc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\hevcdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1743,15 +1761,6 @@
     <ClCompile Include="..\libavcodec\mscc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\msmpeg4dec.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\msmpeg4.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\msmpeg4enc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\siren.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2316,7 +2325,7 @@
     <ClCompile Include="..\libavcodec\vp56data.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\vp56rac.c">
+    <ClCompile Include="..\libavcodec\vpx_rac.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
     <ClCompile Include="..\libavcodec\vp6.c">
@@ -2676,6 +2685,9 @@
     <ClCompile Include="..\libavcodec\hevc_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\hdr_parser.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\ipu_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2913,9 +2925,6 @@
     <ClCompile Include="..\libavcodec\x86\fft_init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\x86\flacdsp_init.c">
-      <Filter>Source Files\libavcodec\x86</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\x86\fmtconvert_init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
@@ -3024,6 +3033,12 @@
     <ClCompile Include="..\libavcodec\x86\exrdsp_init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\x86\flacdsp_init.c">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\x86\flacencdsp_init.c">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\x86\opusdsp_init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
@@ -3117,6 +3132,9 @@
     <ClCompile Include="libavcodec\dxva2_wrap.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="libavcodec\dxva2_av1_wrap.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="libavcodec\dxva2_h264_wrap.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -3219,9 +3237,6 @@
     <ClCompile Include="..\libavcodec\bswapdsp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\flacdsp.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\fmtconvert.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -3309,6 +3324,9 @@
     <ClCompile Include="..\libavcodec\exrdsp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\flacdsp.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\jpeg2000dsp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

diff --git a/SMP/libavcodec/codec_list.c b/SMP/libavcodec/codec_list.c
@@ -121,6 +121,7 @@ static const FFCodec *codec_list[] = {
     &ff_eac3_encoder,
     &ff_flac_encoder,
     &ff_g723_1_encoder,
+    &ff_hdr_encoder,
     &ff_mlp_encoder,
     &ff_mp2_encoder,
     &ff_mp2fixed_encoder,
@@ -553,6 +554,7 @@ static const FFCodec *codec_list[] = {
     &ff_gsm_ms_decoder,
     &ff_hca_decoder,
     &ff_hcom_decoder,
+    &ff_hdr_decoder,
     &ff_iac_decoder,
     &ff_ilbc_decoder,
     &ff_imc_decoder,