projects: Update for recent upstream merge.

ShiftMediaProject · Jun 7, 2020 · 3b5bea0 · 3b5bea0
1 parent e189be6
commit 3b5bea0
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 3 deletions.
diff --git a/SMP/SMP.patch b/SMP/SMP.patch
@@ -1,10 +1,10 @@
 diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
-index 4121b2807a..53f847a0fe 100644
+index d4b1fd0d53..67d161899e 100644
 --- a/libavcodec/libx264.c
 +++ b/libavcodec/libx264.c
-@@ -30,10 +30,6 @@
- #include "avcodec.h"
+@@ -31,10 +31,6 @@
  #include "internal.h"
+ #include "packet_internal.h"
 
 -#if defined(_MSC_VER)
 -#define X264_API_IMPORTS 1

diff --git a/SMP/config.asm b/SMP/config.asm
@@ -913,6 +913,7 @@
 %define CONFIG_PAM_DECODER 1
 %define CONFIG_PBM_DECODER 1
 %define CONFIG_PCX_DECODER 1
+%define CONFIG_PFM_DECODER 1
 %define CONFIG_PGM_DECODER 1
 %define CONFIG_PGMYUV_DECODER 1
 %define CONFIG_PICTOR_DECODER 1
@@ -1427,6 +1428,7 @@
 %define CONFIG_ADPCM_G726_ENCODER 1
 %define CONFIG_ADPCM_G726LE_ENCODER 1
 %define CONFIG_ADPCM_IMA_QT_ENCODER 1
+%define CONFIG_ADPCM_IMA_SSI_ENCODER 1
 %define CONFIG_ADPCM_IMA_WAV_ENCODER 1
 %define CONFIG_ADPCM_MS_ENCODER 1
 %define CONFIG_ADPCM_SWF_ENCODER 1
@@ -1589,6 +1591,7 @@
 %define CONFIG_H263_PARSER 1
 %define CONFIG_H264_PARSER 1
 %define CONFIG_HEVC_PARSER 1
+%define CONFIG_JPEG2000_PARSER 1
 %define CONFIG_MJPEG_PARSER 1
 %define CONFIG_MLP_PARSER 1
 %define CONFIG_MPEG4VIDEO_PARSER 1
@@ -1809,6 +1812,7 @@
 %define CONFIG_CUE_FILTER 1
 %define CONFIG_CURVES_FILTER 1
 %define CONFIG_DATASCOPE_FILTER 1
+%define CONFIG_DBLUR_FILTER 1
 %define CONFIG_DCTDNOIZ_FILTER 1
 %define CONFIG_DEBAND_FILTER 1
 %define CONFIG_DEBLOCK_FILTER 1
@@ -2476,6 +2480,7 @@
 %define CONFIG_ISMV_MUXER 1
 %define CONFIG_IVF_MUXER 1
 %define CONFIG_JACOSUB_MUXER 1
+%define CONFIG_KVAG_MUXER 1
 %define CONFIG_LATM_MUXER 1
 %define CONFIG_LRC_MUXER 1
 %define CONFIG_M4V_MUXER 1

diff --git a/SMP/config.h b/SMP/config.h
@@ -983,6 +983,7 @@
 #define CONFIG_PAM_DECODER 1
 #define CONFIG_PBM_DECODER 1
 #define CONFIG_PCX_DECODER 1
+#define CONFIG_PFM_DECODER 1
 #define CONFIG_PGM_DECODER 1
 #define CONFIG_PGMYUV_DECODER 1
 #define CONFIG_PICTOR_DECODER 1
@@ -1497,6 +1498,7 @@
 #define CONFIG_ADPCM_G726_ENCODER 1
 #define CONFIG_ADPCM_G726LE_ENCODER 1
 #define CONFIG_ADPCM_IMA_QT_ENCODER 1
+#define CONFIG_ADPCM_IMA_SSI_ENCODER 1
 #define CONFIG_ADPCM_IMA_WAV_ENCODER 1
 #define CONFIG_ADPCM_MS_ENCODER 1
 #define CONFIG_ADPCM_SWF_ENCODER 1
@@ -1711,6 +1713,7 @@
 #define CONFIG_H263_PARSER 1
 #define CONFIG_H264_PARSER 1
 #define CONFIG_HEVC_PARSER 1
+#define CONFIG_JPEG2000_PARSER 1
 #define CONFIG_MJPEG_PARSER 1
 #define CONFIG_MLP_PARSER 1
 #define CONFIG_MPEG4VIDEO_PARSER 1
@@ -1931,6 +1934,7 @@
 #define CONFIG_CUE_FILTER 1
 #define CONFIG_CURVES_FILTER 1
 #define CONFIG_DATASCOPE_FILTER 1
+#define CONFIG_DBLUR_FILTER 1
 #define CONFIG_DCTDNOIZ_FILTER 1
 #define CONFIG_DEBAND_FILTER 1
 #define CONFIG_DEBLOCK_FILTER 1
@@ -2598,6 +2602,7 @@
 #define CONFIG_ISMV_MUXER 1
 #define CONFIG_IVF_MUXER 1
 #define CONFIG_JACOSUB_MUXER 1
+#define CONFIG_KVAG_MUXER 1
 #define CONFIG_LATM_MUXER 1
 #define CONFIG_LRC_MUXER 1
 #define CONFIG_M4V_MUXER 1

diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj
@@ -927,6 +927,7 @@
     <ClCompile Include="..\libavcodec\h263_parser.c" />
     <ClCompile Include="..\libavcodec\h264_parser.c" />
     <ClCompile Include="..\libavcodec\hevc_parser.c" />
+    <ClCompile Include="..\libavcodec\jpeg2000_parser.c" />
     <ClCompile Include="..\libavcodec\mjpeg_parser.c" />
     <ClCompile Include="..\libavcodec\mlp_parse.c" />
     <ClCompile Include="..\libavcodec\mlp_parser.c" />
@@ -1233,6 +1234,7 @@
     <ClInclude Include="..\libavcodec\avdct.h" />
     <ClInclude Include="..\libavcodec\avfft.h" />
     <ClInclude Include="..\libavcodec\bsf.h" />
+    <ClInclude Include="..\libavcodec\codec.h" />
     <ClInclude Include="..\libavcodec\codec_desc.h" />
     <ClInclude Include="..\libavcodec\codec_id.h" />
     <ClInclude Include="..\libavcodec\codec_par.h" />
@@ -1479,6 +1481,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
@@ -1567,6 +1570,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
@@ -1662,6 +1666,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
@@ -1755,6 +1760,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
@@ -1849,6 +1855,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
@@ -1941,6 +1948,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
@@ -2041,6 +2049,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
@@ -2140,6 +2149,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
@@ -2240,6 +2250,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
@@ -2339,6 +2350,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec

diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
@@ -2631,6 +2631,9 @@
     <ClCompile Include="..\libavcodec\hevc_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\jpeg2000_parser.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\mjpeg_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -3221,6 +3224,9 @@
     <ClInclude Include="..\libavcodec\bsf.h">
       <Filter>Header Files\libavcodec</Filter>
     </ClInclude>
+    <ClInclude Include="..\libavcodec\codec.h">
+      <Filter>Header Files\libavcodec</Filter>
+    </ClInclude>
     <ClInclude Include="..\libavcodec\codec_desc.h">
       <Filter>Header Files\libavcodec</Filter>
     </ClInclude>

diff --git a/SMP/libavcodec/codec_list.c b/SMP/libavcodec/codec_list.c
@@ -159,6 +159,7 @@ static const AVCodec *codec_list[] = {
     &ff_adpcm_g726_encoder,
     &ff_adpcm_g726le_encoder,
     &ff_adpcm_ima_qt_encoder,
+    &ff_adpcm_ima_ssi_encoder,
     &ff_adpcm_ima_wav_encoder,
     &ff_adpcm_ms_encoder,
     &ff_adpcm_swf_encoder,
@@ -346,6 +347,7 @@ static const AVCodec *codec_list[] = {
     &ff_pam_decoder,
     &ff_pbm_decoder,
     &ff_pcx_decoder,
+    &ff_pfm_decoder,
     &ff_pgm_decoder,
     &ff_pgmyuv_decoder,
     &ff_pictor_decoder,

diff --git a/SMP/libavcodec/parser_list.c b/SMP/libavcodec/parser_list.c
@@ -45,6 +45,7 @@ static const AVCodecParser *parser_list[] = {
     &ff_h263_parser,
     &ff_h264_parser,
     &ff_hevc_parser,
+    &ff_jpeg2000_parser,
     &ff_mjpeg_parser,
     &ff_mlp_parser,
     &ff_mpeg4video_parser,

diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj
@@ -248,6 +248,7 @@
     <ClCompile Include="..\libavfilter\vf_cropdetect.c" />
     <ClCompile Include="..\libavfilter\vf_curves.c" />
     <ClCompile Include="..\libavfilter\vf_datascope.c" />
+    <ClCompile Include="..\libavfilter\vf_dblur.c" />
     <ClCompile Include="..\libavfilter\vf_dctdnoiz.c" />
     <ClCompile Include="..\libavfilter\vf_deband.c" />
     <ClCompile Include="..\libavfilter\vf_deblock.c" />
@@ -419,6 +420,7 @@
     <ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_depth2space.c" />
     <ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_maximum.c" />
     <ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_mathbinary.c" />
+    <ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_mathunary.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" />

diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters
@@ -597,6 +597,9 @@
     <ClCompile Include="..\libavfilter\vf_datascope.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_dblur.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_dctdnoiz.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -1110,6 +1113,9 @@
     <ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_mathbinary.c">
       <Filter>Source Files\libavfilter\dnn</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_mathunary.c">
+      <Filter>Source Files\libavfilter\dnn</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\x86\scene_sad_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>

diff --git a/SMP/libavfilter/filter_list.c b/SMP/libavfilter/filter_list.c
@@ -171,6 +171,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_cue,
     &ff_vf_curves,
     &ff_vf_datascope,
+    &ff_vf_dblur,
     &ff_vf_dctdnoiz,
     &ff_vf_deband,
     &ff_vf_deblock,

diff --git a/SMP/libavformat/muxer_list.c b/SMP/libavformat/muxer_list.c
@@ -84,6 +84,7 @@ static const AVOutputFormat *muxer_list[] = {
     &ff_ismv_muxer,
     &ff_ivf_muxer,
     &ff_jacosub_muxer,
+    &ff_kvag_muxer,
     &ff_latm_muxer,
     &ff_lrc_muxer,
     &ff_m4v_muxer,