diff options
Diffstat (limited to 'chromium/third_party/ffmpeg/chromium/config/Chrome')
42 files changed, 392 insertions, 56 deletions
diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/arm-neon/config.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/arm-neon/config.h index fe209918b47..2c9c6fc7c70 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/arm-neon/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/arm-neon/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/hdd1/workspace/chrome2/src/third_party/android_ndk/platforms/android-16/arch-arm --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/android_ndk/sysroot/usr/include/arm-linux-androideabi --extra-cflags='--target=arm-linux-androideabi' --extra-ldflags='--target=arm-linux-androideabi' --extra-ldflags='--gcc-toolchain=/hdd1/workspace/chrome2/src/third_party/android_ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/' --target-os=android --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-neon --extra-cflags='-mtune=generic-armv7-a' --extra-cflags='-mfloat-abi=softfp' --extra-cflags='-mfpu=neon' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-demuxer=aac --enable-parser=aac --enable-decoder=aac" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/ssd/trunk_blink_tot/src/third_party/android_ndk/platforms/android-16/arch-arm --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/android_ndk/sysroot/usr/include/arm-linux-androideabi --extra-cflags='--target=arm-linux-androideabi' --extra-ldflags='--target=arm-linux-androideabi' --extra-ldflags='--gcc-toolchain=/ssd/trunk_blink_tot/src/third_party/android_ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/' --target-os=android --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-neon --extra-cflags='-mtune=generic-armv7-a' --extra-cflags='-mfloat-abi=softfp' --extra-cflags='-mfpu=neon' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-demuxer=aac --enable-parser=aac --enable-decoder=aac" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" -#define CC_IDENT "clang version 9.0.0 (trunk 357692)" +#define CC_IDENT "clang version 9.0.0 (https://github.com/llvm/llvm-project/ f7e52fbdb5a7af8ea0808e98458b497125a5eca1)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -80,6 +80,7 @@ #define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR2 0 #define HAVE_MSA 0 +#define HAVE_MSA2 0 #define HAVE_LOONGSON2 0 #define HAVE_LOONGSON3 0 #define HAVE_MMI 0 @@ -125,6 +126,7 @@ #define HAVE_MIPSDSP_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 #define HAVE_MSA_EXTERNAL 0 +#define HAVE_MSA2_EXTERNAL 0 #define HAVE_LOONGSON2_EXTERNAL 0 #define HAVE_LOONGSON3_EXTERNAL 0 #define HAVE_MMI_EXTERNAL 0 @@ -170,6 +172,7 @@ #define HAVE_MIPSDSP_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 #define HAVE_MSA_INLINE 0 +#define HAVE_MSA2_INLINE 0 #define HAVE_LOONGSON2_INLINE 0 #define HAVE_LOONGSON3_INLINE 0 #define HAVE_MMI_INLINE 0 @@ -489,6 +492,7 @@ #define CONFIG_MEDIACODEC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENGL 0 +#define CONFIG_POCKETSPHINX 0 #define CONFIG_VAPOURSYNTH 0 #define CONFIG_ALSA 0 #define CONFIG_APPKIT 0 @@ -941,6 +945,7 @@ #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 #define CONFIG_VP3_DECODER 0 +#define CONFIG_VP4_DECODER 0 #define CONFIG_VP5_DECODER 0 #define CONFIG_VP6_DECODER 0 #define CONFIG_VP6A_DECODER 0 @@ -1619,7 +1624,9 @@ #define CONFIG_ASETTB_FILTER 0 #define CONFIG_ASHOWINFO_FILTER 0 #define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 #define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 #define CONFIG_ASTATS_FILTER 0 #define CONFIG_ASTREAMSELECT_FILTER 0 #define CONFIG_ATEMPO_FILTER 0 @@ -1638,6 +1645,7 @@ #define CONFIG_CROSSFEED_FILTER 0 #define CONFIG_CRYSTALIZER_FILTER 0 #define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DEESSER_FILTER 0 #define CONFIG_DRMETER_FILTER 0 #define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 @@ -1710,6 +1718,7 @@ #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 #define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1737,6 +1746,7 @@ #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DENOISE_VAAPI_FILTER 0 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 #define CONFIG_DESPILL_FILTER 0 #define CONFIG_DETELECINE_FILTER 0 @@ -1823,6 +1833,7 @@ #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 #define CONFIG_NNEDI_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NOISE_FILTER 0 @@ -1942,6 +1953,7 @@ #define CONFIG_WAVEFORM_FILTER 0 #define CONFIG_WEAVE_FILTER 0 #define CONFIG_XBR_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 #define CONFIG_XSTACK_FILTER 0 #define CONFIG_YADIF_FILTER 0 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1978,6 +1990,7 @@ #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWFREQS_FILTER 0 +#define CONFIG_SHOWSPATIAL_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0 #define CONFIG_SHOWVOLUME_FILTER 0 @@ -2091,6 +2104,7 @@ #define CONFIG_IDCIN_DEMUXER 0 #define CONFIG_IDF_DEMUXER 0 #define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IFV_DEMUXER 0 #define CONFIG_ILBC_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/arm-neon/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/arm-neon/libavutil/ffversion.h index 5a1ba063f01..e4a455c28f9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/arm-neon/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/arm-neon/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" +#define FFMPEG_VERSION "N-95241-g23ca8fd9e6" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/arm64/config.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/arm64/config.h index 7f2c50477d8..db6831fb7bd 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/arm64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/arm64/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/hdd1/workspace/chrome2/src/third_party/android_ndk/platforms/android-21/arch-arm64 --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/android_ndk/sysroot/usr/include/aarch64-linux-android --extra-cflags='--target=aarch64-linux-android' --extra-ldflags='--target=aarch64-linux-android' --extra-ldflags='--gcc-toolchain=/hdd1/workspace/chrome2/src/third_party/android_ndk/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/' --target-os=android --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-demuxer=aac --enable-parser=aac --enable-decoder=aac" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/ssd/trunk_blink_tot/src/third_party/android_ndk/platforms/android-21/arch-arm64 --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/android_ndk/sysroot/usr/include/aarch64-linux-android --extra-cflags='--target=aarch64-linux-android' --extra-ldflags='--target=aarch64-linux-android' --extra-ldflags='--gcc-toolchain=/ssd/trunk_blink_tot/src/third_party/android_ndk/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/' --target-os=android --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-demuxer=aac --enable-parser=aac --enable-decoder=aac" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" -#define CC_IDENT "clang version 9.0.0 (trunk 357692)" +#define CC_IDENT "clang version 9.0.0 (https://github.com/llvm/llvm-project/ f7e52fbdb5a7af8ea0808e98458b497125a5eca1)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -80,6 +80,7 @@ #define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR2 0 #define HAVE_MSA 0 +#define HAVE_MSA2 0 #define HAVE_LOONGSON2 0 #define HAVE_LOONGSON3 0 #define HAVE_MMI 0 @@ -125,6 +126,7 @@ #define HAVE_MIPSDSP_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 #define HAVE_MSA_EXTERNAL 0 +#define HAVE_MSA2_EXTERNAL 0 #define HAVE_LOONGSON2_EXTERNAL 0 #define HAVE_LOONGSON3_EXTERNAL 0 #define HAVE_MMI_EXTERNAL 0 @@ -170,6 +172,7 @@ #define HAVE_MIPSDSP_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 #define HAVE_MSA_INLINE 0 +#define HAVE_MSA2_INLINE 0 #define HAVE_LOONGSON2_INLINE 0 #define HAVE_LOONGSON3_INLINE 0 #define HAVE_MMI_INLINE 0 @@ -489,6 +492,7 @@ #define CONFIG_MEDIACODEC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENGL 0 +#define CONFIG_POCKETSPHINX 0 #define CONFIG_VAPOURSYNTH 0 #define CONFIG_ALSA 0 #define CONFIG_APPKIT 0 @@ -941,6 +945,7 @@ #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 #define CONFIG_VP3_DECODER 0 +#define CONFIG_VP4_DECODER 0 #define CONFIG_VP5_DECODER 0 #define CONFIG_VP6_DECODER 0 #define CONFIG_VP6A_DECODER 0 @@ -1619,7 +1624,9 @@ #define CONFIG_ASETTB_FILTER 0 #define CONFIG_ASHOWINFO_FILTER 0 #define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 #define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 #define CONFIG_ASTATS_FILTER 0 #define CONFIG_ASTREAMSELECT_FILTER 0 #define CONFIG_ATEMPO_FILTER 0 @@ -1638,6 +1645,7 @@ #define CONFIG_CROSSFEED_FILTER 0 #define CONFIG_CRYSTALIZER_FILTER 0 #define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DEESSER_FILTER 0 #define CONFIG_DRMETER_FILTER 0 #define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 @@ -1710,6 +1718,7 @@ #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 #define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1737,6 +1746,7 @@ #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DENOISE_VAAPI_FILTER 0 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 #define CONFIG_DESPILL_FILTER 0 #define CONFIG_DETELECINE_FILTER 0 @@ -1823,6 +1833,7 @@ #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 #define CONFIG_NNEDI_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NOISE_FILTER 0 @@ -1942,6 +1953,7 @@ #define CONFIG_WAVEFORM_FILTER 0 #define CONFIG_WEAVE_FILTER 0 #define CONFIG_XBR_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 #define CONFIG_XSTACK_FILTER 0 #define CONFIG_YADIF_FILTER 0 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1978,6 +1990,7 @@ #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWFREQS_FILTER 0 +#define CONFIG_SHOWSPATIAL_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0 #define CONFIG_SHOWVOLUME_FILTER 0 @@ -2091,6 +2104,7 @@ #define CONFIG_IDCIN_DEMUXER 0 #define CONFIG_IDF_DEMUXER 0 #define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IFV_DEMUXER 0 #define CONFIG_ILBC_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/arm64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/arm64/libavutil/ffversion.h index 5a1ba063f01..e4a455c28f9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/arm64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/arm64/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" +#define FFMPEG_VERSION "N-95241-g23ca8fd9e6" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/ia32/config.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/ia32/config.h index 7b31ae5f409..a513589c58f 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/ia32/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/ia32/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/hdd1/workspace/chrome2/src/third_party/android_ndk/platforms/android-16/arch-x86 --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/android_ndk/sysroot/usr/include/i686-linux-android --extra-cflags='--target=i686-linux-android' --extra-ldflags='--target=i686-linux-android' --extra-ldflags='--gcc-toolchain=/hdd1/workspace/chrome2/src/third_party/android_ndk/toolchains/x86-4.9/prebuilt/linux-x86_64/' --target-os=android --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --disable-x86asm --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-demuxer=aac --enable-parser=aac --enable-decoder=aac" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/ssd/trunk_blink_tot/src/third_party/android_ndk/platforms/android-16/arch-x86 --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/android_ndk/sysroot/usr/include/i686-linux-android --extra-cflags='--target=i686-linux-android' --extra-ldflags='--target=i686-linux-android' --extra-ldflags='--gcc-toolchain=/ssd/trunk_blink_tot/src/third_party/android_ndk/toolchains/x86-4.9/prebuilt/linux-x86_64/' --target-os=android --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --disable-x86asm --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-demuxer=aac --enable-parser=aac --enable-decoder=aac" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" -#define CC_IDENT "clang version 9.0.0 (trunk 357692)" +#define CC_IDENT "clang version 9.0.0 (https://github.com/llvm/llvm-project/ f7e52fbdb5a7af8ea0808e98458b497125a5eca1)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -80,6 +80,7 @@ #define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR2 0 #define HAVE_MSA 0 +#define HAVE_MSA2 0 #define HAVE_LOONGSON2 0 #define HAVE_LOONGSON3 0 #define HAVE_MMI 0 @@ -125,6 +126,7 @@ #define HAVE_MIPSDSP_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 #define HAVE_MSA_EXTERNAL 0 +#define HAVE_MSA2_EXTERNAL 0 #define HAVE_LOONGSON2_EXTERNAL 0 #define HAVE_LOONGSON3_EXTERNAL 0 #define HAVE_MMI_EXTERNAL 0 @@ -170,6 +172,7 @@ #define HAVE_MIPSDSP_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 #define HAVE_MSA_INLINE 0 +#define HAVE_MSA2_INLINE 0 #define HAVE_LOONGSON2_INLINE 0 #define HAVE_LOONGSON3_INLINE 0 #define HAVE_MMI_INLINE 0 @@ -489,6 +492,7 @@ #define CONFIG_MEDIACODEC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENGL 0 +#define CONFIG_POCKETSPHINX 0 #define CONFIG_VAPOURSYNTH 0 #define CONFIG_ALSA 0 #define CONFIG_APPKIT 0 @@ -941,6 +945,7 @@ #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 #define CONFIG_VP3_DECODER 0 +#define CONFIG_VP4_DECODER 0 #define CONFIG_VP5_DECODER 0 #define CONFIG_VP6_DECODER 0 #define CONFIG_VP6A_DECODER 0 @@ -1619,7 +1624,9 @@ #define CONFIG_ASETTB_FILTER 0 #define CONFIG_ASHOWINFO_FILTER 0 #define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 #define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 #define CONFIG_ASTATS_FILTER 0 #define CONFIG_ASTREAMSELECT_FILTER 0 #define CONFIG_ATEMPO_FILTER 0 @@ -1638,6 +1645,7 @@ #define CONFIG_CROSSFEED_FILTER 0 #define CONFIG_CRYSTALIZER_FILTER 0 #define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DEESSER_FILTER 0 #define CONFIG_DRMETER_FILTER 0 #define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 @@ -1710,6 +1718,7 @@ #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 #define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1737,6 +1746,7 @@ #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DENOISE_VAAPI_FILTER 0 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 #define CONFIG_DESPILL_FILTER 0 #define CONFIG_DETELECINE_FILTER 0 @@ -1823,6 +1833,7 @@ #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 #define CONFIG_NNEDI_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NOISE_FILTER 0 @@ -1942,6 +1953,7 @@ #define CONFIG_WAVEFORM_FILTER 0 #define CONFIG_WEAVE_FILTER 0 #define CONFIG_XBR_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 #define CONFIG_XSTACK_FILTER 0 #define CONFIG_YADIF_FILTER 0 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1978,6 +1990,7 @@ #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWFREQS_FILTER 0 +#define CONFIG_SHOWSPATIAL_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0 #define CONFIG_SHOWVOLUME_FILTER 0 @@ -2091,6 +2104,7 @@ #define CONFIG_IDCIN_DEMUXER 0 #define CONFIG_IDF_DEMUXER 0 #define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IFV_DEMUXER 0 #define CONFIG_ILBC_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/ia32/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/ia32/libavutil/ffversion.h index 5a1ba063f01..e4a455c28f9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/ia32/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/ia32/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" +#define FFMPEG_VERSION "N-95241-g23ca8fd9e6" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/mips64el/config.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/mips64el/config.h index e955d1030b5..703dbe1c468 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/mips64el/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/mips64el/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/hdd1/workspace/chrome2/src/third_party/android_ndk/platforms/android-21/arch-mips64 --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/android_ndk/sysroot/usr/include/mips64el-linux-android --extra-cflags='--target=mips64el-linux-android' --extra-ldflags='--target=mips64el-linux-android' --extra-ldflags='--gcc-toolchain=/hdd1/workspace/chrome2/src/third_party/android_ndk/toolchains/mips64el-linux-android-4.9/prebuilt/linux-x86_64/' --target-os=android --arch=mips64el --enable-mipsfpu --disable-mipsdsp --disable-mipsdspr2 --extra-cflags='-march=mips64el' --extra-ldflags='-z notext' --enable-mips64r6 --extra-cflags='-mcpu=mips64r6' --disable-mips64r2 --enable-msa --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-demuxer=aac --enable-parser=aac --enable-decoder=aac" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/ssd/trunk_blink_tot/src/third_party/android_ndk/platforms/android-21/arch-mips64 --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/android_ndk/sysroot/usr/include/mips64el-linux-android --extra-cflags='--target=mips64el-linux-android' --extra-ldflags='--target=mips64el-linux-android' --extra-ldflags='--gcc-toolchain=/ssd/trunk_blink_tot/src/third_party/android_ndk/toolchains/mips64el-linux-android-4.9/prebuilt/linux-x86_64/' --target-os=android --arch=mips64el --enable-mipsfpu --disable-mipsdsp --disable-mipsdspr2 --extra-cflags='-march=mips64el' --extra-ldflags='-z notext' --enable-mips64r6 --extra-cflags='-mcpu=mips64r6' --disable-mips64r2 --enable-msa --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-demuxer=aac --enable-parser=aac --enable-decoder=aac" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" -#define CC_IDENT "clang version 9.0.0 (trunk 357692)" +#define CC_IDENT "clang version 9.0.0 (https://github.com/llvm/llvm-project/ f7e52fbdb5a7af8ea0808e98458b497125a5eca1)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -80,6 +80,7 @@ #define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR2 0 #define HAVE_MSA 1 +#define HAVE_MSA2 0 #define HAVE_LOONGSON2 0 #define HAVE_LOONGSON3 0 #define HAVE_MMI 0 @@ -125,6 +126,7 @@ #define HAVE_MIPSDSP_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 #define HAVE_MSA_EXTERNAL 0 +#define HAVE_MSA2_EXTERNAL 0 #define HAVE_LOONGSON2_EXTERNAL 0 #define HAVE_LOONGSON3_EXTERNAL 0 #define HAVE_MMI_EXTERNAL 0 @@ -170,6 +172,7 @@ #define HAVE_MIPSDSP_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 #define HAVE_MSA_INLINE 0 +#define HAVE_MSA2_INLINE 0 #define HAVE_LOONGSON2_INLINE 0 #define HAVE_LOONGSON3_INLINE 0 #define HAVE_MMI_INLINE 0 @@ -489,6 +492,7 @@ #define CONFIG_MEDIACODEC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENGL 0 +#define CONFIG_POCKETSPHINX 0 #define CONFIG_VAPOURSYNTH 0 #define CONFIG_ALSA 0 #define CONFIG_APPKIT 0 @@ -941,6 +945,7 @@ #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 #define CONFIG_VP3_DECODER 0 +#define CONFIG_VP4_DECODER 0 #define CONFIG_VP5_DECODER 0 #define CONFIG_VP6_DECODER 0 #define CONFIG_VP6A_DECODER 0 @@ -1619,7 +1624,9 @@ #define CONFIG_ASETTB_FILTER 0 #define CONFIG_ASHOWINFO_FILTER 0 #define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 #define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 #define CONFIG_ASTATS_FILTER 0 #define CONFIG_ASTREAMSELECT_FILTER 0 #define CONFIG_ATEMPO_FILTER 0 @@ -1638,6 +1645,7 @@ #define CONFIG_CROSSFEED_FILTER 0 #define CONFIG_CRYSTALIZER_FILTER 0 #define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DEESSER_FILTER 0 #define CONFIG_DRMETER_FILTER 0 #define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 @@ -1710,6 +1718,7 @@ #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 #define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1737,6 +1746,7 @@ #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DENOISE_VAAPI_FILTER 0 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 #define CONFIG_DESPILL_FILTER 0 #define CONFIG_DETELECINE_FILTER 0 @@ -1823,6 +1833,7 @@ #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 #define CONFIG_NNEDI_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NOISE_FILTER 0 @@ -1942,6 +1953,7 @@ #define CONFIG_WAVEFORM_FILTER 0 #define CONFIG_WEAVE_FILTER 0 #define CONFIG_XBR_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 #define CONFIG_XSTACK_FILTER 0 #define CONFIG_YADIF_FILTER 0 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1978,6 +1990,7 @@ #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWFREQS_FILTER 0 +#define CONFIG_SHOWSPATIAL_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0 #define CONFIG_SHOWVOLUME_FILTER 0 @@ -2091,6 +2104,7 @@ #define CONFIG_IDCIN_DEMUXER 0 #define CONFIG_IDF_DEMUXER 0 #define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IFV_DEMUXER 0 #define CONFIG_ILBC_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/mips64el/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/mips64el/libavutil/ffversion.h index 5a1ba063f01..e4a455c28f9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/mips64el/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/mips64el/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" +#define FFMPEG_VERSION "N-95241-g23ca8fd9e6" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/mipsel/config.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/mipsel/config.h index be3e0fa9fb3..5cf481e5112 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/mipsel/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/mipsel/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/hdd1/workspace/chrome2/src/third_party/android_ndk/platforms/android-16/arch-mips --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/android_ndk/sysroot/usr/include/mipsel-linux-android --extra-cflags='--target=mipsel-linux-android' --extra-ldflags='--target=mipsel-linux-android' --extra-ldflags='--gcc-toolchain=/hdd1/workspace/chrome2/src/third_party/android_ndk/toolchains/mipsel-linux-android-4.9/prebuilt/linux-x86_64/' --target-os=android --arch=mipsel --disable-mips32r6 --disable-mips32r5 --disable-mips32r2 --disable-mipsdsp --disable-mipsdspr2 --disable-msa --enable-mipsfpu --extra-cflags='-march=mipsel' --extra-cflags='-mcpu=mips32' --extra-ldflags='-z notext' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-demuxer=aac --enable-parser=aac --enable-decoder=aac" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/ssd/trunk_blink_tot/src/third_party/android_ndk/platforms/android-16/arch-mips --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/android_ndk/sysroot/usr/include/mipsel-linux-android --extra-cflags='--target=mipsel-linux-android' --extra-ldflags='--target=mipsel-linux-android' --extra-ldflags='--gcc-toolchain=/ssd/trunk_blink_tot/src/third_party/android_ndk/toolchains/mipsel-linux-android-4.9/prebuilt/linux-x86_64/' --target-os=android --arch=mipsel --disable-mips32r6 --disable-mips32r5 --disable-mips32r2 --disable-mipsdsp --disable-mipsdspr2 --disable-msa --enable-mipsfpu --extra-cflags='-march=mipsel' --extra-cflags='-mcpu=mips32' --extra-ldflags='-z notext' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-demuxer=aac --enable-parser=aac --enable-decoder=aac" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" -#define CC_IDENT "clang version 9.0.0 (trunk 357692)" +#define CC_IDENT "clang version 9.0.0 (https://github.com/llvm/llvm-project/ f7e52fbdb5a7af8ea0808e98458b497125a5eca1)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -80,6 +80,7 @@ #define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR2 0 #define HAVE_MSA 0 +#define HAVE_MSA2 0 #define HAVE_LOONGSON2 0 #define HAVE_LOONGSON3 0 #define HAVE_MMI 0 @@ -125,6 +126,7 @@ #define HAVE_MIPSDSP_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 #define HAVE_MSA_EXTERNAL 0 +#define HAVE_MSA2_EXTERNAL 0 #define HAVE_LOONGSON2_EXTERNAL 0 #define HAVE_LOONGSON3_EXTERNAL 0 #define HAVE_MMI_EXTERNAL 0 @@ -170,6 +172,7 @@ #define HAVE_MIPSDSP_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 #define HAVE_MSA_INLINE 0 +#define HAVE_MSA2_INLINE 0 #define HAVE_LOONGSON2_INLINE 0 #define HAVE_LOONGSON3_INLINE 0 #define HAVE_MMI_INLINE 0 @@ -489,6 +492,7 @@ #define CONFIG_MEDIACODEC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENGL 0 +#define CONFIG_POCKETSPHINX 0 #define CONFIG_VAPOURSYNTH 0 #define CONFIG_ALSA 0 #define CONFIG_APPKIT 0 @@ -941,6 +945,7 @@ #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 #define CONFIG_VP3_DECODER 0 +#define CONFIG_VP4_DECODER 0 #define CONFIG_VP5_DECODER 0 #define CONFIG_VP6_DECODER 0 #define CONFIG_VP6A_DECODER 0 @@ -1619,7 +1624,9 @@ #define CONFIG_ASETTB_FILTER 0 #define CONFIG_ASHOWINFO_FILTER 0 #define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 #define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 #define CONFIG_ASTATS_FILTER 0 #define CONFIG_ASTREAMSELECT_FILTER 0 #define CONFIG_ATEMPO_FILTER 0 @@ -1638,6 +1645,7 @@ #define CONFIG_CROSSFEED_FILTER 0 #define CONFIG_CRYSTALIZER_FILTER 0 #define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DEESSER_FILTER 0 #define CONFIG_DRMETER_FILTER 0 #define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 @@ -1710,6 +1718,7 @@ #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 #define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1737,6 +1746,7 @@ #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DENOISE_VAAPI_FILTER 0 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 #define CONFIG_DESPILL_FILTER 0 #define CONFIG_DETELECINE_FILTER 0 @@ -1823,6 +1833,7 @@ #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 #define CONFIG_NNEDI_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NOISE_FILTER 0 @@ -1942,6 +1953,7 @@ #define CONFIG_WAVEFORM_FILTER 0 #define CONFIG_WEAVE_FILTER 0 #define CONFIG_XBR_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 #define CONFIG_XSTACK_FILTER 0 #define CONFIG_YADIF_FILTER 0 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1978,6 +1990,7 @@ #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWFREQS_FILTER 0 +#define CONFIG_SHOWSPATIAL_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0 #define CONFIG_SHOWVOLUME_FILTER 0 @@ -2091,6 +2104,7 @@ #define CONFIG_IDCIN_DEMUXER 0 #define CONFIG_IDF_DEMUXER 0 #define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IFV_DEMUXER 0 #define CONFIG_ILBC_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/mipsel/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/mipsel/libavutil/ffversion.h index 5a1ba063f01..e4a455c28f9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/mipsel/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/mipsel/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" +#define FFMPEG_VERSION "N-95241-g23ca8fd9e6" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/x64/config.asm b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/x64/config.asm index 58fcca6bb67..0e5ffd4b27c 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/x64/config.asm +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/x64/config.asm @@ -65,6 +65,7 @@ %define HAVE_MIPSDSP 0 %define HAVE_MIPSDSPR2 0 %define HAVE_MSA 0 +%define HAVE_MSA2 0 %define HAVE_LOONGSON2 0 %define HAVE_LOONGSON3 0 %define HAVE_MMI 0 @@ -110,6 +111,7 @@ %define HAVE_MIPSDSP_EXTERNAL 0 %define HAVE_MIPSDSPR2_EXTERNAL 0 %define HAVE_MSA_EXTERNAL 0 +%define HAVE_MSA2_EXTERNAL 0 %define HAVE_LOONGSON2_EXTERNAL 0 %define HAVE_LOONGSON3_EXTERNAL 0 %define HAVE_MMI_EXTERNAL 0 @@ -155,6 +157,7 @@ %define HAVE_MIPSDSP_INLINE 0 %define HAVE_MIPSDSPR2_INLINE 0 %define HAVE_MSA_INLINE 0 +%define HAVE_MSA2_INLINE 0 %define HAVE_LOONGSON2_INLINE 0 %define HAVE_LOONGSON3_INLINE 0 %define HAVE_MMI_INLINE 0 @@ -474,6 +477,7 @@ %define CONFIG_MEDIACODEC 0 %define CONFIG_OPENAL 0 %define CONFIG_OPENGL 0 +%define CONFIG_POCKETSPHINX 0 %define CONFIG_VAPOURSYNTH 0 %define CONFIG_ALSA 0 %define CONFIG_APPKIT 0 @@ -926,6 +930,7 @@ %define CONFIG_VMDVIDEO_DECODER 0 %define CONFIG_VMNC_DECODER 0 %define CONFIG_VP3_DECODER 0 +%define CONFIG_VP4_DECODER 0 %define CONFIG_VP5_DECODER 0 %define CONFIG_VP6_DECODER 0 %define CONFIG_VP6A_DECODER 0 @@ -1604,7 +1609,9 @@ %define CONFIG_ASETTB_FILTER 0 %define CONFIG_ASHOWINFO_FILTER 0 %define CONFIG_ASIDEDATA_FILTER 0 +%define CONFIG_ASOFTCLIP_FILTER 0 %define CONFIG_ASPLIT_FILTER 0 +%define CONFIG_ASR_FILTER 0 %define CONFIG_ASTATS_FILTER 0 %define CONFIG_ASTREAMSELECT_FILTER 0 %define CONFIG_ATEMPO_FILTER 0 @@ -1623,6 +1630,7 @@ %define CONFIG_CROSSFEED_FILTER 0 %define CONFIG_CRYSTALIZER_FILTER 0 %define CONFIG_DCSHIFT_FILTER 0 +%define CONFIG_DEESSER_FILTER 0 %define CONFIG_DRMETER_FILTER 0 %define CONFIG_DYNAUDNORM_FILTER 0 %define CONFIG_EARWAX_FILTER 0 @@ -1695,6 +1703,7 @@ %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 %define CONFIG_COLORKEY_OPENCL_FILTER 0 +%define CONFIG_COLORHOLD_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1722,6 +1731,7 @@ %define CONFIG_DEJUDDER_FILTER 0 %define CONFIG_DELOGO_FILTER 0 %define CONFIG_DENOISE_VAAPI_FILTER 0 +%define CONFIG_DERAIN_FILTER 0 %define CONFIG_DESHAKE_FILTER 0 %define CONFIG_DESPILL_FILTER 0 %define CONFIG_DETELECINE_FILTER 0 @@ -1808,6 +1818,7 @@ %define CONFIG_MPDECIMATE_FILTER 0 %define CONFIG_NEGATE_FILTER 0 %define CONFIG_NLMEANS_FILTER 0 +%define CONFIG_NLMEANS_OPENCL_FILTER 0 %define CONFIG_NNEDI_FILTER 0 %define CONFIG_NOFORMAT_FILTER 0 %define CONFIG_NOISE_FILTER 0 @@ -1927,6 +1938,7 @@ %define CONFIG_WAVEFORM_FILTER 0 %define CONFIG_WEAVE_FILTER 0 %define CONFIG_XBR_FILTER 0 +%define CONFIG_XMEDIAN_FILTER 0 %define CONFIG_XSTACK_FILTER 0 %define CONFIG_YADIF_FILTER 0 %define CONFIG_YADIF_CUDA_FILTER 0 @@ -1963,6 +1975,7 @@ %define CONFIG_CONCAT_FILTER 0 %define CONFIG_SHOWCQT_FILTER 0 %define CONFIG_SHOWFREQS_FILTER 0 +%define CONFIG_SHOWSPATIAL_FILTER 0 %define CONFIG_SHOWSPECTRUM_FILTER 0 %define CONFIG_SHOWSPECTRUMPIC_FILTER 0 %define CONFIG_SHOWVOLUME_FILTER 0 @@ -2076,6 +2089,7 @@ %define CONFIG_IDCIN_DEMUXER 0 %define CONFIG_IDF_DEMUXER 0 %define CONFIG_IFF_DEMUXER 0 +%define CONFIG_IFV_DEMUXER 0 %define CONFIG_ILBC_DEMUXER 0 %define CONFIG_IMAGE2_DEMUXER 0 %define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/x64/config.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/x64/config.h index 7686a75810c..005cfda6494 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/x64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/x64/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/hdd1/workspace/chrome2/src/third_party/android_ndk/platforms/android-21/arch-x86_64 --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/android_ndk/sysroot/usr/include/x86_64-linux-android --extra-cflags='--target=x86_64-linux-android' --extra-ldflags='--target=x86_64-linux-android' --extra-ldflags='--gcc-toolchain=/hdd1/workspace/chrome2/src/third_party/android_ndk/toolchains/x86_64-4.9/prebuilt/linux-x86_64/' --target-os=android --arch=x86_64 --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-demuxer=aac --enable-parser=aac --enable-decoder=aac" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/ssd/trunk_blink_tot/src/third_party/android_ndk/platforms/android-21/arch-x86_64 --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/android_ndk/sysroot/usr/include/x86_64-linux-android --extra-cflags='--target=x86_64-linux-android' --extra-ldflags='--target=x86_64-linux-android' --extra-ldflags='--gcc-toolchain=/ssd/trunk_blink_tot/src/third_party/android_ndk/toolchains/x86_64-4.9/prebuilt/linux-x86_64/' --target-os=android --arch=x86_64 --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-demuxer=aac --enable-parser=aac --enable-decoder=aac" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" -#define CC_IDENT "clang version 9.0.0 (trunk 357692)" +#define CC_IDENT "clang version 9.0.0 (https://github.com/llvm/llvm-project/ f7e52fbdb5a7af8ea0808e98458b497125a5eca1)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -80,6 +80,7 @@ #define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR2 0 #define HAVE_MSA 0 +#define HAVE_MSA2 0 #define HAVE_LOONGSON2 0 #define HAVE_LOONGSON3 0 #define HAVE_MMI 0 @@ -125,6 +126,7 @@ #define HAVE_MIPSDSP_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 #define HAVE_MSA_EXTERNAL 0 +#define HAVE_MSA2_EXTERNAL 0 #define HAVE_LOONGSON2_EXTERNAL 0 #define HAVE_LOONGSON3_EXTERNAL 0 #define HAVE_MMI_EXTERNAL 0 @@ -170,6 +172,7 @@ #define HAVE_MIPSDSP_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 #define HAVE_MSA_INLINE 0 +#define HAVE_MSA2_INLINE 0 #define HAVE_LOONGSON2_INLINE 0 #define HAVE_LOONGSON3_INLINE 0 #define HAVE_MMI_INLINE 0 @@ -489,6 +492,7 @@ #define CONFIG_MEDIACODEC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENGL 0 +#define CONFIG_POCKETSPHINX 0 #define CONFIG_VAPOURSYNTH 0 #define CONFIG_ALSA 0 #define CONFIG_APPKIT 0 @@ -941,6 +945,7 @@ #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 #define CONFIG_VP3_DECODER 0 +#define CONFIG_VP4_DECODER 0 #define CONFIG_VP5_DECODER 0 #define CONFIG_VP6_DECODER 0 #define CONFIG_VP6A_DECODER 0 @@ -1619,7 +1624,9 @@ #define CONFIG_ASETTB_FILTER 0 #define CONFIG_ASHOWINFO_FILTER 0 #define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 #define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 #define CONFIG_ASTATS_FILTER 0 #define CONFIG_ASTREAMSELECT_FILTER 0 #define CONFIG_ATEMPO_FILTER 0 @@ -1638,6 +1645,7 @@ #define CONFIG_CROSSFEED_FILTER 0 #define CONFIG_CRYSTALIZER_FILTER 0 #define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DEESSER_FILTER 0 #define CONFIG_DRMETER_FILTER 0 #define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 @@ -1710,6 +1718,7 @@ #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 #define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1737,6 +1746,7 @@ #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DENOISE_VAAPI_FILTER 0 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 #define CONFIG_DESPILL_FILTER 0 #define CONFIG_DETELECINE_FILTER 0 @@ -1823,6 +1833,7 @@ #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 #define CONFIG_NNEDI_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NOISE_FILTER 0 @@ -1942,6 +1953,7 @@ #define CONFIG_WAVEFORM_FILTER 0 #define CONFIG_WEAVE_FILTER 0 #define CONFIG_XBR_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 #define CONFIG_XSTACK_FILTER 0 #define CONFIG_YADIF_FILTER 0 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1978,6 +1990,7 @@ #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWFREQS_FILTER 0 +#define CONFIG_SHOWSPATIAL_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0 #define CONFIG_SHOWVOLUME_FILTER 0 @@ -2091,6 +2104,7 @@ #define CONFIG_IDCIN_DEMUXER 0 #define CONFIG_IDF_DEMUXER 0 #define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IFV_DEMUXER 0 #define CONFIG_ILBC_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/x64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/x64/libavutil/ffversion.h index 5a1ba063f01..e4a455c28f9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/android/x64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/android/x64/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" +#define FFMPEG_VERSION "N-95241-g23ca8fd9e6" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux-noasm/x64/config.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux-noasm/x64/config.h index f0fedc087e5..c142381c12f 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux-noasm/x64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux-noasm/x64/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --disable-asm --disable-inline-asm --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --disable-asm --disable-inline-asm --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" -#define CC_IDENT "clang version 9.0.0 (trunk 357692)" +#define CC_IDENT "clang version 9.0.0 (https://github.com/llvm/llvm-project/ f7e52fbdb5a7af8ea0808e98458b497125a5eca1)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -80,6 +80,7 @@ #define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR2 0 #define HAVE_MSA 0 +#define HAVE_MSA2 0 #define HAVE_LOONGSON2 0 #define HAVE_LOONGSON3 0 #define HAVE_MMI 0 @@ -125,6 +126,7 @@ #define HAVE_MIPSDSP_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 #define HAVE_MSA_EXTERNAL 0 +#define HAVE_MSA2_EXTERNAL 0 #define HAVE_LOONGSON2_EXTERNAL 0 #define HAVE_LOONGSON3_EXTERNAL 0 #define HAVE_MMI_EXTERNAL 0 @@ -170,6 +172,7 @@ #define HAVE_MIPSDSP_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 #define HAVE_MSA_INLINE 0 +#define HAVE_MSA2_INLINE 0 #define HAVE_LOONGSON2_INLINE 0 #define HAVE_LOONGSON3_INLINE 0 #define HAVE_MMI_INLINE 0 @@ -230,7 +233,7 @@ #define HAVE_TERMIOS_H 1 #define HAVE_UDPLITE_H 0 #define HAVE_UNISTD_H 1 -#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 1 -- forced to 0. See https://crbug.com/590440 */ +#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 0 -- forced to 0. See https://crbug.com/590440 */ #define HAVE_WINDOWS_H 0 #define HAVE_WINSOCK2_H 0 #define HAVE_INTRINSICS_NEON 0 @@ -489,6 +492,7 @@ #define CONFIG_MEDIACODEC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENGL 0 +#define CONFIG_POCKETSPHINX 0 #define CONFIG_VAPOURSYNTH 0 #define CONFIG_ALSA 1 #define CONFIG_APPKIT 0 @@ -941,6 +945,7 @@ #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 #define CONFIG_VP3_DECODER 1 +#define CONFIG_VP4_DECODER 0 #define CONFIG_VP5_DECODER 0 #define CONFIG_VP6_DECODER 0 #define CONFIG_VP6A_DECODER 0 @@ -1619,7 +1624,9 @@ #define CONFIG_ASETTB_FILTER 0 #define CONFIG_ASHOWINFO_FILTER 0 #define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 #define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 #define CONFIG_ASTATS_FILTER 0 #define CONFIG_ASTREAMSELECT_FILTER 0 #define CONFIG_ATEMPO_FILTER 0 @@ -1638,6 +1645,7 @@ #define CONFIG_CROSSFEED_FILTER 0 #define CONFIG_CRYSTALIZER_FILTER 0 #define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DEESSER_FILTER 0 #define CONFIG_DRMETER_FILTER 0 #define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 @@ -1710,6 +1718,7 @@ #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 #define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1737,6 +1746,7 @@ #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DENOISE_VAAPI_FILTER 0 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 #define CONFIG_DESPILL_FILTER 0 #define CONFIG_DETELECINE_FILTER 0 @@ -1823,6 +1833,7 @@ #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 #define CONFIG_NNEDI_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NOISE_FILTER 0 @@ -1942,6 +1953,7 @@ #define CONFIG_WAVEFORM_FILTER 0 #define CONFIG_WEAVE_FILTER 0 #define CONFIG_XBR_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 #define CONFIG_XSTACK_FILTER 0 #define CONFIG_YADIF_FILTER 0 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1978,6 +1990,7 @@ #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWFREQS_FILTER 0 +#define CONFIG_SHOWSPATIAL_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0 #define CONFIG_SHOWVOLUME_FILTER 0 @@ -2091,6 +2104,7 @@ #define CONFIG_IDCIN_DEMUXER 0 #define CONFIG_IDF_DEMUXER 0 #define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IFV_DEMUXER 0 #define CONFIG_ILBC_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux-noasm/x64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux-noasm/x64/libavutil/ffversion.h index 5a1ba063f01..e4a455c28f9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux-noasm/x64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux-noasm/x64/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" +#define FFMPEG_VERSION "N-95241-g23ca8fd9e6" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm-neon/config.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm-neon/config.h index fd7f464b35e..0ff88312ff9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm-neon/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm-neon/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --extra-cflags='--target=arm-linux-gnueabihf' --extra-ldflags='--target=arm-linux-gnueabihf' --sysroot=/hdd1/workspace/chrome2/src/build/linux/debian_sid_arm-sysroot --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --extra-cflags=-O2 --enable-neon --extra-cflags='-mfpu=neon' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --extra-cflags='--target=arm-linux-gnueabihf' --extra-ldflags='--target=arm-linux-gnueabihf' --sysroot=/ssd/trunk_blink_tot/src/build/linux/debian_sid_arm-sysroot --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --extra-cflags=-O2 --enable-neon --extra-cflags='-mfpu=neon' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" -#define CC_IDENT "clang version 9.0.0 (trunk 357692)" +#define CC_IDENT "clang version 9.0.0 (https://github.com/llvm/llvm-project/ f7e52fbdb5a7af8ea0808e98458b497125a5eca1)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -80,6 +80,7 @@ #define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR2 0 #define HAVE_MSA 0 +#define HAVE_MSA2 0 #define HAVE_LOONGSON2 0 #define HAVE_LOONGSON3 0 #define HAVE_MMI 0 @@ -125,6 +126,7 @@ #define HAVE_MIPSDSP_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 #define HAVE_MSA_EXTERNAL 0 +#define HAVE_MSA2_EXTERNAL 0 #define HAVE_LOONGSON2_EXTERNAL 0 #define HAVE_LOONGSON3_EXTERNAL 0 #define HAVE_MMI_EXTERNAL 0 @@ -170,6 +172,7 @@ #define HAVE_MIPSDSP_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 #define HAVE_MSA_INLINE 0 +#define HAVE_MSA2_INLINE 0 #define HAVE_LOONGSON2_INLINE 0 #define HAVE_LOONGSON3_INLINE 0 #define HAVE_MMI_INLINE 0 @@ -489,6 +492,7 @@ #define CONFIG_MEDIACODEC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENGL 0 +#define CONFIG_POCKETSPHINX 0 #define CONFIG_VAPOURSYNTH 0 #define CONFIG_ALSA 1 #define CONFIG_APPKIT 0 @@ -941,6 +945,7 @@ #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 #define CONFIG_VP3_DECODER 1 +#define CONFIG_VP4_DECODER 0 #define CONFIG_VP5_DECODER 0 #define CONFIG_VP6_DECODER 0 #define CONFIG_VP6A_DECODER 0 @@ -1619,7 +1624,9 @@ #define CONFIG_ASETTB_FILTER 0 #define CONFIG_ASHOWINFO_FILTER 0 #define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 #define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 #define CONFIG_ASTATS_FILTER 0 #define CONFIG_ASTREAMSELECT_FILTER 0 #define CONFIG_ATEMPO_FILTER 0 @@ -1638,6 +1645,7 @@ #define CONFIG_CROSSFEED_FILTER 0 #define CONFIG_CRYSTALIZER_FILTER 0 #define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DEESSER_FILTER 0 #define CONFIG_DRMETER_FILTER 0 #define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 @@ -1710,6 +1718,7 @@ #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 #define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1737,6 +1746,7 @@ #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DENOISE_VAAPI_FILTER 0 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 #define CONFIG_DESPILL_FILTER 0 #define CONFIG_DETELECINE_FILTER 0 @@ -1823,6 +1833,7 @@ #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 #define CONFIG_NNEDI_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NOISE_FILTER 0 @@ -1942,6 +1953,7 @@ #define CONFIG_WAVEFORM_FILTER 0 #define CONFIG_WEAVE_FILTER 0 #define CONFIG_XBR_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 #define CONFIG_XSTACK_FILTER 0 #define CONFIG_YADIF_FILTER 0 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1978,6 +1990,7 @@ #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWFREQS_FILTER 0 +#define CONFIG_SHOWSPATIAL_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0 #define CONFIG_SHOWVOLUME_FILTER 0 @@ -2091,6 +2104,7 @@ #define CONFIG_IDCIN_DEMUXER 0 #define CONFIG_IDF_DEMUXER 0 #define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IFV_DEMUXER 0 #define CONFIG_ILBC_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm-neon/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm-neon/libavutil/ffversion.h index 5a1ba063f01..e4a455c28f9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm-neon/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm-neon/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" +#define FFMPEG_VERSION "N-95241-g23ca8fd9e6" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm/config.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm/config.h index c18dc573484..38ad8e67919 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --extra-cflags='--target=arm-linux-gnueabihf' --extra-ldflags='--target=arm-linux-gnueabihf' --sysroot=/hdd1/workspace/chrome2/src/build/linux/debian_sid_arm-sysroot --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --extra-cflags=-O2 --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --extra-cflags='--target=arm-linux-gnueabihf' --extra-ldflags='--target=arm-linux-gnueabihf' --sysroot=/ssd/trunk_blink_tot/src/build/linux/debian_sid_arm-sysroot --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --extra-cflags=-O2 --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" -#define CC_IDENT "clang version 9.0.0 (trunk 357692)" +#define CC_IDENT "clang version 9.0.0 (https://github.com/llvm/llvm-project/ f7e52fbdb5a7af8ea0808e98458b497125a5eca1)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -80,6 +80,7 @@ #define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR2 0 #define HAVE_MSA 0 +#define HAVE_MSA2 0 #define HAVE_LOONGSON2 0 #define HAVE_LOONGSON3 0 #define HAVE_MMI 0 @@ -125,6 +126,7 @@ #define HAVE_MIPSDSP_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 #define HAVE_MSA_EXTERNAL 0 +#define HAVE_MSA2_EXTERNAL 0 #define HAVE_LOONGSON2_EXTERNAL 0 #define HAVE_LOONGSON3_EXTERNAL 0 #define HAVE_MMI_EXTERNAL 0 @@ -170,6 +172,7 @@ #define HAVE_MIPSDSP_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 #define HAVE_MSA_INLINE 0 +#define HAVE_MSA2_INLINE 0 #define HAVE_LOONGSON2_INLINE 0 #define HAVE_LOONGSON3_INLINE 0 #define HAVE_MMI_INLINE 0 @@ -489,6 +492,7 @@ #define CONFIG_MEDIACODEC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENGL 0 +#define CONFIG_POCKETSPHINX 0 #define CONFIG_VAPOURSYNTH 0 #define CONFIG_ALSA 1 #define CONFIG_APPKIT 0 @@ -941,6 +945,7 @@ #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 #define CONFIG_VP3_DECODER 1 +#define CONFIG_VP4_DECODER 0 #define CONFIG_VP5_DECODER 0 #define CONFIG_VP6_DECODER 0 #define CONFIG_VP6A_DECODER 0 @@ -1619,7 +1624,9 @@ #define CONFIG_ASETTB_FILTER 0 #define CONFIG_ASHOWINFO_FILTER 0 #define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 #define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 #define CONFIG_ASTATS_FILTER 0 #define CONFIG_ASTREAMSELECT_FILTER 0 #define CONFIG_ATEMPO_FILTER 0 @@ -1638,6 +1645,7 @@ #define CONFIG_CROSSFEED_FILTER 0 #define CONFIG_CRYSTALIZER_FILTER 0 #define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DEESSER_FILTER 0 #define CONFIG_DRMETER_FILTER 0 #define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 @@ -1710,6 +1718,7 @@ #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 #define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1737,6 +1746,7 @@ #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DENOISE_VAAPI_FILTER 0 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 #define CONFIG_DESPILL_FILTER 0 #define CONFIG_DETELECINE_FILTER 0 @@ -1823,6 +1833,7 @@ #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 #define CONFIG_NNEDI_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NOISE_FILTER 0 @@ -1942,6 +1953,7 @@ #define CONFIG_WAVEFORM_FILTER 0 #define CONFIG_WEAVE_FILTER 0 #define CONFIG_XBR_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 #define CONFIG_XSTACK_FILTER 0 #define CONFIG_YADIF_FILTER 0 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1978,6 +1990,7 @@ #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWFREQS_FILTER 0 +#define CONFIG_SHOWSPATIAL_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0 #define CONFIG_SHOWVOLUME_FILTER 0 @@ -2091,6 +2104,7 @@ #define CONFIG_IDCIN_DEMUXER 0 #define CONFIG_IDF_DEMUXER 0 #define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IFV_DEMUXER 0 #define CONFIG_ILBC_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm/libavutil/ffversion.h index 5a1ba063f01..e4a455c28f9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" +#define FFMPEG_VERSION "N-95241-g23ca8fd9e6" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/config.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/config.h index 33943767935..2b9c3666335 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --extra-cflags='--target=aarch64-linux-gnu' --extra-ldflags='--target=aarch64-linux-gnu' --sysroot=/hdd1/workspace/chrome2/src/build/linux/debian_sid_arm64-sysroot --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --extra-cflags='--target=aarch64-linux-gnu' --extra-ldflags='--target=aarch64-linux-gnu' --sysroot=/ssd/trunk_blink_tot/src/build/linux/debian_sid_arm64-sysroot --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" -#define CC_IDENT "clang version 9.0.0 (trunk 357692)" +#define CC_IDENT "clang version 9.0.0 (https://github.com/llvm/llvm-project/ f7e52fbdb5a7af8ea0808e98458b497125a5eca1)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -80,6 +80,7 @@ #define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR2 0 #define HAVE_MSA 0 +#define HAVE_MSA2 0 #define HAVE_LOONGSON2 0 #define HAVE_LOONGSON3 0 #define HAVE_MMI 0 @@ -125,6 +126,7 @@ #define HAVE_MIPSDSP_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 #define HAVE_MSA_EXTERNAL 0 +#define HAVE_MSA2_EXTERNAL 0 #define HAVE_LOONGSON2_EXTERNAL 0 #define HAVE_LOONGSON3_EXTERNAL 0 #define HAVE_MMI_EXTERNAL 0 @@ -170,6 +172,7 @@ #define HAVE_MIPSDSP_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 #define HAVE_MSA_INLINE 0 +#define HAVE_MSA2_INLINE 0 #define HAVE_LOONGSON2_INLINE 0 #define HAVE_LOONGSON3_INLINE 0 #define HAVE_MMI_INLINE 0 @@ -489,6 +492,7 @@ #define CONFIG_MEDIACODEC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENGL 0 +#define CONFIG_POCKETSPHINX 0 #define CONFIG_VAPOURSYNTH 0 #define CONFIG_ALSA 1 #define CONFIG_APPKIT 0 @@ -941,6 +945,7 @@ #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 #define CONFIG_VP3_DECODER 1 +#define CONFIG_VP4_DECODER 0 #define CONFIG_VP5_DECODER 0 #define CONFIG_VP6_DECODER 0 #define CONFIG_VP6A_DECODER 0 @@ -1619,7 +1624,9 @@ #define CONFIG_ASETTB_FILTER 0 #define CONFIG_ASHOWINFO_FILTER 0 #define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 #define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 #define CONFIG_ASTATS_FILTER 0 #define CONFIG_ASTREAMSELECT_FILTER 0 #define CONFIG_ATEMPO_FILTER 0 @@ -1638,6 +1645,7 @@ #define CONFIG_CROSSFEED_FILTER 0 #define CONFIG_CRYSTALIZER_FILTER 0 #define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DEESSER_FILTER 0 #define CONFIG_DRMETER_FILTER 0 #define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 @@ -1710,6 +1718,7 @@ #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 #define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1737,6 +1746,7 @@ #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DENOISE_VAAPI_FILTER 0 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 #define CONFIG_DESPILL_FILTER 0 #define CONFIG_DETELECINE_FILTER 0 @@ -1823,6 +1833,7 @@ #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 #define CONFIG_NNEDI_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NOISE_FILTER 0 @@ -1942,6 +1953,7 @@ #define CONFIG_WAVEFORM_FILTER 0 #define CONFIG_WEAVE_FILTER 0 #define CONFIG_XBR_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 #define CONFIG_XSTACK_FILTER 0 #define CONFIG_YADIF_FILTER 0 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1978,6 +1990,7 @@ #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWFREQS_FILTER 0 +#define CONFIG_SHOWSPATIAL_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0 #define CONFIG_SHOWVOLUME_FILTER 0 @@ -2091,6 +2104,7 @@ #define CONFIG_IDCIN_DEMUXER 0 #define CONFIG_IDF_DEMUXER 0 #define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IFV_DEMUXER 0 #define CONFIG_ILBC_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/libavutil/ffversion.h index 5a1ba063f01..e4a455c28f9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" +#define FFMPEG_VERSION "N-95241-g23ca8fd9e6" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/ia32/config.asm b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/ia32/config.asm index 935ec9e9fb6..8b79a515b9b 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/ia32/config.asm +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/ia32/config.asm @@ -65,6 +65,7 @@ %define HAVE_MIPSDSP 0 %define HAVE_MIPSDSPR2 0 %define HAVE_MSA 0 +%define HAVE_MSA2 0 %define HAVE_LOONGSON2 0 %define HAVE_LOONGSON3 0 %define HAVE_MMI 0 @@ -110,6 +111,7 @@ %define HAVE_MIPSDSP_EXTERNAL 0 %define HAVE_MIPSDSPR2_EXTERNAL 0 %define HAVE_MSA_EXTERNAL 0 +%define HAVE_MSA2_EXTERNAL 0 %define HAVE_LOONGSON2_EXTERNAL 0 %define HAVE_LOONGSON3_EXTERNAL 0 %define HAVE_MMI_EXTERNAL 0 @@ -155,6 +157,7 @@ %define HAVE_MIPSDSP_INLINE 0 %define HAVE_MIPSDSPR2_INLINE 0 %define HAVE_MSA_INLINE 0 +%define HAVE_MSA2_INLINE 0 %define HAVE_LOONGSON2_INLINE 0 %define HAVE_LOONGSON3_INLINE 0 %define HAVE_MMI_INLINE 0 @@ -215,7 +218,7 @@ %define HAVE_TERMIOS_H 1 %define HAVE_UDPLITE_H 0 %define HAVE_UNISTD_H 1 -%define HAVE_VALGRIND_VALGRIND_H 1 +%define HAVE_VALGRIND_VALGRIND_H 0 %define HAVE_WINDOWS_H 0 %define HAVE_WINSOCK2_H 0 %define HAVE_INTRINSICS_NEON 0 @@ -474,6 +477,7 @@ %define CONFIG_MEDIACODEC 0 %define CONFIG_OPENAL 0 %define CONFIG_OPENGL 0 +%define CONFIG_POCKETSPHINX 0 %define CONFIG_VAPOURSYNTH 0 %define CONFIG_ALSA 0 %define CONFIG_APPKIT 0 @@ -926,6 +930,7 @@ %define CONFIG_VMDVIDEO_DECODER 0 %define CONFIG_VMNC_DECODER 0 %define CONFIG_VP3_DECODER 1 +%define CONFIG_VP4_DECODER 0 %define CONFIG_VP5_DECODER 0 %define CONFIG_VP6_DECODER 0 %define CONFIG_VP6A_DECODER 0 @@ -1604,7 +1609,9 @@ %define CONFIG_ASETTB_FILTER 0 %define CONFIG_ASHOWINFO_FILTER 0 %define CONFIG_ASIDEDATA_FILTER 0 +%define CONFIG_ASOFTCLIP_FILTER 0 %define CONFIG_ASPLIT_FILTER 0 +%define CONFIG_ASR_FILTER 0 %define CONFIG_ASTATS_FILTER 0 %define CONFIG_ASTREAMSELECT_FILTER 0 %define CONFIG_ATEMPO_FILTER 0 @@ -1623,6 +1630,7 @@ %define CONFIG_CROSSFEED_FILTER 0 %define CONFIG_CRYSTALIZER_FILTER 0 %define CONFIG_DCSHIFT_FILTER 0 +%define CONFIG_DEESSER_FILTER 0 %define CONFIG_DRMETER_FILTER 0 %define CONFIG_DYNAUDNORM_FILTER 0 %define CONFIG_EARWAX_FILTER 0 @@ -1695,6 +1703,7 @@ %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 %define CONFIG_COLORKEY_OPENCL_FILTER 0 +%define CONFIG_COLORHOLD_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1722,6 +1731,7 @@ %define CONFIG_DEJUDDER_FILTER 0 %define CONFIG_DELOGO_FILTER 0 %define CONFIG_DENOISE_VAAPI_FILTER 0 +%define CONFIG_DERAIN_FILTER 0 %define CONFIG_DESHAKE_FILTER 0 %define CONFIG_DESPILL_FILTER 0 %define CONFIG_DETELECINE_FILTER 0 @@ -1808,6 +1818,7 @@ %define CONFIG_MPDECIMATE_FILTER 0 %define CONFIG_NEGATE_FILTER 0 %define CONFIG_NLMEANS_FILTER 0 +%define CONFIG_NLMEANS_OPENCL_FILTER 0 %define CONFIG_NNEDI_FILTER 0 %define CONFIG_NOFORMAT_FILTER 0 %define CONFIG_NOISE_FILTER 0 @@ -1927,6 +1938,7 @@ %define CONFIG_WAVEFORM_FILTER 0 %define CONFIG_WEAVE_FILTER 0 %define CONFIG_XBR_FILTER 0 +%define CONFIG_XMEDIAN_FILTER 0 %define CONFIG_XSTACK_FILTER 0 %define CONFIG_YADIF_FILTER 0 %define CONFIG_YADIF_CUDA_FILTER 0 @@ -1963,6 +1975,7 @@ %define CONFIG_CONCAT_FILTER 0 %define CONFIG_SHOWCQT_FILTER 0 %define CONFIG_SHOWFREQS_FILTER 0 +%define CONFIG_SHOWSPATIAL_FILTER 0 %define CONFIG_SHOWSPECTRUM_FILTER 0 %define CONFIG_SHOWSPECTRUMPIC_FILTER 0 %define CONFIG_SHOWVOLUME_FILTER 0 @@ -2076,6 +2089,7 @@ %define CONFIG_IDCIN_DEMUXER 0 %define CONFIG_IDF_DEMUXER 0 %define CONFIG_IFF_DEMUXER 0 +%define CONFIG_IFV_DEMUXER 0 %define CONFIG_ILBC_DEMUXER 0 %define CONFIG_IMAGE2_DEMUXER 0 %define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/ia32/config.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/ia32/config.h index 2e53dd1e412..f1e466f697c 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/ia32/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/ia32/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" -#define CC_IDENT "clang version 9.0.0 (trunk 357692)" +#define CC_IDENT "clang version 9.0.0 (https://github.com/llvm/llvm-project/ f7e52fbdb5a7af8ea0808e98458b497125a5eca1)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -80,6 +80,7 @@ #define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR2 0 #define HAVE_MSA 0 +#define HAVE_MSA2 0 #define HAVE_LOONGSON2 0 #define HAVE_LOONGSON3 0 #define HAVE_MMI 0 @@ -125,6 +126,7 @@ #define HAVE_MIPSDSP_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 #define HAVE_MSA_EXTERNAL 0 +#define HAVE_MSA2_EXTERNAL 0 #define HAVE_LOONGSON2_EXTERNAL 0 #define HAVE_LOONGSON3_EXTERNAL 0 #define HAVE_MMI_EXTERNAL 0 @@ -170,6 +172,7 @@ #define HAVE_MIPSDSP_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 #define HAVE_MSA_INLINE 0 +#define HAVE_MSA2_INLINE 0 #define HAVE_LOONGSON2_INLINE 0 #define HAVE_LOONGSON3_INLINE 0 #define HAVE_MMI_INLINE 0 @@ -230,7 +233,7 @@ #define HAVE_TERMIOS_H 1 #define HAVE_UDPLITE_H 0 #define HAVE_UNISTD_H 1 -#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 1 -- forced to 0. See https://crbug.com/590440 */ +#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 0 -- forced to 0. See https://crbug.com/590440 */ #define HAVE_WINDOWS_H 0 #define HAVE_WINSOCK2_H 0 #define HAVE_INTRINSICS_NEON 0 @@ -489,6 +492,7 @@ #define CONFIG_MEDIACODEC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENGL 0 +#define CONFIG_POCKETSPHINX 0 #define CONFIG_VAPOURSYNTH 0 #define CONFIG_ALSA 0 #define CONFIG_APPKIT 0 @@ -941,6 +945,7 @@ #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 #define CONFIG_VP3_DECODER 1 +#define CONFIG_VP4_DECODER 0 #define CONFIG_VP5_DECODER 0 #define CONFIG_VP6_DECODER 0 #define CONFIG_VP6A_DECODER 0 @@ -1619,7 +1624,9 @@ #define CONFIG_ASETTB_FILTER 0 #define CONFIG_ASHOWINFO_FILTER 0 #define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 #define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 #define CONFIG_ASTATS_FILTER 0 #define CONFIG_ASTREAMSELECT_FILTER 0 #define CONFIG_ATEMPO_FILTER 0 @@ -1638,6 +1645,7 @@ #define CONFIG_CROSSFEED_FILTER 0 #define CONFIG_CRYSTALIZER_FILTER 0 #define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DEESSER_FILTER 0 #define CONFIG_DRMETER_FILTER 0 #define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 @@ -1710,6 +1718,7 @@ #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 #define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1737,6 +1746,7 @@ #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DENOISE_VAAPI_FILTER 0 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 #define CONFIG_DESPILL_FILTER 0 #define CONFIG_DETELECINE_FILTER 0 @@ -1823,6 +1833,7 @@ #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 #define CONFIG_NNEDI_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NOISE_FILTER 0 @@ -1942,6 +1953,7 @@ #define CONFIG_WAVEFORM_FILTER 0 #define CONFIG_WEAVE_FILTER 0 #define CONFIG_XBR_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 #define CONFIG_XSTACK_FILTER 0 #define CONFIG_YADIF_FILTER 0 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1978,6 +1990,7 @@ #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWFREQS_FILTER 0 +#define CONFIG_SHOWSPATIAL_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0 #define CONFIG_SHOWVOLUME_FILTER 0 @@ -2091,6 +2104,7 @@ #define CONFIG_IDCIN_DEMUXER 0 #define CONFIG_IDF_DEMUXER 0 #define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IFV_DEMUXER 0 #define CONFIG_ILBC_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/ia32/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/ia32/libavutil/ffversion.h index 5a1ba063f01..e4a455c28f9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/ia32/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/ia32/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" +#define FFMPEG_VERSION "N-95241-g23ca8fd9e6" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/mips64el/config.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/mips64el/config.h index 2e517a6668e..e58a813280a 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/mips64el/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/mips64el/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=mips64el --enable-mipsfpu --disable-mipsdsp --disable-mipsdspr2 --extra-cflags='-march=mips64el' --extra-ldflags='-z notext' --enable-cross-compile --target-os=linux --sysroot=/hdd1/workspace/chrome2/src/build/linux/debian_sid_mips64el-sysroot --enable-mips64r2 --disable-mips64r6 --disable-msa --extra-cflags='-mcpu=mips64r2' --extra-cflags='--target=mips64el-linux-gnuabi64' --extra-ldflags='--target=mips64el-linux-gnuabi64' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=mips64el --enable-mipsfpu --disable-mipsdsp --disable-mipsdspr2 --extra-cflags='-march=mips64el' --extra-ldflags='-z notext' --enable-cross-compile --target-os=linux --sysroot=/ssd/trunk_blink_tot/src/build/linux/debian_sid_mips64el-sysroot --enable-mips64r2 --disable-mips64r6 --disable-msa --extra-cflags='-mcpu=mips64r2' --extra-cflags='--target=mips64el-linux-gnuabi64' --extra-ldflags='--target=mips64el-linux-gnuabi64' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" -#define CC_IDENT "clang version 9.0.0 (trunk 357692)" +#define CC_IDENT "clang version 9.0.0 (https://github.com/llvm/llvm-project/ f7e52fbdb5a7af8ea0808e98458b497125a5eca1)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -80,6 +80,7 @@ #define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR2 0 #define HAVE_MSA 0 +#define HAVE_MSA2 0 #define HAVE_LOONGSON2 0 #define HAVE_LOONGSON3 0 #define HAVE_MMI 0 @@ -125,6 +126,7 @@ #define HAVE_MIPSDSP_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 #define HAVE_MSA_EXTERNAL 0 +#define HAVE_MSA2_EXTERNAL 0 #define HAVE_LOONGSON2_EXTERNAL 0 #define HAVE_LOONGSON3_EXTERNAL 0 #define HAVE_MMI_EXTERNAL 0 @@ -170,6 +172,7 @@ #define HAVE_MIPSDSP_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 #define HAVE_MSA_INLINE 0 +#define HAVE_MSA2_INLINE 0 #define HAVE_LOONGSON2_INLINE 0 #define HAVE_LOONGSON3_INLINE 0 #define HAVE_MMI_INLINE 0 @@ -489,6 +492,7 @@ #define CONFIG_MEDIACODEC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENGL 0 +#define CONFIG_POCKETSPHINX 0 #define CONFIG_VAPOURSYNTH 0 #define CONFIG_ALSA 1 #define CONFIG_APPKIT 0 @@ -941,6 +945,7 @@ #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 #define CONFIG_VP3_DECODER 1 +#define CONFIG_VP4_DECODER 0 #define CONFIG_VP5_DECODER 0 #define CONFIG_VP6_DECODER 0 #define CONFIG_VP6A_DECODER 0 @@ -1619,7 +1624,9 @@ #define CONFIG_ASETTB_FILTER 0 #define CONFIG_ASHOWINFO_FILTER 0 #define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 #define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 #define CONFIG_ASTATS_FILTER 0 #define CONFIG_ASTREAMSELECT_FILTER 0 #define CONFIG_ATEMPO_FILTER 0 @@ -1638,6 +1645,7 @@ #define CONFIG_CROSSFEED_FILTER 0 #define CONFIG_CRYSTALIZER_FILTER 0 #define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DEESSER_FILTER 0 #define CONFIG_DRMETER_FILTER 0 #define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 @@ -1710,6 +1718,7 @@ #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 #define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1737,6 +1746,7 @@ #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DENOISE_VAAPI_FILTER 0 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 #define CONFIG_DESPILL_FILTER 0 #define CONFIG_DETELECINE_FILTER 0 @@ -1823,6 +1833,7 @@ #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 #define CONFIG_NNEDI_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NOISE_FILTER 0 @@ -1942,6 +1953,7 @@ #define CONFIG_WAVEFORM_FILTER 0 #define CONFIG_WEAVE_FILTER 0 #define CONFIG_XBR_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 #define CONFIG_XSTACK_FILTER 0 #define CONFIG_YADIF_FILTER 0 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1978,6 +1990,7 @@ #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWFREQS_FILTER 0 +#define CONFIG_SHOWSPATIAL_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0 #define CONFIG_SHOWVOLUME_FILTER 0 @@ -2091,6 +2104,7 @@ #define CONFIG_IDCIN_DEMUXER 0 #define CONFIG_IDF_DEMUXER 0 #define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IFV_DEMUXER 0 #define CONFIG_ILBC_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/mips64el/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/mips64el/libavutil/ffversion.h index 5a1ba063f01..e4a455c28f9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/mips64el/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/mips64el/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" +#define FFMPEG_VERSION "N-95241-g23ca8fd9e6" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/mipsel/config.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/mipsel/config.h index 1bd05e000e4..983a4fc5cef 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/mipsel/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/mipsel/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=mipsel --disable-mips32r6 --disable-mips32r5 --disable-mips32r2 --disable-mipsdsp --disable-mipsdspr2 --disable-msa --enable-mipsfpu --extra-cflags='-march=mipsel' --extra-cflags='-mcpu=mips32' --extra-ldflags='-z notext' --enable-cross-compile --target-os=linux --sysroot=/hdd1/workspace/chrome2/src/build/linux/debian_sid_mips-sysroot --extra-cflags='--target=mipsel-linux-gnu' --extra-ldflags='--target=mipsel-linux-gnu' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=mipsel --disable-mips32r6 --disable-mips32r5 --disable-mips32r2 --disable-mipsdsp --disable-mipsdspr2 --disable-msa --enable-mipsfpu --extra-cflags='-march=mipsel' --extra-cflags='-mcpu=mips32' --extra-ldflags='-z notext' --enable-cross-compile --target-os=linux --sysroot=/ssd/trunk_blink_tot/src/build/linux/debian_sid_mips-sysroot --extra-cflags='--target=mipsel-linux-gnu' --extra-ldflags='--target=mipsel-linux-gnu' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" -#define CC_IDENT "clang version 9.0.0 (trunk 357692)" +#define CC_IDENT "clang version 9.0.0 (https://github.com/llvm/llvm-project/ f7e52fbdb5a7af8ea0808e98458b497125a5eca1)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -80,6 +80,7 @@ #define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR2 0 #define HAVE_MSA 0 +#define HAVE_MSA2 0 #define HAVE_LOONGSON2 0 #define HAVE_LOONGSON3 0 #define HAVE_MMI 0 @@ -125,6 +126,7 @@ #define HAVE_MIPSDSP_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 #define HAVE_MSA_EXTERNAL 0 +#define HAVE_MSA2_EXTERNAL 0 #define HAVE_LOONGSON2_EXTERNAL 0 #define HAVE_LOONGSON3_EXTERNAL 0 #define HAVE_MMI_EXTERNAL 0 @@ -170,6 +172,7 @@ #define HAVE_MIPSDSP_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 #define HAVE_MSA_INLINE 0 +#define HAVE_MSA2_INLINE 0 #define HAVE_LOONGSON2_INLINE 0 #define HAVE_LOONGSON3_INLINE 0 #define HAVE_MMI_INLINE 0 @@ -489,6 +492,7 @@ #define CONFIG_MEDIACODEC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENGL 0 +#define CONFIG_POCKETSPHINX 0 #define CONFIG_VAPOURSYNTH 0 #define CONFIG_ALSA 1 #define CONFIG_APPKIT 0 @@ -941,6 +945,7 @@ #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 #define CONFIG_VP3_DECODER 1 +#define CONFIG_VP4_DECODER 0 #define CONFIG_VP5_DECODER 0 #define CONFIG_VP6_DECODER 0 #define CONFIG_VP6A_DECODER 0 @@ -1619,7 +1624,9 @@ #define CONFIG_ASETTB_FILTER 0 #define CONFIG_ASHOWINFO_FILTER 0 #define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 #define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 #define CONFIG_ASTATS_FILTER 0 #define CONFIG_ASTREAMSELECT_FILTER 0 #define CONFIG_ATEMPO_FILTER 0 @@ -1638,6 +1645,7 @@ #define CONFIG_CROSSFEED_FILTER 0 #define CONFIG_CRYSTALIZER_FILTER 0 #define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DEESSER_FILTER 0 #define CONFIG_DRMETER_FILTER 0 #define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 @@ -1710,6 +1718,7 @@ #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 #define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1737,6 +1746,7 @@ #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DENOISE_VAAPI_FILTER 0 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 #define CONFIG_DESPILL_FILTER 0 #define CONFIG_DETELECINE_FILTER 0 @@ -1823,6 +1833,7 @@ #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 #define CONFIG_NNEDI_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NOISE_FILTER 0 @@ -1942,6 +1953,7 @@ #define CONFIG_WAVEFORM_FILTER 0 #define CONFIG_WEAVE_FILTER 0 #define CONFIG_XBR_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 #define CONFIG_XSTACK_FILTER 0 #define CONFIG_YADIF_FILTER 0 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1978,6 +1990,7 @@ #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWFREQS_FILTER 0 +#define CONFIG_SHOWSPATIAL_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0 #define CONFIG_SHOWVOLUME_FILTER 0 @@ -2091,6 +2104,7 @@ #define CONFIG_IDCIN_DEMUXER 0 #define CONFIG_IDF_DEMUXER 0 #define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IFV_DEMUXER 0 #define CONFIG_ILBC_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/mipsel/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/mipsel/libavutil/ffversion.h index 5a1ba063f01..e4a455c28f9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/mipsel/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/mipsel/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" +#define FFMPEG_VERSION "N-95241-g23ca8fd9e6" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/x64/config.asm b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/x64/config.asm index cb825f8ad88..0bdaad93876 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/x64/config.asm +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/x64/config.asm @@ -65,6 +65,7 @@ %define HAVE_MIPSDSP 0 %define HAVE_MIPSDSPR2 0 %define HAVE_MSA 0 +%define HAVE_MSA2 0 %define HAVE_LOONGSON2 0 %define HAVE_LOONGSON3 0 %define HAVE_MMI 0 @@ -110,6 +111,7 @@ %define HAVE_MIPSDSP_EXTERNAL 0 %define HAVE_MIPSDSPR2_EXTERNAL 0 %define HAVE_MSA_EXTERNAL 0 +%define HAVE_MSA2_EXTERNAL 0 %define HAVE_LOONGSON2_EXTERNAL 0 %define HAVE_LOONGSON3_EXTERNAL 0 %define HAVE_MMI_EXTERNAL 0 @@ -155,6 +157,7 @@ %define HAVE_MIPSDSP_INLINE 0 %define HAVE_MIPSDSPR2_INLINE 0 %define HAVE_MSA_INLINE 0 +%define HAVE_MSA2_INLINE 0 %define HAVE_LOONGSON2_INLINE 0 %define HAVE_LOONGSON3_INLINE 0 %define HAVE_MMI_INLINE 0 @@ -215,7 +218,7 @@ %define HAVE_TERMIOS_H 1 %define HAVE_UDPLITE_H 0 %define HAVE_UNISTD_H 1 -%define HAVE_VALGRIND_VALGRIND_H 1 +%define HAVE_VALGRIND_VALGRIND_H 0 %define HAVE_WINDOWS_H 0 %define HAVE_WINSOCK2_H 0 %define HAVE_INTRINSICS_NEON 0 @@ -474,6 +477,7 @@ %define CONFIG_MEDIACODEC 0 %define CONFIG_OPENAL 0 %define CONFIG_OPENGL 0 +%define CONFIG_POCKETSPHINX 0 %define CONFIG_VAPOURSYNTH 0 %define CONFIG_ALSA 1 %define CONFIG_APPKIT 0 @@ -926,6 +930,7 @@ %define CONFIG_VMDVIDEO_DECODER 0 %define CONFIG_VMNC_DECODER 0 %define CONFIG_VP3_DECODER 1 +%define CONFIG_VP4_DECODER 0 %define CONFIG_VP5_DECODER 0 %define CONFIG_VP6_DECODER 0 %define CONFIG_VP6A_DECODER 0 @@ -1604,7 +1609,9 @@ %define CONFIG_ASETTB_FILTER 0 %define CONFIG_ASHOWINFO_FILTER 0 %define CONFIG_ASIDEDATA_FILTER 0 +%define CONFIG_ASOFTCLIP_FILTER 0 %define CONFIG_ASPLIT_FILTER 0 +%define CONFIG_ASR_FILTER 0 %define CONFIG_ASTATS_FILTER 0 %define CONFIG_ASTREAMSELECT_FILTER 0 %define CONFIG_ATEMPO_FILTER 0 @@ -1623,6 +1630,7 @@ %define CONFIG_CROSSFEED_FILTER 0 %define CONFIG_CRYSTALIZER_FILTER 0 %define CONFIG_DCSHIFT_FILTER 0 +%define CONFIG_DEESSER_FILTER 0 %define CONFIG_DRMETER_FILTER 0 %define CONFIG_DYNAUDNORM_FILTER 0 %define CONFIG_EARWAX_FILTER 0 @@ -1695,6 +1703,7 @@ %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 %define CONFIG_COLORKEY_OPENCL_FILTER 0 +%define CONFIG_COLORHOLD_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1722,6 +1731,7 @@ %define CONFIG_DEJUDDER_FILTER 0 %define CONFIG_DELOGO_FILTER 0 %define CONFIG_DENOISE_VAAPI_FILTER 0 +%define CONFIG_DERAIN_FILTER 0 %define CONFIG_DESHAKE_FILTER 0 %define CONFIG_DESPILL_FILTER 0 %define CONFIG_DETELECINE_FILTER 0 @@ -1808,6 +1818,7 @@ %define CONFIG_MPDECIMATE_FILTER 0 %define CONFIG_NEGATE_FILTER 0 %define CONFIG_NLMEANS_FILTER 0 +%define CONFIG_NLMEANS_OPENCL_FILTER 0 %define CONFIG_NNEDI_FILTER 0 %define CONFIG_NOFORMAT_FILTER 0 %define CONFIG_NOISE_FILTER 0 @@ -1927,6 +1938,7 @@ %define CONFIG_WAVEFORM_FILTER 0 %define CONFIG_WEAVE_FILTER 0 %define CONFIG_XBR_FILTER 0 +%define CONFIG_XMEDIAN_FILTER 0 %define CONFIG_XSTACK_FILTER 0 %define CONFIG_YADIF_FILTER 0 %define CONFIG_YADIF_CUDA_FILTER 0 @@ -1963,6 +1975,7 @@ %define CONFIG_CONCAT_FILTER 0 %define CONFIG_SHOWCQT_FILTER 0 %define CONFIG_SHOWFREQS_FILTER 0 +%define CONFIG_SHOWSPATIAL_FILTER 0 %define CONFIG_SHOWSPECTRUM_FILTER 0 %define CONFIG_SHOWSPECTRUMPIC_FILTER 0 %define CONFIG_SHOWVOLUME_FILTER 0 @@ -2076,6 +2089,7 @@ %define CONFIG_IDCIN_DEMUXER 0 %define CONFIG_IDF_DEMUXER 0 %define CONFIG_IFF_DEMUXER 0 +%define CONFIG_IFV_DEMUXER 0 %define CONFIG_ILBC_DEMUXER 0 %define CONFIG_IMAGE2_DEMUXER 0 %define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/x64/config.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/x64/config.h index 7b2827efd22..22aa9bb6bff 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/x64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/x64/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" -#define CC_IDENT "clang version 9.0.0 (trunk 357692)" +#define CC_IDENT "clang version 9.0.0 (https://github.com/llvm/llvm-project/ f7e52fbdb5a7af8ea0808e98458b497125a5eca1)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -80,6 +80,7 @@ #define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR2 0 #define HAVE_MSA 0 +#define HAVE_MSA2 0 #define HAVE_LOONGSON2 0 #define HAVE_LOONGSON3 0 #define HAVE_MMI 0 @@ -125,6 +126,7 @@ #define HAVE_MIPSDSP_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 #define HAVE_MSA_EXTERNAL 0 +#define HAVE_MSA2_EXTERNAL 0 #define HAVE_LOONGSON2_EXTERNAL 0 #define HAVE_LOONGSON3_EXTERNAL 0 #define HAVE_MMI_EXTERNAL 0 @@ -170,6 +172,7 @@ #define HAVE_MIPSDSP_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 #define HAVE_MSA_INLINE 0 +#define HAVE_MSA2_INLINE 0 #define HAVE_LOONGSON2_INLINE 0 #define HAVE_LOONGSON3_INLINE 0 #define HAVE_MMI_INLINE 0 @@ -230,7 +233,7 @@ #define HAVE_TERMIOS_H 1 #define HAVE_UDPLITE_H 0 #define HAVE_UNISTD_H 1 -#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 1 -- forced to 0. See https://crbug.com/590440 */ +#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 0 -- forced to 0. See https://crbug.com/590440 */ #define HAVE_WINDOWS_H 0 #define HAVE_WINSOCK2_H 0 #define HAVE_INTRINSICS_NEON 0 @@ -489,6 +492,7 @@ #define CONFIG_MEDIACODEC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENGL 0 +#define CONFIG_POCKETSPHINX 0 #define CONFIG_VAPOURSYNTH 0 #define CONFIG_ALSA 1 #define CONFIG_APPKIT 0 @@ -941,6 +945,7 @@ #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 #define CONFIG_VP3_DECODER 1 +#define CONFIG_VP4_DECODER 0 #define CONFIG_VP5_DECODER 0 #define CONFIG_VP6_DECODER 0 #define CONFIG_VP6A_DECODER 0 @@ -1619,7 +1624,9 @@ #define CONFIG_ASETTB_FILTER 0 #define CONFIG_ASHOWINFO_FILTER 0 #define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 #define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 #define CONFIG_ASTATS_FILTER 0 #define CONFIG_ASTREAMSELECT_FILTER 0 #define CONFIG_ATEMPO_FILTER 0 @@ -1638,6 +1645,7 @@ #define CONFIG_CROSSFEED_FILTER 0 #define CONFIG_CRYSTALIZER_FILTER 0 #define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DEESSER_FILTER 0 #define CONFIG_DRMETER_FILTER 0 #define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 @@ -1710,6 +1718,7 @@ #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 #define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1737,6 +1746,7 @@ #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DENOISE_VAAPI_FILTER 0 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 #define CONFIG_DESPILL_FILTER 0 #define CONFIG_DETELECINE_FILTER 0 @@ -1823,6 +1833,7 @@ #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 #define CONFIG_NNEDI_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NOISE_FILTER 0 @@ -1942,6 +1953,7 @@ #define CONFIG_WAVEFORM_FILTER 0 #define CONFIG_WEAVE_FILTER 0 #define CONFIG_XBR_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 #define CONFIG_XSTACK_FILTER 0 #define CONFIG_YADIF_FILTER 0 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1978,6 +1990,7 @@ #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWFREQS_FILTER 0 +#define CONFIG_SHOWSPATIAL_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0 #define CONFIG_SHOWVOLUME_FILTER 0 @@ -2091,6 +2104,7 @@ #define CONFIG_IDCIN_DEMUXER 0 #define CONFIG_IDF_DEMUXER 0 #define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IFV_DEMUXER 0 #define CONFIG_ILBC_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/x64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/x64/libavutil/ffversion.h index 5a1ba063f01..e4a455c28f9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/x64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/x64/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" +#define FFMPEG_VERSION "N-95241-g23ca8fd9e6" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/mac/x64/config.asm b/chromium/third_party/ffmpeg/chromium/config/Chrome/mac/x64/config.asm index 1a8d6c5abac..a56597e0694 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/mac/x64/config.asm +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/mac/x64/config.asm @@ -65,6 +65,7 @@ %define HAVE_MIPSDSP 0 %define HAVE_MIPSDSPR2 0 %define HAVE_MSA 0 +%define HAVE_MSA2 0 %define HAVE_LOONGSON2 0 %define HAVE_LOONGSON3 0 %define HAVE_MMI 0 @@ -110,6 +111,7 @@ %define HAVE_MIPSDSP_EXTERNAL 0 %define HAVE_MIPSDSPR2_EXTERNAL 0 %define HAVE_MSA_EXTERNAL 0 +%define HAVE_MSA2_EXTERNAL 0 %define HAVE_LOONGSON2_EXTERNAL 0 %define HAVE_LOONGSON3_EXTERNAL 0 %define HAVE_MMI_EXTERNAL 0 @@ -155,6 +157,7 @@ %define HAVE_MIPSDSP_INLINE 0 %define HAVE_MIPSDSPR2_INLINE 0 %define HAVE_MSA_INLINE 0 +%define HAVE_MSA2_INLINE 0 %define HAVE_LOONGSON2_INLINE 0 %define HAVE_LOONGSON3_INLINE 0 %define HAVE_MMI_INLINE 0 @@ -474,6 +477,7 @@ %define CONFIG_MEDIACODEC 0 %define CONFIG_OPENAL 0 %define CONFIG_OPENGL 0 +%define CONFIG_POCKETSPHINX 0 %define CONFIG_VAPOURSYNTH 0 %define CONFIG_ALSA 0 %define CONFIG_APPKIT 0 @@ -926,6 +930,7 @@ %define CONFIG_VMDVIDEO_DECODER 0 %define CONFIG_VMNC_DECODER 0 %define CONFIG_VP3_DECODER 1 +%define CONFIG_VP4_DECODER 0 %define CONFIG_VP5_DECODER 0 %define CONFIG_VP6_DECODER 0 %define CONFIG_VP6A_DECODER 0 @@ -1604,7 +1609,9 @@ %define CONFIG_ASETTB_FILTER 0 %define CONFIG_ASHOWINFO_FILTER 0 %define CONFIG_ASIDEDATA_FILTER 0 +%define CONFIG_ASOFTCLIP_FILTER 0 %define CONFIG_ASPLIT_FILTER 0 +%define CONFIG_ASR_FILTER 0 %define CONFIG_ASTATS_FILTER 0 %define CONFIG_ASTREAMSELECT_FILTER 0 %define CONFIG_ATEMPO_FILTER 0 @@ -1623,6 +1630,7 @@ %define CONFIG_CROSSFEED_FILTER 0 %define CONFIG_CRYSTALIZER_FILTER 0 %define CONFIG_DCSHIFT_FILTER 0 +%define CONFIG_DEESSER_FILTER 0 %define CONFIG_DRMETER_FILTER 0 %define CONFIG_DYNAUDNORM_FILTER 0 %define CONFIG_EARWAX_FILTER 0 @@ -1695,6 +1703,7 @@ %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 %define CONFIG_COLORKEY_OPENCL_FILTER 0 +%define CONFIG_COLORHOLD_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1722,6 +1731,7 @@ %define CONFIG_DEJUDDER_FILTER 0 %define CONFIG_DELOGO_FILTER 0 %define CONFIG_DENOISE_VAAPI_FILTER 0 +%define CONFIG_DERAIN_FILTER 0 %define CONFIG_DESHAKE_FILTER 0 %define CONFIG_DESPILL_FILTER 0 %define CONFIG_DETELECINE_FILTER 0 @@ -1808,6 +1818,7 @@ %define CONFIG_MPDECIMATE_FILTER 0 %define CONFIG_NEGATE_FILTER 0 %define CONFIG_NLMEANS_FILTER 0 +%define CONFIG_NLMEANS_OPENCL_FILTER 0 %define CONFIG_NNEDI_FILTER 0 %define CONFIG_NOFORMAT_FILTER 0 %define CONFIG_NOISE_FILTER 0 @@ -1927,6 +1938,7 @@ %define CONFIG_WAVEFORM_FILTER 0 %define CONFIG_WEAVE_FILTER 0 %define CONFIG_XBR_FILTER 0 +%define CONFIG_XMEDIAN_FILTER 0 %define CONFIG_XSTACK_FILTER 0 %define CONFIG_YADIF_FILTER 0 %define CONFIG_YADIF_CUDA_FILTER 0 @@ -1963,6 +1975,7 @@ %define CONFIG_CONCAT_FILTER 0 %define CONFIG_SHOWCQT_FILTER 0 %define CONFIG_SHOWFREQS_FILTER 0 +%define CONFIG_SHOWSPATIAL_FILTER 0 %define CONFIG_SHOWSPECTRUM_FILTER 0 %define CONFIG_SHOWSPECTRUMPIC_FILTER 0 %define CONFIG_SHOWVOLUME_FILTER 0 @@ -2076,6 +2089,7 @@ %define CONFIG_IDCIN_DEMUXER 0 %define CONFIG_IDF_DEMUXER 0 %define CONFIG_IFF_DEMUXER 0 +%define CONFIG_IFV_DEMUXER 0 %define CONFIG_ILBC_DEMUXER 0 %define CONFIG_IMAGE2_DEMUXER 0 %define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/mac/x64/config.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/mac/x64/config.h index 13bb7e86b0c..cd97c8fcca8 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/mac/x64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/mac/x64/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cross-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=i686-apple-darwin-macho' --extra-cflags=-F/hdd1/workspace/chrome2/src/build/win_files/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/hdd1/workspace/chrome2/src/build/win_files/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include --extra-cflags=-isystem/hdd1/workspace/chrome2/src/build/win_files/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/c++/4.2.1 --extra-cflags=-isystem/hdd1/workspace/chrome2/src/build/win_files/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.1.0/include/ --extra-ldflags=-syslibroot --extra-ldflags=/hdd1/workspace/chrome2/src/build/win_files/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk --extra-ldflags=-L/hdd1/workspace/chrome2/src/build/win_files/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --arch=x86_64 --extra-cflags=-m64 --extra-ldflags=-m64 --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cross-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=i686-apple-darwin-macho' --extra-cflags=-F/ssd/trunk_blink_tot/src/build/win_files/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/ssd/trunk_blink_tot/src/build/win_files/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include --extra-cflags=-isystem/ssd/trunk_blink_tot/src/build/win_files/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/c++/4.2.1 --extra-cflags=-isystem/ssd/trunk_blink_tot/src/build/win_files/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.1.0/include/ --extra-ldflags=-syslibroot --extra-ldflags=/ssd/trunk_blink_tot/src/build/win_files/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk --extra-ldflags=-L/ssd/trunk_blink_tot/src/build/win_files/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --arch=x86_64 --extra-cflags=-m64 --extra-ldflags=-m64 --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" -#define CC_IDENT "clang version 9.0.0 (trunk 357692)" +#define CC_IDENT "clang version 9.0.0 (https://github.com/llvm/llvm-project/ f7e52fbdb5a7af8ea0808e98458b497125a5eca1)" #define av_restrict restrict #define EXTERN_PREFIX "_" #define EXTERN_ASM _ @@ -80,6 +80,7 @@ #define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR2 0 #define HAVE_MSA 0 +#define HAVE_MSA2 0 #define HAVE_LOONGSON2 0 #define HAVE_LOONGSON3 0 #define HAVE_MMI 0 @@ -125,6 +126,7 @@ #define HAVE_MIPSDSP_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 #define HAVE_MSA_EXTERNAL 0 +#define HAVE_MSA2_EXTERNAL 0 #define HAVE_LOONGSON2_EXTERNAL 0 #define HAVE_LOONGSON3_EXTERNAL 0 #define HAVE_MMI_EXTERNAL 0 @@ -170,6 +172,7 @@ #define HAVE_MIPSDSP_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 #define HAVE_MSA_INLINE 0 +#define HAVE_MSA2_INLINE 0 #define HAVE_LOONGSON2_INLINE 0 #define HAVE_LOONGSON3_INLINE 0 #define HAVE_MMI_INLINE 0 @@ -489,6 +492,7 @@ #define CONFIG_MEDIACODEC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENGL 0 +#define CONFIG_POCKETSPHINX 0 #define CONFIG_VAPOURSYNTH 0 #define CONFIG_ALSA 0 #define CONFIG_APPKIT 0 @@ -941,6 +945,7 @@ #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 #define CONFIG_VP3_DECODER 1 +#define CONFIG_VP4_DECODER 0 #define CONFIG_VP5_DECODER 0 #define CONFIG_VP6_DECODER 0 #define CONFIG_VP6A_DECODER 0 @@ -1619,7 +1624,9 @@ #define CONFIG_ASETTB_FILTER 0 #define CONFIG_ASHOWINFO_FILTER 0 #define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 #define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 #define CONFIG_ASTATS_FILTER 0 #define CONFIG_ASTREAMSELECT_FILTER 0 #define CONFIG_ATEMPO_FILTER 0 @@ -1638,6 +1645,7 @@ #define CONFIG_CROSSFEED_FILTER 0 #define CONFIG_CRYSTALIZER_FILTER 0 #define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DEESSER_FILTER 0 #define CONFIG_DRMETER_FILTER 0 #define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 @@ -1710,6 +1718,7 @@ #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 #define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1737,6 +1746,7 @@ #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DENOISE_VAAPI_FILTER 0 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 #define CONFIG_DESPILL_FILTER 0 #define CONFIG_DETELECINE_FILTER 0 @@ -1823,6 +1833,7 @@ #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 #define CONFIG_NNEDI_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NOISE_FILTER 0 @@ -1942,6 +1953,7 @@ #define CONFIG_WAVEFORM_FILTER 0 #define CONFIG_WEAVE_FILTER 0 #define CONFIG_XBR_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 #define CONFIG_XSTACK_FILTER 0 #define CONFIG_YADIF_FILTER 0 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1978,6 +1990,7 @@ #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWFREQS_FILTER 0 +#define CONFIG_SHOWSPATIAL_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0 #define CONFIG_SHOWVOLUME_FILTER 0 @@ -2091,6 +2104,7 @@ #define CONFIG_IDCIN_DEMUXER 0 #define CONFIG_IDF_DEMUXER 0 #define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IFV_DEMUXER 0 #define CONFIG_ILBC_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/mac/x64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/mac/x64/libavutil/ffversion.h index 5a1ba063f01..e4a455c28f9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/mac/x64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/mac/x64/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" +#define FFMPEG_VERSION "N-95241-g23ca8fd9e6" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/win/arm64/config.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/win/arm64/config.h index 35919dbe53d..0c20c44233e 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/win/arm64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/win/arm64/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/ffmpeg/chromium/include/win --enable-cross-compile --cc=clang-cl --ld=lld-link --nm=llvm-nm --ar=llvm-ar --extra-cflags=-O2 --arch=aarch64 --as=clang-cl --extra-cflags='--target=arm64-windows' --extra-ldflags='--target=arm64-windows' --extra-cflags=-imsvc/hdd1/workspace/chrome2/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/um --extra-cflags=-imsvc/hdd1/workspace/chrome2/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/shared --extra-cflags=-imsvc/hdd1/workspace/chrome2/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/winrt --extra-cflags=-imsvc/hdd1/workspace/chrome2/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/ucrt --extra-cflags=-imsvc/hdd1/workspace/chrome2/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/include --extra-cflags=-imsvc/hdd1/workspace/chrome2/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/atlmfc/include --extra-ldflags='-libpath:/hdd1/workspace/chrome2/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/atlmfc/lib/arm64' --extra-ldflags='-libpath:/hdd1/workspace/chrome2/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Lib/10.0.17763.0/ucrt/arm64' --extra-ldflags='-libpath:/hdd1/workspace/chrome2/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Lib/10.0.17763.0/um/arm64' --extra-ldflags='-libpath:/hdd1/workspace/chrome2/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/lib/arm64' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/ffmpeg/chromium/include/win --enable-cross-compile --cc=clang-cl --ld=lld-link --nm=llvm-nm --ar=llvm-ar --extra-cflags=-O2 --arch=aarch64 --as=clang-cl --extra-cflags='--target=arm64-windows' --extra-ldflags='--target=arm64-windows' --extra-cflags=-imsvc/ssd/trunk_blink_tot/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/win_sdk/Include/10.0.18362.0/um --extra-cflags=-imsvc/ssd/trunk_blink_tot/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/win_sdk/Include/10.0.18362.0/shared --extra-cflags=-imsvc/ssd/trunk_blink_tot/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/win_sdk/Include/10.0.18362.0/winrt --extra-cflags=-imsvc/ssd/trunk_blink_tot/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/win_sdk/Include/10.0.18362.0/ucrt --extra-cflags=-imsvc/ssd/trunk_blink_tot/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/VC/Tools/MSVC/14.16.27023/include --extra-cflags=-imsvc/ssd/trunk_blink_tot/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/VC/Tools/MSVC/14.16.27023/atlmfc/include --extra-ldflags='-libpath:/ssd/trunk_blink_tot/src/third_party/depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/VC/Tools/MSVC/14.16.27023/atlmfc/lib/arm64' --extra-ldflags='-libpath:/ssd/trunk_blink_tot/src/third_party/depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/win_sdk/Lib/10.0.18362.0/ucrt/arm64' --extra-ldflags='-libpath:/ssd/trunk_blink_tot/src/third_party/depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/win_sdk/Lib/10.0.18362.0/um/arm64' --extra-ldflags='-libpath:/ssd/trunk_blink_tot/src/third_party/depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/VC/Tools/MSVC/14.16.27023/lib/arm64' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -80,6 +80,7 @@ #define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR2 0 #define HAVE_MSA 0 +#define HAVE_MSA2 0 #define HAVE_LOONGSON2 0 #define HAVE_LOONGSON3 0 #define HAVE_MMI 0 @@ -125,6 +126,7 @@ #define HAVE_MIPSDSP_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 #define HAVE_MSA_EXTERNAL 0 +#define HAVE_MSA2_EXTERNAL 0 #define HAVE_LOONGSON2_EXTERNAL 0 #define HAVE_LOONGSON3_EXTERNAL 0 #define HAVE_MMI_EXTERNAL 0 @@ -170,6 +172,7 @@ #define HAVE_MIPSDSP_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 #define HAVE_MSA_INLINE 0 +#define HAVE_MSA2_INLINE 0 #define HAVE_LOONGSON2_INLINE 0 #define HAVE_LOONGSON3_INLINE 0 #define HAVE_MMI_INLINE 0 @@ -489,6 +492,7 @@ #define CONFIG_MEDIACODEC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENGL 0 +#define CONFIG_POCKETSPHINX 0 #define CONFIG_VAPOURSYNTH 0 #define CONFIG_ALSA 0 #define CONFIG_APPKIT 0 @@ -941,6 +945,7 @@ #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 #define CONFIG_VP3_DECODER 1 +#define CONFIG_VP4_DECODER 0 #define CONFIG_VP5_DECODER 0 #define CONFIG_VP6_DECODER 0 #define CONFIG_VP6A_DECODER 0 @@ -1619,7 +1624,9 @@ #define CONFIG_ASETTB_FILTER 0 #define CONFIG_ASHOWINFO_FILTER 0 #define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 #define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 #define CONFIG_ASTATS_FILTER 0 #define CONFIG_ASTREAMSELECT_FILTER 0 #define CONFIG_ATEMPO_FILTER 0 @@ -1638,6 +1645,7 @@ #define CONFIG_CROSSFEED_FILTER 0 #define CONFIG_CRYSTALIZER_FILTER 0 #define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DEESSER_FILTER 0 #define CONFIG_DRMETER_FILTER 0 #define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 @@ -1710,6 +1718,7 @@ #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 #define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1737,6 +1746,7 @@ #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DENOISE_VAAPI_FILTER 0 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 #define CONFIG_DESPILL_FILTER 0 #define CONFIG_DETELECINE_FILTER 0 @@ -1823,6 +1833,7 @@ #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 #define CONFIG_NNEDI_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NOISE_FILTER 0 @@ -1942,6 +1953,7 @@ #define CONFIG_WAVEFORM_FILTER 0 #define CONFIG_WEAVE_FILTER 0 #define CONFIG_XBR_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 #define CONFIG_XSTACK_FILTER 0 #define CONFIG_YADIF_FILTER 0 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1978,6 +1990,7 @@ #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWFREQS_FILTER 0 +#define CONFIG_SHOWSPATIAL_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0 #define CONFIG_SHOWVOLUME_FILTER 0 @@ -2091,6 +2104,7 @@ #define CONFIG_IDCIN_DEMUXER 0 #define CONFIG_IDF_DEMUXER 0 #define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IFV_DEMUXER 0 #define CONFIG_ILBC_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/win/arm64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/win/arm64/libavutil/ffversion.h index 5a1ba063f01..e4a455c28f9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/win/arm64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/win/arm64/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" +#define FFMPEG_VERSION "N-95241-g23ca8fd9e6" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/win/ia32/config.asm b/chromium/third_party/ffmpeg/chromium/config/Chrome/win/ia32/config.asm index b468b3b24be..e0930008451 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/win/ia32/config.asm +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/win/ia32/config.asm @@ -65,6 +65,7 @@ %define HAVE_MIPSDSP 0 %define HAVE_MIPSDSPR2 0 %define HAVE_MSA 0 +%define HAVE_MSA2 0 %define HAVE_LOONGSON2 0 %define HAVE_LOONGSON3 0 %define HAVE_MMI 0 @@ -110,6 +111,7 @@ %define HAVE_MIPSDSP_EXTERNAL 0 %define HAVE_MIPSDSPR2_EXTERNAL 0 %define HAVE_MSA_EXTERNAL 0 +%define HAVE_MSA2_EXTERNAL 0 %define HAVE_LOONGSON2_EXTERNAL 0 %define HAVE_LOONGSON3_EXTERNAL 0 %define HAVE_MMI_EXTERNAL 0 @@ -155,6 +157,7 @@ %define HAVE_MIPSDSP_INLINE 0 %define HAVE_MIPSDSPR2_INLINE 0 %define HAVE_MSA_INLINE 0 +%define HAVE_MSA2_INLINE 0 %define HAVE_LOONGSON2_INLINE 0 %define HAVE_LOONGSON3_INLINE 0 %define HAVE_MMI_INLINE 0 @@ -474,6 +477,7 @@ %define CONFIG_MEDIACODEC 0 %define CONFIG_OPENAL 0 %define CONFIG_OPENGL 0 +%define CONFIG_POCKETSPHINX 0 %define CONFIG_VAPOURSYNTH 0 %define CONFIG_ALSA 0 %define CONFIG_APPKIT 0 @@ -926,6 +930,7 @@ %define CONFIG_VMDVIDEO_DECODER 0 %define CONFIG_VMNC_DECODER 0 %define CONFIG_VP3_DECODER 1 +%define CONFIG_VP4_DECODER 0 %define CONFIG_VP5_DECODER 0 %define CONFIG_VP6_DECODER 0 %define CONFIG_VP6A_DECODER 0 @@ -1604,7 +1609,9 @@ %define CONFIG_ASETTB_FILTER 0 %define CONFIG_ASHOWINFO_FILTER 0 %define CONFIG_ASIDEDATA_FILTER 0 +%define CONFIG_ASOFTCLIP_FILTER 0 %define CONFIG_ASPLIT_FILTER 0 +%define CONFIG_ASR_FILTER 0 %define CONFIG_ASTATS_FILTER 0 %define CONFIG_ASTREAMSELECT_FILTER 0 %define CONFIG_ATEMPO_FILTER 0 @@ -1623,6 +1630,7 @@ %define CONFIG_CROSSFEED_FILTER 0 %define CONFIG_CRYSTALIZER_FILTER 0 %define CONFIG_DCSHIFT_FILTER 0 +%define CONFIG_DEESSER_FILTER 0 %define CONFIG_DRMETER_FILTER 0 %define CONFIG_DYNAUDNORM_FILTER 0 %define CONFIG_EARWAX_FILTER 0 @@ -1695,6 +1703,7 @@ %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 %define CONFIG_COLORKEY_OPENCL_FILTER 0 +%define CONFIG_COLORHOLD_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1722,6 +1731,7 @@ %define CONFIG_DEJUDDER_FILTER 0 %define CONFIG_DELOGO_FILTER 0 %define CONFIG_DENOISE_VAAPI_FILTER 0 +%define CONFIG_DERAIN_FILTER 0 %define CONFIG_DESHAKE_FILTER 0 %define CONFIG_DESPILL_FILTER 0 %define CONFIG_DETELECINE_FILTER 0 @@ -1808,6 +1818,7 @@ %define CONFIG_MPDECIMATE_FILTER 0 %define CONFIG_NEGATE_FILTER 0 %define CONFIG_NLMEANS_FILTER 0 +%define CONFIG_NLMEANS_OPENCL_FILTER 0 %define CONFIG_NNEDI_FILTER 0 %define CONFIG_NOFORMAT_FILTER 0 %define CONFIG_NOISE_FILTER 0 @@ -1927,6 +1938,7 @@ %define CONFIG_WAVEFORM_FILTER 0 %define CONFIG_WEAVE_FILTER 0 %define CONFIG_XBR_FILTER 0 +%define CONFIG_XMEDIAN_FILTER 0 %define CONFIG_XSTACK_FILTER 0 %define CONFIG_YADIF_FILTER 0 %define CONFIG_YADIF_CUDA_FILTER 0 @@ -1963,6 +1975,7 @@ %define CONFIG_CONCAT_FILTER 0 %define CONFIG_SHOWCQT_FILTER 0 %define CONFIG_SHOWFREQS_FILTER 0 +%define CONFIG_SHOWSPATIAL_FILTER 0 %define CONFIG_SHOWSPECTRUM_FILTER 0 %define CONFIG_SHOWSPECTRUMPIC_FILTER 0 %define CONFIG_SHOWVOLUME_FILTER 0 @@ -2076,6 +2089,7 @@ %define CONFIG_IDCIN_DEMUXER 0 %define CONFIG_IDF_DEMUXER 0 %define CONFIG_IFF_DEMUXER 0 +%define CONFIG_IFV_DEMUXER 0 %define CONFIG_ILBC_DEMUXER 0 %define CONFIG_IMAGE2_DEMUXER 0 %define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/win/ia32/config.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/win/ia32/config.h index 1b93f6ca464..8ea687b6464 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/win/ia32/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/win/ia32/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/ffmpeg/chromium/include/win --enable-cross-compile --cc=clang-cl --ld=lld-link --nm=llvm-nm --ar=llvm-ar --extra-cflags=-O2 --extra-cflags=-m32 --extra-cflags=-imsvc/hdd1/workspace/chrome2/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/um --extra-cflags=-imsvc/hdd1/workspace/chrome2/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/shared --extra-cflags=-imsvc/hdd1/workspace/chrome2/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/winrt --extra-cflags=-imsvc/hdd1/workspace/chrome2/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/ucrt --extra-cflags=-imsvc/hdd1/workspace/chrome2/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/include --extra-cflags=-imsvc/hdd1/workspace/chrome2/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/atlmfc/include --extra-ldflags='-libpath:/hdd1/workspace/chrome2/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/atlmfc/lib/x86' --extra-ldflags='-libpath:/hdd1/workspace/chrome2/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Lib/10.0.17763.0/ucrt/x86' --extra-ldflags='-libpath:/hdd1/workspace/chrome2/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Lib/10.0.17763.0/um/x86' --extra-ldflags='-libpath:/hdd1/workspace/chrome2/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/lib/x86' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/ffmpeg/chromium/include/win --enable-cross-compile --cc=clang-cl --ld=lld-link --nm=llvm-nm --ar=llvm-ar --extra-cflags=-O2 --extra-cflags=-m32 --extra-cflags=-imsvc/ssd/trunk_blink_tot/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/win_sdk/Include/10.0.18362.0/um --extra-cflags=-imsvc/ssd/trunk_blink_tot/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/win_sdk/Include/10.0.18362.0/shared --extra-cflags=-imsvc/ssd/trunk_blink_tot/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/win_sdk/Include/10.0.18362.0/winrt --extra-cflags=-imsvc/ssd/trunk_blink_tot/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/win_sdk/Include/10.0.18362.0/ucrt --extra-cflags=-imsvc/ssd/trunk_blink_tot/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/VC/Tools/MSVC/14.16.27023/include --extra-cflags=-imsvc/ssd/trunk_blink_tot/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/VC/Tools/MSVC/14.16.27023/atlmfc/include --extra-ldflags='-libpath:/ssd/trunk_blink_tot/src/third_party/depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/VC/Tools/MSVC/14.16.27023/atlmfc/lib/x86' --extra-ldflags='-libpath:/ssd/trunk_blink_tot/src/third_party/depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/win_sdk/Lib/10.0.18362.0/ucrt/x86' --extra-ldflags='-libpath:/ssd/trunk_blink_tot/src/third_party/depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/win_sdk/Lib/10.0.18362.0/um/x86' --extra-ldflags='-libpath:/ssd/trunk_blink_tot/src/third_party/depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/VC/Tools/MSVC/14.16.27023/lib/x86' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -80,6 +80,7 @@ #define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR2 0 #define HAVE_MSA 0 +#define HAVE_MSA2 0 #define HAVE_LOONGSON2 0 #define HAVE_LOONGSON3 0 #define HAVE_MMI 0 @@ -125,6 +126,7 @@ #define HAVE_MIPSDSP_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 #define HAVE_MSA_EXTERNAL 0 +#define HAVE_MSA2_EXTERNAL 0 #define HAVE_LOONGSON2_EXTERNAL 0 #define HAVE_LOONGSON3_EXTERNAL 0 #define HAVE_MMI_EXTERNAL 0 @@ -170,6 +172,7 @@ #define HAVE_MIPSDSP_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 #define HAVE_MSA_INLINE 0 +#define HAVE_MSA2_INLINE 0 #define HAVE_LOONGSON2_INLINE 0 #define HAVE_LOONGSON3_INLINE 0 #define HAVE_MMI_INLINE 0 @@ -489,6 +492,7 @@ #define CONFIG_MEDIACODEC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENGL 0 +#define CONFIG_POCKETSPHINX 0 #define CONFIG_VAPOURSYNTH 0 #define CONFIG_ALSA 0 #define CONFIG_APPKIT 0 @@ -941,6 +945,7 @@ #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 #define CONFIG_VP3_DECODER 1 +#define CONFIG_VP4_DECODER 0 #define CONFIG_VP5_DECODER 0 #define CONFIG_VP6_DECODER 0 #define CONFIG_VP6A_DECODER 0 @@ -1619,7 +1624,9 @@ #define CONFIG_ASETTB_FILTER 0 #define CONFIG_ASHOWINFO_FILTER 0 #define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 #define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 #define CONFIG_ASTATS_FILTER 0 #define CONFIG_ASTREAMSELECT_FILTER 0 #define CONFIG_ATEMPO_FILTER 0 @@ -1638,6 +1645,7 @@ #define CONFIG_CROSSFEED_FILTER 0 #define CONFIG_CRYSTALIZER_FILTER 0 #define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DEESSER_FILTER 0 #define CONFIG_DRMETER_FILTER 0 #define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 @@ -1710,6 +1718,7 @@ #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 #define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1737,6 +1746,7 @@ #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DENOISE_VAAPI_FILTER 0 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 #define CONFIG_DESPILL_FILTER 0 #define CONFIG_DETELECINE_FILTER 0 @@ -1823,6 +1833,7 @@ #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 #define CONFIG_NNEDI_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NOISE_FILTER 0 @@ -1942,6 +1953,7 @@ #define CONFIG_WAVEFORM_FILTER 0 #define CONFIG_WEAVE_FILTER 0 #define CONFIG_XBR_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 #define CONFIG_XSTACK_FILTER 0 #define CONFIG_YADIF_FILTER 0 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1978,6 +1990,7 @@ #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWFREQS_FILTER 0 +#define CONFIG_SHOWSPATIAL_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0 #define CONFIG_SHOWVOLUME_FILTER 0 @@ -2091,6 +2104,7 @@ #define CONFIG_IDCIN_DEMUXER 0 #define CONFIG_IDF_DEMUXER 0 #define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IFV_DEMUXER 0 #define CONFIG_ILBC_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/win/ia32/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/win/ia32/libavutil/ffversion.h index 5a1ba063f01..e4a455c28f9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/win/ia32/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/win/ia32/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" +#define FFMPEG_VERSION "N-95241-g23ca8fd9e6" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/win/x64/config.asm b/chromium/third_party/ffmpeg/chromium/config/Chrome/win/x64/config.asm index 4aaed46f644..4bc2501bcf0 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/win/x64/config.asm +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/win/x64/config.asm @@ -65,6 +65,7 @@ %define HAVE_MIPSDSP 0 %define HAVE_MIPSDSPR2 0 %define HAVE_MSA 0 +%define HAVE_MSA2 0 %define HAVE_LOONGSON2 0 %define HAVE_LOONGSON3 0 %define HAVE_MMI 0 @@ -110,6 +111,7 @@ %define HAVE_MIPSDSP_EXTERNAL 0 %define HAVE_MIPSDSPR2_EXTERNAL 0 %define HAVE_MSA_EXTERNAL 0 +%define HAVE_MSA2_EXTERNAL 0 %define HAVE_LOONGSON2_EXTERNAL 0 %define HAVE_LOONGSON3_EXTERNAL 0 %define HAVE_MMI_EXTERNAL 0 @@ -155,6 +157,7 @@ %define HAVE_MIPSDSP_INLINE 0 %define HAVE_MIPSDSPR2_INLINE 0 %define HAVE_MSA_INLINE 0 +%define HAVE_MSA2_INLINE 0 %define HAVE_LOONGSON2_INLINE 0 %define HAVE_LOONGSON3_INLINE 0 %define HAVE_MMI_INLINE 0 @@ -474,6 +477,7 @@ %define CONFIG_MEDIACODEC 0 %define CONFIG_OPENAL 0 %define CONFIG_OPENGL 0 +%define CONFIG_POCKETSPHINX 0 %define CONFIG_VAPOURSYNTH 0 %define CONFIG_ALSA 0 %define CONFIG_APPKIT 0 @@ -926,6 +930,7 @@ %define CONFIG_VMDVIDEO_DECODER 0 %define CONFIG_VMNC_DECODER 0 %define CONFIG_VP3_DECODER 1 +%define CONFIG_VP4_DECODER 0 %define CONFIG_VP5_DECODER 0 %define CONFIG_VP6_DECODER 0 %define CONFIG_VP6A_DECODER 0 @@ -1604,7 +1609,9 @@ %define CONFIG_ASETTB_FILTER 0 %define CONFIG_ASHOWINFO_FILTER 0 %define CONFIG_ASIDEDATA_FILTER 0 +%define CONFIG_ASOFTCLIP_FILTER 0 %define CONFIG_ASPLIT_FILTER 0 +%define CONFIG_ASR_FILTER 0 %define CONFIG_ASTATS_FILTER 0 %define CONFIG_ASTREAMSELECT_FILTER 0 %define CONFIG_ATEMPO_FILTER 0 @@ -1623,6 +1630,7 @@ %define CONFIG_CROSSFEED_FILTER 0 %define CONFIG_CRYSTALIZER_FILTER 0 %define CONFIG_DCSHIFT_FILTER 0 +%define CONFIG_DEESSER_FILTER 0 %define CONFIG_DRMETER_FILTER 0 %define CONFIG_DYNAUDNORM_FILTER 0 %define CONFIG_EARWAX_FILTER 0 @@ -1695,6 +1703,7 @@ %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 %define CONFIG_COLORKEY_OPENCL_FILTER 0 +%define CONFIG_COLORHOLD_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1722,6 +1731,7 @@ %define CONFIG_DEJUDDER_FILTER 0 %define CONFIG_DELOGO_FILTER 0 %define CONFIG_DENOISE_VAAPI_FILTER 0 +%define CONFIG_DERAIN_FILTER 0 %define CONFIG_DESHAKE_FILTER 0 %define CONFIG_DESPILL_FILTER 0 %define CONFIG_DETELECINE_FILTER 0 @@ -1808,6 +1818,7 @@ %define CONFIG_MPDECIMATE_FILTER 0 %define CONFIG_NEGATE_FILTER 0 %define CONFIG_NLMEANS_FILTER 0 +%define CONFIG_NLMEANS_OPENCL_FILTER 0 %define CONFIG_NNEDI_FILTER 0 %define CONFIG_NOFORMAT_FILTER 0 %define CONFIG_NOISE_FILTER 0 @@ -1927,6 +1938,7 @@ %define CONFIG_WAVEFORM_FILTER 0 %define CONFIG_WEAVE_FILTER 0 %define CONFIG_XBR_FILTER 0 +%define CONFIG_XMEDIAN_FILTER 0 %define CONFIG_XSTACK_FILTER 0 %define CONFIG_YADIF_FILTER 0 %define CONFIG_YADIF_CUDA_FILTER 0 @@ -1963,6 +1975,7 @@ %define CONFIG_CONCAT_FILTER 0 %define CONFIG_SHOWCQT_FILTER 0 %define CONFIG_SHOWFREQS_FILTER 0 +%define CONFIG_SHOWSPATIAL_FILTER 0 %define CONFIG_SHOWSPECTRUM_FILTER 0 %define CONFIG_SHOWSPECTRUMPIC_FILTER 0 %define CONFIG_SHOWVOLUME_FILTER 0 @@ -2076,6 +2089,7 @@ %define CONFIG_IDCIN_DEMUXER 0 %define CONFIG_IDF_DEMUXER 0 %define CONFIG_IFF_DEMUXER 0 +%define CONFIG_IFV_DEMUXER 0 %define CONFIG_ILBC_DEMUXER 0 %define CONFIG_IMAGE2_DEMUXER 0 %define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/win/x64/config.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/win/x64/config.h index 9ff6479fe74..2cf4508cebd 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/win/x64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/win/x64/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/hdd1/workspace/chrome2/src/third_party/ffmpeg/chromium/include/win --target-os=win64 --enable-cross-compile --cc=clang-cl --ld=lld-link --nm=llvm-nm --ar=llvm-ar --extra-cflags=-O2 --extra-cflags=-imsvc/hdd1/workspace/chrome2/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/um --extra-cflags=-imsvc/hdd1/workspace/chrome2/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/shared --extra-cflags=-imsvc/hdd1/workspace/chrome2/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/winrt --extra-cflags=-imsvc/hdd1/workspace/chrome2/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/ucrt --extra-cflags=-imsvc/hdd1/workspace/chrome2/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/include --extra-cflags=-imsvc/hdd1/workspace/chrome2/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/atlmfc/include --extra-ldflags='-libpath:/hdd1/workspace/chrome2/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/atlmfc/lib/x64' --extra-ldflags='-libpath:/hdd1/workspace/chrome2/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Lib/10.0.17763.0/ucrt/x64' --extra-ldflags='-libpath:/hdd1/workspace/chrome2/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Lib/10.0.17763.0/um/x64' --extra-ldflags='-libpath:/hdd1/workspace/chrome2/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/lib/x64' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/ffmpeg/chromium/include/win --target-os=win64 --enable-cross-compile --cc=clang-cl --ld=lld-link --nm=llvm-nm --ar=llvm-ar --extra-cflags=-O2 --extra-cflags=-imsvc/ssd/trunk_blink_tot/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/win_sdk/Include/10.0.18362.0/um --extra-cflags=-imsvc/ssd/trunk_blink_tot/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/win_sdk/Include/10.0.18362.0/shared --extra-cflags=-imsvc/ssd/trunk_blink_tot/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/win_sdk/Include/10.0.18362.0/winrt --extra-cflags=-imsvc/ssd/trunk_blink_tot/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/win_sdk/Include/10.0.18362.0/ucrt --extra-cflags=-imsvc/ssd/trunk_blink_tot/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/VC/Tools/MSVC/14.16.27023/include --extra-cflags=-imsvc/ssd/trunk_blink_tot/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/VC/Tools/MSVC/14.16.27023/atlmfc/include --extra-ldflags='-libpath:/ssd/trunk_blink_tot/src/third_party/depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/VC/Tools/MSVC/14.16.27023/atlmfc/lib/x64' --extra-ldflags='-libpath:/ssd/trunk_blink_tot/src/third_party/depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/win_sdk/Lib/10.0.18362.0/ucrt/x64' --extra-ldflags='-libpath:/ssd/trunk_blink_tot/src/third_party/depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/win_sdk/Lib/10.0.18362.0/um/x64' --extra-ldflags='-libpath:/ssd/trunk_blink_tot/src/third_party/depot_tools/win_toolchain/vs_files/418b3076791776573a815eb298c8aa590307af63/VC/Tools/MSVC/14.16.27023/lib/x64' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -80,6 +80,7 @@ #define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR2 0 #define HAVE_MSA 0 +#define HAVE_MSA2 0 #define HAVE_LOONGSON2 0 #define HAVE_LOONGSON3 0 #define HAVE_MMI 0 @@ -125,6 +126,7 @@ #define HAVE_MIPSDSP_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 #define HAVE_MSA_EXTERNAL 0 +#define HAVE_MSA2_EXTERNAL 0 #define HAVE_LOONGSON2_EXTERNAL 0 #define HAVE_LOONGSON3_EXTERNAL 0 #define HAVE_MMI_EXTERNAL 0 @@ -170,6 +172,7 @@ #define HAVE_MIPSDSP_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 #define HAVE_MSA_INLINE 0 +#define HAVE_MSA2_INLINE 0 #define HAVE_LOONGSON2_INLINE 0 #define HAVE_LOONGSON3_INLINE 0 #define HAVE_MMI_INLINE 0 @@ -489,6 +492,7 @@ #define CONFIG_MEDIACODEC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENGL 0 +#define CONFIG_POCKETSPHINX 0 #define CONFIG_VAPOURSYNTH 0 #define CONFIG_ALSA 0 #define CONFIG_APPKIT 0 @@ -941,6 +945,7 @@ #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 #define CONFIG_VP3_DECODER 1 +#define CONFIG_VP4_DECODER 0 #define CONFIG_VP5_DECODER 0 #define CONFIG_VP6_DECODER 0 #define CONFIG_VP6A_DECODER 0 @@ -1619,7 +1624,9 @@ #define CONFIG_ASETTB_FILTER 0 #define CONFIG_ASHOWINFO_FILTER 0 #define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 #define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 #define CONFIG_ASTATS_FILTER 0 #define CONFIG_ASTREAMSELECT_FILTER 0 #define CONFIG_ATEMPO_FILTER 0 @@ -1638,6 +1645,7 @@ #define CONFIG_CROSSFEED_FILTER 0 #define CONFIG_CRYSTALIZER_FILTER 0 #define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DEESSER_FILTER 0 #define CONFIG_DRMETER_FILTER 0 #define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 @@ -1710,6 +1718,7 @@ #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 #define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1737,6 +1746,7 @@ #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DENOISE_VAAPI_FILTER 0 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 #define CONFIG_DESPILL_FILTER 0 #define CONFIG_DETELECINE_FILTER 0 @@ -1823,6 +1833,7 @@ #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 #define CONFIG_NNEDI_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NOISE_FILTER 0 @@ -1942,6 +1953,7 @@ #define CONFIG_WAVEFORM_FILTER 0 #define CONFIG_WEAVE_FILTER 0 #define CONFIG_XBR_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 #define CONFIG_XSTACK_FILTER 0 #define CONFIG_YADIF_FILTER 0 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1978,6 +1990,7 @@ #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWFREQS_FILTER 0 +#define CONFIG_SHOWSPATIAL_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0 #define CONFIG_SHOWVOLUME_FILTER 0 @@ -2091,6 +2104,7 @@ #define CONFIG_IDCIN_DEMUXER 0 #define CONFIG_IDF_DEMUXER 0 #define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IFV_DEMUXER 0 #define CONFIG_ILBC_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chrome/win/x64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chrome/win/x64/libavutil/ffversion.h index 5a1ba063f01..e4a455c28f9 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chrome/win/x64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chrome/win/x64/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" +#define FFMPEG_VERSION "N-95241-g23ca8fd9e6" #endif /* AVUTIL_FFVERSION_H */ |