projects: Update for recent upstream merge.

cb4303d0 · Matt Oliver · df89ebef · cb4303d0 · cb4303d0 · cb4303d0
14 changed file
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -1177,6 +1177,7 @@
 %define CONFIG_ADPCM_IMA_ALP_DECODER 1
 %define CONFIG_ADPCM_IMA_APC_DECODER 1
 %define CONFIG_ADPCM_IMA_APM_DECODER 1
+%define CONFIG_ADPCM_IMA_CUNNING_DECODER 1
 %define CONFIG_ADPCM_IMA_DAT4_DECODER 1
 %define CONFIG_ADPCM_IMA_DK3_DECODER 1
 %define CONFIG_ADPCM_IMA_DK4_DECODER 1
@@ -1597,6 +1598,7 @@
 %define CONFIG_VP3_PARSER 1
 %define CONFIG_VP8_PARSER 1
 %define CONFIG_VP9_PARSER 1
+%define CONFIG_WEBP_PARSER 1
 %define CONFIG_XMA_PARSER 1
 %define CONFIG_ALSA_INDEV 0
 %define CONFIG_ANDROID_CAMERA_INDEV 0
@@ -1891,6 +1893,7 @@
 %define CONFIG_MASKEDMAX_FILTER 1
 %define CONFIG_MASKEDMERGE_FILTER 1
 %define CONFIG_MASKEDMIN_FILTER 1
+%define CONFIG_MASKEDTHRESHOLD_FILTER 1
 %define CONFIG_MASKFUN_FILTER 1
 %define CONFIG_MCDEINT_FILTER 1
 %define CONFIG_MEDIAN_FILTER 1
@@ -2002,6 +2005,7 @@
 %define CONFIG_TILE_FILTER 1
 %define CONFIG_TINTERLACE_FILTER 1
 %define CONFIG_TLUT2_FILTER 1
+%define CONFIG_TMEDIAN_FILTER 1
 %define CONFIG_TMIX_FILTER 1
 %define CONFIG_TONEMAP_FILTER 1
 %define CONFIG_TONEMAP_OPENCL_FILTER 0

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -1247,6 +1247,7 @@
 #define CONFIG_ADPCM_IMA_ALP_DECODER 1
 #define CONFIG_ADPCM_IMA_APC_DECODER 1
 #define CONFIG_ADPCM_IMA_APM_DECODER 1
+#define CONFIG_ADPCM_IMA_CUNNING_DECODER 1
 #define CONFIG_ADPCM_IMA_DAT4_DECODER 1
 #define CONFIG_ADPCM_IMA_DK3_DECODER 1
 #define CONFIG_ADPCM_IMA_DK4_DECODER 1
@@ -1719,6 +1720,7 @@
 #define CONFIG_VP3_PARSER 1
 #define CONFIG_VP8_PARSER 1
 #define CONFIG_VP9_PARSER 1
+#define CONFIG_WEBP_PARSER 1
 #define CONFIG_XMA_PARSER 1
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_ANDROID_CAMERA_INDEV 0
@@ -2013,6 +2015,7 @@
 #define CONFIG_MASKEDMAX_FILTER 1
 #define CONFIG_MASKEDMERGE_FILTER 1
 #define CONFIG_MASKEDMIN_FILTER 1
+#define CONFIG_MASKEDTHRESHOLD_FILTER 1
 #define CONFIG_MASKFUN_FILTER 1
 #define CONFIG_MCDEINT_FILTER 1
 #define CONFIG_MEDIAN_FILTER 1
@@ -2124,6 +2127,7 @@
 #define CONFIG_TILE_FILTER 1
 #define CONFIG_TINTERLACE_FILTER 1
 #define CONFIG_TLUT2_FILTER 1
+#define CONFIG_TMEDIAN_FILTER 1
 #define CONFIG_TMIX_FILTER 1
 #define CONFIG_TONEMAP_FILTER 1
 #define CONFIG_TONEMAP_OPENCL_FILTER 0

--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -941,6 +941,7 @@
    <ClCompile Include="..\libavcodec\vp3_parser.c" />
    <ClCompile Include="..\libavcodec\vp8_parser.c" />
    <ClCompile Include="..\libavcodec\vp9_parser.c" />
+    <ClCompile Include="..\libavcodec\webp_parser.c" />
    <ClCompile Include="..\libavcodec\xma_parser.c" />
    <ClCompile Include="..\libavcodec\aac_adtstoasc_bsf.c" />
    <ClCompile Include="..\libavcodec\av1_metadata_bsf.c" />

--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -2673,6 +2673,9 @@
    <ClCompile Include="..\libavcodec\vp9_parser.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\webp_parser.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\xma_parser.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>

