projects: Update for recent merge.

ShiftMediaProject · Oct 31, 2019 · ad20af7 · ad20af7
1 parent b4e2188
commit ad20af7
Show file tree

Hide file tree

Showing 13 changed files with 184 additions and 54 deletions.
diff --git a/SMP/config.asm b/SMP/config.asm
@@ -1014,6 +1014,7 @@
 %define CONFIG_AAC_LATM_DECODER 1
 %define CONFIG_AC3_DECODER 1
 %define CONFIG_AC3_FIXED_DECODER 1
+%define CONFIG_ACELP_KELVIN_DECODER 1
 %define CONFIG_ALAC_DECODER 1
 %define CONFIG_ALS_DECODER 1
 %define CONFIG_AMRNB_DECODER 1
@@ -1219,7 +1220,6 @@
 %define CONFIG_PCM_MULAW_AT_DECODER 0
 %define CONFIG_QDMC_AT_DECODER 0
 %define CONFIG_QDM2_AT_DECODER 0
-%define CONFIG_LIBAOM_AV1_DECODER 0
 %define CONFIG_LIBARIBB24_DECODER 0
 %define CONFIG_LIBCELT_DECODER 0
 %define CONFIG_LIBCODEC2_DECODER 0
@@ -1242,6 +1242,7 @@
 %define CONFIG_BINTEXT_DECODER 1
 %define CONFIG_XBIN_DECODER 1
 %define CONFIG_IDF_DECODER 1
+%define CONFIG_LIBAOM_AV1_DECODER 0
 %define CONFIG_LIBOPENH264_DECODER 0
 %define CONFIG_H264_CUVID_DECODER 1
 %define CONFIG_HEVC_CUVID_DECODER 1
@@ -1521,6 +1522,7 @@
 %define CONFIG_VP9_DXVA2_HWACCEL 1
 %define CONFIG_VP9_NVDEC_HWACCEL 1
 %define CONFIG_VP9_VAAPI_HWACCEL 0
+%define CONFIG_VP9_VDPAU_HWACCEL 0
 %define CONFIG_WMV3_D3D11VA_HWACCEL 1
 %define CONFIG_WMV3_D3D11VA2_HWACCEL 1
 %define CONFIG_WMV3_DXVA2_HWACCEL 1
@@ -1637,6 +1639,7 @@
 %define CONFIG_AMULTIPLY_FILTER 1
 %define CONFIG_ANEQUALIZER_FILTER 1
 %define CONFIG_ANLMDN_FILTER 1
+%define CONFIG_ANLMS_FILTER 1
 %define CONFIG_ANULL_FILTER 1
 %define CONFIG_APAD_FILTER 1
 %define CONFIG_APERMS_FILTER 1
@@ -1645,6 +1648,7 @@
 %define CONFIG_AREALTIME_FILTER 1
 %define CONFIG_ARESAMPLE_FILTER 1
 %define CONFIG_AREVERSE_FILTER 1
+%define CONFIG_ARNNDN_FILTER 1
 %define CONFIG_ASELECT_FILTER 1
 %define CONFIG_ASENDCMD_FILTER 1
 %define CONFIG_ASETNSAMPLES_FILTER 1
@@ -1731,6 +1735,7 @@
 %define CONFIG_AVGBLUR_OPENCL_FILTER 0
 %define CONFIG_BBOX_FILTER 1
 %define CONFIG_BENCH_FILTER 1
+%define CONFIG_BILATERAL_FILTER 1
 %define CONFIG_BITPLANENOISE_FILTER 1
 %define CONFIG_BLACKDETECT_FILTER 1
 %define CONFIG_BLACKFRAME_FILTER 1
@@ -1852,9 +1857,12 @@
 %define CONFIG_LUTRGB_FILTER 1
 %define CONFIG_LUTYUV_FILTER 1
 %define CONFIG_MASKEDCLAMP_FILTER 1
+%define CONFIG_MASKEDMAX_FILTER 1
 %define CONFIG_MASKEDMERGE_FILTER 1
