projects: Update for recent merge.

ShiftMediaProject · May 20, 2023 · 1f93f7c · 1f93f7c
1 parent a9f8c0b
commit 1f93f7c
Show file tree

Hide file tree

Showing 20 changed files with 138 additions and 96 deletions.
diff --git a/SMP/SMP.patch b/SMP/SMP.patch
@@ -1,5 +1,5 @@
 diff --git a/fftools/opt_common.c b/fftools/opt_common.c
-index 8a06df82df..9a31622bb4 100644
+index f6fe9815e1..d5d32cb89e 100644
 --- a/fftools/opt_common.c
 +++ b/fftools/opt_common.c
 @@ -48,6 +48,9 @@
@@ -13,7 +13,7 @@ index 8a06df82df..9a31622bb4 100644
  #include "libavdevice/version.h"
 
 diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c
-index f3415df10b..42f36b77bb 100644
+index 8d950a3109..43ca0ead31 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
@@ -366,6 +366,7 @@
 %define HAVE_BCRYPT 1
 %define HAVE_VAAPI_DRM 0
 %define HAVE_VAAPI_X11 0
+%define HAVE_VAAPI_WIN32 0
 %define HAVE_VDPAU_X11 0
 %define HAVE_PTHREADS 0
 %define HAVE_OS2THREADS 0
@@ -499,6 +500,7 @@
 %define CONFIG_LADSPA 0
 %define CONFIG_LCMS2 0
 %define CONFIG_LIBAOM 0
+%define CONFIG_LIBARIBCAPTION 0
 %define CONFIG_LIBASS 1
 %define CONFIG_LIBBLURAY 1
 %define CONFIG_LIBBS2B 0

diff --git a/SMP/config.h b/SMP/config.h
@@ -446,6 +446,7 @@
 #define HAVE_BCRYPT 1
 #define HAVE_VAAPI_DRM 0
 #define HAVE_VAAPI_X11 0
+#define HAVE_VAAPI_WIN32 0
 #define HAVE_VDPAU_X11 0
 #define HAVE_PTHREADS 0
 #define HAVE_OS2THREADS 0
@@ -599,6 +600,7 @@
 #define CONFIG_LADSPA 0
 #define CONFIG_LCMS2 0
 #define CONFIG_LIBAOM 0
+#define CONFIG_LIBARIBCAPTION 0
 #define CONFIG_LIBASS 1
 #define CONFIG_LIBBLURAY 1
 #define CONFIG_LIBBS2B 0

diff --git a/SMP/config_components.h b/SMP/config_components.h
@@ -243,6 +243,7 @@
 #define CONFIG_PAM_DECODER 1
 #define CONFIG_PBM_DECODER 1
 #define CONFIG_PCX_DECODER 1
+#define CONFIG_PDV_DECODER 1
 #define CONFIG_PFM_DECODER 1
 #define CONFIG_PGM_DECODER 1
 #define CONFIG_PGMYUV_DECODER 1
@@ -607,6 +608,7 @@
 #define CONFIG_PCM_MULAW_AT_DECODER 0
 #define CONFIG_QDMC_AT_DECODER 0
 #define CONFIG_QDM2_AT_DECODER 0
+#define CONFIG_LIBARIBCAPTION_DECODER 0
 #define CONFIG_LIBARIBB24_DECODER 0
 #define CONFIG_LIBCELT_DECODER 0
 #define CONFIG_LIBCODEC2_DECODER 0
@@ -619,7 +621,6 @@
 #define CONFIG_LIBJXL_DECODER 0
 #define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
 #define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
-#define CONFIG_LIBOPENJPEG_DECODER 0
 #define CONFIG_LIBOPUS_DECODER 1
 #define CONFIG_LIBRSVG_DECODER 0
 #define CONFIG_LIBSPEEX_DECODER 1
@@ -926,6 +927,7 @@
 #define CONFIG_AAC_MF_ENCODER 1
 #define CONFIG_AC3_MF_ENCODER 1
 #define CONFIG_H263_V4L2M2M_ENCODER 0