--- a/SMP/libavcodec/codec_list.c
+++ b/SMP/libavcodec/codec_list.c
@@ -600,6 +600,7 @@ static const AVCodec *codec_list[] = {
    &ff_adpcm_ima_alp_decoder,
    &ff_adpcm_ima_apc_decoder,
    &ff_adpcm_ima_apm_decoder,
+    &ff_adpcm_ima_cunning_decoder,
    &ff_adpcm_ima_dat4_decoder,
    &ff_adpcm_ima_dk3_decoder,
    &ff_adpcm_ima_dk4_decoder,

--- a/SMP/libavcodec/parser_list.c
+++ b/SMP/libavcodec/parser_list.c
@@ -63,5 +63,6 @@ static const AVCodecParser *parser_list[] = {
    &ff_vp3_parser,
    &ff_vp8_parser,
    &ff_vp9_parser,
+    &ff_webp_parser,
    &ff_xma_parser,
    NULL };
\ No newline at end of file
--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -309,6 +309,7 @@
    <ClCompile Include="..\libavfilter\vf_lut.c" />
    <ClCompile Include="..\libavfilter\vf_lut2.c" />
    <ClCompile Include="..\libavfilter\vf_maskedminmax.c" />
+    <ClCompile Include="..\libavfilter\vf_maskedthreshold.c" />
    <ClCompile Include="..\libavfilter\vf_maskfun.c" />
    <ClCompile Include="..\libavfilter\vf_mcdeint.c" />
    <ClCompile Include="..\libavfilter\vf_median.c" />
@@ -369,6 +370,7 @@
    <ClCompile Include="..\libavfilter\vf_telecine.c" />
    <ClCompile Include="..\libavfilter\vf_thumbnail.c" />
    <ClCompile Include="..\libavfilter\vf_tile.c" />
+    <ClCompile Include="..\libavfilter\vf_xmedian.c" />
    <ClCompile Include="..\libavfilter\vf_tonemap.c" />
    <ClCompile Include="..\libavfilter\vf_tpad.c" />
    <ClCompile Include="..\libavfilter\vf_unsharp.c" />
@@ -384,7 +386,6 @@
    <ClCompile Include="..\libavfilter\vf_waveform.c" />
    <ClCompile Include="..\libavfilter\vf_xbr.c" />
    <ClCompile Include="..\libavfilter\vf_xfade.c" />
-    <ClCompile Include="..\libavfilter\vf_xmedian.c" />
    <ClCompile Include="..\libavfilter\vf_yaepblur.c" />
    <ClCompile Include="..\libavfilter\vf_zoompan.c" />
    <ClCompile Include="..\libavfilter\vsrc_testsrc.c" />

--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -780,6 +780,9 @@
    <ClCompile Include="..\libavfilter\vf_maskedminmax.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_maskedthreshold.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_maskfun.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -960,6 +963,9 @@
    <ClCompile Include="..\libavfilter\vf_tile.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_xmedian.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_tonemap.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -1005,9 +1011,6 @@
    <ClCompile Include="..\libavfilter\vf_xfade.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_xmedian.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_yaepblur.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>

--- a/SMP/libavfilter/filter_list.c
+++ b/SMP/libavfilter/filter_list.c
@@ -256,6 +256,7 @@ static const AVFilter *filter_list[] = {
    &ff_vf_maskedmax,
    &ff_vf_maskedmerge,
    &ff_vf_maskedmin,
+    &ff_vf_maskedthreshold,
    &ff_vf_maskfun,
    &ff_vf_mcdeint,
    &ff_vf_median,
@@ -349,6 +350,7 @@ static const AVFilter *filter_list[] = {
    &ff_vf_tile,
    &ff_vf_tinterlace,
    &ff_vf_tlut2,
+    &ff_vf_tmedian,
    &ff_vf_tmix,
    &ff_vf_tonemap,
    &ff_vf_tpad,

--- a/SMP/libavformat.vcxproj
+++ b/SMP/libavformat.vcxproj
@@ -307,8 +307,6 @@
    <ClCompile Include="..\libavformat\av1.c" />
    <ClCompile Include="..\libavformat\hevc.c" />
    <ClCompile Include="..\libavformat\wv.c" />
-    <ClCompile Include="..\libavformat\webmdashenc.c" />
-    <ClCompile Include="..\libavformat\webm_chunk.c" />
    <ClCompile Include="..\libavformat\mgsts.c" />
    <ClCompile Include="..\libavformat\microdvddec.c" />
    <ClCompile Include="..\libavformat\microdvdenc.c" />
@@ -481,6 +479,8 @@
    <ClCompile Include="..\libavformat\w64.c" />
    <ClCompile Include="..\libavformat\wavenc.c" />
    <ClCompile Include="..\libavformat\wc3movie.c" />
+    <ClCompile Include="..\libavformat\webmdashenc.c" />
+    <ClCompile Include="..\libavformat\webm_chunk.c" />
    <ClCompile Include="..\libavformat\webpenc.c" />
    <ClCompile Include="..\libavformat\webvttdec.c" />
    <ClCompile Include="..\libavformat\webvttenc.c" />

--- a/SMP/libavformat.vcxproj.filters
+++ b/SMP/libavformat.vcxproj.filters
@@ -772,12 +772,6 @@
    <ClCompile Include="..\libavformat\wv.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavformat\webmdashenc.c">
-      <Filter>Source Files\libavformat</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavformat\webm_chunk.c">
-      <Filter>Source Files\libavformat</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavformat\mgsts.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
@@ -1294,6 +1288,12 @@
    <ClCompile Include="..\libavformat\wc3movie.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavformat\webmdashenc.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavformat\webm_chunk.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavformat\webpenc.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>

--- a/SMP/libavutil.def
+++ b/SMP/libavutil.def
@@ -115,6 +115,7 @@ EXPORTS
    av_display_rotation_set
    av_div_i
    av_div_q
+    av_dovi_alloc
    av_downmix_info_update_side_data
    av_dynamic_hdr_plus_alloc
    av_dynamic_hdr_plus_create_side_data

--- a/SMP/libavutil.vcxproj
+++ b/SMP/libavutil.vcxproj
@@ -88,6 +88,7 @@
    <ClCompile Include="..\libavutil\des.c" />
    <ClCompile Include="..\libavutil\dict.c" />
    <ClCompile Include="..\libavutil\display.c" />
+    <ClCompile Include="..\libavutil\dovi_meta.c" />
    <ClCompile Include="..\libavutil\downmix_info.c" />
    <ClCompile Include="..\libavutil\encryption_info.c" />
    <ClCompile Include="..\libavutil\error.c" />
@@ -193,6 +194,7 @@
    <ClInclude Include="..\libavutil\des.h" />
    <ClInclude Include="..\libavutil\dict.h" />
    <ClInclude Include="..\libavutil\display.h" />
+    <ClInclude Include="..\libavutil\dovi_meta.h" />
    <ClInclude Include="..\libavutil\downmix_info.h" />
    <ClInclude Include="..\libavutil\encryption_info.h" />
    <ClInclude Include="..\libavutil\error.h" />
@@ -500,6 +502,7 @@ copy ..\libavutil\crc.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\des.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\dict.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\display.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\dovi_meta.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\downmix_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\encryption_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\error.h "$(OutDir)"\include\libavutil
@@ -649,6 +652,7 @@ copy ..\libavutil\crc.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\des.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\dict.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\display.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\dovi_meta.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\downmix_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\encryption_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\error.h "$(OutDir)"\include\libavutil
@@ -805,6 +809,7 @@ copy ..\libavutil\crc.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\des.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\dict.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\display.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\dovi_meta.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\downmix_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\encryption_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\error.h "$(OutDir)"\include\libavutil
@@ -959,6 +964,7 @@ copy ..\libavutil\crc.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\des.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\dict.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\display.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\dovi_meta.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\downmix_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\encryption_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\error.h "$(OutDir)"\include\libavutil
@@ -1114,6 +1120,7 @@ copy ..\libavutil\crc.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\des.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\dict.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\display.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\dovi_meta.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\downmix_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\encryption_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\error.h "$(OutDir)"\include\libavutil
@@ -1267,6 +1274,7 @@ copy ..\libavutil\crc.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\des.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\dict.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\display.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\dovi_meta.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\downmix_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\encryption_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\error.h "$(OutDir)"\include\libavutil
@@ -1428,6 +1436,7 @@ copy ..\libavutil\crc.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\des.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\dict.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\display.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\dovi_meta.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\downmix_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\encryption_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\error.h "$(OutDir)"\include\libavutil
@@ -1588,6 +1597,7 @@ copy ..\libavutil\crc.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\des.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\dict.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\display.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\dovi_meta.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\downmix_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\encryption_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\error.h "$(OutDir)"\include\libavutil
@@ -1749,6 +1759,7 @@ copy ..\libavutil\crc.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\des.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\dict.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\display.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\dovi_meta.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\downmix_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\encryption_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\error.h "$(OutDir)"\include\libavutil
@@ -1909,6 +1920,7 @@ copy ..\libavutil\crc.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\des.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\dict.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\display.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\dovi_meta.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\downmix_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\encryption_info.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\error.h "$(OutDir)"\include\libavutil

--- a/SMP/libavutil.vcxproj.filters
+++ b/SMP/libavutil.vcxproj.filters
@@ -120,6 +120,9 @@
    <ClCompile Include="..\libavutil\display.c">
      <Filter>Source Files\libavutil</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavutil\dovi_meta.c">
+      <Filter>Source Files\libavutil</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavutil\downmix_info.c">
      <Filter>Source Files\libavutil</Filter>
    </ClCompile>
@@ -395,6 +398,9 @@
    <ClInclude Include="..\libavutil\display.h">
      <Filter>Header Files\libavutil</Filter>
    </ClInclude>
+    <ClInclude Include="..\libavutil\dovi_meta.h">
+      <Filter>Header Files\libavutil</Filter>
+    </ClInclude>
    <ClInclude Include="..\libavutil\downmix_info.h">
      <Filter>Header Files\libavutil</Filter>
    </ClInclude>