+%define CONFIG_MASKEDMIN_FILTER 1
 %define CONFIG_MASKFUN_FILTER 1
 %define CONFIG_MCDEINT_FILTER 1
+%define CONFIG_MEDIAN_FILTER 1
 %define CONFIG_MERGEPLANES_FILTER 1
 %define CONFIG_MESTIMATE_FILTER 1
 %define CONFIG_METADATA_FILTER 1
@@ -1883,6 +1891,7 @@
 %define CONFIG_PERMS_FILTER 1
 %define CONFIG_PERSPECTIVE_FILTER 1
 %define CONFIG_PHASE_FILTER 1
+%define CONFIG_PHOTOSENSITIVITY_FILTER 1
 %define CONFIG_PIXDESCTEST_FILTER 1
 %define CONFIG_PIXSCOPE_FILTER 1
 %define CONFIG_PP_FILTER 1
@@ -1916,6 +1925,7 @@
 %define CONFIG_SCALE_QSV_FILTER 1
 %define CONFIG_SCALE_VAAPI_FILTER 0
 %define CONFIG_SCALE2REF_FILTER 1
+%define CONFIG_SCROLL_FILTER 1
 %define CONFIG_SELECT_FILTER 1
 %define CONFIG_SELECTIVECOLOR_FILTER 1
 %define CONFIG_SENDCMD_FILTER 1
@@ -2007,6 +2017,7 @@
 %define CONFIG_PAL75BARS_FILTER 1
 %define CONFIG_PAL100BARS_FILTER 1
 %define CONFIG_RGBTESTSRC_FILTER 1
+%define CONFIG_SIERPINSKI_FILTER 1
 %define CONFIG_SMPTEBARS_FILTER 1
 %define CONFIG_SMPTEHDBARS_FILTER 1
 %define CONFIG_TESTSRC_FILTER 1
@@ -2474,6 +2485,7 @@
 %define CONFIG_SPX_MUXER 1
 %define CONFIG_SPDIF_MUXER 1
 %define CONFIG_SRT_MUXER 1
+%define CONFIG_STREAMHASH_MUXER 1
 %define CONFIG_SUP_MUXER 1
 %define CONFIG_SWF_MUXER 1
 %define CONFIG_TEE_MUXER 1

diff --git a/SMP/config.h b/SMP/config.h
@@ -1084,6 +1084,7 @@
 #define CONFIG_AAC_LATM_DECODER 1
 #define CONFIG_AC3_DECODER 1
 #define CONFIG_AC3_FIXED_DECODER 1
+#define CONFIG_ACELP_KELVIN_DECODER 1
 #define CONFIG_ALAC_DECODER 1
 #define CONFIG_ALS_DECODER 1
 #define CONFIG_AMRNB_DECODER 1
@@ -1289,7 +1290,6 @@
 #define CONFIG_PCM_MULAW_AT_DECODER 0
 #define CONFIG_QDMC_AT_DECODER 0
 #define CONFIG_QDM2_AT_DECODER 0
-#define CONFIG_LIBAOM_AV1_DECODER 0
 #define CONFIG_LIBARIBB24_DECODER 0
 #define CONFIG_LIBCELT_DECODER 0
 #define CONFIG_LIBCODEC2_DECODER 0
@@ -1312,6 +1312,7 @@
 #define CONFIG_BINTEXT_DECODER 1
 #define CONFIG_XBIN_DECODER 1
 #define CONFIG_IDF_DECODER 1
+#define CONFIG_LIBAOM_AV1_DECODER 0
 #define CONFIG_LIBOPENH264_DECODER 0
 #define CONFIG_H264_CUVID_DECODER 1
 #define CONFIG_HEVC_CUVID_DECODER 1
@@ -1635,6 +1636,7 @@
 #endif
 #define CONFIG_VP9_NVDEC_HWACCEL 1
 #define CONFIG_VP9_VAAPI_HWACCEL 0
+#define CONFIG_VP9_VDPAU_HWACCEL 0
 #if CONFIG_D3D11VA
 #   define CONFIG_WMV3_D3D11VA_HWACCEL 1
 #else
