project: Update for recent upstream merge.

aa7fe4be · Matt Oliver · a65d77a7 · aa7fe4be · aa7fe4be · aa7fe4be
11 changed file
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -823,6 +823,7 @@
 %define CONFIG_HQ_HQA_DECODER 1
 %define CONFIG_HQX_DECODER 1
 %define CONFIG_HUFFYUV_DECODER 1
+%define CONFIG_HYMT_DECODER 1
 %define CONFIG_IDCIN_DECODER 1
 %define CONFIG_IFF_ILBM_DECODER 1
 %define CONFIG_IMM4_DECODER 1
@@ -1031,6 +1032,7 @@
 %define CONFIG_G729_DECODER 1
 %define CONFIG_GSM_DECODER 1
 %define CONFIG_GSM_MS_DECODER 1
+%define CONFIG_HCOM_DECODER 1
 %define CONFIG_IAC_DECODER 1
 %define CONFIG_ILBC_DECODER 1
 %define CONFIG_IMC_DECODER 1
@@ -1616,6 +1618,7 @@
 %define CONFIG_AMIX_FILTER 1
 %define CONFIG_AMULTIPLY_FILTER 1
 %define CONFIG_ANEQUALIZER_FILTER 1
+%define CONFIG_ANLMDN_FILTER 1
 %define CONFIG_ANULL_FILTER 1
 %define CONFIG_APAD_FILTER 1
 %define CONFIG_APERMS_FILTER 1
@@ -1823,6 +1826,7 @@
 %define CONFIG_LUTYUV_FILTER 1
 %define CONFIG_MASKEDCLAMP_FILTER 1
 %define CONFIG_MASKEDMERGE_FILTER 1
+%define CONFIG_MASKFUN_FILTER 1
 %define CONFIG_MCDEINT_FILTER 1
 %define CONFIG_MERGEPLANES_FILTER 1
 %define CONFIG_MESTIMATE_FILTER 1
@@ -1931,6 +1935,7 @@
 %define CONFIG_TRANSPOSE_FILTER 1
 %define CONFIG_TRANSPOSE_NPP_FILTER 0
 %define CONFIG_TRANSPOSE_OPENCL_FILTER 0
+%define CONFIG_TRANSPOSE_VAAPI_FILTER 0
 %define CONFIG_TRIM_FILTER 1
 %define CONFIG_UNPREMULTIPLY_FILTER 1
 %define CONFIG_UNSHARP_FILTER 1
@@ -2092,6 +2097,7 @@
 %define CONFIG_H261_DEMUXER 1
 %define CONFIG_H263_DEMUXER 1
 %define CONFIG_H264_DEMUXER 1
+%define CONFIG_HCOM_DEMUXER 1
 %define CONFIG_HEVC_DEMUXER 1
 %define CONFIG_HLS_DEMUXER 1
 %define CONFIG_HNM_DEMUXER 1

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -23,7 +23,7 @@
 #define SMP_CONFIG_H
 #define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-bzlib --enable-iconv --enable-lzma --enable-sdl2 --enable-zlib --enable-avisynth --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-libxml2 --enable-gnutls --disable-schannel --enable-gcrypt --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-libmfx --enable-ffnvcodec --enable-cuda --enable-amf --toolchain=msvc"
 #define FFMPEG_LICENSE "GPL version 3 or later"
-#define CONFIG_THIS_YEAR 2018
+#define CONFIG_THIS_YEAR 2019
 #define FFMPEG_DATADIR "."
 #define AVCONV_DATADIR "."
 #if defined(__INTEL_COMPILER)
@@ -888,6 +888,7 @@
 #define CONFIG_HQ_HQA_DECODER 1
 #define CONFIG_HQX_DECODER 1
 #define CONFIG_HUFFYUV_DECODER 1
+#define CONFIG_HYMT_DECODER 1
 #define CONFIG_IDCIN_DECODER 1
 #define CONFIG_IFF_ILBM_DECODER 1
 #define CONFIG_IMM4_DECODER 1