+#define CONFIG_AV1_MEDIACODEC_ENCODER 0
 #if CONFIG_NVENC
 #   define CONFIG_AV1_NVENC_ENCODER 1
 #else
@@ -992,11 +994,14 @@
 #   define CONFIG_MPEG2_QSV_ENCODER 0
 #endif
 #define CONFIG_MPEG2_VAAPI_ENCODER 0
+#define CONFIG_MPEG4_MEDIACODEC_ENCODER 0
 #define CONFIG_MPEG4_OMX_ENCODER 0
 #define CONFIG_MPEG4_V4L2M2M_ENCODER 0
 #define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0
+#define CONFIG_VP8_MEDIACODEC_ENCODER 0
 #define CONFIG_VP8_V4L2M2M_ENCODER 0
 #define CONFIG_VP8_VAAPI_ENCODER 0
+#define CONFIG_VP9_MEDIACODEC_ENCODER 0
 #define CONFIG_VP9_VAAPI_ENCODER 0
 #if CONFIG_LIBMFX
 #   define CONFIG_VP9_QSV_ENCODER 1
@@ -1354,6 +1359,7 @@
 #define CONFIG_AREALTIME_FILTER 1
 #define CONFIG_ARESAMPLE_FILTER 1
 #define CONFIG_AREVERSE_FILTER 1
+#define CONFIG_ARLS_FILTER 1
 #define CONFIG_ARNNDN_FILTER 1
 #define CONFIG_ASDR_FILTER 1
 #define CONFIG_ASEGMENT_FILTER 1
@@ -1438,6 +1444,7 @@
 #define CONFIG_VOLUMEDETECT_FILTER 1
 #define CONFIG_AEVALSRC_FILTER 1
 #define CONFIG_AFDELAYSRC_FILTER 1
+#define CONFIG_AFIREQSRC_FILTER 1
 #define CONFIG_AFIRSRC_FILTER 1
 #define CONFIG_ANOISESRC_FILTER 1
 #define CONFIG_ANULLSRC_FILTER 1
@@ -1472,6 +1479,7 @@
 #define CONFIG_BOXBLUR_OPENCL_FILTER 0
 #define CONFIG_BWDIF_FILTER 1
 #define CONFIG_CAS_FILTER 1
+#define CONFIG_CCREPACK_FILTER 1
 #define CONFIG_CHROMABER_VULKAN_FILTER 0
 #define CONFIG_CHROMAHOLD_FILTER 1
 #define CONFIG_CHROMAKEY_FILTER 1
@@ -1632,7 +1640,7 @@
 #define CONFIG_MASKEDMIN_FILTER 1
 #define CONFIG_MASKEDTHRESHOLD_FILTER 1
 #define CONFIG_MASKFUN_FILTER 1
-#define CONFIG_MCDEINT_FILTER 0
+#define CONFIG_MCDEINT_FILTER 1
 #define CONFIG_MEDIAN_FILTER 1
 #define CONFIG_MERGEPLANES_FILTER 1
 #define CONFIG_MESTIMATE_FILTER 1
@@ -1783,7 +1791,7 @@
 #define CONFIG_UNSHARP_FILTER 1
 #define CONFIG_UNSHARP_OPENCL_FILTER 0
 #define CONFIG_UNTILE_FILTER 1
-#define CONFIG_USPP_FILTER 0
+#define CONFIG_USPP_FILTER 1
 #define CONFIG_V360_FILTER 1
 #define CONFIG_VAGUEDENOISER_FILTER 1
 #define CONFIG_VARBLUR_FILTER 1
@@ -1866,6 +1874,7 @@
 #define CONFIG_TESTSRC_FILTER 1
 #define CONFIG_TESTSRC2_FILTER 1
 #define CONFIG_YUVTESTSRC_FILTER 1
+#define CONFIG_ZONEPLATE_FILTER 1
 #define CONFIG_NULLSINK_FILTER 1
 #define CONFIG_A3DSCOPE_FILTER 1
 #define CONFIG_ABITSCOPE_FILTER 1
