diff options
Diffstat (limited to 'chromium/third_party/ffmpeg/chromium')
109 files changed, 874 insertions, 237 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 2b24f6efdd7..fe209918b47 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/usr/local/google/home/sandersd/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/platforms/android-16/arch-arm --extra-cflags=-I/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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/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_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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_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 c9151830722..5a1ba063f01 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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #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 03bab3e925a..7f2c50477d8 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/usr/local/google/home/sandersd/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/platforms/android-21/arch-arm64 --extra-cflags=-I/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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/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_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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_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 c9151830722..5a1ba063f01 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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #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 125efab9fa3..7b31ae5f409 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/usr/local/google/home/sandersd/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/platforms/android-16/arch-x86 --extra-cflags=-I/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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/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_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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_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 c9151830722..5a1ba063f01 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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #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 1c436be2df3..e955d1030b5 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/usr/local/google/home/sandersd/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/platforms/android-21/arch-mips64 --extra-cflags=-I/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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/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_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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_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 c9151830722..5a1ba063f01 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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #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 50bd6180006..be3e0fa9fb3 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/usr/local/google/home/sandersd/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/platforms/android-16/arch-mips --extra-cflags=-I/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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/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_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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_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 c9151830722..5a1ba063f01 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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #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 77831fe6870..58fcca6bb67 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 @@ -334,6 +334,7 @@ %define HAVE_XFORM_ASM 0 %define HAVE_XMM_CLOBBERS 1 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 %define HAVE_SOCKLEN_T 0 %define HAVE_STRUCT_ADDRINFO 0 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -662,6 +663,7 @@ %define CONFIG_WMA_FREQS 0 %define CONFIG_WMV2DSP 0 %define CONFIG_AAC_ADTSTOASC_BSF 0 +%define CONFIG_AV1_FRAME_SPLIT_BSF 0 %define CONFIG_AV1_METADATA_BSF 0 %define CONFIG_CHOMP_BSF 0 %define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -805,6 +807,7 @@ %define CONFIG_KMVC_DECODER 0 %define CONFIG_LAGARITH_DECODER 0 %define CONFIG_LOCO_DECODER 0 +%define CONFIG_LSCR_DECODER 0 %define CONFIG_M101_DECODER 0 %define CONFIG_MAGICYUV_DECODER 0 %define CONFIG_MDEC_DECODER 0 @@ -1093,6 +1096,7 @@ %define CONFIG_ADPCM_4XM_DECODER 0 %define CONFIG_ADPCM_ADX_DECODER 0 %define CONFIG_ADPCM_AFC_DECODER 0 +%define CONFIG_ADPCM_AGM_DECODER 0 %define CONFIG_ADPCM_AICA_DECODER 0 %define CONFIG_ADPCM_CT_DECODER 0 %define CONFIG_ADPCM_DTK_DECODER 0 @@ -1690,6 +1694,7 @@ %define CONFIG_COLORBALANCE_FILTER 0 %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 +%define CONFIG_COLORKEY_OPENCL_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1777,6 +1782,7 @@ %define CONFIG_INTERLACE_FILTER 0 %define CONFIG_INTERLEAVE_FILTER 0 %define CONFIG_KERNDEINT_FILTER 0 +%define CONFIG_LAGFUN_FILTER 0 %define CONFIG_LENSCORRECTION_FILTER 0 %define CONFIG_LENSFUN_FILTER 0 %define CONFIG_LIBVMAF_FILTER 0 @@ -2084,6 +2090,7 @@ %define CONFIG_IVR_DEMUXER 0 %define CONFIG_JACOSUB_DEMUXER 0 %define CONFIG_JV_DEMUXER 0 +%define CONFIG_KUX_DEMUXER 0 %define CONFIG_LMLM4_DEMUXER 0 %define CONFIG_LOAS_DEMUXER 0 %define CONFIG_LRC_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 e31f179748d..7686a75810c 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/usr/local/google/home/sandersd/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/platforms/android-21/arch-x86_64 --extra-cflags=-I/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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/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_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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_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 c9151830722..5a1ba063f01 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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #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 b63137bafbb..f0fedc087e5 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/usr/local/google/home/sandersd/chromium/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/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_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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -230,7 +230,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 0 -- forced to 0. See https://crbug.com/590440 */ +#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 1 -- forced to 0. See https://crbug.com/590440 */ #define HAVE_WINDOWS_H 0 #define HAVE_WINSOCK2_H 0 #define HAVE_INTRINSICS_NEON 0 @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_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 c9151830722..5a1ba063f01 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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #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 1572349335b..fd7f464b35e 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/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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/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_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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_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 c9151830722..5a1ba063f01 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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #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 b313ac1293f..c18dc573484 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/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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/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_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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_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 c9151830722..5a1ba063f01 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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #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 87366dcf2f8..33943767935 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/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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/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_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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_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 c9151830722..5a1ba063f01 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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #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 e7e39c2cb01..935ec9e9fb6 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 @@ -215,7 +215,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 %define HAVE_WINDOWS_H 0 %define HAVE_WINSOCK2_H 0 %define HAVE_INTRINSICS_NEON 0 @@ -334,6 +334,7 @@ %define HAVE_XFORM_ASM 0 %define HAVE_XMM_CLOBBERS 1 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 %define HAVE_SOCKLEN_T 0 %define HAVE_STRUCT_ADDRINFO 0 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -662,6 +663,7 @@ %define CONFIG_WMA_FREQS 0 %define CONFIG_WMV2DSP 0 %define CONFIG_AAC_ADTSTOASC_BSF 0 +%define CONFIG_AV1_FRAME_SPLIT_BSF 0 %define CONFIG_AV1_METADATA_BSF 0 %define CONFIG_CHOMP_BSF 0 %define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -805,6 +807,7 @@ %define CONFIG_KMVC_DECODER 0 %define CONFIG_LAGARITH_DECODER 0 %define CONFIG_LOCO_DECODER 0 +%define CONFIG_LSCR_DECODER 0 %define CONFIG_M101_DECODER 0 %define CONFIG_MAGICYUV_DECODER 0 %define CONFIG_MDEC_DECODER 0 @@ -1093,6 +1096,7 @@ %define CONFIG_ADPCM_4XM_DECODER 0 %define CONFIG_ADPCM_ADX_DECODER 0 %define CONFIG_ADPCM_AFC_DECODER 0 +%define CONFIG_ADPCM_AGM_DECODER 0 %define CONFIG_ADPCM_AICA_DECODER 0 %define CONFIG_ADPCM_CT_DECODER 0 %define CONFIG_ADPCM_DTK_DECODER 0 @@ -1690,6 +1694,7 @@ %define CONFIG_COLORBALANCE_FILTER 0 %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 +%define CONFIG_COLORKEY_OPENCL_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1777,6 +1782,7 @@ %define CONFIG_INTERLACE_FILTER 0 %define CONFIG_INTERLEAVE_FILTER 0 %define CONFIG_KERNDEINT_FILTER 0 +%define CONFIG_LAGFUN_FILTER 0 %define CONFIG_LENSCORRECTION_FILTER 0 %define CONFIG_LENSFUN_FILTER 0 %define CONFIG_LIBVMAF_FILTER 0 @@ -2084,6 +2090,7 @@ %define CONFIG_IVR_DEMUXER 0 %define CONFIG_JACOSUB_DEMUXER 0 %define CONFIG_JV_DEMUXER 0 +%define CONFIG_KUX_DEMUXER 0 %define CONFIG_LMLM4_DEMUXER 0 %define CONFIG_LOAS_DEMUXER 0 %define CONFIG_LRC_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 57279d52e32..2e53dd1e412 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/usr/local/google/home/sandersd/chromium/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/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_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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -230,7 +230,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 0 -- forced to 0. See https://crbug.com/590440 */ +#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 1 -- forced to 0. See https://crbug.com/590440 */ #define HAVE_WINDOWS_H 0 #define HAVE_WINSOCK2_H 0 #define HAVE_INTRINSICS_NEON 0 @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_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 c9151830722..5a1ba063f01 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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #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 067a9c19262..2e517a6668e 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/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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/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_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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_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 c9151830722..5a1ba063f01 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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #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 2d005d85373..1bd05e000e4 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/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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/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_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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_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 c9151830722..5a1ba063f01 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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #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 743c18e16d6..cb825f8ad88 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 @@ -215,7 +215,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 %define HAVE_WINDOWS_H 0 %define HAVE_WINSOCK2_H 0 %define HAVE_INTRINSICS_NEON 0 @@ -334,6 +334,7 @@ %define HAVE_XFORM_ASM 0 %define HAVE_XMM_CLOBBERS 1 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 %define HAVE_SOCKLEN_T 0 %define HAVE_STRUCT_ADDRINFO 0 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -662,6 +663,7 @@ %define CONFIG_WMA_FREQS 0 %define CONFIG_WMV2DSP 0 %define CONFIG_AAC_ADTSTOASC_BSF 0 +%define CONFIG_AV1_FRAME_SPLIT_BSF 0 %define CONFIG_AV1_METADATA_BSF 0 %define CONFIG_CHOMP_BSF 0 %define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -805,6 +807,7 @@ %define CONFIG_KMVC_DECODER 0 %define CONFIG_LAGARITH_DECODER 0 %define CONFIG_LOCO_DECODER 0 +%define CONFIG_LSCR_DECODER 0 %define CONFIG_M101_DECODER 0 %define CONFIG_MAGICYUV_DECODER 0 %define CONFIG_MDEC_DECODER 0 @@ -1093,6 +1096,7 @@ %define CONFIG_ADPCM_4XM_DECODER 0 %define CONFIG_ADPCM_ADX_DECODER 0 %define CONFIG_ADPCM_AFC_DECODER 0 +%define CONFIG_ADPCM_AGM_DECODER 0 %define CONFIG_ADPCM_AICA_DECODER 0 %define CONFIG_ADPCM_CT_DECODER 0 %define CONFIG_ADPCM_DTK_DECODER 0 @@ -1690,6 +1694,7 @@ %define CONFIG_COLORBALANCE_FILTER 0 %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 +%define CONFIG_COLORKEY_OPENCL_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1777,6 +1782,7 @@ %define CONFIG_INTERLACE_FILTER 0 %define CONFIG_INTERLEAVE_FILTER 0 %define CONFIG_KERNDEINT_FILTER 0 +%define CONFIG_LAGFUN_FILTER 0 %define CONFIG_LENSCORRECTION_FILTER 0 %define CONFIG_LENSFUN_FILTER 0 %define CONFIG_LIBVMAF_FILTER 0 @@ -2084,6 +2090,7 @@ %define CONFIG_IVR_DEMUXER 0 %define CONFIG_JACOSUB_DEMUXER 0 %define CONFIG_JV_DEMUXER 0 +%define CONFIG_KUX_DEMUXER 0 %define CONFIG_LMLM4_DEMUXER 0 %define CONFIG_LOAS_DEMUXER 0 %define CONFIG_LRC_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 2a586d55672..7b2827efd22 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/usr/local/google/home/sandersd/chromium/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/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_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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -230,7 +230,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 0 -- forced to 0. See https://crbug.com/590440 */ +#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 1 -- forced to 0. See https://crbug.com/590440 */ #define HAVE_WINDOWS_H 0 #define HAVE_WINSOCK2_H 0 #define HAVE_INTRINSICS_NEON 0 @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_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 c9151830722..5a1ba063f01 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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #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 9cc5521f669..1a8d6c5abac 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 @@ -334,6 +334,7 @@ %define HAVE_XFORM_ASM 0 %define HAVE_XMM_CLOBBERS 1 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 %define HAVE_SOCKLEN_T 0 %define HAVE_STRUCT_ADDRINFO 0 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -662,6 +663,7 @@ %define CONFIG_WMA_FREQS 0 %define CONFIG_WMV2DSP 0 %define CONFIG_AAC_ADTSTOASC_BSF 0 +%define CONFIG_AV1_FRAME_SPLIT_BSF 0 %define CONFIG_AV1_METADATA_BSF 0 %define CONFIG_CHOMP_BSF 0 %define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -805,6 +807,7 @@ %define CONFIG_KMVC_DECODER 0 %define CONFIG_LAGARITH_DECODER 0 %define CONFIG_LOCO_DECODER 0 +%define CONFIG_LSCR_DECODER 0 %define CONFIG_M101_DECODER 0 %define CONFIG_MAGICYUV_DECODER 0 %define CONFIG_MDEC_DECODER 0 @@ -1093,6 +1096,7 @@ %define CONFIG_ADPCM_4XM_DECODER 0 %define CONFIG_ADPCM_ADX_DECODER 0 %define CONFIG_ADPCM_AFC_DECODER 0 +%define CONFIG_ADPCM_AGM_DECODER 0 %define CONFIG_ADPCM_AICA_DECODER 0 %define CONFIG_ADPCM_CT_DECODER 0 %define CONFIG_ADPCM_DTK_DECODER 0 @@ -1690,6 +1694,7 @@ %define CONFIG_COLORBALANCE_FILTER 0 %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 +%define CONFIG_COLORKEY_OPENCL_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1777,6 +1782,7 @@ %define CONFIG_INTERLACE_FILTER 0 %define CONFIG_INTERLEAVE_FILTER 0 %define CONFIG_KERNDEINT_FILTER 0 +%define CONFIG_LAGFUN_FILTER 0 %define CONFIG_LENSCORRECTION_FILTER 0 %define CONFIG_LENSFUN_FILTER 0 %define CONFIG_LIBVMAF_FILTER 0 @@ -2084,6 +2090,7 @@ %define CONFIG_IVR_DEMUXER 0 %define CONFIG_JACOSUB_DEMUXER 0 %define CONFIG_JV_DEMUXER 0 +%define CONFIG_KUX_DEMUXER 0 %define CONFIG_LMLM4_DEMUXER 0 %define CONFIG_LOAS_DEMUXER 0 %define CONFIG_LRC_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 be28a8aca30..13bb7e86b0c 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/usr/local/google/home/sandersd/chromium/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/usr/local/google/home/sandersd/chromium/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/usr/local/google/home/sandersd/chromium/src/build/win_files/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/sandersd/chromium/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/usr/local/google/home/sandersd/chromium/src/build/win_files/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.1.0/include/ --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/sandersd/chromium/src/build/win_files/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk --extra-ldflags=-L/usr/local/google/home/sandersd/chromium/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/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_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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "_" #define EXTERN_ASM _ @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_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 c9151830722..5a1ba063f01 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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #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 5ba6e725913..35919dbe53d 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/usr/local/google/home/sandersd/chromium/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/usr/local/google/home/sandersd/chromium/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/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/um --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/shared --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/winrt --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/ucrt --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/include --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/atlmfc/include --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/atlmfc/lib/arm64' --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Lib/10.0.17763.0/ucrt/arm64' --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Lib/10.0.17763.0/um/arm64' --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/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/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_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_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 c9151830722..5a1ba063f01 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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #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 817be42604b..b468b3b24be 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 @@ -334,6 +334,7 @@ %define HAVE_XFORM_ASM 0 %define HAVE_XMM_CLOBBERS 1 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 %define HAVE_SOCKLEN_T 0 %define HAVE_STRUCT_ADDRINFO 0 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -662,6 +663,7 @@ %define CONFIG_WMA_FREQS 0 %define CONFIG_WMV2DSP 0 %define CONFIG_AAC_ADTSTOASC_BSF 0 +%define CONFIG_AV1_FRAME_SPLIT_BSF 0 %define CONFIG_AV1_METADATA_BSF 0 %define CONFIG_CHOMP_BSF 0 %define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -805,6 +807,7 @@ %define CONFIG_KMVC_DECODER 0 %define CONFIG_LAGARITH_DECODER 0 %define CONFIG_LOCO_DECODER 0 +%define CONFIG_LSCR_DECODER 0 %define CONFIG_M101_DECODER 0 %define CONFIG_MAGICYUV_DECODER 0 %define CONFIG_MDEC_DECODER 0 @@ -1093,6 +1096,7 @@ %define CONFIG_ADPCM_4XM_DECODER 0 %define CONFIG_ADPCM_ADX_DECODER 0 %define CONFIG_ADPCM_AFC_DECODER 0 +%define CONFIG_ADPCM_AGM_DECODER 0 %define CONFIG_ADPCM_AICA_DECODER 0 %define CONFIG_ADPCM_CT_DECODER 0 %define CONFIG_ADPCM_DTK_DECODER 0 @@ -1690,6 +1694,7 @@ %define CONFIG_COLORBALANCE_FILTER 0 %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 +%define CONFIG_COLORKEY_OPENCL_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1777,6 +1782,7 @@ %define CONFIG_INTERLACE_FILTER 0 %define CONFIG_INTERLEAVE_FILTER 0 %define CONFIG_KERNDEINT_FILTER 0 +%define CONFIG_LAGFUN_FILTER 0 %define CONFIG_LENSCORRECTION_FILTER 0 %define CONFIG_LENSFUN_FILTER 0 %define CONFIG_LIBVMAF_FILTER 0 @@ -2084,6 +2090,7 @@ %define CONFIG_IVR_DEMUXER 0 %define CONFIG_JACOSUB_DEMUXER 0 %define CONFIG_JV_DEMUXER 0 +%define CONFIG_KUX_DEMUXER 0 %define CONFIG_LMLM4_DEMUXER 0 %define CONFIG_LOAS_DEMUXER 0 %define CONFIG_LRC_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 71e60e914e5..1b93f6ca464 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/usr/local/google/home/sandersd/chromium/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/usr/local/google/home/sandersd/chromium/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/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/um --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/shared --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/winrt --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/ucrt --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/include --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/atlmfc/include --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/atlmfc/lib/x86' --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Lib/10.0.17763.0/ucrt/x86' --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Lib/10.0.17763.0/um/x86' --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/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/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_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_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 c9151830722..5a1ba063f01 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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #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 568864d4046..4aaed46f644 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 @@ -334,6 +334,7 @@ %define HAVE_XFORM_ASM 0 %define HAVE_XMM_CLOBBERS 1 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 %define HAVE_SOCKLEN_T 0 %define HAVE_STRUCT_ADDRINFO 0 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -662,6 +663,7 @@ %define CONFIG_WMA_FREQS 0 %define CONFIG_WMV2DSP 0 %define CONFIG_AAC_ADTSTOASC_BSF 0 +%define CONFIG_AV1_FRAME_SPLIT_BSF 0 %define CONFIG_AV1_METADATA_BSF 0 %define CONFIG_CHOMP_BSF 0 %define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -805,6 +807,7 @@ %define CONFIG_KMVC_DECODER 0 %define CONFIG_LAGARITH_DECODER 0 %define CONFIG_LOCO_DECODER 0 +%define CONFIG_LSCR_DECODER 0 %define CONFIG_M101_DECODER 0 %define CONFIG_MAGICYUV_DECODER 0 %define CONFIG_MDEC_DECODER 0 @@ -1093,6 +1096,7 @@ %define CONFIG_ADPCM_4XM_DECODER 0 %define CONFIG_ADPCM_ADX_DECODER 0 %define CONFIG_ADPCM_AFC_DECODER 0 +%define CONFIG_ADPCM_AGM_DECODER 0 %define CONFIG_ADPCM_AICA_DECODER 0 %define CONFIG_ADPCM_CT_DECODER 0 %define CONFIG_ADPCM_DTK_DECODER 0 @@ -1690,6 +1694,7 @@ %define CONFIG_COLORBALANCE_FILTER 0 %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 +%define CONFIG_COLORKEY_OPENCL_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1777,6 +1782,7 @@ %define CONFIG_INTERLACE_FILTER 0 %define CONFIG_INTERLEAVE_FILTER 0 %define CONFIG_KERNDEINT_FILTER 0 +%define CONFIG_LAGFUN_FILTER 0 %define CONFIG_LENSCORRECTION_FILTER 0 %define CONFIG_LENSFUN_FILTER 0 %define CONFIG_LIBVMAF_FILTER 0 @@ -2084,6 +2090,7 @@ %define CONFIG_IVR_DEMUXER 0 %define CONFIG_JACOSUB_DEMUXER 0 %define CONFIG_JV_DEMUXER 0 +%define CONFIG_KUX_DEMUXER 0 %define CONFIG_LMLM4_DEMUXER 0 %define CONFIG_LOAS_DEMUXER 0 %define CONFIG_LRC_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 7ac39bb6835..9ff6479fe74 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/usr/local/google/home/sandersd/chromium/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/usr/local/google/home/sandersd/chromium/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/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/um --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/shared --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/winrt --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/ucrt --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/include --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/atlmfc/include --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/atlmfc/lib/x64' --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Lib/10.0.17763.0/ucrt/x64' --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Lib/10.0.17763.0/um/x64' --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/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/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_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_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 c9151830722..5a1ba063f01 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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux-noasm/x64/config.h b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux-noasm/x64/config.h index b9195ae1d43..cb467f3246a 100644 --- a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux-noasm/x64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/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-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/usr/local/google/home/sandersd/chromium/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' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- 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-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' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -230,7 +230,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 0 -- forced to 0. See https://crbug.com/590440 */ +#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 1 -- forced to 0. See https://crbug.com/590440 */ #define HAVE_WINDOWS_H 0 #define HAVE_WINSOCK2_H 0 #define HAVE_INTRINSICS_NEON 0 @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux-noasm/x64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux-noasm/x64/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux-noasm/x64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm-neon/config.h b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm-neon/config.h index 58a7850132b..ab897517999 100644 --- a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm-neon/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/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-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/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- 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-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' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm-neon/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm-neon/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm-neon/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm/config.h b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm/config.h index e3dad0e250b..d3ad1558913 100644 --- a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/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-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/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- 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-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' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm64/config.h b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm64/config.h index 078b45c5563..3258b01974e 100644 --- a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/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-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/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- 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-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' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm64/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/ia32/config.asm b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/ia32/config.asm index 048d781c435..e3b975bcdcc 100644 --- a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/ia32/config.asm +++ b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/ia32/config.asm @@ -215,7 +215,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 %define HAVE_WINDOWS_H 0 %define HAVE_WINSOCK2_H 0 %define HAVE_INTRINSICS_NEON 0 @@ -334,6 +334,7 @@ %define HAVE_XFORM_ASM 0 %define HAVE_XMM_CLOBBERS 1 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 %define HAVE_SOCKLEN_T 0 %define HAVE_STRUCT_ADDRINFO 0 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -662,6 +663,7 @@ %define CONFIG_WMA_FREQS 0 %define CONFIG_WMV2DSP 0 %define CONFIG_AAC_ADTSTOASC_BSF 0 +%define CONFIG_AV1_FRAME_SPLIT_BSF 0 %define CONFIG_AV1_METADATA_BSF 0 %define CONFIG_CHOMP_BSF 0 %define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -805,6 +807,7 @@ %define CONFIG_KMVC_DECODER 0 %define CONFIG_LAGARITH_DECODER 0 %define CONFIG_LOCO_DECODER 0 +%define CONFIG_LSCR_DECODER 0 %define CONFIG_M101_DECODER 0 %define CONFIG_MAGICYUV_DECODER 0 %define CONFIG_MDEC_DECODER 0 @@ -1093,6 +1096,7 @@ %define CONFIG_ADPCM_4XM_DECODER 0 %define CONFIG_ADPCM_ADX_DECODER 0 %define CONFIG_ADPCM_AFC_DECODER 0 +%define CONFIG_ADPCM_AGM_DECODER 0 %define CONFIG_ADPCM_AICA_DECODER 0 %define CONFIG_ADPCM_CT_DECODER 0 %define CONFIG_ADPCM_DTK_DECODER 0 @@ -1690,6 +1694,7 @@ %define CONFIG_COLORBALANCE_FILTER 0 %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 +%define CONFIG_COLORKEY_OPENCL_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1777,6 +1782,7 @@ %define CONFIG_INTERLACE_FILTER 0 %define CONFIG_INTERLEAVE_FILTER 0 %define CONFIG_KERNDEINT_FILTER 0 +%define CONFIG_LAGFUN_FILTER 0 %define CONFIG_LENSCORRECTION_FILTER 0 %define CONFIG_LENSFUN_FILTER 0 %define CONFIG_LIBVMAF_FILTER 0 @@ -2084,6 +2090,7 @@ %define CONFIG_IVR_DEMUXER 0 %define CONFIG_JACOSUB_DEMUXER 0 %define CONFIG_JV_DEMUXER 0 +%define CONFIG_KUX_DEMUXER 0 %define CONFIG_LMLM4_DEMUXER 0 %define CONFIG_LOAS_DEMUXER 0 %define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/ia32/config.h b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/ia32/config.h index 7f740503848..7de59556541 100644 --- a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/ia32/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/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-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/usr/local/google/home/sandersd/chromium/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' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- 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-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' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -230,7 +230,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 0 -- forced to 0. See https://crbug.com/590440 */ +#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 1 -- forced to 0. See https://crbug.com/590440 */ #define HAVE_WINDOWS_H 0 #define HAVE_WINSOCK2_H 0 #define HAVE_INTRINSICS_NEON 0 @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/ia32/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/ia32/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/ia32/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/mips64el/config.h b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/mips64el/config.h index 10c4f8e163f..9341cbc449b 100644 --- a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/mips64el/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/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-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/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- 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-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' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/mips64el/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/mips64el/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/mips64el/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/mipsel/config.h b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/mipsel/config.h index 110340266e1..ea68cf84dd6 100644 --- a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/mipsel/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/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-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/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- 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-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' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/mipsel/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/mipsel/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/mipsel/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/x64/config.asm b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/x64/config.asm index 679673169ea..a8da91e2f41 100644 --- a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/x64/config.asm +++ b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/x64/config.asm @@ -215,7 +215,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 %define HAVE_WINDOWS_H 0 %define HAVE_WINSOCK2_H 0 %define HAVE_INTRINSICS_NEON 0 @@ -334,6 +334,7 @@ %define HAVE_XFORM_ASM 0 %define HAVE_XMM_CLOBBERS 1 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 %define HAVE_SOCKLEN_T 0 %define HAVE_STRUCT_ADDRINFO 0 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -662,6 +663,7 @@ %define CONFIG_WMA_FREQS 0 %define CONFIG_WMV2DSP 0 %define CONFIG_AAC_ADTSTOASC_BSF 0 +%define CONFIG_AV1_FRAME_SPLIT_BSF 0 %define CONFIG_AV1_METADATA_BSF 0 %define CONFIG_CHOMP_BSF 0 %define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -805,6 +807,7 @@ %define CONFIG_KMVC_DECODER 0 %define CONFIG_LAGARITH_DECODER 0 %define CONFIG_LOCO_DECODER 0 +%define CONFIG_LSCR_DECODER 0 %define CONFIG_M101_DECODER 0 %define CONFIG_MAGICYUV_DECODER 0 %define CONFIG_MDEC_DECODER 0 @@ -1093,6 +1096,7 @@ %define CONFIG_ADPCM_4XM_DECODER 0 %define CONFIG_ADPCM_ADX_DECODER 0 %define CONFIG_ADPCM_AFC_DECODER 0 +%define CONFIG_ADPCM_AGM_DECODER 0 %define CONFIG_ADPCM_AICA_DECODER 0 %define CONFIG_ADPCM_CT_DECODER 0 %define CONFIG_ADPCM_DTK_DECODER 0 @@ -1690,6 +1694,7 @@ %define CONFIG_COLORBALANCE_FILTER 0 %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 +%define CONFIG_COLORKEY_OPENCL_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1777,6 +1782,7 @@ %define CONFIG_INTERLACE_FILTER 0 %define CONFIG_INTERLEAVE_FILTER 0 %define CONFIG_KERNDEINT_FILTER 0 +%define CONFIG_LAGFUN_FILTER 0 %define CONFIG_LENSCORRECTION_FILTER 0 %define CONFIG_LENSFUN_FILTER 0 %define CONFIG_LIBVMAF_FILTER 0 @@ -2084,6 +2090,7 @@ %define CONFIG_IVR_DEMUXER 0 %define CONFIG_JACOSUB_DEMUXER 0 %define CONFIG_JV_DEMUXER 0 +%define CONFIG_KUX_DEMUXER 0 %define CONFIG_LMLM4_DEMUXER 0 %define CONFIG_LOAS_DEMUXER 0 %define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/x64/config.h b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/x64/config.h index a6d32300ee5..b3be3067a7b 100644 --- a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/x64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/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-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/usr/local/google/home/sandersd/chromium/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' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- 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-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' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -230,7 +230,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 0 -- forced to 0. See https://crbug.com/590440 */ +#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 1 -- forced to 0. See https://crbug.com/590440 */ #define HAVE_WINDOWS_H 0 #define HAVE_WINSOCK2_H 0 #define HAVE_INTRINSICS_NEON 0 @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/x64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/x64/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/ChromeOS/linux/x64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/ChromeOS/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/arm-neon/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/android/arm-neon/config.h index 1156f1f0d0d..79211ae0a18 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/arm-neon/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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/usr/local/google/home/sandersd/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/platforms/android-16/arch-arm --extra-cflags=-I/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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'" -- 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/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'" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/arm-neon/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/android/arm-neon/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/arm-neon/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/arm64/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/android/arm64/config.h index 7892cf9b462..a64110657e5 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/arm64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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/usr/local/google/home/sandersd/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/platforms/android-21/arch-arm64 --extra-cflags=-I/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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" -- 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/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" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/arm64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/android/arm64/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/arm64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/ia32/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/android/ia32/config.h index 72f2ee14c62..8cc4f4f7e00 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/ia32/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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/usr/local/google/home/sandersd/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/platforms/android-16/arch-x86 --extra-cflags=-I/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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" -- 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/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" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/ia32/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/android/ia32/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/ia32/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/mips64el/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/android/mips64el/config.h index 4fdd606e3a7..1758be3a253 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/mips64el/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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/usr/local/google/home/sandersd/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/platforms/android-21/arch-mips64 --extra-cflags=-I/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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'" -- 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/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'" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/mips64el/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/android/mips64el/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/mips64el/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/mipsel/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/android/mipsel/config.h index 6cde377366a..89dabdf81d4 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/mipsel/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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/usr/local/google/home/sandersd/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/platforms/android-16/arch-mips --extra-cflags=-I/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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" -- 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/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" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/mipsel/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/android/mipsel/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/mipsel/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/x64/config.asm b/chromium/third_party/ffmpeg/chromium/config/Chromium/android/x64/config.asm index ea4f24eb926..af622fbc4ad 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/x64/config.asm +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/android/x64/config.asm @@ -334,6 +334,7 @@ %define HAVE_XFORM_ASM 0 %define HAVE_XMM_CLOBBERS 1 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 %define HAVE_SOCKLEN_T 0 %define HAVE_STRUCT_ADDRINFO 0 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -662,6 +663,7 @@ %define CONFIG_WMA_FREQS 0 %define CONFIG_WMV2DSP 0 %define CONFIG_AAC_ADTSTOASC_BSF 0 +%define CONFIG_AV1_FRAME_SPLIT_BSF 0 %define CONFIG_AV1_METADATA_BSF 0 %define CONFIG_CHOMP_BSF 0 %define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -805,6 +807,7 @@ %define CONFIG_KMVC_DECODER 0 %define CONFIG_LAGARITH_DECODER 0 %define CONFIG_LOCO_DECODER 0 +%define CONFIG_LSCR_DECODER 0 %define CONFIG_M101_DECODER 0 %define CONFIG_MAGICYUV_DECODER 0 %define CONFIG_MDEC_DECODER 0 @@ -1093,6 +1096,7 @@ %define CONFIG_ADPCM_4XM_DECODER 0 %define CONFIG_ADPCM_ADX_DECODER 0 %define CONFIG_ADPCM_AFC_DECODER 0 +%define CONFIG_ADPCM_AGM_DECODER 0 %define CONFIG_ADPCM_AICA_DECODER 0 %define CONFIG_ADPCM_CT_DECODER 0 %define CONFIG_ADPCM_DTK_DECODER 0 @@ -1690,6 +1694,7 @@ %define CONFIG_COLORBALANCE_FILTER 0 %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 +%define CONFIG_COLORKEY_OPENCL_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1777,6 +1782,7 @@ %define CONFIG_INTERLACE_FILTER 0 %define CONFIG_INTERLEAVE_FILTER 0 %define CONFIG_KERNDEINT_FILTER 0 +%define CONFIG_LAGFUN_FILTER 0 %define CONFIG_LENSCORRECTION_FILTER 0 %define CONFIG_LENSFUN_FILTER 0 %define CONFIG_LIBVMAF_FILTER 0 @@ -2084,6 +2090,7 @@ %define CONFIG_IVR_DEMUXER 0 %define CONFIG_JACOSUB_DEMUXER 0 %define CONFIG_JV_DEMUXER 0 +%define CONFIG_KUX_DEMUXER 0 %define CONFIG_LMLM4_DEMUXER 0 %define CONFIG_LOAS_DEMUXER 0 %define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/x64/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/android/x64/config.h index a9921b65520..65a76e5425f 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/x64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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/usr/local/google/home/sandersd/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-cross-compile --sysroot=/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/platforms/android-21/arch-x86_64 --extra-cflags=-I/usr/local/google/home/sandersd/chromium/src/third_party/android_ndk/sysroot/usr/include --extra-cflags=-I/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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'" -- 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/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'" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/x64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/android/x64/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/android/x64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux-noasm/x64/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux-noasm/x64/config.h index 3b49a593c1e..e1a8287206e 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux-noasm/x64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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/usr/local/google/home/sandersd/chromium/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'" -- 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/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'" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -230,7 +230,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 0 -- forced to 0. See https://crbug.com/590440 */ +#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 1 -- forced to 0. See https://crbug.com/590440 */ #define HAVE_WINDOWS_H 0 #define HAVE_WINSOCK2_H 0 #define HAVE_INTRINSICS_NEON 0 @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux-noasm/x64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux-noasm/x64/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux-noasm/x64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h index 268d5863ccd..254ee3d4f74 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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'" -- 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/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'" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h index 8b98fbbcc97..93b06f4221f 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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'" -- 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/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'" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h index 258e90648e8..42c3a68bac7 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/src/build/linux/debian_sid_arm64-sysroot --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang" -- 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/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" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.asm b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.asm index d5c895438da..48970128b7f 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.asm +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.asm @@ -215,7 +215,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 %define HAVE_WINDOWS_H 0 %define HAVE_WINSOCK2_H 0 %define HAVE_INTRINSICS_NEON 0 @@ -334,6 +334,7 @@ %define HAVE_XFORM_ASM 0 %define HAVE_XMM_CLOBBERS 1 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 %define HAVE_SOCKLEN_T 0 %define HAVE_STRUCT_ADDRINFO 0 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -662,6 +663,7 @@ %define CONFIG_WMA_FREQS 0 %define CONFIG_WMV2DSP 0 %define CONFIG_AAC_ADTSTOASC_BSF 0 +%define CONFIG_AV1_FRAME_SPLIT_BSF 0 %define CONFIG_AV1_METADATA_BSF 0 %define CONFIG_CHOMP_BSF 0 %define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -805,6 +807,7 @@ %define CONFIG_KMVC_DECODER 0 %define CONFIG_LAGARITH_DECODER 0 %define CONFIG_LOCO_DECODER 0 +%define CONFIG_LSCR_DECODER 0 %define CONFIG_M101_DECODER 0 %define CONFIG_MAGICYUV_DECODER 0 %define CONFIG_MDEC_DECODER 0 @@ -1093,6 +1096,7 @@ %define CONFIG_ADPCM_4XM_DECODER 0 %define CONFIG_ADPCM_ADX_DECODER 0 %define CONFIG_ADPCM_AFC_DECODER 0 +%define CONFIG_ADPCM_AGM_DECODER 0 %define CONFIG_ADPCM_AICA_DECODER 0 %define CONFIG_ADPCM_CT_DECODER 0 %define CONFIG_ADPCM_DTK_DECODER 0 @@ -1690,6 +1694,7 @@ %define CONFIG_COLORBALANCE_FILTER 0 %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 +%define CONFIG_COLORKEY_OPENCL_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1777,6 +1782,7 @@ %define CONFIG_INTERLACE_FILTER 0 %define CONFIG_INTERLEAVE_FILTER 0 %define CONFIG_KERNDEINT_FILTER 0 +%define CONFIG_LAGFUN_FILTER 0 %define CONFIG_LENSCORRECTION_FILTER 0 %define CONFIG_LENSFUN_FILTER 0 %define CONFIG_LIBVMAF_FILTER 0 @@ -2084,6 +2090,7 @@ %define CONFIG_IVR_DEMUXER 0 %define CONFIG_JACOSUB_DEMUXER 0 %define CONFIG_JV_DEMUXER 0 +%define CONFIG_KUX_DEMUXER 0 %define CONFIG_LMLM4_DEMUXER 0 %define CONFIG_LOAS_DEMUXER 0 %define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h index 0230e9ea6e6..c9ae255c515 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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/usr/local/google/home/sandersd/chromium/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" -- 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/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" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -230,7 +230,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 0 -- forced to 0. See https://crbug.com/590440 */ +#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 1 -- forced to 0. See https://crbug.com/590440 */ #define HAVE_WINDOWS_H 0 #define HAVE_WINSOCK2_H 0 #define HAVE_INTRINSICS_NEON 0 @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/mips64el/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/mips64el/config.h index 82ccd60b452..42a591a654e 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/mips64el/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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'" -- 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/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'" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/mips64el/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/mips64el/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/mips64el/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/mipsel/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/mipsel/config.h index 9a5687974fe..c35ac930d2e 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/mipsel/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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/usr/local/google/home/sandersd/chromium/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=/usr/local/google/home/sandersd/chromium/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" -- 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/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" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/mipsel/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/mipsel/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/mipsel/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.asm b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.asm index 17624f74cab..9babedcd223 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.asm +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.asm @@ -215,7 +215,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 %define HAVE_WINDOWS_H 0 %define HAVE_WINSOCK2_H 0 %define HAVE_INTRINSICS_NEON 0 @@ -334,6 +334,7 @@ %define HAVE_XFORM_ASM 0 %define HAVE_XMM_CLOBBERS 1 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 %define HAVE_SOCKLEN_T 0 %define HAVE_STRUCT_ADDRINFO 0 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -662,6 +663,7 @@ %define CONFIG_WMA_FREQS 0 %define CONFIG_WMV2DSP 0 %define CONFIG_AAC_ADTSTOASC_BSF 0 +%define CONFIG_AV1_FRAME_SPLIT_BSF 0 %define CONFIG_AV1_METADATA_BSF 0 %define CONFIG_CHOMP_BSF 0 %define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -805,6 +807,7 @@ %define CONFIG_KMVC_DECODER 0 %define CONFIG_LAGARITH_DECODER 0 %define CONFIG_LOCO_DECODER 0 +%define CONFIG_LSCR_DECODER 0 %define CONFIG_M101_DECODER 0 %define CONFIG_MAGICYUV_DECODER 0 %define CONFIG_MDEC_DECODER 0 @@ -1093,6 +1096,7 @@ %define CONFIG_ADPCM_4XM_DECODER 0 %define CONFIG_ADPCM_ADX_DECODER 0 %define CONFIG_ADPCM_AFC_DECODER 0 +%define CONFIG_ADPCM_AGM_DECODER 0 %define CONFIG_ADPCM_AICA_DECODER 0 %define CONFIG_ADPCM_CT_DECODER 0 %define CONFIG_ADPCM_DTK_DECODER 0 @@ -1690,6 +1694,7 @@ %define CONFIG_COLORBALANCE_FILTER 0 %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 +%define CONFIG_COLORKEY_OPENCL_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1777,6 +1782,7 @@ %define CONFIG_INTERLACE_FILTER 0 %define CONFIG_INTERLEAVE_FILTER 0 %define CONFIG_KERNDEINT_FILTER 0 +%define CONFIG_LAGFUN_FILTER 0 %define CONFIG_LENSCORRECTION_FILTER 0 %define CONFIG_LENSFUN_FILTER 0 %define CONFIG_LIBVMAF_FILTER 0 @@ -2084,6 +2090,7 @@ %define CONFIG_IVR_DEMUXER 0 %define CONFIG_JACOSUB_DEMUXER 0 %define CONFIG_JV_DEMUXER 0 +%define CONFIG_KUX_DEMUXER 0 %define CONFIG_LMLM4_DEMUXER 0 %define CONFIG_LOAS_DEMUXER 0 %define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h index f84ecf97787..5db3bb63385 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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/usr/local/google/home/sandersd/chromium/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'" -- 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/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'" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -230,7 +230,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 0 -- forced to 0. See https://crbug.com/590440 */ +#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 1 -- forced to 0. See https://crbug.com/590440 */ #define HAVE_WINDOWS_H 0 #define HAVE_WINSOCK2_H 0 #define HAVE_INTRINSICS_NEON 0 @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/mac/x64/config.asm b/chromium/third_party/ffmpeg/chromium/config/Chromium/mac/x64/config.asm index 2f9e0f5bd79..10ed0688df7 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/mac/x64/config.asm +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/mac/x64/config.asm @@ -334,6 +334,7 @@ %define HAVE_XFORM_ASM 0 %define HAVE_XMM_CLOBBERS 1 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 %define HAVE_SOCKLEN_T 0 %define HAVE_STRUCT_ADDRINFO 0 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -662,6 +663,7 @@ %define CONFIG_WMA_FREQS 0 %define CONFIG_WMV2DSP 0 %define CONFIG_AAC_ADTSTOASC_BSF 0 +%define CONFIG_AV1_FRAME_SPLIT_BSF 0 %define CONFIG_AV1_METADATA_BSF 0 %define CONFIG_CHOMP_BSF 0 %define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -805,6 +807,7 @@ %define CONFIG_KMVC_DECODER 0 %define CONFIG_LAGARITH_DECODER 0 %define CONFIG_LOCO_DECODER 0 +%define CONFIG_LSCR_DECODER 0 %define CONFIG_M101_DECODER 0 %define CONFIG_MAGICYUV_DECODER 0 %define CONFIG_MDEC_DECODER 0 @@ -1093,6 +1096,7 @@ %define CONFIG_ADPCM_4XM_DECODER 0 %define CONFIG_ADPCM_ADX_DECODER 0 %define CONFIG_ADPCM_AFC_DECODER 0 +%define CONFIG_ADPCM_AGM_DECODER 0 %define CONFIG_ADPCM_AICA_DECODER 0 %define CONFIG_ADPCM_CT_DECODER 0 %define CONFIG_ADPCM_DTK_DECODER 0 @@ -1690,6 +1694,7 @@ %define CONFIG_COLORBALANCE_FILTER 0 %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 +%define CONFIG_COLORKEY_OPENCL_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1777,6 +1782,7 @@ %define CONFIG_INTERLACE_FILTER 0 %define CONFIG_INTERLEAVE_FILTER 0 %define CONFIG_KERNDEINT_FILTER 0 +%define CONFIG_LAGFUN_FILTER 0 %define CONFIG_LENSCORRECTION_FILTER 0 %define CONFIG_LENSFUN_FILTER 0 %define CONFIG_LIBVMAF_FILTER 0 @@ -2084,6 +2090,7 @@ %define CONFIG_IVR_DEMUXER 0 %define CONFIG_JACOSUB_DEMUXER 0 %define CONFIG_JV_DEMUXER 0 +%define CONFIG_KUX_DEMUXER 0 %define CONFIG_LMLM4_DEMUXER 0 %define CONFIG_LOAS_DEMUXER 0 %define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/mac/x64/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/mac/x64/config.h index e23a2dadd24..7b6ea530e85 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/mac/x64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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/usr/local/google/home/sandersd/chromium/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/usr/local/google/home/sandersd/chromium/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/usr/local/google/home/sandersd/chromium/src/build/win_files/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/sandersd/chromium/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/usr/local/google/home/sandersd/chromium/src/build/win_files/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.1.0/include/ --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/sandersd/chromium/src/build/win_files/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk --extra-ldflags=-L/usr/local/google/home/sandersd/chromium/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" -- 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/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" -- 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 357316)" +#define CC_IDENT "clang version 9.0.0 (trunk 357692)" #define av_restrict restrict #define EXTERN_PREFIX "_" #define EXTERN_ASM _ @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/mac/x64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/mac/x64/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/mac/x64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/win/arm64/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/win/arm64/config.h index 819a3f4e520..d0491d0952a 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/win/arm64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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/usr/local/google/home/sandersd/chromium/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/usr/local/google/home/sandersd/chromium/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/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/um --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/shared --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/winrt --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/ucrt --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/include --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/atlmfc/include --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/atlmfc/lib/arm64' --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Lib/10.0.17763.0/ucrt/arm64' --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Lib/10.0.17763.0/um/arm64' --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/lib/arm64'" -- 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/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'" -- 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" @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 0 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/win/arm64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/win/arm64/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/win/arm64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/win/ia32/config.asm b/chromium/third_party/ffmpeg/chromium/config/Chromium/win/ia32/config.asm index 2a815fd2f7e..dbdd1a6aac3 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/win/ia32/config.asm +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/win/ia32/config.asm @@ -334,6 +334,7 @@ %define HAVE_XFORM_ASM 0 %define HAVE_XMM_CLOBBERS 1 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 %define HAVE_SOCKLEN_T 0 %define HAVE_STRUCT_ADDRINFO 0 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -662,6 +663,7 @@ %define CONFIG_WMA_FREQS 0 %define CONFIG_WMV2DSP 0 %define CONFIG_AAC_ADTSTOASC_BSF 0 +%define CONFIG_AV1_FRAME_SPLIT_BSF 0 %define CONFIG_AV1_METADATA_BSF 0 %define CONFIG_CHOMP_BSF 0 %define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -805,6 +807,7 @@ %define CONFIG_KMVC_DECODER 0 %define CONFIG_LAGARITH_DECODER 0 %define CONFIG_LOCO_DECODER 0 +%define CONFIG_LSCR_DECODER 0 %define CONFIG_M101_DECODER 0 %define CONFIG_MAGICYUV_DECODER 0 %define CONFIG_MDEC_DECODER 0 @@ -1093,6 +1096,7 @@ %define CONFIG_ADPCM_4XM_DECODER 0 %define CONFIG_ADPCM_ADX_DECODER 0 %define CONFIG_ADPCM_AFC_DECODER 0 +%define CONFIG_ADPCM_AGM_DECODER 0 %define CONFIG_ADPCM_AICA_DECODER 0 %define CONFIG_ADPCM_CT_DECODER 0 %define CONFIG_ADPCM_DTK_DECODER 0 @@ -1690,6 +1694,7 @@ %define CONFIG_COLORBALANCE_FILTER 0 %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 +%define CONFIG_COLORKEY_OPENCL_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1777,6 +1782,7 @@ %define CONFIG_INTERLACE_FILTER 0 %define CONFIG_INTERLEAVE_FILTER 0 %define CONFIG_KERNDEINT_FILTER 0 +%define CONFIG_LAGFUN_FILTER 0 %define CONFIG_LENSCORRECTION_FILTER 0 %define CONFIG_LENSFUN_FILTER 0 %define CONFIG_LIBVMAF_FILTER 0 @@ -2084,6 +2090,7 @@ %define CONFIG_IVR_DEMUXER 0 %define CONFIG_JACOSUB_DEMUXER 0 %define CONFIG_JV_DEMUXER 0 +%define CONFIG_KUX_DEMUXER 0 %define CONFIG_LMLM4_DEMUXER 0 %define CONFIG_LOAS_DEMUXER 0 %define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/win/ia32/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/win/ia32/config.h index 13a680cd0ad..2ae08958574 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/win/ia32/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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/usr/local/google/home/sandersd/chromium/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/usr/local/google/home/sandersd/chromium/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/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/um --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/shared --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/winrt --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/ucrt --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/include --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/atlmfc/include --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/atlmfc/lib/x86' --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Lib/10.0.17763.0/ucrt/x86' --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Lib/10.0.17763.0/um/x86' --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/lib/x86'" -- 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/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'" -- 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" @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/win/ia32/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/win/ia32/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/win/ia32/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/win/x64/config.asm b/chromium/third_party/ffmpeg/chromium/config/Chromium/win/x64/config.asm index 02d3606860c..a7c72064535 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/win/x64/config.asm +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/win/x64/config.asm @@ -334,6 +334,7 @@ %define HAVE_XFORM_ASM 0 %define HAVE_XMM_CLOBBERS 1 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 %define HAVE_SOCKLEN_T 0 %define HAVE_STRUCT_ADDRINFO 0 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -662,6 +663,7 @@ %define CONFIG_WMA_FREQS 0 %define CONFIG_WMV2DSP 0 %define CONFIG_AAC_ADTSTOASC_BSF 0 +%define CONFIG_AV1_FRAME_SPLIT_BSF 0 %define CONFIG_AV1_METADATA_BSF 0 %define CONFIG_CHOMP_BSF 0 %define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -805,6 +807,7 @@ %define CONFIG_KMVC_DECODER 0 %define CONFIG_LAGARITH_DECODER 0 %define CONFIG_LOCO_DECODER 0 +%define CONFIG_LSCR_DECODER 0 %define CONFIG_M101_DECODER 0 %define CONFIG_MAGICYUV_DECODER 0 %define CONFIG_MDEC_DECODER 0 @@ -1093,6 +1096,7 @@ %define CONFIG_ADPCM_4XM_DECODER 0 %define CONFIG_ADPCM_ADX_DECODER 0 %define CONFIG_ADPCM_AFC_DECODER 0 +%define CONFIG_ADPCM_AGM_DECODER 0 %define CONFIG_ADPCM_AICA_DECODER 0 %define CONFIG_ADPCM_CT_DECODER 0 %define CONFIG_ADPCM_DTK_DECODER 0 @@ -1690,6 +1694,7 @@ %define CONFIG_COLORBALANCE_FILTER 0 %define CONFIG_COLORCHANNELMIXER_FILTER 0 %define CONFIG_COLORKEY_FILTER 0 +%define CONFIG_COLORKEY_OPENCL_FILTER 0 %define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COLORSPACE_FILTER 0 @@ -1777,6 +1782,7 @@ %define CONFIG_INTERLACE_FILTER 0 %define CONFIG_INTERLEAVE_FILTER 0 %define CONFIG_KERNDEINT_FILTER 0 +%define CONFIG_LAGFUN_FILTER 0 %define CONFIG_LENSCORRECTION_FILTER 0 %define CONFIG_LENSFUN_FILTER 0 %define CONFIG_LIBVMAF_FILTER 0 @@ -2084,6 +2090,7 @@ %define CONFIG_IVR_DEMUXER 0 %define CONFIG_JACOSUB_DEMUXER 0 %define CONFIG_JV_DEMUXER 0 +%define CONFIG_KUX_DEMUXER 0 %define CONFIG_LMLM4_DEMUXER 0 %define CONFIG_LOAS_DEMUXER 0 %define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/win/x64/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/win/x64/config.h index b783c377c45..e59a377c705 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/win/x64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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/usr/local/google/home/sandersd/chromium/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/usr/local/google/home/sandersd/chromium/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/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/um --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/shared --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/winrt --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Include/10.0.17763.0/ucrt --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/include --extra-cflags=-imsvc/usr/local/google/home/sandersd/chromium/src/third_party/ffmpeg/../depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/atlmfc/include --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/atlmfc/lib/x64' --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Lib/10.0.17763.0/ucrt/x64' --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/win_sdk/Lib/10.0.17763.0/um/x64' --extra-ldflags='-libpath:/usr/local/google/home/sandersd/chromium/src/third_party/depot_tools/win_toolchain/vs_files/818a152b3f1da991c1725d85be19a0f27af6bab4/VC/Tools/MSVC/14.16.27023/lib/x64'" -- 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/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'" -- 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" @@ -349,6 +349,7 @@ #define HAVE_XFORM_ASM 0 #define HAVE_XMM_CLOBBERS 1 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -677,6 +678,7 @@ #define CONFIG_WMA_FREQS 0 #define CONFIG_WMV2DSP 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_AV1_FRAME_SPLIT_BSF 0 #define CONFIG_AV1_METADATA_BSF 0 #define CONFIG_CHOMP_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -820,6 +822,7 @@ #define CONFIG_KMVC_DECODER 0 #define CONFIG_LAGARITH_DECODER 0 #define CONFIG_LOCO_DECODER 0 +#define CONFIG_LSCR_DECODER 0 #define CONFIG_M101_DECODER 0 #define CONFIG_MAGICYUV_DECODER 0 #define CONFIG_MDEC_DECODER 0 @@ -1108,6 +1111,7 @@ #define CONFIG_ADPCM_4XM_DECODER 0 #define CONFIG_ADPCM_ADX_DECODER 0 #define CONFIG_ADPCM_AFC_DECODER 0 +#define CONFIG_ADPCM_AGM_DECODER 0 #define CONFIG_ADPCM_AICA_DECODER 0 #define CONFIG_ADPCM_CT_DECODER 0 #define CONFIG_ADPCM_DTK_DECODER 0 @@ -1705,6 +1709,7 @@ #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 #define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COLORSPACE_FILTER 0 @@ -1792,6 +1797,7 @@ #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 0 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBVMAF_FILTER 0 @@ -2099,6 +2105,7 @@ #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 #define CONFIG_LOAS_DEMUXER 0 #define CONFIG_LRC_DEMUXER 0 diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/win/x64/libavutil/ffversion.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/win/x64/libavutil/ffversion.h index c9151830722..5a1ba063f01 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/win/x64/libavutil/ffversion.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/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-94448-g3cea9cd219" +#define FFMPEG_VERSION "N-94581-gb4c1b9c2a7" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/third_party/ffmpeg/chromium/patches/README b/chromium/third_party/ffmpeg/chromium/patches/README index dccbbbfee8c..2f13f1be4d6 100644 --- a/chromium/third_party/ffmpeg/chromium/patches/README +++ b/chromium/third_party/ffmpeg/chromium/patches/README @@ -807,3 +807,83 @@ Date: Mon Mar 4 14:01:22 2019 -0800 Affects: libavformat/mov.c +------------------------------------------------------------------ +commit d17a8c9b951d5c4cc8fd2027db48b657deec290f +Author: Dan Sanders <sandersd@chromium.org> +Date: Fri Apr 19 14:52:58 2019 -0700 + + libavformat/mov: limit nb_frames_for_fps to INT_MAX + + Bug: 827894 + Change-Id: I0de1422ba7c8bfb4d66675552d5704bb86ea1fe2 + Reviewed-on: https://chromium-review.googlesource.com/c/chromium/third_party/ffmpeg/+/1575672 + Reviewed-by: Chrome Cunningham <chcunningham@chromium.org> + +Affects: + libavformat/mov.c + +------------------------------------------------------------------ +commit d82e355b42a185683ce8c19ccb27e162c9ff66e8 +Author: Dan Sanders <sandersd@chromium.org> +Date: Mon Apr 22 11:08:48 2019 -0700 + + libavformat/mov: limit nb_frames_for_fps to INT_MAX + + Part 2. + + Bug: 827894 + Change-Id: Icf597a26f817f342cf120f0c9c17a95122a45797 + Reviewed-on: https://chromium-review.googlesource.com/c/chromium/third_party/ffmpeg/+/1577698 + Reviewed-by: Chrome Cunningham <chcunningham@chromium.org> + +Affects: + libavformat/mov.c + +------------------------------------------------------------------ +commit 68f1932090d5e35d958434d0588a33986cd3d65d +Author: Felicia Lim <flim@chromium.org> +Date: Thu May 9 17:40:11 2019 -0700 + + Revert "Revert "libopus: Add channel mapping 2 support in libopusdec"" + + This reverts commit ffec9d32feaff7075c0b150f1168e08aeb4a296a to avoid + incorrect reordering of Opus Ambisonics channels. + + This is a temporary fix that should be removed once Opus Ambisonics is properly + supported upstream. + + Bug: chromium:958645 + Change-Id: I2842b8084eda12e5bed19789056075d5ef3d8de3 + Reviewed-on: https://chromium-review.googlesource.com/c/chromium/third_party/ffmpeg/+/1604210 + Reviewed-by: Dale Curtis <dalecurtis@chromium.org> + +Affects: + libavcodec/libopusdec.c + +------------------------------------------------------------------ +commit 4267885f5c532b54fa7ee40c9915fa452dd1dfc5 +Author: Matt Wolenetz <wolenetz@chromium.org> +Date: Wed Jul 24 16:38:05 2019 -0700 + + wavdec: Fail bext parsing on incomplete reads + + avio_read can successfully return even when less than the requested + amount of input was read. wavdec's bext parsing mistakenly assumed a + successful avio_read always read the full amount that was requested. + The result could be dictionary tags populated with partially + uninitialized values. + + This change also fixes a broken assertion in wav_parse_bext_string that + was off-by-one, though no known current usage of that method hits that + broken case. + + BUG=987270 + + Change-Id: I5b2fc654b865195a7c5e3932fd2e3a3eaeff04f7 + Reviewed-on: https://chromium-review.googlesource.com/c/chromium/third_party/ffmpeg/+/1717599 + Reviewed-by: Frank Liberato <liberato@chromium.org> + (cherry picked from commit e0e3133c40fbca0032a2d9400da736e4b933882f) + +Affects: + libavformat/wavdec.c + diff --git a/chromium/third_party/ffmpeg/chromium/patches/config_flag_changes.txt b/chromium/third_party/ffmpeg/chromium/patches/config_flag_changes.txt index ff4a939bd64..a377c7b8fc2 100644 --- a/chromium/third_party/ffmpeg/chromium/patches/config_flag_changes.txt +++ b/chromium/third_party/ffmpeg/chromium/patches/config_flag_changes.txt @@ -1,5 +1,9 @@ -+ CONFIG_AGM_DECODER 0 -+ CONFIG_CUDA_NVCC 0 -- CONFIG_LIBNDI_NEWTEK 0 -- CONFIG_LIBNDI_NEWTEK_INDEV 0 -- CONFIG_LIBNDI_NEWTEK_OUTDEV 0 ++ CONFIG_ADPCM_AGM_DECODER 0 ++ CONFIG_AV1_FRAME_SPLIT_BSF 0 ++ CONFIG_COLORKEY_OPENCL_FILTER 0 ++ CONFIG_KUX_DEMUXER 0 ++ CONFIG_LAGFUN_FILTER 0 ++ CONFIG_LSCR_DECODER 0 ++ HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 +- HAVE_VALGRIND_VALGRIND_H 0 ++ HAVE_VALGRIND_VALGRIND_H 1 diff --git a/chromium/third_party/ffmpeg/chromium/scripts/robo_branch.py b/chromium/third_party/ffmpeg/chromium/scripts/robo_branch.py index ba1aec446ff..35c82b7ba19 100644 --- a/chromium/third_party/ffmpeg/chromium/scripts/robo_branch.py +++ b/chromium/third_party/ffmpeg/chromium/scripts/robo_branch.py @@ -16,7 +16,6 @@ import find_patches import os from robo_lib import UserInstructions from robo_lib import log -from subprocess import call from subprocess import check_output def IsWorkingDirectoryClean(): @@ -38,7 +37,7 @@ def CreateAndCheckoutDatedSushiBranch(cfg): branch_name=cfg.sushi_branch_prefix() + now.strftime("%Y-%m-%d-%H-%M-%S") log("Creating dated branch %s" % branch_name) # Fetch the latest from origin - if call(["git", "fetch", "origin"]): + if cfg.Call(["git", "fetch", "origin"]): raise Exception("Could not fetch from origin") # Create the named branch @@ -52,7 +51,11 @@ def CreateAndCheckoutDatedSushiBranch(cfg): # # We don't want to push anything to origin yet, though, just to keep from # making a bunch of sushi branches. We can do it later just as easily. - if call(["git", "branch", "--no-track", branch_name, "origin/master"]): + if cfg.Call(["git", + "branch", + "--no-track", + branch_name, + "origin/master"]): raise Exception("Could not create branch") # NOTE: we could push the remote branch back to origin and start tracking it @@ -60,8 +63,8 @@ def CreateAndCheckoutDatedSushiBranch(cfg): # actually work, i don't want to push a bunch of branches to origin. # Check out the branch. On failure, delete the new branch. - if call(["git", "checkout", branch_name]): - call(["git", "branch", "-D", branch_name]) + if cfg.Call(["git", "checkout", branch_name]): + cfg.Call(["git", "branch", "-D", branch_name]) raise Exception("Could not checkout branch") cfg.SetBranchName(branch_name) @@ -79,9 +82,9 @@ def MergeUpstreamToSushiBranch(cfg): log("Merging upstream/master to local branch") if not cfg.sushi_branch_name(): raise Exception("Refusing to do a merge on a branch I didn't create") - if call(["git", "fetch", "upstream"]): + if cfg.Call(["git", "fetch", "upstream"]): raise Exception("Could not fetch from upstream") - if call(["git", "merge", "upstream/master"]): + if cfg.Call(["git", "merge", "upstream/master"]): raise UserInstructions("Merge failed -- resolve conflicts manually.") log("Merge has completed successfully") @@ -106,7 +109,7 @@ def MergeUpstreamToSushiBranchIfNeeded(cfg): return # See if a merge is in progress. "git merge HEAD" will do nothing if it # succeeds, but will fail if a merge is in progress. - if call(["git", "merge", "HEAD"]): + if cfg.Call(["git", "merge", "HEAD"]): raise UserInstructions( "Merge is in progress -- please resolve conflicts and complete it.") # There is no merge on this branch, and none is in progress. Start a merge. @@ -144,9 +147,9 @@ def AddAndCommit(cfg, commit_title): log("No files to commit to %s" % commit_title) return # TODO: Ignore this file, for the "comment out autorename exception" thing. - if call(["git", "add", "-u"]): + if cfg.Call(["git", "add", "-u"]): raise Exception("Could not add files") - if call(["git", "commit", "-m", commit_title]): + if cfg.Call(["git", "commit", "-m", commit_title]): raise Exception("Could create commit") def IsTrackingBranchSet(cfg): @@ -166,9 +169,9 @@ def PushToOriginWithoutReviewAndTrackIfNeeded(cfg): log("Already have local tracking branch") return log("Pushing merge to origin without review") - call(["git", "push", "origin", cfg.sushi_branch_name()]) + cfg.Call(["git", "push", "origin", cfg.sushi_branch_name()]) log("Setting tracking branch") - call(["git", "branch", "--set-upstream-to=origin/%s" % + cfg.Call(["git", "branch", "--set-upstream-to=origin/%s" % cfg.sushi_branch_name()]) # Sanity check. We don't want to start pushing other commits without review. if not IsTrackingBranchSet(cfg): @@ -179,9 +182,9 @@ def HandleAutorename(cfg): # removes files needed for autorenames. Run it. log("Updating git for any autorename changes") cfg.chdir_to_ffmpeg_home(); - if call(["chmod", "+x", cfg.autorename_git_file()]): + if cfg.Call(["chmod", "+x", cfg.autorename_git_file()]): raise Exception("Unable to chmod %s" % cfg.autorename_git_file()) - if call([cfg.autorename_git_file()]): + if cfg.Call([cfg.autorename_git_file()]): raise Exception("Unable to run %s" % cfg.autorename_git_file()) def IsCommitOnThisBranch(robo_configuration, commit_title): @@ -190,3 +193,18 @@ def IsCommitOnThisBranch(robo_configuration, commit_title): titles = check_output(["git", "log", "--format=%s", "origin/master..%s" % robo_configuration.branch_name()]) return commit_title in titles + +def IsPatchesFileDone(robo_configuration): + """Return False if and only if the patches file isn't checked in.""" + if IsCommitOnThisBranch( + robo_configuration, + robo_configuration.patches_commit_title()): + log("Skipping patches file since already committed") + return True + return False + +def UpdatePatchesFileUnconditionally(robo_configuration): + """Update the patches file.""" + WritePatchesReadme(robo_configuration) + AddAndCommit(robo_configuration, + robo_configuration.patches_commit_title()) diff --git a/chromium/third_party/ffmpeg/chromium/scripts/robo_build.py b/chromium/third_party/ffmpeg/chromium/scripts/robo_build.py index b11948cde68..e93f6a463c6 100644 --- a/chromium/third_party/ffmpeg/chromium/scripts/robo_build.py +++ b/chromium/third_party/ffmpeg/chromium/scripts/robo_build.py @@ -8,7 +8,6 @@ import os from robo_lib import log -from subprocess import call def ConfigureAndBuildFFmpeg(robo_configuration, platform, architecture): """Run FFmpeg's configure script, and build ffmpeg. @@ -27,7 +26,7 @@ def ConfigureAndBuildFFmpeg(robo_configuration, platform, architecture): command = ["./chromium/scripts/build_ffmpeg.py", platform] if architecture: command.append(architecture) - if call(command): + if robo_configuration.Call(command): raise Exception("FFmpeg build failed for %s %s" % (platform, architecture)) @@ -41,13 +40,13 @@ def ImportFFmpegConfigsIntoChromium(robo_configuration, write_git_file = False): """ robo_configuration.chdir_to_ffmpeg_home(); log("Copying FFmpeg configs") - if call(["./chromium/scripts/copy_config.sh"]): + if robo_configuration.Call(["./chromium/scripts/copy_config.sh"]): raise Exception("FFmpeg copy_config.sh failed") log("Generating GN config for all ffmpeg versions") generate_cmd = ["./chromium/scripts/generate_gn.py"] if write_git_file: generate_cmd += ["-i", robo_configuration.autorename_git_file()] - if call(generate_cmd): + if robo_configuration.Call(generate_cmd): raise Exception("FFmpeg generate_gn.sh failed") def BuildAndImportAllFFmpegConfigs(robo_configuration): @@ -98,7 +97,7 @@ def BuildChromeTargetASAN(robo_configuration, target, platform, architecture): architecture: arch to build it for (e.g., "x64"). """ robo_configuration.chdir_to_chrome_src() - if call(["ninja", "-j5000", "-C", + if robo_configuration.Call(["ninja", "-j5000", "-C", robo_configuration.relative_asan_directory(), target]): raise Exception("Failed to build %s" % target) @@ -117,7 +116,8 @@ def BuildAndRunChromeTargetASAN(robo_configuration, target, platform, # TODO: we should be smarter about running things on android, for example. log("Running %s" % target) robo_configuration.chdir_to_chrome_src() - if call([os.path.join(robo_configuration.absolute_asan_directory(), target)]): + if robo_configuration.Call( + [os.path.join(robo_configuration.absolute_asan_directory(), target)]): raise Exception("%s didn't complete successfully" % target) log("%s ran successfully" % target) diff --git a/chromium/third_party/ffmpeg/chromium/scripts/robo_lib.py b/chromium/third_party/ffmpeg/chromium/scripts/robo_lib.py index 93e4ece35ce..c008d3afee1 100644 --- a/chromium/third_party/ffmpeg/chromium/scripts/robo_lib.py +++ b/chromium/third_party/ffmpeg/chromium/scripts/robo_lib.py @@ -32,6 +32,7 @@ class RoboConfiguration: Important: We might be doing --setup, so these sanity checks should only be for things that we don't plan for fix as part of that. """ + self.set_prompt_on_call(False) # This is the prefix that our branches start with. self._sushi_branch_prefix = "sushi-" # This is the title that we use for the commit with GN configs. @@ -175,3 +176,20 @@ class RoboConfiguration: def autorename_git_file(self): return self._autorename_git_file + + def prompt_on_call(self): + """ Return True if and only if we're supposed to ask the user before running + any command that might have a side-effect.""" + return self._prompt_on_call + + def set_prompt_on_call(self, value): + self._prompt_on_call = value + + def Call(self, args, shell=False): + """Run the command specified by |args| (see subprocess.call), optionally + prompting the user.""" + if self.prompt_on_call(): + print("[%s] About to run: %s " % (os.getcwd(), args)) + raw_input("Press ENTER to continue, or interrupt the script: ") + return call(args, shell=shell) + diff --git a/chromium/third_party/ffmpeg/chromium/scripts/robo_setup.py b/chromium/third_party/ffmpeg/chromium/scripts/robo_setup.py index 7dd3a4b1549..ed0505c3fb9 100755 --- a/chromium/third_party/ffmpeg/chromium/scripts/robo_setup.py +++ b/chromium/third_party/ffmpeg/chromium/scripts/robo_setup.py @@ -9,7 +9,6 @@ import io import os from robo_lib import UserInstructions -from subprocess import call import subprocess from robo_lib import log import shutil @@ -23,7 +22,8 @@ def InstallUbuntuPackage(robo_configuration, package): """ log("Installing package %s" % package) - if call(["sudo", "apt-get", "install", package]): + if robo_configuration.Call(["sudo", "apt-get", "install", + package]): raise Exception("Could not install %s" % package) def InstallPrereqs(robo_configuration): @@ -38,7 +38,8 @@ def InstallPrereqs(robo_configuration): media_directory = os.path.join("media", "test", "data", "internal") if not os.path.exists(media_directory): log("Checking out media internal test data") - if call(["git", "clone", + if robo_configuration.Call( + ["git", "clone", "https://chrome-internal.googlesource.com/chrome/data/media", media_directory]): raise Exception( @@ -87,7 +88,8 @@ def EnsureASANDirWorks(robo_configuration): # Ask gn to generate build files. log("Running gn on %s" % directory_name) - if call(["gn", "gen", robo_configuration.relative_asan_directory()]): + if robo_configuration.Call( + ["gn", "gen", robo_configuration.relative_asan_directory()]): raise Exception("Unable to gn gen %s" % robo_configuration.local_asan_directory()) @@ -129,7 +131,7 @@ def EnsureGClientTargets(robo_configuration): # Sync regardless of whether we changed the config. log("Running gclient sync") robo_configuration.chdir_to_chrome_src() - if call(["gclient", "sync"]): + if robo_configuration.Call(["gclient", "sync"]): raise Exception("gclient sync failed") def FetchAdditionalWindowsBinaries(robo_configuration): @@ -137,7 +139,8 @@ def FetchAdditionalWindowsBinaries(robo_configuration): sometimes remove these. Re-run this if you're missing llvm-nm or llvm-ar.""" robo_configuration.chdir_to_chrome_src() log("Downloading some additional compiler tools") - if call(["tools/clang/scripts/download_objdump.py"]): + if robo_configuration.Call( + ["tools/clang/scripts/download_objdump.py"]): raise Exception("download_objdump.py failed") def FetchMacSDK(robo_configuration): @@ -148,7 +151,7 @@ def FetchMacSDK(robo_configuration): if not os.path.exists(sdk_base): os.makedirs(sdk_base) os.chdir(sdk_base) - if call( + if robo_configuration.Call( "gsutil.py cat gs://chrome-mac-sdk/toolchain-8E2002-3.tgz | tar xzvf -", shell=True): raise Exception("Cannot download and extract Mac SDK") @@ -173,7 +176,8 @@ def EnsureSysroots(robo_configuration): """Install arm/arm64/mips/mips64 sysroots.""" robo_configuration.chdir_to_chrome_src() for arch in ["arm", "arm64", "mips", "mips64el"]: - if call(["build/linux/sysroot_scripts/install-sysroot.py", + if robo_configuration.Call( + ["build/linux/sysroot_scripts/install-sysroot.py", "--arch=" + arch]): raise Exception("Failed to install sysroot for " + arch); @@ -197,7 +201,7 @@ def EnsureChromiumNasm(robo_configuration): "nasm") if not os.path.exists(chromium_nasm_path): log("Building Chromium's nasm") - if call(["ninja", "-j5000", "-C", + if robo_configuration.Call(["ninja", "-j5000", "-C", robo_configuration.relative_asan_directory(), "third_party/nasm"]): raise Exception("Failed to build nasm") # Verify that it exists now, for sanity. @@ -217,3 +221,17 @@ def EnsureToolchains(robo_configuration): FetchMacSDK(robo_configuration) EnsureLLVMSymlinks(robo_configuration) EnsureSysroots(robo_configuration) + +def EnsureUpstreamRemote(robo_configuration): + """Make sure that the upstream remote is defined.""" + remotes = subprocess.check_output(["git", "remote", "-v"]).split() + if "upstream" in remotes: + log("Upstream remote found") + return + log("Adding upstream remote") + if robo_configuration.Call(["git", + "remote", + "add", + "upstream", + "git://source.ffmpeg.org/ffmpeg.git"]): + raise Exception("Failed to add git remote") diff --git a/chromium/third_party/ffmpeg/chromium/scripts/robosushi.py b/chromium/third_party/ffmpeg/chromium/scripts/robosushi.py index 01467da483a..08c508fffce 100755 --- a/chromium/third_party/ffmpeg/chromium/scripts/robosushi.py +++ b/chromium/third_party/ffmpeg/chromium/scripts/robosushi.py @@ -6,12 +6,15 @@ # # Set up everything for the roll. # -# --setup: set up the host to do a roll. Idempotent, but probably doesn't need -# to be run more than once in a while. -# --test: configure ffmpeg for the host machine, and try running media unit -# tests and the ffmpeg regression tests. -# --build: build ffmpeg configs for all platforms, then generate gn config. -# --all: do everything. Right now, this is the same as "--test --build". +# --prompt: require user input before taking any action. Use in conjunction +# with (before) other options. +# --setup: set up the host to do a roll. Idempotent, but probably doesn't +# need to be run more than once in a while. +# --auto-merge: do the merge. Requires --setup to be run first. +# --test: configure ffmpeg for the host machine, and try running media +# unit tests and the ffmpeg regression tests. +# --build-gn: build ffmpeg configs for all platforms, then generate gn config. +# --patches: generate chromium/patches/README and commit it locally. import getopt import os @@ -19,79 +22,165 @@ import sys import robo_branch from robo_lib import log +from robo_lib import UserInstructions import robo_lib import robo_build import robo_setup +def AreGnConfigsDone(cfg): + # Try to get everything to build if we haven't committed the configs yet. + # Note that the only time we need to do this again is if some change makes + # different files added / deleted to the build, or if ffmpeg configure + # changes. We don't need to do this if you just edit ffmpeg sources; + # those will be built with the tests if they've changed since last time. + # + # So, if you're just editing ffmpeg sources to get tests to pass, then you + # probably don't need to do this step again. + # + # TODO: Add a way to override this. I guess just edit out the config + # commit with a rebase for now. + return robo_branch.IsCommitOnThisBranch(cfg, cfg.gn_commit_title()) + +def BuildGnConfigsUnconditionally(robo_configuration): + robo_build.BuildAndImportAllFFmpegConfigs(robo_configuration) + # Run sanity checks on the merge before we commit. + robo_branch.CheckMerge(robo_configuration) + # Write the config changes to help the reviewer. + robo_branch.WriteConfigChangesFile(robo_configuration) + # TODO(liberato): Add the 'autodetect' regex too. + # Handle autorenames last, so that we don't stage things and then fail. + # While it's probably okay, it's nicer if we don't. + robo_branch.HandleAutorename(robo_configuration) + robo_branch.AddAndCommit(robo_configuration, + robo_configuration.gn_commit_title()) + +# Array of steps that this script knows how to perform. Each step is a +# dictionary that has the following keys: +# desc: (required) user-friendly description of this step. +# pre_fn: (optional) function that will be run first to test if all required +# prerequisites are done. Should throw an exception if not. +# skip_fn: (optional) function that will be run after |pre_fn| to determine if +# this step is already done / not required. Should return True to +# skip the step, False to do it. +# do_fn: (required) function that runs this step. +steps = { + "install_prereqs": { "desc": "Install required software.", + "do_fn": robo_setup.InstallPrereqs }, + "ensure_toolchains": { "desc": "Download mac / win toolchains", + "do_fn": robo_setup.EnsureToolchains }, + "ensure_asan_dir": { "desc": "Create ninja ASAN output directory if needed", + "do_fn": robo_setup.EnsureASANDirWorks }, + "ensure_nasm": { "desc": "Compile chromium's nasm if needed", + "do_fn": robo_setup.EnsureChromiumNasm }, + "ensure_remote": { "desc": "Set git remotes if needed", + "do_fn": robo_setup.EnsureUpstreamRemote }, + + # Convenience roll-up for --setup + "setup": { "do_fn": lambda cfg : RunSteps(cfg, ["install_prereqs", + "ensure_toolchains", + "ensure_asan_dir", + "ensure_nasm", + "ensure_remote"]) }, + + # TODO(liberato): consider moving the "if needed" to |req_fn|. + "create_sushi_branch": + { "desc": "Create a sushi-MDY branch if we're not on one", + "do_fn": robo_branch.CreateAndCheckoutDatedSushiBranchIfNeeded }, + "merge_from_upstream": + { "desc": "Merge upstream/master to our local sushi-MDY branch if needed", + "do_fn": robo_branch.MergeUpstreamToSushiBranchIfNeeded }, + "push_merge_to_origin": + { "desc": """Push the merge commit, without review, to origin/sushi-MDY, + if needed. Also sets the local sushi-MDY to track it, so + that 'git cl upload' won't try to upload it for review.""", + "do_fn": robo_branch.PushToOriginWithoutReviewAndTrackIfNeeded }, + "build_gn_configs": + { "desc": "Build gn configs (slow), and commit the results locally.", + "skip_fn": AreGnConfigsDone, + "do_fn": BuildGnConfigsUnconditionally }, + "update_patches_file": + { "desc": "Rewrite chromium/patches/README and commit locally if needed.", + "skip_fn": robo_branch.IsPatchesFileDone, + "do_fn": robo_branch.UpdatePatchesFileUnconditionally }, + "run_tests": + { "desc": "Compile and run ffmpeg_regression_tests and media_unittests", + "do_fn": robo_build.RunTests }, + + # Roll-up for --auto-merge + "auto-merge": + { "do_fn": lambda cfg : RunSteps(cfg, [ "create_sushi_branch", + "merge_from_upstream", + "push_merge_to_origin", + "build_gn_configs", + "update_patches_file", + # TODO: If the tests fail, and this is a manual roll, then the right thing + # to do is to upload the gn config / patches for review and land it. + "run_tests", + ]) }, +} + +def RunSteps(cfg, step_names): + for step_name in step_names: + if not step_name in steps: + raise Exception("Unknown step %s" % step_name) + log("Step %s" % step_name) + step = steps[step_name] + try: + if "pre_fn" in step: + raise Exception("pre_fn not supported yet") + if "skip_fn" in step: + if step["skip_fn"](cfg): + log("Step %s not needed, skipping" % step_name) + continue + step["do_fn"](cfg) + except Exception, e: + log("Step %s failed" % step_name) + raise e + +def ListSteps(): + for name, step in steps.iteritems(): + if "desc" in step: + print "%s: %s\n" % (name, step["desc"]) + def main(argv): robo_configuration = robo_lib.RoboConfiguration() robo_configuration.chdir_to_ffmpeg_home(); + # TODO(liberato): Add a way to skip |skip_fn|. parsed, remaining = getopt.getopt(argv, "", - ["setup", "test", "build", "auto-merge"]) + [ + "prompt", + "setup", + "test", + "build", + "patches", + "auto-merge", + "step=", + "list", + ]) for opt, arg in parsed: - if opt == "--setup": - robo_setup.InstallPrereqs(robo_configuration) - robo_setup.EnsureToolchains(robo_configuration) - robo_setup.EnsureASANDirWorks(robo_configuration) - robo_setup.EnsureChromiumNasm(robo_configuration) + if opt == "--prompt": + robo_configuration.set_prompt_on_call(True) + elif opt == "--setup": + RunSteps(robo_configuration, ["setup"]) elif opt == "--test": robo_build.BuildAndImportFFmpegConfigForHost(robo_configuration) robo_build.RunTests(robo_configuration) - elif opt == "--build": + elif opt == "--build-gn": # Unconditionally build all the configs and import them. robo_build.BuildAndImportAllFFmpegConfigs(robo_configuration) + elif opt == "--patches": + # To be run after committing a local change to fix the tests. + if not robo_branch.IsWorkingDirectoryClean(): + raise UserInstructions( + "Working directory must be clean to generate patches file") + robo_branch.UpdatePatchesFileUnconditionally(robo_configuration) elif opt == "--auto-merge": - # Start a branch (if needed), merge (if needed), and try to verify it. - # TODO: Verify that the working directory is clean. - robo_branch.CreateAndCheckoutDatedSushiBranchIfNeeded(robo_configuration) - robo_branch.MergeUpstreamToSushiBranchIfNeeded(robo_configuration) - # We want to push the merge and make the local branch track it, so that - # future 'git cl upload's don't try to review the merge commit, and spam - # the ffmpeg committers. - robo_branch.PushToOriginWithoutReviewAndTrackIfNeeded(robo_configuration) - - # Try to get everything to build if we haven't committed the configs yet. - # Note that the only time we need to do this again is if some change makes - # different files added / deleted to the build, or if ffmpeg configure - # changes. We don't need to do this if you just edit ffmpeg sources; - # those will be built with the tests if they've changed since last time. - # - # So, if you're just editing ffmpeg sources to get tests to pass, then you - # probably don't need to do this step again. - # - # TODO: Add a way to override this. I guess just edit out the config - # commit with a rebase for now. - if robo_branch.IsCommitOnThisBranch(robo_configuration, - robo_configuration.gn_commit_title()): - log("Skipping config build since already committed") - else: - robo_build.BuildAndImportAllFFmpegConfigs(robo_configuration) - # Run sanity checks on the merge before we commit. - robo_branch.CheckMerge(robo_configuration) - # Write the config changes to help the reviewer. - robo_branch.WriteConfigChangesFile(robo_configuration) - # TODO(liberato): Add the 'autodetect' regex too. - # Handle autorenames last, so that we don't stage things and then fail. - # While it's probably okay, it's nicer if we don't. - robo_branch.HandleAutorename(robo_configuration) - robo_branch.AddAndCommit(robo_configuration, - robo_configuration.gn_commit_title()) - - # Update the patches file. - if robo_branch.IsCommitOnThisBranch( - robo_configuration, - robo_configuration.patches_commit_title()): - log("Skipping patches file since already committed") - else: - robo_branch.WritePatchesReadme(robo_configuration) - robo_branch.AddAndCommit(robo_configuration, - robo_configuration.patches_commit_title()) - - # Run the tests. Note that this will re-run ninja from chromium/src, - # which will rebuild any changed ffmpeg sources as it normally would. - robo_build.RunTests(robo_configuration) + # TODO: make sure that any untracked autorename files are removed, or + # make sure that the autorename git script doesn't try to 'git rm' + # untracked files, else the script fails. + RunSteps(robo_configuration, ["auto-merge"]) # TODO: Start a fake deps roll. To do this, we would: # Create new remote branch from the current remote sushi branch. @@ -105,6 +194,10 @@ def main(argv): # reviewer at it. # TODO: git cl upload for review. + elif opt == "--step": + RunSteps(robo_configuration, arg.split(",")) + elif opt == "--list": + ListSteps() else: raise Exception("Unknown option '%s'" % opt); |