@@ -1096,6 +1097,7 @@
 #define CONFIG_G729_DECODER 1
 #define CONFIG_GSM_DECODER 1
 #define CONFIG_GSM_MS_DECODER 1
+#define CONFIG_HCOM_DECODER 1
 #define CONFIG_IAC_DECODER 1
 #define CONFIG_ILBC_DECODER 1
 #define CONFIG_IMC_DECODER 1
@@ -1519,15 +1521,31 @@
 #define CONFIG_VP9_VAAPI_ENCODER 0
 #define CONFIG_H263_VAAPI_HWACCEL 0
 #define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
-#define CONFIG_H264_D3D11VA_HWACCEL CONFIG_D3D11VA
-#define CONFIG_H264_D3D11VA2_HWACCEL CONFIG_D3D11VA
+#if CONFIG_D3D11VA
+#   define CONFIG_H264_D3D11VA_HWACCEL 1
+#else
+#   define CONFIG_H264_D3D11VA_HWACCEL 0
+#endif
+#if CONFIG_D3D11VA
+#   define CONFIG_H264_D3D11VA2_HWACCEL 1
+#else
+#   define CONFIG_H264_D3D11VA2_HWACCEL 0
+#endif
 #define CONFIG_H264_DXVA2_HWACCEL 1
 #define CONFIG_H264_NVDEC_HWACCEL 1
 #define CONFIG_H264_VAAPI_HWACCEL 0
 #define CONFIG_H264_VDPAU_HWACCEL 0
 #define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
-#define CONFIG_HEVC_D3D11VA_HWACCEL CONFIG_D3D11VA
-#define CONFIG_HEVC_D3D11VA2_HWACCEL CONFIG_D3D11VA
+#if CONFIG_D3D11VA
+#   define CONFIG_HEVC_D3D11VA_HWACCEL 1
+#else
+#   define CONFIG_HEVC_D3D11VA_HWACCEL 0
+#endif
+#if CONFIG_D3D11VA
+#   define CONFIG_HEVC_D3D11VA2_HWACCEL 1
+#else
+#   define CONFIG_HEVC_D3D11VA2_HWACCEL 0
+#endif
 #define CONFIG_HEVC_DXVA2_HWACCEL 1
 #define CONFIG_HEVC_NVDEC_HWACCEL 1
 #define CONFIG_HEVC_VAAPI_HWACCEL 0
@@ -1539,8 +1557,16 @@
 #define CONFIG_MPEG1_VDPAU_HWACCEL 0
 #define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_MPEG1_XVMC_HWACCEL 0
-#define CONFIG_MPEG2_D3D11VA_HWACCEL CONFIG_D3D11VA
-#define CONFIG_MPEG2_D3D11VA2_HWACCEL CONFIG_D3D11VA
+#if CONFIG_D3D11VA
+#   define CONFIG_MPEG2_D3D11VA_HWACCEL 1
+#else
+#   define CONFIG_MPEG2_D3D11VA_HWACCEL 0
+#endif
+#if CONFIG_D3D11VA
+#   define CONFIG_MPEG2_D3D11VA2_HWACCEL 1
+#else
+#   define CONFIG_MPEG2_D3D11VA2_HWACCEL 0
+#endif
 #define CONFIG_MPEG2_NVDEC_HWACCEL 1
 #define CONFIG_MPEG2_DXVA2_HWACCEL 1
 #define CONFIG_MPEG2_VAAPI_HWACCEL 0
@@ -1551,8 +1577,16 @@
 #define CONFIG_MPEG4_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
 #define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