@@ -2102,6 +2111,7 @@
 #define CONFIG_PCM_U16BE_DEMUXER 1
 #define CONFIG_PCM_U16LE_DEMUXER 1
 #define CONFIG_PCM_U8_DEMUXER 1
+#define CONFIG_PDV_DEMUXER 1
 #define CONFIG_PJS_DEMUXER 1
 #define CONFIG_PMP_DEMUXER 1
 #define CONFIG_PP_BNK_DEMUXER 1

diff --git a/SMP/ffmpeg.vcxproj b/SMP/ffmpeg.vcxproj
@@ -43,7 +43,9 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\fftools\ffmpeg_dec.c" />
     <ClCompile Include="..\fftools\ffmpeg_demux.c" />
+    <ClCompile Include="..\fftools\ffmpeg_enc.c" />
     <ClCompile Include="..\fftools\ffmpeg_filter.c" />
     <ClCompile Include="..\fftools\ffmpeg_hw.c" />
     <ClCompile Include="..\fftools\ffmpeg_mux.c" />

diff --git a/SMP/ffmpeg.vcxproj.filters b/SMP/ffmpeg.vcxproj.filters
@@ -26,9 +26,15 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\fftools\ffmpeg_dec.c">
+      <Filter>Source Files\fftools</Filter>
+    </ClCompile>
     <ClCompile Include="..\fftools\ffmpeg_demux.c">
       <Filter>Source Files\fftools</Filter>
     </ClCompile>
+    <ClCompile Include="..\fftools\ffmpeg_enc.c">
+      <Filter>Source Files\fftools</Filter>
+    </ClCompile>
     <ClCompile Include="..\fftools\ffmpeg_filter.c">
       <Filter>Source Files\fftools</Filter>
     </ClCompile>

diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
@@ -571,9 +571,6 @@
     <ClCompile Include="..\libavcodec\hevc_sei.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\dynamic_hdr10_plus.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\dynamic_hdr_vivid.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1657,6 +1654,9 @@
     <ClCompile Include="..\libavcodec\mqcdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\jpeg2000htdec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\jpeglsdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1930,6 +1930,9 @@
     <ClCompile Include="..\libavcodec\pcxenc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\pdvdec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\pgssubdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2377,6 +2380,9 @@
     <ClCompile Include="..\libavcodec\vp8.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\vp8data.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\vp9.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2635,9 +2641,6 @@
     <ClCompile Include="..\libavcodec\libvpxenc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\libvpx.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\libx264.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2665,6 +2668,9 @@
     <ClCompile Include="..\libavcodec\av1_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\av1_parse.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\avs2.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2854,9 +2860,6 @@
     <ClCompile Include="..\libavcodec\extract_extradata_bsf.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\av1_parse.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\filter_units_bsf.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

