projects: Update for recent upstream merge.

7be2c06f · Matt Oliver · 8673d422 · 7be2c06f · 7be2c06f · 7be2c06f
8 changed file
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -503,6 +503,7 @@
 %define CONFIG_MEDIACODEC 0
 %define CONFIG_OPENAL 0
 %define CONFIG_OPENGL 1
+%define CONFIG_VAPOURSYNTH 0
 %define CONFIG_ALSA 0
 %define CONFIG_APPKIT 0
 %define CONFIG_AVFOUNDATION 0
@@ -611,6 +612,7 @@
 %define CONFIG_CBS_H264 1
 %define CONFIG_CBS_H265 1
 %define CONFIG_CBS_MPEG2 1
+%define CONFIG_CBS_VP9 1
 %define CONFIG_DIRAC_PARSE 1
 %define CONFIG_DVPROFILE 1
 %define CONFIG_EXIF 1
@@ -709,6 +711,7 @@
 %define CONFIG_REMOVE_EXTRADATA_BSF 1
 %define CONFIG_TEXT2MOVSUB_BSF 1
 %define CONFIG_TRACE_HEADERS_BSF 1
+%define CONFIG_VP9_METADATA_BSF 1
 %define CONFIG_VP9_RAW_REORDER_BSF 1
 %define CONFIG_VP9_SUPERFRAME_BSF 1
 %define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 1
@@ -1656,6 +1659,7 @@
 %define CONFIG_ANULLSINK_FILTER 1
 %define CONFIG_ALPHAEXTRACT_FILTER 1
 %define CONFIG_ALPHAMERGE_FILTER 1
+%define CONFIG_AMPLIFY_FILTER 1
 %define CONFIG_ASS_FILTER 1
 %define CONFIG_ATADENOISE_FILTER 1
 %define CONFIG_AVGBLUR_FILTER 1
@@ -1845,6 +1849,7 @@
 %define CONFIG_SOBEL_FILTER 1
 %define CONFIG_SPLIT_FILTER 1
 %define CONFIG_SPP_FILTER 1
+%define CONFIG_SRCNN_FILTER 1
 %define CONFIG_SSIM_FILTER 1
 %define CONFIG_STEREO3D_FILTER 1
 %define CONFIG_STREAMSELECT_FILTER 1
@@ -2213,6 +2218,7 @@
 %define CONFIG_LIBGME_DEMUXER 1
 %define CONFIG_LIBMODPLUG_DEMUXER 1
 %define CONFIG_LIBOPENMPT_DEMUXER 0
+%define CONFIG_VAPOURSYNTH_DEMUXER 0
 %define CONFIG_A64_MUXER 1
 %define CONFIG_AC3_MUXER 1
 %define CONFIG_ADTS_MUXER 1

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -553,6 +553,7 @@
 #define CONFIG_MEDIACODEC 0
 #define CONFIG_OPENAL 0
 #define CONFIG_OPENGL 1
+#define CONFIG_VAPOURSYNTH 0
 #define CONFIG_ALSA 0
 #define CONFIG_APPKIT 0
 #define CONFIG_AVFOUNDATION 0
@@ -676,6 +677,7 @@
 #define CONFIG_CBS_H264 1
 #define CONFIG_CBS_H265 1
 #define CONFIG_CBS_MPEG2 1
+#define CONFIG_CBS_VP9 1
 #define CONFIG_DIRAC_PARSE 1
 #define CONFIG_DVPROFILE 1
 #define CONFIG_EXIF 1
@@ -774,6 +776,7 @@
 #define CONFIG_REMOVE_EXTRADATA_BSF 1
 #define CONFIG_TEXT2MOVSUB_BSF 1
 #define CONFIG_TRACE_HEADERS_BSF 1
+#define CONFIG_VP9_METADATA_BSF 1
 #define CONFIG_VP9_RAW_REORDER_BSF 1
 #define CONFIG_VP9_SUPERFRAME_BSF 1
 #define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 1
@@ -1742,6 +1745,7 @@
 #define CONFIG_ANULLSINK_FILTER 1
 #define CONFIG_ALPHAEXTRACT_FILTER 1
 #define CONFIG_ALPHAMERGE_FILTER 1
+#define CONFIG_AMPLIFY_FILTER 1
 #define CONFIG_ASS_FILTER 1
 #define CONFIG_ATADENOISE_FILTER 1
 #define CONFIG_AVGBLUR_FILTER 1