-#define CONFIG_VC1_D3D11VA_HWACCEL CONFIG_D3D11VA
-#define CONFIG_VC1_D3D11VA2_HWACCEL CONFIG_D3D11VA
+#if CONFIG_D3D11VA
+#   define CONFIG_VC1_D3D11VA_HWACCEL 1
+#else
+#   define CONFIG_VC1_D3D11VA_HWACCEL 0
+#endif
+#if CONFIG_D3D11VA
+#   define CONFIG_VC1_D3D11VA2_HWACCEL 1
+#else
+#   define CONFIG_VC1_D3D11VA2_HWACCEL 0
+#endif
 #define CONFIG_VC1_DXVA2_HWACCEL 1
 #define CONFIG_VC1_NVDEC_HWACCEL 1
 #define CONFIG_VC1_VAAPI_HWACCEL 0
@@ -1585,8 +1619,16 @@
 #endif
 #define CONFIG_VP9_NVDEC_HWACCEL 1
 #define CONFIG_VP9_VAAPI_HWACCEL 0
-#define CONFIG_WMV3_D3D11VA_HWACCEL CONFIG_D3D11VA
-#define CONFIG_WMV3_D3D11VA2_HWACCEL CONFIG_D3D11VA
+#if CONFIG_D3D11VA
+#   define CONFIG_WMV3_D3D11VA_HWACCEL 1
+#else
+#   define CONFIG_WMV3_D3D11VA_HWACCEL 0
+#endif
+#if CONFIG_D3D11VA
+#   define CONFIG_WMV3_D3D11VA2_HWACCEL 1
+#else
+#   define CONFIG_WMV3_D3D11VA2_HWACCEL 0
+#endif
 #define CONFIG_WMV3_DXVA2_HWACCEL 1
 #define CONFIG_WMV3_NVDEC_HWACCEL 1
 #define CONFIG_WMV3_VAAPI_HWACCEL 0
@@ -1702,6 +1744,7 @@
 #define CONFIG_AMIX_FILTER 1
 #define CONFIG_AMULTIPLY_FILTER 1
 #define CONFIG_ANEQUALIZER_FILTER 1
+#define CONFIG_ANLMDN_FILTER 1
 #define CONFIG_ANULL_FILTER 1
 #define CONFIG_APAD_FILTER 1
 #define CONFIG_APERMS_FILTER 1
@@ -1909,6 +1952,7 @@
 #define CONFIG_LUTYUV_FILTER 1
 #define CONFIG_MASKEDCLAMP_FILTER 1
 #define CONFIG_MASKEDMERGE_FILTER 1
+#define CONFIG_MASKFUN_FILTER 1
 #define CONFIG_MCDEINT_FILTER 1
 #define CONFIG_MERGEPLANES_FILTER 1
 #define CONFIG_MESTIMATE_FILTER 1
@@ -2017,6 +2061,7 @@
 #define CONFIG_TRANSPOSE_FILTER 1
 #define CONFIG_TRANSPOSE_NPP_FILTER 0
 #define CONFIG_TRANSPOSE_OPENCL_FILTER 0
+#define CONFIG_TRANSPOSE_VAAPI_FILTER 0
 #define CONFIG_TRIM_FILTER 1
 #define CONFIG_UNPREMULTIPLY_FILTER 1
 #define CONFIG_UNSHARP_FILTER 1
@@ -2178,6 +2223,7 @@
 #define CONFIG_H261_DEMUXER 1
 #define CONFIG_H263_DEMUXER 1
 #define CONFIG_H264_DEMUXER 1
+#define CONFIG_HCOM_DEMUXER 1
 #define CONFIG_HEVC_DEMUXER 1
 #define CONFIG_HLS_DEMUXER 1
 #define CONFIG_HNM_DEMUXER 1

--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -531,6 +531,7 @@
    <ClCompile Include="..\libavcodec\qsvenc_h264.c" />
    <ClCompile Include="..\libavcodec\hapdec.c" />
    <ClCompile Include="..\libavcodec\hap.c" />