@@ -1759,6 +1761,7 @@
 #define CONFIG_AMULTIPLY_FILTER 1
 #define CONFIG_ANEQUALIZER_FILTER 1
 #define CONFIG_ANLMDN_FILTER 1
+#define CONFIG_ANLMS_FILTER 1
 #define CONFIG_ANULL_FILTER 1
 #define CONFIG_APAD_FILTER 1
 #define CONFIG_APERMS_FILTER 1
@@ -1767,6 +1770,7 @@
 #define CONFIG_AREALTIME_FILTER 1
 #define CONFIG_ARESAMPLE_FILTER 1
 #define CONFIG_AREVERSE_FILTER 1
+#define CONFIG_ARNNDN_FILTER 1
 #define CONFIG_ASELECT_FILTER 1
 #define CONFIG_ASENDCMD_FILTER 1
 #define CONFIG_ASETNSAMPLES_FILTER 1
@@ -1853,6 +1857,7 @@
 #define CONFIG_AVGBLUR_OPENCL_FILTER 0
 #define CONFIG_BBOX_FILTER 1
 #define CONFIG_BENCH_FILTER 1
+#define CONFIG_BILATERAL_FILTER 1
 #define CONFIG_BITPLANENOISE_FILTER 1
 #define CONFIG_BLACKDETECT_FILTER 1
 #define CONFIG_BLACKFRAME_FILTER 1
@@ -1974,9 +1979,12 @@
 #define CONFIG_LUTRGB_FILTER 1
 #define CONFIG_LUTYUV_FILTER 1
 #define CONFIG_MASKEDCLAMP_FILTER 1
+#define CONFIG_MASKEDMAX_FILTER 1
 #define CONFIG_MASKEDMERGE_FILTER 1
+#define CONFIG_MASKEDMIN_FILTER 1
 #define CONFIG_MASKFUN_FILTER 1
 #define CONFIG_MCDEINT_FILTER 1
+#define CONFIG_MEDIAN_FILTER 1
 #define CONFIG_MERGEPLANES_FILTER 1
 #define CONFIG_MESTIMATE_FILTER 1
 #define CONFIG_METADATA_FILTER 1
@@ -2005,6 +2013,7 @@
 #define CONFIG_PERMS_FILTER 1
 #define CONFIG_PERSPECTIVE_FILTER 1
 #define CONFIG_PHASE_FILTER 1
+#define CONFIG_PHOTOSENSITIVITY_FILTER 1
 #define CONFIG_PIXDESCTEST_FILTER 1
 #define CONFIG_PIXSCOPE_FILTER 1
 #define CONFIG_PP_FILTER 1
@@ -2038,6 +2047,7 @@
 #define CONFIG_SCALE_QSV_FILTER 1
 #define CONFIG_SCALE_VAAPI_FILTER 0
 #define CONFIG_SCALE2REF_FILTER 1
+#define CONFIG_SCROLL_FILTER 1
 #define CONFIG_SELECT_FILTER 1
 #define CONFIG_SELECTIVECOLOR_FILTER 1
 #define CONFIG_SENDCMD_FILTER 1
@@ -2129,6 +2139,7 @@
 #define CONFIG_PAL75BARS_FILTER 1
 #define CONFIG_PAL100BARS_FILTER 1
 #define CONFIG_RGBTESTSRC_FILTER 1
+#define CONFIG_SIERPINSKI_FILTER 1
 #define CONFIG_SMPTEBARS_FILTER 1
 #define CONFIG_SMPTEHDBARS_FILTER 1
 #define CONFIG_TESTSRC_FILTER 1
@@ -2596,6 +2607,7 @@
 #define CONFIG_SPX_MUXER 1
 #define CONFIG_SPDIF_MUXER 1
 #define CONFIG_SRT_MUXER 1
+#define CONFIG_STREAMHASH_MUXER 1
 #define CONFIG_SUP_MUXER 1
 #define CONFIG_SWF_MUXER 1
 #define CONFIG_TEE_MUXER 1