@@ -1931,6 +1935,7 @@
 #define CONFIG_SOBEL_FILTER 1
 #define CONFIG_SPLIT_FILTER 1
 #define CONFIG_SPP_FILTER 1
+#define CONFIG_SRCNN_FILTER 1
 #define CONFIG_SSIM_FILTER 1
 #define CONFIG_STEREO3D_FILTER 1
 #define CONFIG_STREAMSELECT_FILTER 1
@@ -2299,6 +2304,7 @@
 #define CONFIG_LIBGME_DEMUXER 1
 #define CONFIG_LIBMODPLUG_DEMUXER 1
 #define CONFIG_LIBOPENMPT_DEMUXER 0
+#define CONFIG_VAPOURSYNTH_DEMUXER 0
 #define CONFIG_A64_MUXER 1
 #define CONFIG_AC3_MUXER 1
 #define CONFIG_ADTS_MUXER 1

--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -204,6 +204,7 @@
    <ClCompile Include="..\libavcodec\cbs_h2645.c" />
    <ClCompile Include="..\libavcodec\h2645_parse.c" />
    <ClCompile Include="..\libavcodec\cbs_mpeg2.c" />
+    <ClCompile Include="..\libavcodec\cbs_vp9.c" />
    <ClCompile Include="..\libavcodec\dct.c" />
    <ClCompile Include="..\libavcodec\dct32_fixed.c" />
    <ClCompile Include="..\libavcodec\dct32_float.c" />
@@ -880,7 +881,6 @@
    <ClCompile Include="..\libavcodec\libx264.c" />
    <ClCompile Include="..\libavcodec\libx265.c" />
    <ClCompile Include="..\libavcodec\libxvid.c" />
-    <ClCompile Include="..\libavcodec\libxvid_rc.c" />
    <ClCompile Include="..\libavcodec\latm_parser.c" />
    <ClCompile Include="..\libavcodec\aac_parser.c" />
    <ClCompile Include="..\libavcodec\aac_ac3_parser.c" />
@@ -944,6 +944,7 @@
    <ClCompile Include="..\libavcodec\null_bsf.c" />
    <ClCompile Include="..\libavcodec\remove_extradata_bsf.c" />
    <ClCompile Include="..\libavcodec\trace_headers_bsf.c" />
+    <ClCompile Include="..\libavcodec\vp9_metadata_bsf.c" />
    <ClCompile Include="..\libavcodec\vp9_raw_reorder_bsf.c" />
    <ClCompile Include="..\libavcodec\vp9_superframe_bsf.c" />
    <ClCompile Include="..\libavcodec\vp9_superframe_split_bsf.c" />

--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -435,6 +435,9 @@
    <ClCompile Include="..\libavcodec\cbs_mpeg2.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\cbs_vp9.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\dct.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -2463,9 +2466,6 @@
    <ClCompile Include="..\libavcodec\libxvid.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\libxvid_rc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\latm_parser.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -2655,6 +2655,9 @@
    <ClCompile Include="..\libavcodec\trace_headers_bsf.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\vp9_metadata_bsf.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\vp9_raw_reorder_bsf.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>