+    <ClCompile Include="..\libavcodec\hcom.c" />
    <ClCompile Include="..\libavcodec\hevcdec.c" />
    <ClCompile Include="..\libavcodec\hevc_mvs.c" />
    <ClCompile Include="..\libavcodec\hevc_cabac.c" />

--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -1416,6 +1416,9 @@
    <ClCompile Include="..\libavcodec\hap.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\hcom.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\hevcdec.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>

--- a/SMP/libavcodec/codec_list.c
+++ b/SMP/libavcodec/codec_list.c
@@ -282,6 +282,7 @@ static const AVCodec *codec_list[] = {
    &ff_hq_hqa_decoder,
    &ff_hqx_decoder,
    &ff_huffyuv_decoder,
+    &ff_hymt_decoder,
    &ff_idcin_decoder,
    &ff_iff_ilbm_decoder,
    &ff_imm4_decoder,
@@ -473,6 +474,7 @@ static const AVCodec *codec_list[] = {
    &ff_g729_decoder,
    &ff_gsm_decoder,
    &ff_gsm_ms_decoder,
+    &ff_hcom_decoder,
    &ff_iac_decoder,
    &ff_ilbc_decoder,
    &ff_imc_decoder,

--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -71,6 +71,7 @@
  <ItemGroup>
    <NASM Include="..\libavfilter\x86\scene_sad.asm" />
    <NASM Include="..\libavfilter\x86\af_afir.asm" />
+    <NASM Include="..\libavfilter\x86\af_anlmdn.asm" />
    <NASM Include="..\libavfilter\x86\vf_blend.asm" />
    <NASM Include="..\libavfilter\x86\vf_bwdif.asm" />
    <NASM Include="..\libavfilter\x86\colorspacedsp.asm" />
@@ -222,6 +223,7 @@
    <ClCompile Include="..\libavfilter\vf_bm3d.c" />
    <ClCompile Include="..\libavfilter\vf_boxblur.c" />
    <ClCompile Include="..\libavfilter\boxblur.c" />
+    <ClCompile Include="..\libavfilter\yadif_common.c" />
    <ClCompile Include="..\libavfilter\vf_chromakey.c" />
    <ClCompile Include="..\libavfilter\vf_chromashift.c" />
    <ClCompile Include="..\libavfilter\vf_ciescope.c" />
@@ -302,6 +304,7 @@
    <ClCompile Include="..\libavfilter\vf_lut.c" />
    <ClCompile Include="..\libavfilter\vf_lut2.c" />
    <ClCompile Include="..\libavfilter\vf_maskedclamp.c" />
+    <ClCompile Include="..\libavfilter\vf_maskfun.c" />
    <ClCompile Include="..\libavfilter\vf_mcdeint.c" />
    <ClCompile Include="..\libavfilter\vf_mergeplanes.c" />
    <ClCompile Include="..\libavfilter\vf_mestimate.c" />
@@ -373,7 +376,6 @@
    <ClCompile Include="..\libavfilter\vf_vpp_qsv.c" />
    <ClCompile Include="..\libavfilter\vf_waveform.c" />
    <ClCompile Include="..\libavfilter\vf_xbr.c" />
-    <ClCompile Include="..\libavfilter\yadif_common.c" />
    <ClCompile Include="..\libavfilter\vf_zoompan.c" />
    <ClCompile Include="..\libavfilter\vsrc_testsrc.c" />
    <ClCompile Include="..\libavfilter\vsrc_cellauto.c" />
@@ -394,6 +396,7 @@
    <ClCompile Include="..\libavfilter\src_movie.c" />
    <ClCompile Include="..\libavfilter\x86\scene_sad_init.c" />
    <ClCompile Include="..\libavfilter\x86\af_afir_init.c" />
+    <ClCompile Include="..\libavfilter\x86\af_anlmdn_init.c" />
    <ClCompile Include="..\libavfilter\x86\vf_blend_init.c" />
    <ClCompile Include="..\libavfilter\x86\vf_bwdif_init.c" />
    <ClCompile Include="..\libavfilter\x86\colorspacedsp_init.c" />
@@ -426,6 +429,9 @@
    <ClCompile Include="..\libavfilter\af_afir.c">
      <ObjectFileName>$(IntDir)\libavfilter_af_afir.obj</ObjectFileName>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\af_anlmdn.c">
+      <ObjectFileName>$(IntDir)\libavfilter_af_anlmdn.obj</ObjectFileName>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\af_volume.c">
      <ObjectFileName>$(IntDir)\libavfilter_af_volume.obj</ObjectFileName>
    </ClCompile>

--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -40,6 +40,9 @@
    <NASM Include="..\libavfilter\x86\af_afir.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
    </NASM>
+    <NASM Include="..\libavfilter\x86\af_anlmdn.asm">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </NASM>
    <NASM Include="..\libavfilter\x86\vf_blend.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
    </NASM>
@@ -489,6 +492,9 @@
    <ClCompile Include="..\libavfilter\boxblur.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\yadif_common.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_chromakey.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -729,6 +735,9 @@
    <ClCompile Include="..\libavfilter\vf_maskedclamp.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_maskfun.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_mcdeint.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -942,9 +951,6 @@
    <ClCompile Include="..\libavfilter\vf_xbr.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavfilter\yadif_common.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_zoompan.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -1005,6 +1011,9 @@
    <ClCompile Include="..\libavfilter\x86\af_afir_init.c">
      <Filter>Source Files\libavfilter\x86</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\x86\af_anlmdn_init.c">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\x86\vf_blend_init.c">
      <Filter>Source Files\libavfilter\x86</Filter>
    </ClCompile>
@@ -1089,6 +1098,9 @@
    <ClCompile Include="..\libavfilter\af_afir.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\af_anlmdn.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\af_volume.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>

--- a/SMP/libavfilter/filter_list.c
+++ b/SMP/libavfilter/filter_list.c
@@ -51,6 +51,7 @@ static const AVFilter *filter_list[] = {
    &ff_af_amix,
    &ff_af_amultiply,
    &ff_af_anequalizer,
+    &ff_af_anlmdn,
    &ff_af_anull,
    &ff_af_apad,
    &ff_af_aperms,
@@ -239,6 +240,7 @@ static const AVFilter *filter_list[] = {
    &ff_vf_lutyuv,
    &ff_vf_maskedclamp,
    &ff_vf_maskedmerge,
+    &ff_vf_maskfun,
    &ff_vf_mcdeint,
    &ff_vf_mergeplanes,
    &ff_vf_mestimate,

--- a/SMP/libavformat.vcxproj
+++ b/SMP/libavformat.vcxproj
@@ -263,6 +263,7 @@
    <ClCompile Include="..\libavformat\h261dec.c" />
    <ClCompile Include="..\libavformat\h263dec.c" />
    <ClCompile Include="..\libavformat\h264dec.c" />
+    <ClCompile Include="..\libavformat\hcom.c" />
    <ClCompile Include="..\libavformat\hdsenc.c" />
    <ClCompile Include="..\libavformat\hevcdec.c" />
    <ClCompile Include="..\libavformat\hls.c" />

--- a/SMP/libavformat.vcxproj.filters
+++ b/SMP/libavformat.vcxproj.filters
@@ -613,6 +613,9 @@
    <ClCompile Include="..\libavformat\h264dec.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavformat\hcom.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavformat\hdsenc.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>

--- a/SMP/libavformat/demuxer_list.c
+++ b/SMP/libavformat/demuxer_list.c
@@ -114,6 +114,7 @@ static const AVInputFormat *demuxer_list[] = {
    &ff_h261_demuxer,
    &ff_h263_demuxer,
    &ff_h264_demuxer,
+    &ff_hcom_demuxer,
    &ff_hevc_demuxer,
    &ff_hls_demuxer,
    &ff_hnm_demuxer,