diff --git a/SMP/libavcodec.def b/SMP/libavcodec.def
@@ -216,6 +216,7 @@ EXPORTS
     avpriv_h264_has_num_reorder_frames
     avpriv_init_elbg
     avpriv_mpeg4audio_get_config
+    avpriv_mpeg4audio_get_config2
     avpriv_mpegaudio_decode_header
     avpriv_put_string
     avpriv_split_xiph_headers

diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj
@@ -313,6 +313,13 @@
     <ClCompile Include="..\libavcodec\ac3enc_float.c" />
     <ClCompile Include="..\libavcodec\ac3enc.c" />
     <ClCompile Include="..\libavcodec\ac3enc_fixed.c" />
+    <ClCompile Include="..\libavcodec\g729dec.c" />
+    <ClCompile Include="..\libavcodec\celp_math.c" />
+    <ClCompile Include="..\libavcodec\celp_filters.c" />
+    <ClCompile Include="..\libavcodec\acelp_filters.c" />
+    <ClCompile Include="..\libavcodec\acelp_pitch_delay.c" />
+    <ClCompile Include="..\libavcodec\acelp_vectors.c" />
+    <ClCompile Include="..\libavcodec\g729postfilter.c" />
     <ClCompile Include="..\libavcodec\agm.c" />
     <ClCompile Include="..\libavcodec\aic.c" />
     <ClCompile Include="..\libavcodec\alac.c" />
@@ -324,11 +331,6 @@
     <ClCompile Include="..\libavcodec\bgmc.c" />
     <ClCompile Include="..\libavcodec\mlz.c" />
     <ClCompile Include="..\libavcodec\amrnbdec.c" />
-    <ClCompile Include="..\libavcodec\celp_filters.c" />
-    <ClCompile Include="..\libavcodec\celp_math.c" />
-    <ClCompile Include="..\libavcodec\acelp_filters.c" />
-    <ClCompile Include="..\libavcodec\acelp_vectors.c" />
-    <ClCompile Include="..\libavcodec\acelp_pitch_delay.c" />
     <ClCompile Include="..\libavcodec\amrwbdec.c" />
     <ClCompile Include="..\libavcodec\mjpegenc.c" />
     <ClCompile Include="..\libavcodec\mjpegenc_common.c" />
@@ -480,8 +482,6 @@
     <ClCompile Include="..\libavcodec\g723_1dec.c" />
     <ClCompile Include="..\libavcodec\g723_1.c" />
     <ClCompile Include="..\libavcodec\g723_1enc.c" />
-    <ClCompile Include="..\libavcodec\g729dec.c" />
-    <ClCompile Include="..\libavcodec\g729postfilter.c" />
     <ClCompile Include="..\libavcodec\gdv.c" />
     <ClCompile Include="..\libavcodec\gifdec.c" />
     <ClCompile Include="..\libavcodec\lzw.c" />

diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
@@ -789,6 +789,27 @@
     <ClCompile Include="..\libavcodec\ac3enc_fixed.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\g729dec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\celp_math.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\celp_filters.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\acelp_filters.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\acelp_pitch_delay.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\acelp_vectors.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\g729postfilter.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\agm.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -822,21 +843,6 @@
     <ClCompile Include="..\libavcodec\amrnbdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\celp_filters.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\celp_math.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\acelp_filters.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\acelp_vectors.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\acelp_pitch_delay.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\amrwbdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1290,12 +1296,6 @@
     <ClCompile Include="..\libavcodec\g723_1enc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\g729dec.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\g729postfilter.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\gdv.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

diff --git a/SMP/libavcodec/codec_list.c b/SMP/libavcodec/codec_list.c
@@ -445,6 +445,7 @@ static const AVCodec *codec_list[] = {
     &ff_aac_latm_decoder,
     &ff_ac3_decoder,
     &ff_ac3_fixed_decoder,
+    &ff_acelp_kelvin_decoder,
     &ff_alac_decoder,
     &ff_als_decoder,
     &ff_amrnb_decoder,