diff --git a/SMP/libavcodec/codec_list.c b/SMP/libavcodec/codec_list.c
@@ -405,6 +405,7 @@ static const FFCodec *codec_list[] = {
     &ff_pam_decoder,
     &ff_pbm_decoder,
     &ff_pcx_decoder,
+    &ff_pdv_decoder,
     &ff_pfm_decoder,
     &ff_pgm_decoder,
     &ff_pgmyuv_decoder,

diff --git a/SMP/libavcodec_files.props b/SMP/libavcodec_files.props
@@ -199,7 +199,6 @@
     <ClCompile Include="..\libavcodec\hevc_ps.c" />
     <ClCompile Include="..\libavcodec\hevc_data.c" />
     <ClCompile Include="..\libavcodec\hevc_sei.c" />
-    <ClCompile Include="..\libavcodec\dynamic_hdr10_plus.c" />
     <ClCompile Include="..\libavcodec\dynamic_hdr_vivid.c" />
     <ClCompile Include="..\libavcodec\huffman.c" />
     <ClCompile Include="..\libavcodec\jrevdct.c" />
@@ -561,6 +560,7 @@
     <ClCompile Include="..\libavcodec\jpeg2000dwt.c" />
     <ClCompile Include="..\libavcodec\jpeg2000dec.c" />
     <ClCompile Include="..\libavcodec\mqcdec.c" />
+    <ClCompile Include="..\libavcodec\jpeg2000htdec.c" />
     <ClCompile Include="..\libavcodec\jpeglsdec.c" />
     <ClCompile Include="..\libavcodec\jpegls.c" />
     <ClCompile Include="..\libavcodec\jpeglsenc.c" />
@@ -652,6 +652,7 @@
     <ClCompile Include="..\libavcodec\pnmenc.c" />
     <ClCompile Include="..\libavcodec\pcx.c" />
     <ClCompile Include="..\libavcodec\pcxenc.c" />
+    <ClCompile Include="..\libavcodec\pdvdec.c" />
     <ClCompile Include="..\libavcodec\pgssubdec.c" />
     <ClCompile Include="..\libavcodec\pgxdec.c" />
     <ClCompile Include="..\libavcodec\photocd.c" />
@@ -801,6 +802,7 @@
     <ClCompile Include="..\libavcodec\vpx_rac.c" />
     <ClCompile Include="..\libavcodec\vp6.c" />
     <ClCompile Include="..\libavcodec\vp8.c" />
+    <ClCompile Include="..\libavcodec\vp8data.c" />
     <ClCompile Include="..\libavcodec\vp9.c" />
     <ClCompile Include="..\libavcodec\vp9data.c" />
     <ClCompile Include="..\libavcodec\vp9dsp.c" />
@@ -887,7 +889,6 @@
     <ClCompile Include="..\libavcodec\libvorbisenc.c" />
     <ClCompile Include="..\libavcodec\libvpxdec.c" />
     <ClCompile Include="..\libavcodec\libvpxenc.c" />
-    <ClCompile Include="..\libavcodec\libvpx.c" />
     <ClCompile Include="..\libavcodec\libx264.c" />
     <ClCompile Include="..\libavcodec\libx265.c" />
     <ClCompile Include="..\libavcodec\libxvid.c" />
@@ -897,6 +898,7 @@
     <ClCompile Include="..\libavcodec\adx_parser.c" />
     <ClCompile Include="..\libavcodec\amr_parser.c" />
     <ClCompile Include="..\libavcodec\av1_parser.c" />
+    <ClCompile Include="..\libavcodec\av1_parse.c" />
     <ClCompile Include="..\libavcodec\avs2.c" />
     <ClCompile Include="..\libavcodec\avs2_parser.c" />
     <ClCompile Include="..\libavcodec\avs3_parser.c" />
@@ -960,7 +962,6 @@
     <ClCompile Include="..\libavcodec\dv_error_marker_bsf.c" />
     <ClCompile Include="..\libavcodec\eac3_core_bsf.c" />
     <ClCompile Include="..\libavcodec\extract_extradata_bsf.c" />
-    <ClCompile Include="..\libavcodec\av1_parse.c" />
     <ClCompile Include="..\libavcodec\filter_units_bsf.c" />
     <ClCompile Include="..\libavcodec\h264_metadata_bsf.c" />
     <ClCompile Include="..\libavcodec\h264_levels.c" />

diff --git a/SMP/libavcodec_winrt.vcxproj.filters b/SMP/libavcodec_winrt.vcxproj.filters
@@ -571,9 +571,6 @@
     <ClCompile Include="..\libavcodec\hevc_sei.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\dynamic_hdr10_plus.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\dynamic_hdr_vivid.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1657,6 +1654,9 @@
     <ClCompile Include="..\libavcodec\mqcdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\jpeg2000htdec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\jpeglsdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1930,6 +1930,9 @@
     <ClCompile Include="..\libavcodec\pcxenc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\pdvdec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\pgssubdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2377,6 +2380,9 @@
     <ClCompile Include="..\libavcodec\vp8.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\vp8data.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\vp9.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2635,9 +2641,6 @@
     <ClCompile Include="..\libavcodec\libvpxenc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\libvpx.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\libx264.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2665,6 +2668,9 @@
     <ClCompile Include="..\libavcodec\av1_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\av1_parse.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\avs2.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2854,9 +2860,6 @@
     <ClCompile Include="..\libavcodec\extract_extradata_bsf.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\av1_parse.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\filter_units_bsf.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>