--- a/SMP/libavcodec/bsf_list.c
+++ b/SMP/libavcodec/bsf_list.c
@@ -44,6 +44,7 @@ static const AVBitStreamFilter *bitstream_filters[] = {
    &ff_remove_extradata_bsf,
    &ff_text2movsub_bsf,
    &ff_trace_headers_bsf,
+    &ff_vp9_metadata_bsf,
    &ff_vp9_raw_reorder_bsf,
    &ff_vp9_superframe_bsf,
    &ff_vp9_superframe_split_bsf,

--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -82,6 +82,7 @@
    <NASM Include="..\libavfilter\x86\vf_interlace.asm" />
    <NASM Include="..\libavfilter\x86\vf_limiter.asm" />
    <NASM Include="..\libavfilter\x86\vf_maskedmerge.asm" />
+    <NASM Include="..\libavfilter\x86\vf_overlay.asm" />
    <NASM Include="..\libavfilter\x86\vf_pp7.asm" />
    <NASM Include="..\libavfilter\x86\vf_psnr.asm" />
    <NASM Include="..\libavfilter\x86\vf_pullup.asm" />
@@ -199,6 +200,7 @@
    <ClCompile Include="..\libavfilter\asink_anullsink.c" />
    <ClCompile Include="..\libavfilter\vf_extractplanes.c" />
    <ClCompile Include="..\libavfilter\vf_alphamerge.c" />
+    <ClCompile Include="..\libavfilter\vf_amplify.c" />
    <ClCompile Include="..\libavfilter\vf_subtitles.c" />
    <ClCompile Include="..\libavfilter\vf_atadenoise.c" />
    <ClCompile Include="..\libavfilter\vf_avgblur.c" />
@@ -294,7 +296,6 @@
    <ClCompile Include="..\libavfilter\vf_noise.c" />
    <ClCompile Include="..\libavfilter\vf_normalize.c" />
    <ClCompile Include="..\libavfilter\vf_null.c" />
-    <ClCompile Include="..\libavfilter\vf_overlay.c" />
    <ClCompile Include="..\libavfilter\vf_overlay_qsv.c" />
    <ClCompile Include="..\libavfilter\vf_owdenoise.c" />
    <ClCompile Include="..\libavfilter\vf_pad.c" />
@@ -332,6 +333,7 @@
    <ClCompile Include="..\libavfilter\vf_signature.c" />
    <ClCompile Include="..\libavfilter\vf_smartblur.c" />
    <ClCompile Include="..\libavfilter\vf_spp.c" />
+    <ClCompile Include="..\libavfilter\vf_srcnn.c" />
    <ClCompile Include="..\libavfilter\vf_super2xsai.c" />
    <ClCompile Include="..\libavfilter\vf_swaprect.c" />
    <ClCompile Include="..\libavfilter\vf_swapuv.c" />
@@ -382,6 +384,7 @@
    <ClCompile Include="..\libavfilter\x86\vf_tinterlace_init.c" />
    <ClCompile Include="..\libavfilter\x86\vf_limiter_init.c" />
    <ClCompile Include="..\libavfilter\x86\vf_maskedmerge_init.c" />
+    <ClCompile Include="..\libavfilter\x86\vf_overlay_init.c" />
    <ClCompile Include="..\libavfilter\x86\vf_pp7_init.c" />
    <ClCompile Include="..\libavfilter\x86\vf_psnr_init.c" />
    <ClCompile Include="..\libavfilter\x86\vf_pullup_init.c" />
@@ -434,6 +437,9 @@
    <ClCompile Include="..\libavfilter\vf_maskedmerge.c">
      <ObjectFileName>$(IntDir)\libavfilter_vf_maskedmerge.obj</ObjectFileName>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_overlay.c">
+      <ObjectFileName>$(IntDir)\libavfilter_vf_overlay.obj</ObjectFileName>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_pp7.c">
      <ObjectFileName>$(IntDir)\libavfilter_vf_pp7.obj</ObjectFileName>
    </ClCompile>

--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -73,6 +73,9 @@
    <NASM Include="..\libavfilter\x86\vf_maskedmerge.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_overlay.asm">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </NASM>
    <NASM Include="..\libavfilter\x86\vf_pp7.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
    </NASM>
@@ -420,6 +423,9 @@
    <ClCompile Include="..\libavfilter\vf_alphamerge.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_amplify.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_subtitles.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -705,9 +711,6 @@
    <ClCompile Include="..\libavfilter\vf_null.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_overlay.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_overlay_qsv.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -819,6 +822,9 @@
    <ClCompile Include="..\libavfilter\vf_spp.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_srcnn.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_super2xsai.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -969,6 +975,9 @@
    <ClCompile Include="..\libavfilter\x86\vf_maskedmerge_init.c">
      <Filter>Source Files\libavfilter\x86</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\x86\vf_overlay_init.c">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\x86\vf_pp7_init.c">
      <Filter>Source Files\libavfilter\x86</Filter>
    </ClCompile>
@@ -1047,6 +1056,9 @@
    <ClCompile Include="..\libavfilter\vf_maskedmerge.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_overlay.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_pp7.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>

--- a/SMP/libavfilter/filter_list.c
+++ b/SMP/libavfilter/filter_list.c
@@ -117,6 +117,7 @@ static const AVFilter *filter_list[] = {
    &ff_asink_anullsink,
    &ff_vf_alphaextract,
    &ff_vf_alphamerge,
+    &ff_vf_amplify,
    &ff_vf_ass,
    &ff_vf_atadenoise,
    &ff_vf_avgblur,
@@ -290,6 +291,7 @@ static const AVFilter *filter_list[] = {
    &ff_vf_sobel,
    &ff_vf_split,
    &ff_vf_spp,
+    &ff_vf_srcnn,
    &ff_vf_ssim,
    &ff_vf_stereo3d,
    &ff_vf_streamselect,