From 7328d5182d85fabe3f0042dee50bdd4852e1dc0c Mon Sep 17 00:00:00 2001 From: Sta Zhu Date: Mon, 29 Jul 2024 23:13:05 +0800 Subject: [PATCH] Video: Add HEVC ffmpeg decoder & parser Add ffmpeg software decoder and parser for HEVC, this will make sure those users using macOS version < 11 or Windows < 8 or those users who disabled gpu acceleration or hardware not supported profiles to have software HEVC decoding ability. --- .../config/Chrome/android/arm-neon/config.h | 6 +- .../android/arm-neon/config_components.h | 4 +- .../android/arm-neon/libavcodec/codec_list.c | 1 + .../android/arm-neon/libavcodec/parser_list.c | 1 + chromium/config/Chrome/android/arm64/config.h | 8 +-- .../Chrome/android/arm64/config_components.h | 4 +- .../android/arm64/libavcodec/codec_list.c | 1 + .../android/arm64/libavcodec/parser_list.c | 1 + chromium/config/Chrome/android/ia32/config.h | 8 +-- .../Chrome/android/ia32/config_components.h | 4 +- .../android/ia32/libavcodec/codec_list.c | 1 + .../android/ia32/libavcodec/parser_list.c | 1 + chromium/config/Chrome/android/x64/config.h | 8 +-- .../Chrome/android/x64/config_components.h | 4 +- .../android/x64/libavcodec/codec_list.c | 1 + .../android/x64/libavcodec/parser_list.c | 1 + chromium/config/Chrome/ios/arm64/config.h | 8 +-- .../Chrome/ios/arm64/config_components.h | 4 +- .../Chrome/ios/arm64/libavcodec/codec_list.c | 1 + .../Chrome/ios/arm64/libavcodec/parser_list.c | 1 + .../config/Chrome/linux/arm-neon/config.h | 8 +-- .../Chrome/linux/arm-neon/config_components.h | 4 +- .../linux/arm-neon/libavcodec/codec_list.c | 1 + .../linux/arm-neon/libavcodec/parser_list.c | 1 + chromium/config/Chrome/linux/arm/config.h | 8 +-- .../Chrome/linux/arm/config_components.h | 4 +- .../Chrome/linux/arm/libavcodec/codec_list.c | 1 + .../Chrome/linux/arm/libavcodec/parser_list.c | 1 + chromium/config/Chrome/linux/arm64/config.h | 8 +-- .../Chrome/linux/arm64/config_components.h | 4 +- .../linux/arm64/libavcodec/codec_list.c | 1 + .../linux/arm64/libavcodec/parser_list.c | 1 + chromium/config/Chrome/linux/ia32/config.h | 8 +-- .../Chrome/linux/ia32/config_components.h | 4 +- .../Chrome/linux/ia32/libavcodec/codec_list.c | 1 + .../linux/ia32/libavcodec/parser_list.c | 1 + chromium/config/Chrome/linux/x64/config.h | 8 +-- .../Chrome/linux/x64/config_components.h | 4 +- .../Chrome/linux/x64/libavcodec/codec_list.c | 1 + .../Chrome/linux/x64/libavcodec/parser_list.c | 1 + chromium/config/Chrome/mac/arm64/config.h | 8 +-- .../Chrome/mac/arm64/config_components.h | 4 +- .../Chrome/mac/arm64/libavcodec/codec_list.c | 1 + .../Chrome/mac/arm64/libavcodec/parser_list.c | 1 + chromium/config/Chrome/mac/x64/config.asm | 6 +- chromium/config/Chrome/mac/x64/config.h | 8 +-- .../config/Chrome/mac/x64/config_components.h | 4 +- .../Chrome/mac/x64/libavcodec/codec_list.c | 1 + .../Chrome/mac/x64/libavcodec/parser_list.c | 1 + .../config/Chrome/win-msvc/ia32/config.asm | 8 +-- chromium/config/Chrome/win-msvc/ia32/config.h | 10 +-- .../win-msvc/ia32/libavcodec/codec_list.c | 1 + .../win-msvc/ia32/libavcodec/parser_list.c | 1 + .../config/Chrome/win-msvc/x64/config.asm | 8 +-- chromium/config/Chrome/win-msvc/x64/config.h | 10 +-- .../win-msvc/x64/libavcodec/codec_list.c | 1 + .../win-msvc/x64/libavcodec/parser_list.c | 1 + chromium/config/Chrome/win/arm64/config.h | 8 +-- .../Chrome/win/arm64/config_components.h | 4 +- .../Chrome/win/arm64/libavcodec/codec_list.c | 1 + .../Chrome/win/arm64/libavcodec/parser_list.c | 1 + chromium/config/Chrome/win/ia32/config.asm | 6 +- chromium/config/Chrome/win/ia32/config.h | 8 +-- .../Chrome/win/ia32/config_components.h | 4 +- .../Chrome/win/ia32/libavcodec/codec_list.c | 1 + .../Chrome/win/ia32/libavcodec/parser_list.c | 1 + chromium/config/Chrome/win/x64/config.asm | 6 +- chromium/config/Chrome/win/x64/config.h | 8 +-- .../config/Chrome/win/x64/config_components.h | 4 +- .../Chrome/win/x64/libavcodec/codec_list.c | 1 + .../Chrome/win/x64/libavcodec/parser_list.c | 1 + .../config/Chromium/android/arm-neon/config.h | 6 +- .../android/arm-neon/config_components.h | 4 +- .../android/arm-neon/libavcodec/codec_list.c | 1 + .../android/arm-neon/libavcodec/parser_list.c | 1 + .../config/Chromium/android/arm64/config.h | 6 +- .../android/arm64/config_components.h | 4 +- .../android/arm64/libavcodec/codec_list.c | 1 + .../android/arm64/libavcodec/parser_list.c | 1 + .../config/Chromium/android/ia32/config.h | 6 +- .../Chromium/android/ia32/config_components.h | 4 +- .../android/ia32/libavcodec/codec_list.c | 1 + .../android/ia32/libavcodec/parser_list.c | 1 + chromium/config/Chromium/android/x64/config.h | 6 +- .../Chromium/android/x64/config_components.h | 4 +- .../android/x64/libavcodec/codec_list.c | 1 + .../android/x64/libavcodec/parser_list.c | 1 + chromium/config/Chromium/ios/arm64/config.h | 6 +- .../Chromium/ios/arm64/config_components.h | 4 +- .../ios/arm64/libavcodec/codec_list.c | 1 + .../ios/arm64/libavcodec/parser_list.c | 1 + .../config/Chromium/linux-noasm/x64/config.h | 6 +- .../linux-noasm/x64/config_components.h | 4 +- .../linux-noasm/x64/libavcodec/codec_list.c | 1 + .../linux-noasm/x64/libavcodec/parser_list.c | 1 + .../config/Chromium/linux/arm-neon/config.h | 6 +- .../linux/arm-neon/config_components.h | 4 +- .../linux/arm-neon/libavcodec/codec_list.c | 1 + .../linux/arm-neon/libavcodec/parser_list.c | 1 + chromium/config/Chromium/linux/arm/config.h | 6 +- .../Chromium/linux/arm/config_components.h | 4 +- .../linux/arm/libavcodec/codec_list.c | 1 + .../linux/arm/libavcodec/parser_list.c | 1 + chromium/config/Chromium/linux/arm64/config.h | 6 +- .../Chromium/linux/arm64/config_components.h | 4 +- .../linux/arm64/libavcodec/codec_list.c | 1 + .../linux/arm64/libavcodec/parser_list.c | 1 + chromium/config/Chromium/linux/ia32/config.h | 6 +- .../Chromium/linux/ia32/config_components.h | 4 +- .../linux/ia32/libavcodec/codec_list.c | 1 + .../linux/ia32/libavcodec/parser_list.c | 1 + chromium/config/Chromium/linux/x64/config.h | 6 +- .../Chromium/linux/x64/config_components.h | 4 +- .../linux/x64/libavcodec/codec_list.c | 1 + .../linux/x64/libavcodec/parser_list.c | 1 + chromium/config/Chromium/mac/arm64/config.h | 6 +- .../Chromium/mac/arm64/config_components.h | 4 +- .../mac/arm64/libavcodec/codec_list.c | 1 + .../mac/arm64/libavcodec/parser_list.c | 1 + chromium/config/Chromium/mac/x64/config.asm | 6 +- chromium/config/Chromium/mac/x64/config.h | 6 +- .../Chromium/mac/x64/config_components.h | 4 +- .../Chromium/mac/x64/libavcodec/codec_list.c | 1 + .../Chromium/mac/x64/libavcodec/parser_list.c | 1 + .../config/Chromium/win-msvc/ia32/config.asm | 8 +-- .../config/Chromium/win-msvc/ia32/config.h | 8 +-- .../win-msvc/ia32/libavcodec/codec_list.c | 1 + .../win-msvc/ia32/libavcodec/parser_list.c | 1 + .../config/Chromium/win-msvc/x64/config.asm | 8 +-- .../config/Chromium/win-msvc/x64/config.h | 8 +-- .../win-msvc/x64/libavcodec/codec_list.c | 1 + .../win-msvc/x64/libavcodec/parser_list.c | 1 + chromium/config/Chromium/win/arm64/config.h | 6 +- .../Chromium/win/arm64/config_components.h | 4 +- .../win/arm64/libavcodec/codec_list.c | 1 + .../win/arm64/libavcodec/parser_list.c | 1 + chromium/config/Chromium/win/ia32/config.asm | 6 +- chromium/config/Chromium/win/ia32/config.h | 6 +- .../Chromium/win/ia32/config_components.h | 4 +- .../Chromium/win/ia32/libavcodec/codec_list.c | 1 + .../win/ia32/libavcodec/parser_list.c | 1 + chromium/config/Chromium/win/x64/config.asm | 6 +- chromium/config/Chromium/win/x64/config.h | 6 +- .../Chromium/win/x64/config_components.h | 4 +- .../Chromium/win/x64/libavcodec/codec_list.c | 1 + .../Chromium/win/x64/libavcodec/parser_list.c | 1 + ffmpeg_generated.gni | 69 +++++++++++++++++++ ...ame_libavcodec_aarch64_hevcdsp_idct_neon.S | 2 + ...name_libavcodec_aarch64_hevcdsp_sao_neon.S | 2 + libavcodec/autorename_libavcodec_bswapdsp.c | 2 + 150 files changed, 366 insertions(+), 221 deletions(-) create mode 100644 libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_idct_neon.S create mode 100644 libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_sao_neon.S create mode 100644 libavcodec/autorename_libavcodec_bswapdsp.c diff --git a/chromium/config/Chrome/android/arm-neon/config.h b/chromium/config/Chrome/android/arm-neon/config.h index a21f421312..661805b93b 100644 --- a/chromium/config/Chrome/android/arm-neon/config.h +++ b/chromium/config/Chrome/android/arm-neon/config.h @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 0 #define CONFIG_H264QPEL 0 #define CONFIG_H264_SEI 0 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/android/arm-neon/config_components.h b/chromium/config/Chrome/android/arm-neon/config_components.h index 365e50d4ab..6655d612e8 100644 --- a/chromium/config/Chrome/android/arm-neon/config_components.h +++ b/chromium/config/Chrome/android/arm-neon/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/android/arm-neon/libavcodec/codec_list.c b/chromium/config/Chrome/android/arm-neon/libavcodec/codec_list.c index dfe1c0ac28..8ed11252f5 100644 --- a/chromium/config/Chrome/android/arm-neon/libavcodec/codec_list.c +++ b/chromium/config/Chrome/android/arm-neon/libavcodec/codec_list.c @@ -13,4 +13,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/android/arm-neon/libavcodec/parser_list.c b/chromium/config/Chrome/android/arm-neon/libavcodec/parser_list.c index b1e4dd0061..7cdcadbe2f 100644 --- a/chromium/config/Chrome/android/arm-neon/libavcodec/parser_list.c +++ b/chromium/config/Chrome/android/arm-neon/libavcodec/parser_list.c @@ -5,4 +5,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/android/arm64/config.h b/chromium/config/Chrome/android/arm64/config.h index b600d4acb7..962963edc5 100644 --- a/chromium/config/Chrome/android/arm64/config.h +++ b/chromium/config/Chrome/android/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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cross-compile --sysroot=/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/aarch64-linux-android --extra-cflags='--target=aarch64-linux-android26' --extra-ldflags='--target=aarch64-linux-android26' --extra-ldflags=-L/tmp/fakelinkerscripts --extra-ldflags=-L/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/aarch64-linux-android --extra-ldflags='--gcc-toolchain=/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/' --target-os=android --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cross-compile --sysroot=/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/aarch64-linux-android --extra-cflags='--target=aarch64-linux-android26' --extra-ldflags='--target=aarch64-linux-android26' --extra-ldflags=-L/tmp/fakelinkerscripts --extra-ldflags=-L/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/aarch64-linux-android --extra-ldflags='--gcc-toolchain=/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/' --target-os=android --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-decoder='aac,ac3,eac3,h264,hevc' --enable-demuxer=aac,ac3,eac3 --enable-parser='aac,ac3,eac3,h264,hevc'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2024 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -681,7 +681,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -715,8 +715,8 @@ #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 #define CONFIG_H264_SEI 1 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/android/arm64/config_components.h b/chromium/config/Chrome/android/arm64/config_components.h index 8ebce4c9b5..0e5816accb 100644 --- a/chromium/config/Chrome/android/arm64/config_components.h +++ b/chromium/config/Chrome/android/arm64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/android/arm64/libavcodec/codec_list.c b/chromium/config/Chrome/android/arm64/libavcodec/codec_list.c index fe5adb0d92..c9666ae199 100644 --- a/chromium/config/Chrome/android/arm64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/android/arm64/libavcodec/codec_list.c @@ -14,4 +14,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/android/arm64/libavcodec/parser_list.c b/chromium/config/Chrome/android/arm64/libavcodec/parser_list.c index 3e4fa9c320..c85087a596 100644 --- a/chromium/config/Chrome/android/arm64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/android/arm64/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/android/ia32/config.h b/chromium/config/Chrome/android/ia32/config.h index 9389faa398..f6fa752e71 100644 --- a/chromium/config/Chrome/android/ia32/config.h +++ b/chromium/config/Chrome/android/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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cross-compile --sysroot=/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/i686-linux-android --extra-cflags='--target=i686-linux-android26' --extra-ldflags='--target=i686-linux-android26' --extra-ldflags=-L/tmp/fakelinkerscripts --extra-ldflags=-L/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/i686-linux-android --extra-ldflags='--gcc-toolchain=/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/' --target-os=android --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --disable-x86asm --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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cross-compile --sysroot=/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/i686-linux-android --extra-cflags='--target=i686-linux-android26' --extra-ldflags='--target=i686-linux-android26' --extra-ldflags=-L/tmp/fakelinkerscripts --extra-ldflags=-L/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/i686-linux-android --extra-ldflags='--gcc-toolchain=/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/' --target-os=android --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --disable-x86asm --enable-decoder='aac,ac3,eac3,h264,hevc' --enable-demuxer=aac,ac3,eac3 --enable-parser='aac,ac3,eac3,h264,hevc'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2024 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 #define CONFIG_H264_SEI 1 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/android/ia32/config_components.h b/chromium/config/Chrome/android/ia32/config_components.h index 8ebce4c9b5..0e5816accb 100644 --- a/chromium/config/Chrome/android/ia32/config_components.h +++ b/chromium/config/Chrome/android/ia32/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/android/ia32/libavcodec/codec_list.c b/chromium/config/Chrome/android/ia32/libavcodec/codec_list.c index fe5adb0d92..c9666ae199 100644 --- a/chromium/config/Chrome/android/ia32/libavcodec/codec_list.c +++ b/chromium/config/Chrome/android/ia32/libavcodec/codec_list.c @@ -14,4 +14,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/android/ia32/libavcodec/parser_list.c b/chromium/config/Chrome/android/ia32/libavcodec/parser_list.c index 3e4fa9c320..c85087a596 100644 --- a/chromium/config/Chrome/android/ia32/libavcodec/parser_list.c +++ b/chromium/config/Chrome/android/ia32/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/android/x64/config.h b/chromium/config/Chrome/android/x64/config.h index db53697f2c..10332c717a 100644 --- a/chromium/config/Chrome/android/x64/config.h +++ b/chromium/config/Chrome/android/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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cross-compile --sysroot=/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/x86_64-linux-android --extra-cflags='--target=x86_64-linux-android26' --extra-ldflags='--target=x86_64-linux-android26' --extra-ldflags=-L/tmp/fakelinkerscripts --extra-ldflags=-L/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/x86_64-linux-android --extra-ldflags='--gcc-toolchain=/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/' --target-os=android --arch=x86_64 --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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --enable-small --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cross-compile --sysroot=/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/x86_64-linux-android --extra-cflags='--target=x86_64-linux-android26' --extra-ldflags='--target=x86_64-linux-android26' --extra-ldflags=-L/tmp/fakelinkerscripts --extra-ldflags=-L/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/x86_64-linux-android --extra-ldflags='--gcc-toolchain=/usr/local/google/home/dalecurtis/code/chrome/src/third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/' --target-os=android --arch=x86_64 --enable-decoder='aac,ac3,eac3,h264,hevc' --enable-demuxer=aac,ac3,eac3 --enable-parser='aac,ac3,eac3,h264,hevc'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2024 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 #define CONFIG_H264_SEI 1 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/android/x64/config_components.h b/chromium/config/Chrome/android/x64/config_components.h index 8ebce4c9b5..0e5816accb 100644 --- a/chromium/config/Chrome/android/x64/config_components.h +++ b/chromium/config/Chrome/android/x64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/android/x64/libavcodec/codec_list.c b/chromium/config/Chrome/android/x64/libavcodec/codec_list.c index fe5adb0d92..c9666ae199 100644 --- a/chromium/config/Chrome/android/x64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/android/x64/libavcodec/codec_list.c @@ -14,4 +14,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/android/x64/libavcodec/parser_list.c b/chromium/config/Chrome/android/x64/libavcodec/parser_list.c index 3e4fa9c320..c85087a596 100644 --- a/chromium/config/Chrome/android/x64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/android/x64/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/ios/arm64/config.h b/chromium/config/Chrome/ios/arm64/config.h index 44bab03499..cde2ebfebb 100644 --- a/chromium/config/Chrome/ios/arm64/config.h +++ b/chromium/config/Chrome/ios/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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --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=arm64-apple-macosx' --extra-cflags=-F/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=arm64 --extra-cflags='-arch arm64' --extra-ldflags='-arch 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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O3\"' --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=arm64-apple-macosx' --extra-cflags=-F/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=arm64 --extra-cflags='-arch arm64' --extra-ldflags='-arch arm64' --enable-decoder='aac,ac3,eac3,h264,hevc' --enable-demuxer=aac,ac3,eac3 --enable-parser='aac,ac3,eac3,h264,hevc'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2024 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -681,7 +681,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -715,8 +715,8 @@ #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 #define CONFIG_H264_SEI 1 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/ios/arm64/config_components.h b/chromium/config/Chrome/ios/arm64/config_components.h index 8ebce4c9b5..0e5816accb 100644 --- a/chromium/config/Chrome/ios/arm64/config_components.h +++ b/chromium/config/Chrome/ios/arm64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/ios/arm64/libavcodec/codec_list.c b/chromium/config/Chrome/ios/arm64/libavcodec/codec_list.c index fe5adb0d92..c9666ae199 100644 --- a/chromium/config/Chrome/ios/arm64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/ios/arm64/libavcodec/codec_list.c @@ -14,4 +14,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/ios/arm64/libavcodec/parser_list.c b/chromium/config/Chrome/ios/arm64/libavcodec/parser_list.c index 3e4fa9c320..c85087a596 100644 --- a/chromium/config/Chrome/ios/arm64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/ios/arm64/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/linux/arm-neon/config.h b/chromium/config/Chrome/linux/arm-neon/config.h index f798be9686..33eb8b16b0 100644 --- a/chromium/config/Chrome/linux/arm-neon/config.h +++ b/chromium/config/Chrome/linux/arm-neon/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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --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/dalecurtis/code/chrome/src/build/linux/debian_bullseye_armhf-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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O3\"' --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/dalecurtis/code/chrome/src/build/linux/debian_bullseye_armhf-sysroot --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --extra-cflags=-O3 --enable-neon --extra-cflags='-mfpu=neon' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,ac3,eac3,h264,hevc' --enable-demuxer=aac,ac3,eac3 --enable-parser='aac,ac3,eac3,h264,hevc'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2024 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 #define CONFIG_H264_SEI 1 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/linux/arm-neon/config_components.h b/chromium/config/Chrome/linux/arm-neon/config_components.h index 8ebce4c9b5..0e5816accb 100644 --- a/chromium/config/Chrome/linux/arm-neon/config_components.h +++ b/chromium/config/Chrome/linux/arm-neon/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/linux/arm-neon/libavcodec/codec_list.c b/chromium/config/Chrome/linux/arm-neon/libavcodec/codec_list.c index fe5adb0d92..c9666ae199 100644 --- a/chromium/config/Chrome/linux/arm-neon/libavcodec/codec_list.c +++ b/chromium/config/Chrome/linux/arm-neon/libavcodec/codec_list.c @@ -14,4 +14,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/linux/arm-neon/libavcodec/parser_list.c b/chromium/config/Chrome/linux/arm-neon/libavcodec/parser_list.c index 3e4fa9c320..c85087a596 100644 --- a/chromium/config/Chrome/linux/arm-neon/libavcodec/parser_list.c +++ b/chromium/config/Chrome/linux/arm-neon/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/linux/arm/config.h b/chromium/config/Chrome/linux/arm/config.h index 1a4219a9d3..45de1c09dc 100644 --- a/chromium/config/Chrome/linux/arm/config.h +++ b/chromium/config/Chrome/linux/arm/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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --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/dalecurtis/code/chrome/src/build/linux/debian_bullseye_armhf-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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O3\"' --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/dalecurtis/code/chrome/src/build/linux/debian_bullseye_armhf-sysroot --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --extra-cflags=-O3 --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,ac3,eac3,h264,hevc' --enable-demuxer=aac,ac3,eac3 --enable-parser='aac,ac3,eac3,h264,hevc'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2024 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 #define CONFIG_H264_SEI 1 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/linux/arm/config_components.h b/chromium/config/Chrome/linux/arm/config_components.h index 8ebce4c9b5..0e5816accb 100644 --- a/chromium/config/Chrome/linux/arm/config_components.h +++ b/chromium/config/Chrome/linux/arm/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/linux/arm/libavcodec/codec_list.c b/chromium/config/Chrome/linux/arm/libavcodec/codec_list.c index fe5adb0d92..c9666ae199 100644 --- a/chromium/config/Chrome/linux/arm/libavcodec/codec_list.c +++ b/chromium/config/Chrome/linux/arm/libavcodec/codec_list.c @@ -14,4 +14,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/linux/arm/libavcodec/parser_list.c b/chromium/config/Chrome/linux/arm/libavcodec/parser_list.c index 3e4fa9c320..c85087a596 100644 --- a/chromium/config/Chrome/linux/arm/libavcodec/parser_list.c +++ b/chromium/config/Chrome/linux/arm/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/linux/arm64/config.h b/chromium/config/Chrome/linux/arm64/config.h index b27a4c7217..e7707dfb11 100644 --- a/chromium/config/Chrome/linux/arm64/config.h +++ b/chromium/config/Chrome/linux/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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --extra-cflags='--target=aarch64-linux-gnu' --extra-ldflags='--target=aarch64-linux-gnu' --target-os=linux --sysroot=/usr/local/google/home/dalecurtis/code/chrome/src/build/linux/debian_bullseye_arm64-sysroot --disable-dotprod --disable-i8mm --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O3\"' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --extra-cflags='--target=aarch64-linux-gnu' --extra-ldflags='--target=aarch64-linux-gnu' --target-os=linux --sysroot=/usr/local/google/home/dalecurtis/code/chrome/src/build/linux/debian_bullseye_arm64-sysroot --disable-dotprod --disable-i8mm --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,ac3,eac3,h264,hevc' --enable-demuxer=aac,ac3,eac3 --enable-parser='aac,ac3,eac3,h264,hevc'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2024 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -681,7 +681,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -715,8 +715,8 @@ #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 #define CONFIG_H264_SEI 1 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/linux/arm64/config_components.h b/chromium/config/Chrome/linux/arm64/config_components.h index 8ebce4c9b5..0e5816accb 100644 --- a/chromium/config/Chrome/linux/arm64/config_components.h +++ b/chromium/config/Chrome/linux/arm64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/linux/arm64/libavcodec/codec_list.c b/chromium/config/Chrome/linux/arm64/libavcodec/codec_list.c index fe5adb0d92..c9666ae199 100644 --- a/chromium/config/Chrome/linux/arm64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/linux/arm64/libavcodec/codec_list.c @@ -14,4 +14,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/linux/arm64/libavcodec/parser_list.c b/chromium/config/Chrome/linux/arm64/libavcodec/parser_list.c index 3e4fa9c320..c85087a596 100644 --- a/chromium/config/Chrome/linux/arm64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/linux/arm64/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/linux/ia32/config.h b/chromium/config/Chrome/linux/ia32/config.h index e84893e734..ef8372c777 100644 --- a/chromium/config/Chrome/linux/ia32/config.h +++ b/chromium/config/Chrome/linux/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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O3\"' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,ac3,eac3,h264,hevc' --enable-demuxer=aac,ac3,eac3 --enable-parser='aac,ac3,eac3,h264,hevc'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2024 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 #define CONFIG_H264_SEI 1 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/linux/ia32/config_components.h b/chromium/config/Chrome/linux/ia32/config_components.h index 8ebce4c9b5..0e5816accb 100644 --- a/chromium/config/Chrome/linux/ia32/config_components.h +++ b/chromium/config/Chrome/linux/ia32/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/linux/ia32/libavcodec/codec_list.c b/chromium/config/Chrome/linux/ia32/libavcodec/codec_list.c index fe5adb0d92..c9666ae199 100644 --- a/chromium/config/Chrome/linux/ia32/libavcodec/codec_list.c +++ b/chromium/config/Chrome/linux/ia32/libavcodec/codec_list.c @@ -14,4 +14,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/linux/ia32/libavcodec/parser_list.c b/chromium/config/Chrome/linux/ia32/libavcodec/parser_list.c index 3e4fa9c320..c85087a596 100644 --- a/chromium/config/Chrome/linux/ia32/libavcodec/parser_list.c +++ b/chromium/config/Chrome/linux/ia32/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/linux/x64/config.h b/chromium/config/Chrome/linux/x64/config.h index ad40660dbb..0753236c99 100644 --- a/chromium/config/Chrome/linux/x64/config.h +++ b/chromium/config/Chrome/linux/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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-lto --arch=x86_64 --target-os=linux --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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O3\"' --enable-lto --arch=x86_64 --target-os=linux --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,ac3,eac3,h264,hevc' --enable-demuxer=aac,ac3,eac3 --enable-parser='aac,ac3,eac3,h264,hevc'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2024 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 #define CONFIG_H264_SEI 1 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/linux/x64/config_components.h b/chromium/config/Chrome/linux/x64/config_components.h index 8ebce4c9b5..0e5816accb 100644 --- a/chromium/config/Chrome/linux/x64/config_components.h +++ b/chromium/config/Chrome/linux/x64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c b/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c index fe5adb0d92..c9666ae199 100644 --- a/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c @@ -14,4 +14,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c b/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c index 3e4fa9c320..c85087a596 100644 --- a/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/mac/arm64/config.h b/chromium/config/Chrome/mac/arm64/config.h index 44bab03499..cde2ebfebb 100644 --- a/chromium/config/Chrome/mac/arm64/config.h +++ b/chromium/config/Chrome/mac/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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --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=arm64-apple-macosx' --extra-cflags=-F/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=arm64 --extra-cflags='-arch arm64' --extra-ldflags='-arch 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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O3\"' --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=arm64-apple-macosx' --extra-cflags=-F/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=arm64 --extra-cflags='-arch arm64' --extra-ldflags='-arch arm64' --enable-decoder='aac,ac3,eac3,h264,hevc' --enable-demuxer=aac,ac3,eac3 --enable-parser='aac,ac3,eac3,h264,hevc'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2024 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -681,7 +681,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -715,8 +715,8 @@ #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 #define CONFIG_H264_SEI 1 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/mac/arm64/config_components.h b/chromium/config/Chrome/mac/arm64/config_components.h index 8ebce4c9b5..0e5816accb 100644 --- a/chromium/config/Chrome/mac/arm64/config_components.h +++ b/chromium/config/Chrome/mac/arm64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/mac/arm64/libavcodec/codec_list.c b/chromium/config/Chrome/mac/arm64/libavcodec/codec_list.c index fe5adb0d92..c9666ae199 100644 --- a/chromium/config/Chrome/mac/arm64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/mac/arm64/libavcodec/codec_list.c @@ -14,4 +14,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/mac/arm64/libavcodec/parser_list.c b/chromium/config/Chrome/mac/arm64/libavcodec/parser_list.c index 3e4fa9c320..c85087a596 100644 --- a/chromium/config/Chrome/mac/arm64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/mac/arm64/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/mac/x64/config.asm b/chromium/config/Chrome/mac/x64/config.asm index 61fe976c14..c187aae464 100644 --- a/chromium/config/Chrome/mac/x64/config.asm +++ b/chromium/config/Chrome/mac/x64/config.asm @@ -666,7 +666,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 1 %define CONFIG_CBS 0 %define CONFIG_CBS_AV1 0 @@ -700,8 +700,8 @@ %define CONFIG_H264PRED 1 %define CONFIG_H264QPEL 1 %define CONFIG_H264_SEI 1 -%define CONFIG_HEVCPARSE 0 -%define CONFIG_HEVC_SEI 0 +%define CONFIG_HEVCPARSE 1 +%define CONFIG_HEVC_SEI 1 %define CONFIG_HPELDSP 0 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/mac/x64/config.h b/chromium/config/Chrome/mac/x64/config.h index 382b19fc1d..8ba62765bb 100644 --- a/chromium/config/Chrome/mac/x64/config.h +++ b/chromium/config/Chrome/mac/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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --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=x86_64-apple-macosx' --extra-cflags=-F/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=x86_64 --extra-cflags=-m64 --extra-ldflags='-arch x86_64' --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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O3\"' --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=x86_64-apple-macosx' --extra-cflags=-F/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=x86_64 --extra-cflags=-m64 --extra-ldflags='-arch x86_64' --enable-decoder='aac,ac3,eac3,h264,hevc' --enable-demuxer=aac,ac3,eac3 --enable-parser='aac,ac3,eac3,h264,hevc'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2024 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 #define CONFIG_H264_SEI 1 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/mac/x64/config_components.h b/chromium/config/Chrome/mac/x64/config_components.h index 8ebce4c9b5..0e5816accb 100644 --- a/chromium/config/Chrome/mac/x64/config_components.h +++ b/chromium/config/Chrome/mac/x64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/mac/x64/libavcodec/codec_list.c b/chromium/config/Chrome/mac/x64/libavcodec/codec_list.c index fe5adb0d92..c9666ae199 100644 --- a/chromium/config/Chrome/mac/x64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/mac/x64/libavcodec/codec_list.c @@ -14,4 +14,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/mac/x64/libavcodec/parser_list.c b/chromium/config/Chrome/mac/x64/libavcodec/parser_list.c index 3e4fa9c320..c85087a596 100644 --- a/chromium/config/Chrome/mac/x64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/mac/x64/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/win-msvc/ia32/config.asm b/chromium/config/Chrome/win-msvc/ia32/config.asm index ac13ddabdd..1305cdb704 100644 --- a/chromium/config/Chrome/win-msvc/ia32/config.asm +++ b/chromium/config/Chrome/win-msvc/ia32/config.asm @@ -563,7 +563,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 1 %define CONFIG_CBS 0 %define CONFIG_CBS_H264 0 @@ -587,7 +587,7 @@ %define CONFIG_H264PARSE 1 %define CONFIG_H264PRED 1 %define CONFIG_H264QPEL 1 -%define CONFIG_HEVCPARSE 0 +%define CONFIG_HEVCPARSE 1 %define CONFIG_HPELDSP 1 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 @@ -752,7 +752,7 @@ %define CONFIG_H264_QSV_DECODER 0 %define CONFIG_H264_RKMPP_DECODER 0 %define CONFIG_HAP_DECODER 0 -%define CONFIG_HEVC_DECODER 0 +%define CONFIG_HEVC_DECODER 1 %define CONFIG_HEVC_QSV_DECODER 0 %define CONFIG_HEVC_RKMPP_DECODER 0 %define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -1450,7 +1450,7 @@ %define CONFIG_H261_PARSER 0 %define CONFIG_H263_PARSER 0 %define CONFIG_H264_PARSER 1 -%define CONFIG_HEVC_PARSER 0 +%define CONFIG_HEVC_PARSER 1 %define CONFIG_MJPEG_PARSER 0 %define CONFIG_MLP_PARSER 0 %define CONFIG_MPEG4VIDEO_PARSER 0 diff --git a/chromium/config/Chrome/win-msvc/ia32/config.h b/chromium/config/Chrome/win-msvc/ia32/config.h index 90497d03b1..0b6d522ef3 100644 --- a/chromium/config/Chrome/win-msvc/ia32/config.h +++ b/chromium/config/Chrome/win-msvc/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-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' --extra-cflags=-I/cygdrive/d/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=yasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/cygdrive/d/chromium/src/third_party/ffmpeg/chromium/include/win --cc='cygwin-wrapper cl' --ld='cygwin-wrapper link' --nm='cygwin-wrapper dumpbin -symbols' --ar='cygwin-wrapper lib' --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-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' --extra-cflags=-I/cygdrive/d/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=yasm --optflags='\"-O3\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/cygdrive/d/chromium/src/third_party/ffmpeg/chromium/include/win --cc='cygwin-wrapper cl' --ld='cygwin-wrapper link' --nm='cygwin-wrapper dumpbin -symbols' --ar='cygwin-wrapper lib' --enable-decoder='aac,ac3,eac3,h264,hevc' --enable-demuxer=aac,ac3,eac3 --enable-parser='aac,ac3,eac3,h264,hevc'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2018 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -578,7 +578,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_H264 0 @@ -602,7 +602,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 @@ -767,7 +767,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -1465,7 +1465,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_MJPEG_PARSER 0 #define CONFIG_MLP_PARSER 0 #define CONFIG_MPEG4VIDEO_PARSER 0 diff --git a/chromium/config/Chrome/win-msvc/ia32/libavcodec/codec_list.c b/chromium/config/Chrome/win-msvc/ia32/libavcodec/codec_list.c index 49f757b2d8..5ca1e9958c 100644 --- a/chromium/config/Chrome/win-msvc/ia32/libavcodec/codec_list.c +++ b/chromium/config/Chrome/win-msvc/ia32/libavcodec/codec_list.c @@ -17,4 +17,5 @@ static const AVCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/win-msvc/ia32/libavcodec/parser_list.c b/chromium/config/Chrome/win-msvc/ia32/libavcodec/parser_list.c index 19d670aa24..f55c2ca459 100644 --- a/chromium/config/Chrome/win-msvc/ia32/libavcodec/parser_list.c +++ b/chromium/config/Chrome/win-msvc/ia32/libavcodec/parser_list.c @@ -7,4 +7,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vorbis_parser, &ff_vp3_parser, &ff_vp8_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/win-msvc/x64/config.asm b/chromium/config/Chrome/win-msvc/x64/config.asm index 49d66ac57d..c3e7f4de28 100644 --- a/chromium/config/Chrome/win-msvc/x64/config.asm +++ b/chromium/config/Chrome/win-msvc/x64/config.asm @@ -563,7 +563,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 1 %define CONFIG_CBS 0 %define CONFIG_CBS_H264 0 @@ -587,7 +587,7 @@ %define CONFIG_H264PARSE 1 %define CONFIG_H264PRED 1 %define CONFIG_H264QPEL 1 -%define CONFIG_HEVCPARSE 0 +%define CONFIG_HEVCPARSE 1 %define CONFIG_HPELDSP 1 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 @@ -752,7 +752,7 @@ %define CONFIG_H264_QSV_DECODER 0 %define CONFIG_H264_RKMPP_DECODER 0 %define CONFIG_HAP_DECODER 0 -%define CONFIG_HEVC_DECODER 0 +%define CONFIG_HEVC_DECODER 1 %define CONFIG_HEVC_QSV_DECODER 0 %define CONFIG_HEVC_RKMPP_DECODER 0 %define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -1450,7 +1450,7 @@ %define CONFIG_H261_PARSER 0 %define CONFIG_H263_PARSER 0 %define CONFIG_H264_PARSER 1 -%define CONFIG_HEVC_PARSER 0 +%define CONFIG_HEVC_PARSER 1 %define CONFIG_MJPEG_PARSER 0 %define CONFIG_MLP_PARSER 0 %define CONFIG_MPEG4VIDEO_PARSER 0 diff --git a/chromium/config/Chrome/win-msvc/x64/config.h b/chromium/config/Chrome/win-msvc/x64/config.h index 359682176a..d45775e30a 100644 --- a/chromium/config/Chrome/win-msvc/x64/config.h +++ b/chromium/config/Chrome/win-msvc/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-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' --extra-cflags=-I/cygdrive/d/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=yasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/cygdrive/d/chromium/src/third_party/ffmpeg/chromium/include/win --cc='cygwin-wrapper cl' --ld='cygwin-wrapper link' --nm='cygwin-wrapper dumpbin -symbols' --ar='cygwin-wrapper lib' --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-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' --extra-cflags=-I/cygdrive/d/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=yasm --optflags='\"-O3\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/cygdrive/d/chromium/src/third_party/ffmpeg/chromium/include/win --cc='cygwin-wrapper cl' --ld='cygwin-wrapper link' --nm='cygwin-wrapper dumpbin -symbols' --ar='cygwin-wrapper lib' --enable-decoder='aac,ac3,eac3,h264,hevc' --enable-demuxer=aac,ac3,eac3 --enable-parser='aac,ac3,eac3,h264,hevc'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2018 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -578,7 +578,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_H264 0 @@ -602,7 +602,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 @@ -767,7 +767,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -1465,7 +1465,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_MJPEG_PARSER 0 #define CONFIG_MLP_PARSER 0 #define CONFIG_MPEG4VIDEO_PARSER 0 diff --git a/chromium/config/Chrome/win-msvc/x64/libavcodec/codec_list.c b/chromium/config/Chrome/win-msvc/x64/libavcodec/codec_list.c index 49f757b2d8..5ca1e9958c 100644 --- a/chromium/config/Chrome/win-msvc/x64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/win-msvc/x64/libavcodec/codec_list.c @@ -17,4 +17,5 @@ static const AVCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/win-msvc/x64/libavcodec/parser_list.c b/chromium/config/Chrome/win-msvc/x64/libavcodec/parser_list.c index 19d670aa24..f55c2ca459 100644 --- a/chromium/config/Chrome/win-msvc/x64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/win-msvc/x64/libavcodec/parser_list.c @@ -7,4 +7,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vorbis_parser, &ff_vp3_parser, &ff_vp8_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/win/arm64/config.h b/chromium/config/Chrome/win/arm64/config.h index 183c93882e..9896041326 100644 --- a/chromium/config/Chrome/win/arm64/config.h +++ b/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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --toolchain=msvc --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/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-cflags=/winsysroot/usr/local/google/home/dalecurtis/code/chrome/src/third_party/depot_tools/win_toolchain/vs_files/7393122652 --extra-ldflags='/winsysroot:/usr/local/google/home/dalecurtis/code/chrome/src/third_party/depot_tools/win_toolchain/vs_files/7393122652' --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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O3\"' --toolchain=msvc --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/ffmpeg/chromium/include/win --enable-cross-compile --cc=clang-cl --ld=lld-link --nm=llvm-nm --ar=llvm-ar --extra-cflags=-O3 --arch=aarch64 --as=clang-cl --extra-cflags='--target=arm64-windows' --extra-cflags=/winsysroot/usr/local/google/home/dalecurtis/code/chrome/src/third_party/depot_tools/win_toolchain/vs_files/7393122652 --extra-ldflags='/winsysroot:/usr/local/google/home/dalecurtis/code/chrome/src/third_party/depot_tools/win_toolchain/vs_files/7393122652' --enable-decoder='aac,ac3,eac3,h264,hevc' --enable-demuxer=aac,ac3,eac3 --enable-parser='aac,ac3,eac3,h264,hevc'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2024 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -681,7 +681,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -715,8 +715,8 @@ #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 #define CONFIG_H264_SEI 1 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/win/arm64/config_components.h b/chromium/config/Chrome/win/arm64/config_components.h index 8ebce4c9b5..0e5816accb 100644 --- a/chromium/config/Chrome/win/arm64/config_components.h +++ b/chromium/config/Chrome/win/arm64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/win/arm64/libavcodec/codec_list.c b/chromium/config/Chrome/win/arm64/libavcodec/codec_list.c index fe5adb0d92..c9666ae199 100644 --- a/chromium/config/Chrome/win/arm64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/win/arm64/libavcodec/codec_list.c @@ -14,4 +14,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/win/arm64/libavcodec/parser_list.c b/chromium/config/Chrome/win/arm64/libavcodec/parser_list.c index 3e4fa9c320..c85087a596 100644 --- a/chromium/config/Chrome/win/arm64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/win/arm64/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/win/ia32/config.asm b/chromium/config/Chrome/win/ia32/config.asm index af16ed14a2..a0dc0b90fd 100644 --- a/chromium/config/Chrome/win/ia32/config.asm +++ b/chromium/config/Chrome/win/ia32/config.asm @@ -666,7 +666,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 1 %define CONFIG_CBS 0 %define CONFIG_CBS_AV1 0 @@ -700,8 +700,8 @@ %define CONFIG_H264PRED 1 %define CONFIG_H264QPEL 1 %define CONFIG_H264_SEI 1 -%define CONFIG_HEVCPARSE 0 -%define CONFIG_HEVC_SEI 0 +%define CONFIG_HEVCPARSE 1 +%define CONFIG_HEVC_SEI 1 %define CONFIG_HPELDSP 0 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/win/ia32/config.h b/chromium/config/Chrome/win/ia32/config.h index 9e849b6271..9cb723846c 100644 --- a/chromium/config/Chrome/win/ia32/config.h +++ b/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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --toolchain=msvc --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/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=/winsysroot/usr/local/google/home/dalecurtis/code/chrome/src/third_party/depot_tools/win_toolchain/vs_files/7393122652 --extra-ldflags='/winsysroot:/usr/local/google/home/dalecurtis/code/chrome/src/third_party/depot_tools/win_toolchain/vs_files/7393122652' --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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O3\"' --toolchain=msvc --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/ffmpeg/chromium/include/win --enable-cross-compile --cc=clang-cl --ld=lld-link --nm=llvm-nm --ar=llvm-ar --extra-cflags=-O3 --extra-cflags=-m32 --extra-cflags=/winsysroot/usr/local/google/home/dalecurtis/code/chrome/src/third_party/depot_tools/win_toolchain/vs_files/7393122652 --extra-ldflags='/winsysroot:/usr/local/google/home/dalecurtis/code/chrome/src/third_party/depot_tools/win_toolchain/vs_files/7393122652' --enable-decoder='aac,ac3,eac3,h264,hevc' --enable-demuxer=aac,ac3,eac3 --enable-parser='aac,ac3,eac3,h264,hevc'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2024 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 #define CONFIG_H264_SEI 1 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/win/ia32/config_components.h b/chromium/config/Chrome/win/ia32/config_components.h index 8ebce4c9b5..0e5816accb 100644 --- a/chromium/config/Chrome/win/ia32/config_components.h +++ b/chromium/config/Chrome/win/ia32/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/win/ia32/libavcodec/codec_list.c b/chromium/config/Chrome/win/ia32/libavcodec/codec_list.c index fe5adb0d92..c9666ae199 100644 --- a/chromium/config/Chrome/win/ia32/libavcodec/codec_list.c +++ b/chromium/config/Chrome/win/ia32/libavcodec/codec_list.c @@ -14,4 +14,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/win/ia32/libavcodec/parser_list.c b/chromium/config/Chrome/win/ia32/libavcodec/parser_list.c index 3e4fa9c320..c85087a596 100644 --- a/chromium/config/Chrome/win/ia32/libavcodec/parser_list.c +++ b/chromium/config/Chrome/win/ia32/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/win/x64/config.asm b/chromium/config/Chrome/win/x64/config.asm index c4f94cbc6f..79d7b566c4 100644 --- a/chromium/config/Chrome/win/x64/config.asm +++ b/chromium/config/Chrome/win/x64/config.asm @@ -666,7 +666,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 1 %define CONFIG_CBS 0 %define CONFIG_CBS_AV1 0 @@ -700,8 +700,8 @@ %define CONFIG_H264PRED 1 %define CONFIG_H264QPEL 1 %define CONFIG_H264_SEI 1 -%define CONFIG_HEVCPARSE 0 -%define CONFIG_HEVC_SEI 0 +%define CONFIG_HEVCPARSE 1 +%define CONFIG_HEVC_SEI 1 %define CONFIG_HPELDSP 0 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/win/x64/config.h b/chromium/config/Chrome/win/x64/config.h index deabb6f1db..ffb176cad1 100644 --- a/chromium/config/Chrome/win/x64/config.h +++ b/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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --toolchain=msvc --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/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=/winsysroot/usr/local/google/home/dalecurtis/code/chrome/src/third_party/depot_tools/win_toolchain/vs_files/7393122652 --extra-ldflags='/winsysroot:/usr/local/google/home/dalecurtis/code/chrome/src/third_party/depot_tools/win_toolchain/vs_files/7393122652' --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-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --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/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O3\"' --toolchain=msvc --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/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=-O3 --extra-cflags=/winsysroot/usr/local/google/home/dalecurtis/code/chrome/src/third_party/depot_tools/win_toolchain/vs_files/7393122652 --extra-ldflags='/winsysroot:/usr/local/google/home/dalecurtis/code/chrome/src/third_party/depot_tools/win_toolchain/vs_files/7393122652' --enable-decoder='aac,ac3,eac3,h264,hevc' --enable-demuxer=aac,ac3,eac3 --enable-parser='aac,ac3,eac3,h264,hevc'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2024 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 #define CONFIG_H264_SEI 1 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/win/x64/config_components.h b/chromium/config/Chrome/win/x64/config_components.h index 8ebce4c9b5..0e5816accb 100644 --- a/chromium/config/Chrome/win/x64/config_components.h +++ b/chromium/config/Chrome/win/x64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/win/x64/libavcodec/codec_list.c b/chromium/config/Chrome/win/x64/libavcodec/codec_list.c index fe5adb0d92..c9666ae199 100644 --- a/chromium/config/Chrome/win/x64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/win/x64/libavcodec/codec_list.c @@ -14,4 +14,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/win/x64/libavcodec/parser_list.c b/chromium/config/Chrome/win/x64/libavcodec/parser_list.c index 3e4fa9c320..c85087a596 100644 --- a/chromium/config/Chrome/win/x64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/win/x64/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/android/arm-neon/config.h b/chromium/config/Chromium/android/arm-neon/config.h index 6283fcdd8b..58ad628385 100644 --- a/chromium/config/Chromium/android/arm-neon/config.h +++ b/chromium/config/Chromium/android/arm-neon/config.h @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 0 #define CONFIG_H264QPEL 0 #define CONFIG_H264_SEI 0 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/android/arm-neon/config_components.h b/chromium/config/Chromium/android/arm-neon/config_components.h index 9b4b898861..33647f9f69 100644 --- a/chromium/config/Chromium/android/arm-neon/config_components.h +++ b/chromium/config/Chromium/android/arm-neon/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/android/arm-neon/libavcodec/codec_list.c b/chromium/config/Chromium/android/arm-neon/libavcodec/codec_list.c index 7d9debfe61..f9faf1d332 100644 --- a/chromium/config/Chromium/android/arm-neon/libavcodec/codec_list.c +++ b/chromium/config/Chromium/android/arm-neon/libavcodec/codec_list.c @@ -12,4 +12,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/android/arm-neon/libavcodec/parser_list.c b/chromium/config/Chromium/android/arm-neon/libavcodec/parser_list.c index fdc533b38f..520472e237 100644 --- a/chromium/config/Chromium/android/arm-neon/libavcodec/parser_list.c +++ b/chromium/config/Chromium/android/arm-neon/libavcodec/parser_list.c @@ -4,4 +4,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/android/arm64/config.h b/chromium/config/Chromium/android/arm64/config.h index 0ffcc4af87..5a5bbe61b4 100644 --- a/chromium/config/Chromium/android/arm64/config.h +++ b/chromium/config/Chromium/android/arm64/config.h @@ -681,7 +681,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -715,8 +715,8 @@ #define CONFIG_H264PRED 0 #define CONFIG_H264QPEL 0 #define CONFIG_H264_SEI 0 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/android/arm64/config_components.h b/chromium/config/Chromium/android/arm64/config_components.h index 9b4b898861..33647f9f69 100644 --- a/chromium/config/Chromium/android/arm64/config_components.h +++ b/chromium/config/Chromium/android/arm64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/android/arm64/libavcodec/codec_list.c b/chromium/config/Chromium/android/arm64/libavcodec/codec_list.c index 7d9debfe61..f9faf1d332 100644 --- a/chromium/config/Chromium/android/arm64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/android/arm64/libavcodec/codec_list.c @@ -12,4 +12,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/android/arm64/libavcodec/parser_list.c b/chromium/config/Chromium/android/arm64/libavcodec/parser_list.c index fdc533b38f..520472e237 100644 --- a/chromium/config/Chromium/android/arm64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/android/arm64/libavcodec/parser_list.c @@ -4,4 +4,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/android/ia32/config.h b/chromium/config/Chromium/android/ia32/config.h index ece14747d9..3c191cf2dc 100644 --- a/chromium/config/Chromium/android/ia32/config.h +++ b/chromium/config/Chromium/android/ia32/config.h @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 0 #define CONFIG_H264QPEL 0 #define CONFIG_H264_SEI 0 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/android/ia32/config_components.h b/chromium/config/Chromium/android/ia32/config_components.h index 9b4b898861..33647f9f69 100644 --- a/chromium/config/Chromium/android/ia32/config_components.h +++ b/chromium/config/Chromium/android/ia32/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/android/ia32/libavcodec/codec_list.c b/chromium/config/Chromium/android/ia32/libavcodec/codec_list.c index 7d9debfe61..f9faf1d332 100644 --- a/chromium/config/Chromium/android/ia32/libavcodec/codec_list.c +++ b/chromium/config/Chromium/android/ia32/libavcodec/codec_list.c @@ -12,4 +12,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/android/ia32/libavcodec/parser_list.c b/chromium/config/Chromium/android/ia32/libavcodec/parser_list.c index fdc533b38f..520472e237 100644 --- a/chromium/config/Chromium/android/ia32/libavcodec/parser_list.c +++ b/chromium/config/Chromium/android/ia32/libavcodec/parser_list.c @@ -4,4 +4,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/android/x64/config.h b/chromium/config/Chromium/android/x64/config.h index 7fe0956c78..2de3731514 100644 --- a/chromium/config/Chromium/android/x64/config.h +++ b/chromium/config/Chromium/android/x64/config.h @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 0 #define CONFIG_H264QPEL 0 #define CONFIG_H264_SEI 0 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/android/x64/config_components.h b/chromium/config/Chromium/android/x64/config_components.h index 9b4b898861..33647f9f69 100644 --- a/chromium/config/Chromium/android/x64/config_components.h +++ b/chromium/config/Chromium/android/x64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/android/x64/libavcodec/codec_list.c b/chromium/config/Chromium/android/x64/libavcodec/codec_list.c index 7d9debfe61..f9faf1d332 100644 --- a/chromium/config/Chromium/android/x64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/android/x64/libavcodec/codec_list.c @@ -12,4 +12,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/android/x64/libavcodec/parser_list.c b/chromium/config/Chromium/android/x64/libavcodec/parser_list.c index fdc533b38f..520472e237 100644 --- a/chromium/config/Chromium/android/x64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/android/x64/libavcodec/parser_list.c @@ -4,4 +4,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/ios/arm64/config.h b/chromium/config/Chromium/ios/arm64/config.h index 6e3f4a2652..8b8e56b3f0 100644 --- a/chromium/config/Chromium/ios/arm64/config.h +++ b/chromium/config/Chromium/ios/arm64/config.h @@ -681,7 +681,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -715,8 +715,8 @@ #define CONFIG_H264PRED 0 #define CONFIG_H264QPEL 0 #define CONFIG_H264_SEI 0 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/ios/arm64/config_components.h b/chromium/config/Chromium/ios/arm64/config_components.h index 9b4b898861..33647f9f69 100644 --- a/chromium/config/Chromium/ios/arm64/config_components.h +++ b/chromium/config/Chromium/ios/arm64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/ios/arm64/libavcodec/codec_list.c b/chromium/config/Chromium/ios/arm64/libavcodec/codec_list.c index 7d9debfe61..f9faf1d332 100644 --- a/chromium/config/Chromium/ios/arm64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/ios/arm64/libavcodec/codec_list.c @@ -12,4 +12,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/ios/arm64/libavcodec/parser_list.c b/chromium/config/Chromium/ios/arm64/libavcodec/parser_list.c index fdc533b38f..520472e237 100644 --- a/chromium/config/Chromium/ios/arm64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/ios/arm64/libavcodec/parser_list.c @@ -4,4 +4,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/linux-noasm/x64/config.h b/chromium/config/Chromium/linux-noasm/x64/config.h index 505531f4c6..1dc6286ec4 100644 --- a/chromium/config/Chromium/linux-noasm/x64/config.h +++ b/chromium/config/Chromium/linux-noasm/x64/config.h @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 0 #define CONFIG_H264QPEL 0 #define CONFIG_H264_SEI 0 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/linux-noasm/x64/config_components.h b/chromium/config/Chromium/linux-noasm/x64/config_components.h index 9b4b898861..33647f9f69 100644 --- a/chromium/config/Chromium/linux-noasm/x64/config_components.h +++ b/chromium/config/Chromium/linux-noasm/x64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/linux-noasm/x64/libavcodec/codec_list.c b/chromium/config/Chromium/linux-noasm/x64/libavcodec/codec_list.c index 7d9debfe61..f9faf1d332 100644 --- a/chromium/config/Chromium/linux-noasm/x64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/linux-noasm/x64/libavcodec/codec_list.c @@ -12,4 +12,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/linux-noasm/x64/libavcodec/parser_list.c b/chromium/config/Chromium/linux-noasm/x64/libavcodec/parser_list.c index fdc533b38f..520472e237 100644 --- a/chromium/config/Chromium/linux-noasm/x64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/linux-noasm/x64/libavcodec/parser_list.c @@ -4,4 +4,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/linux/arm-neon/config.h b/chromium/config/Chromium/linux/arm-neon/config.h index 19d5c45a8c..94e1645cb9 100644 --- a/chromium/config/Chromium/linux/arm-neon/config.h +++ b/chromium/config/Chromium/linux/arm-neon/config.h @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 0 #define CONFIG_H264QPEL 0 #define CONFIG_H264_SEI 0 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/linux/arm-neon/config_components.h b/chromium/config/Chromium/linux/arm-neon/config_components.h index 9b4b898861..33647f9f69 100644 --- a/chromium/config/Chromium/linux/arm-neon/config_components.h +++ b/chromium/config/Chromium/linux/arm-neon/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/linux/arm-neon/libavcodec/codec_list.c b/chromium/config/Chromium/linux/arm-neon/libavcodec/codec_list.c index 7d9debfe61..f9faf1d332 100644 --- a/chromium/config/Chromium/linux/arm-neon/libavcodec/codec_list.c +++ b/chromium/config/Chromium/linux/arm-neon/libavcodec/codec_list.c @@ -12,4 +12,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/linux/arm-neon/libavcodec/parser_list.c b/chromium/config/Chromium/linux/arm-neon/libavcodec/parser_list.c index fdc533b38f..520472e237 100644 --- a/chromium/config/Chromium/linux/arm-neon/libavcodec/parser_list.c +++ b/chromium/config/Chromium/linux/arm-neon/libavcodec/parser_list.c @@ -4,4 +4,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/linux/arm/config.h b/chromium/config/Chromium/linux/arm/config.h index 43b91c55cc..5af47c2601 100644 --- a/chromium/config/Chromium/linux/arm/config.h +++ b/chromium/config/Chromium/linux/arm/config.h @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 0 #define CONFIG_H264QPEL 0 #define CONFIG_H264_SEI 0 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/linux/arm/config_components.h b/chromium/config/Chromium/linux/arm/config_components.h index 9b4b898861..33647f9f69 100644 --- a/chromium/config/Chromium/linux/arm/config_components.h +++ b/chromium/config/Chromium/linux/arm/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/linux/arm/libavcodec/codec_list.c b/chromium/config/Chromium/linux/arm/libavcodec/codec_list.c index 7d9debfe61..f9faf1d332 100644 --- a/chromium/config/Chromium/linux/arm/libavcodec/codec_list.c +++ b/chromium/config/Chromium/linux/arm/libavcodec/codec_list.c @@ -12,4 +12,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/linux/arm/libavcodec/parser_list.c b/chromium/config/Chromium/linux/arm/libavcodec/parser_list.c index fdc533b38f..520472e237 100644 --- a/chromium/config/Chromium/linux/arm/libavcodec/parser_list.c +++ b/chromium/config/Chromium/linux/arm/libavcodec/parser_list.c @@ -4,4 +4,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/linux/arm64/config.h b/chromium/config/Chromium/linux/arm64/config.h index b2c5559211..e36d8bec5d 100644 --- a/chromium/config/Chromium/linux/arm64/config.h +++ b/chromium/config/Chromium/linux/arm64/config.h @@ -681,7 +681,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -715,8 +715,8 @@ #define CONFIG_H264PRED 0 #define CONFIG_H264QPEL 0 #define CONFIG_H264_SEI 0 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/linux/arm64/config_components.h b/chromium/config/Chromium/linux/arm64/config_components.h index 9b4b898861..33647f9f69 100644 --- a/chromium/config/Chromium/linux/arm64/config_components.h +++ b/chromium/config/Chromium/linux/arm64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/linux/arm64/libavcodec/codec_list.c b/chromium/config/Chromium/linux/arm64/libavcodec/codec_list.c index 7d9debfe61..f9faf1d332 100644 --- a/chromium/config/Chromium/linux/arm64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/linux/arm64/libavcodec/codec_list.c @@ -12,4 +12,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/linux/arm64/libavcodec/parser_list.c b/chromium/config/Chromium/linux/arm64/libavcodec/parser_list.c index fdc533b38f..520472e237 100644 --- a/chromium/config/Chromium/linux/arm64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/linux/arm64/libavcodec/parser_list.c @@ -4,4 +4,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/linux/ia32/config.h b/chromium/config/Chromium/linux/ia32/config.h index b8cfcf6bb9..5082a34b9f 100644 --- a/chromium/config/Chromium/linux/ia32/config.h +++ b/chromium/config/Chromium/linux/ia32/config.h @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 0 #define CONFIG_H264QPEL 0 #define CONFIG_H264_SEI 0 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/linux/ia32/config_components.h b/chromium/config/Chromium/linux/ia32/config_components.h index 9b4b898861..33647f9f69 100644 --- a/chromium/config/Chromium/linux/ia32/config_components.h +++ b/chromium/config/Chromium/linux/ia32/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/linux/ia32/libavcodec/codec_list.c b/chromium/config/Chromium/linux/ia32/libavcodec/codec_list.c index 7d9debfe61..f9faf1d332 100644 --- a/chromium/config/Chromium/linux/ia32/libavcodec/codec_list.c +++ b/chromium/config/Chromium/linux/ia32/libavcodec/codec_list.c @@ -12,4 +12,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/linux/ia32/libavcodec/parser_list.c b/chromium/config/Chromium/linux/ia32/libavcodec/parser_list.c index fdc533b38f..520472e237 100644 --- a/chromium/config/Chromium/linux/ia32/libavcodec/parser_list.c +++ b/chromium/config/Chromium/linux/ia32/libavcodec/parser_list.c @@ -4,4 +4,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/linux/x64/config.h b/chromium/config/Chromium/linux/x64/config.h index 6d520db3d7..ba38111853 100644 --- a/chromium/config/Chromium/linux/x64/config.h +++ b/chromium/config/Chromium/linux/x64/config.h @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 0 #define CONFIG_H264QPEL 0 #define CONFIG_H264_SEI 0 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/linux/x64/config_components.h b/chromium/config/Chromium/linux/x64/config_components.h index 9b4b898861..33647f9f69 100644 --- a/chromium/config/Chromium/linux/x64/config_components.h +++ b/chromium/config/Chromium/linux/x64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/linux/x64/libavcodec/codec_list.c b/chromium/config/Chromium/linux/x64/libavcodec/codec_list.c index 7d9debfe61..f9faf1d332 100644 --- a/chromium/config/Chromium/linux/x64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/linux/x64/libavcodec/codec_list.c @@ -12,4 +12,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/linux/x64/libavcodec/parser_list.c b/chromium/config/Chromium/linux/x64/libavcodec/parser_list.c index fdc533b38f..520472e237 100644 --- a/chromium/config/Chromium/linux/x64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/linux/x64/libavcodec/parser_list.c @@ -4,4 +4,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/mac/arm64/config.h b/chromium/config/Chromium/mac/arm64/config.h index 6e3f4a2652..8b8e56b3f0 100644 --- a/chromium/config/Chromium/mac/arm64/config.h +++ b/chromium/config/Chromium/mac/arm64/config.h @@ -681,7 +681,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -715,8 +715,8 @@ #define CONFIG_H264PRED 0 #define CONFIG_H264QPEL 0 #define CONFIG_H264_SEI 0 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/mac/arm64/config_components.h b/chromium/config/Chromium/mac/arm64/config_components.h index 9b4b898861..33647f9f69 100644 --- a/chromium/config/Chromium/mac/arm64/config_components.h +++ b/chromium/config/Chromium/mac/arm64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/mac/arm64/libavcodec/codec_list.c b/chromium/config/Chromium/mac/arm64/libavcodec/codec_list.c index 7d9debfe61..f9faf1d332 100644 --- a/chromium/config/Chromium/mac/arm64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/mac/arm64/libavcodec/codec_list.c @@ -12,4 +12,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/mac/arm64/libavcodec/parser_list.c b/chromium/config/Chromium/mac/arm64/libavcodec/parser_list.c index fdc533b38f..520472e237 100644 --- a/chromium/config/Chromium/mac/arm64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/mac/arm64/libavcodec/parser_list.c @@ -4,4 +4,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/mac/x64/config.asm b/chromium/config/Chromium/mac/x64/config.asm index 85470e7fa0..57f3039fcf 100644 --- a/chromium/config/Chromium/mac/x64/config.asm +++ b/chromium/config/Chromium/mac/x64/config.asm @@ -666,7 +666,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 0 %define CONFIG_CBS 0 %define CONFIG_CBS_AV1 0 @@ -700,8 +700,8 @@ %define CONFIG_H264PRED 0 %define CONFIG_H264QPEL 0 %define CONFIG_H264_SEI 0 -%define CONFIG_HEVCPARSE 0 -%define CONFIG_HEVC_SEI 0 +%define CONFIG_HEVCPARSE 1 +%define CONFIG_HEVC_SEI 1 %define CONFIG_HPELDSP 0 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/mac/x64/config.h b/chromium/config/Chromium/mac/x64/config.h index 2166b98670..b8a22d41b3 100644 --- a/chromium/config/Chromium/mac/x64/config.h +++ b/chromium/config/Chromium/mac/x64/config.h @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 0 #define CONFIG_H264QPEL 0 #define CONFIG_H264_SEI 0 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/mac/x64/config_components.h b/chromium/config/Chromium/mac/x64/config_components.h index 9b4b898861..33647f9f69 100644 --- a/chromium/config/Chromium/mac/x64/config_components.h +++ b/chromium/config/Chromium/mac/x64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/mac/x64/libavcodec/codec_list.c b/chromium/config/Chromium/mac/x64/libavcodec/codec_list.c index 7d9debfe61..f9faf1d332 100644 --- a/chromium/config/Chromium/mac/x64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/mac/x64/libavcodec/codec_list.c @@ -12,4 +12,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/mac/x64/libavcodec/parser_list.c b/chromium/config/Chromium/mac/x64/libavcodec/parser_list.c index fdc533b38f..520472e237 100644 --- a/chromium/config/Chromium/mac/x64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/mac/x64/libavcodec/parser_list.c @@ -4,4 +4,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/win-msvc/ia32/config.asm b/chromium/config/Chromium/win-msvc/ia32/config.asm index e425512ab2..99eeb26c7f 100644 --- a/chromium/config/Chromium/win-msvc/ia32/config.asm +++ b/chromium/config/Chromium/win-msvc/ia32/config.asm @@ -563,7 +563,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 0 %define CONFIG_CBS 0 %define CONFIG_CBS_H264 0 @@ -587,7 +587,7 @@ %define CONFIG_H264PARSE 0 %define CONFIG_H264PRED 1 %define CONFIG_H264QPEL 0 -%define CONFIG_HEVCPARSE 0 +%define CONFIG_HEVCPARSE 1 %define CONFIG_HPELDSP 1 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 @@ -752,7 +752,7 @@ %define CONFIG_H264_QSV_DECODER 0 %define CONFIG_H264_RKMPP_DECODER 0 %define CONFIG_HAP_DECODER 0 -%define CONFIG_HEVC_DECODER 0 +%define CONFIG_HEVC_DECODER 1 %define CONFIG_HEVC_QSV_DECODER 0 %define CONFIG_HEVC_RKMPP_DECODER 0 %define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -1450,7 +1450,7 @@ %define CONFIG_H261_PARSER 0 %define CONFIG_H263_PARSER 0 %define CONFIG_H264_PARSER 0 -%define CONFIG_HEVC_PARSER 0 +%define CONFIG_HEVC_PARSER 1 %define CONFIG_MJPEG_PARSER 0 %define CONFIG_MLP_PARSER 0 %define CONFIG_MPEG4VIDEO_PARSER 0 diff --git a/chromium/config/Chromium/win-msvc/ia32/config.h b/chromium/config/Chromium/win-msvc/ia32/config.h index a23d3a6089..b1fb82acc2 100644 --- a/chromium/config/Chromium/win-msvc/ia32/config.h +++ b/chromium/config/Chromium/win-msvc/ia32/config.h @@ -578,7 +578,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_H264 0 @@ -602,7 +602,7 @@ #define CONFIG_H264PARSE 0 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 0 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 @@ -767,7 +767,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -1465,7 +1465,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_MJPEG_PARSER 0 #define CONFIG_MLP_PARSER 0 #define CONFIG_MPEG4VIDEO_PARSER 0 diff --git a/chromium/config/Chromium/win-msvc/ia32/libavcodec/codec_list.c b/chromium/config/Chromium/win-msvc/ia32/libavcodec/codec_list.c index 9407bd2775..069f0f61bd 100644 --- a/chromium/config/Chromium/win-msvc/ia32/libavcodec/codec_list.c +++ b/chromium/config/Chromium/win-msvc/ia32/libavcodec/codec_list.c @@ -15,4 +15,5 @@ static const AVCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/win-msvc/ia32/libavcodec/parser_list.c b/chromium/config/Chromium/win-msvc/ia32/libavcodec/parser_list.c index 4c59b89cdf..8629776838 100644 --- a/chromium/config/Chromium/win-msvc/ia32/libavcodec/parser_list.c +++ b/chromium/config/Chromium/win-msvc/ia32/libavcodec/parser_list.c @@ -5,4 +5,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vorbis_parser, &ff_vp3_parser, &ff_vp8_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/win-msvc/x64/config.asm b/chromium/config/Chromium/win-msvc/x64/config.asm index 3c9bd63728..71c73ca09b 100644 --- a/chromium/config/Chromium/win-msvc/x64/config.asm +++ b/chromium/config/Chromium/win-msvc/x64/config.asm @@ -563,7 +563,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 0 %define CONFIG_CBS 0 %define CONFIG_CBS_H264 0 @@ -587,7 +587,7 @@ %define CONFIG_H264PARSE 0 %define CONFIG_H264PRED 1 %define CONFIG_H264QPEL 0 -%define CONFIG_HEVCPARSE 0 +%define CONFIG_HEVCPARSE 1 %define CONFIG_HPELDSP 1 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 @@ -752,7 +752,7 @@ %define CONFIG_H264_QSV_DECODER 0 %define CONFIG_H264_RKMPP_DECODER 0 %define CONFIG_HAP_DECODER 0 -%define CONFIG_HEVC_DECODER 0 +%define CONFIG_HEVC_DECODER 1 %define CONFIG_HEVC_QSV_DECODER 0 %define CONFIG_HEVC_RKMPP_DECODER 0 %define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -1450,7 +1450,7 @@ %define CONFIG_H261_PARSER 0 %define CONFIG_H263_PARSER 0 %define CONFIG_H264_PARSER 0 -%define CONFIG_HEVC_PARSER 0 +%define CONFIG_HEVC_PARSER 1 %define CONFIG_MJPEG_PARSER 0 %define CONFIG_MLP_PARSER 0 %define CONFIG_MPEG4VIDEO_PARSER 0 diff --git a/chromium/config/Chromium/win-msvc/x64/config.h b/chromium/config/Chromium/win-msvc/x64/config.h index 89d69e4734..81ff36df32 100644 --- a/chromium/config/Chromium/win-msvc/x64/config.h +++ b/chromium/config/Chromium/win-msvc/x64/config.h @@ -578,7 +578,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_H264 0 @@ -602,7 +602,7 @@ #define CONFIG_H264PARSE 0 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 0 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 @@ -767,7 +767,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -1465,7 +1465,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_MJPEG_PARSER 0 #define CONFIG_MLP_PARSER 0 #define CONFIG_MPEG4VIDEO_PARSER 0 diff --git a/chromium/config/Chromium/win-msvc/x64/libavcodec/codec_list.c b/chromium/config/Chromium/win-msvc/x64/libavcodec/codec_list.c index 9407bd2775..069f0f61bd 100644 --- a/chromium/config/Chromium/win-msvc/x64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/win-msvc/x64/libavcodec/codec_list.c @@ -15,4 +15,5 @@ static const AVCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/win-msvc/x64/libavcodec/parser_list.c b/chromium/config/Chromium/win-msvc/x64/libavcodec/parser_list.c index 4c59b89cdf..8629776838 100644 --- a/chromium/config/Chromium/win-msvc/x64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/win-msvc/x64/libavcodec/parser_list.c @@ -5,4 +5,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vorbis_parser, &ff_vp3_parser, &ff_vp8_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/win/arm64/config.h b/chromium/config/Chromium/win/arm64/config.h index 932974dbd0..ae09b055c4 100644 --- a/chromium/config/Chromium/win/arm64/config.h +++ b/chromium/config/Chromium/win/arm64/config.h @@ -681,7 +681,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -715,8 +715,8 @@ #define CONFIG_H264PRED 0 #define CONFIG_H264QPEL 0 #define CONFIG_H264_SEI 0 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/win/arm64/config_components.h b/chromium/config/Chromium/win/arm64/config_components.h index 9b4b898861..33647f9f69 100644 --- a/chromium/config/Chromium/win/arm64/config_components.h +++ b/chromium/config/Chromium/win/arm64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/win/arm64/libavcodec/codec_list.c b/chromium/config/Chromium/win/arm64/libavcodec/codec_list.c index 7d9debfe61..f9faf1d332 100644 --- a/chromium/config/Chromium/win/arm64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/win/arm64/libavcodec/codec_list.c @@ -12,4 +12,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/win/arm64/libavcodec/parser_list.c b/chromium/config/Chromium/win/arm64/libavcodec/parser_list.c index fdc533b38f..520472e237 100644 --- a/chromium/config/Chromium/win/arm64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/win/arm64/libavcodec/parser_list.c @@ -4,4 +4,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/win/ia32/config.asm b/chromium/config/Chromium/win/ia32/config.asm index 9497c88ac6..494fca0549 100644 --- a/chromium/config/Chromium/win/ia32/config.asm +++ b/chromium/config/Chromium/win/ia32/config.asm @@ -666,7 +666,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 0 %define CONFIG_CBS 0 %define CONFIG_CBS_AV1 0 @@ -700,8 +700,8 @@ %define CONFIG_H264PRED 0 %define CONFIG_H264QPEL 0 %define CONFIG_H264_SEI 0 -%define CONFIG_HEVCPARSE 0 -%define CONFIG_HEVC_SEI 0 +%define CONFIG_HEVCPARSE 1 +%define CONFIG_HEVC_SEI 1 %define CONFIG_HPELDSP 0 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/win/ia32/config.h b/chromium/config/Chromium/win/ia32/config.h index 3236bfea69..db8fea08fb 100644 --- a/chromium/config/Chromium/win/ia32/config.h +++ b/chromium/config/Chromium/win/ia32/config.h @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 0 #define CONFIG_H264QPEL 0 #define CONFIG_H264_SEI 0 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/win/ia32/config_components.h b/chromium/config/Chromium/win/ia32/config_components.h index 9b4b898861..33647f9f69 100644 --- a/chromium/config/Chromium/win/ia32/config_components.h +++ b/chromium/config/Chromium/win/ia32/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/win/ia32/libavcodec/codec_list.c b/chromium/config/Chromium/win/ia32/libavcodec/codec_list.c index 7d9debfe61..f9faf1d332 100644 --- a/chromium/config/Chromium/win/ia32/libavcodec/codec_list.c +++ b/chromium/config/Chromium/win/ia32/libavcodec/codec_list.c @@ -12,4 +12,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/win/ia32/libavcodec/parser_list.c b/chromium/config/Chromium/win/ia32/libavcodec/parser_list.c index fdc533b38f..520472e237 100644 --- a/chromium/config/Chromium/win/ia32/libavcodec/parser_list.c +++ b/chromium/config/Chromium/win/ia32/libavcodec/parser_list.c @@ -4,4 +4,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/win/x64/config.asm b/chromium/config/Chromium/win/x64/config.asm index 0f407c9972..08cf9aaded 100644 --- a/chromium/config/Chromium/win/x64/config.asm +++ b/chromium/config/Chromium/win/x64/config.asm @@ -666,7 +666,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 0 %define CONFIG_CBS 0 %define CONFIG_CBS_AV1 0 @@ -700,8 +700,8 @@ %define CONFIG_H264PRED 0 %define CONFIG_H264QPEL 0 %define CONFIG_H264_SEI 0 -%define CONFIG_HEVCPARSE 0 -%define CONFIG_HEVC_SEI 0 +%define CONFIG_HEVCPARSE 1 +%define CONFIG_HEVC_SEI 1 %define CONFIG_HPELDSP 0 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/win/x64/config.h b/chromium/config/Chromium/win/x64/config.h index 1f8cf607c1..e1c0b5cc46 100644 --- a/chromium/config/Chromium/win/x64/config.h +++ b/chromium/config/Chromium/win/x64/config.h @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -714,8 +714,8 @@ #define CONFIG_H264PRED 0 #define CONFIG_H264QPEL 0 #define CONFIG_H264_SEI 0 -#define CONFIG_HEVCPARSE 0 -#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVCPARSE 1 +#define CONFIG_HEVC_SEI 1 #define CONFIG_HPELDSP 0 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/win/x64/config_components.h b/chromium/config/Chromium/win/x64/config_components.h index 9b4b898861..33647f9f69 100644 --- a/chromium/config/Chromium/win/x64/config_components.h +++ b/chromium/config/Chromium/win/x64/config_components.h @@ -135,7 +135,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -982,7 +982,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/win/x64/libavcodec/codec_list.c b/chromium/config/Chromium/win/x64/libavcodec/codec_list.c index 7d9debfe61..f9faf1d332 100644 --- a/chromium/config/Chromium/win/x64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/win/x64/libavcodec/codec_list.c @@ -12,4 +12,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/win/x64/libavcodec/parser_list.c b/chromium/config/Chromium/win/x64/libavcodec/parser_list.c index fdc533b38f..520472e237 100644 --- a/chromium/config/Chromium/win/x64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/win/x64/libavcodec/parser_list.c @@ -4,4 +4,5 @@ static const AVCodecParser * const parser_list[] = { &ff_opus_parser, &ff_vorbis_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/ffmpeg_generated.gni b/ffmpeg_generated.gni index e282aa7480..dbabb55c6f 100644 --- a/ffmpeg_generated.gni +++ b/ffmpeg_generated.gni @@ -217,6 +217,27 @@ if ((current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_apple && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && ffmpeg_branding == "Chrome")) { + + ffmpeg_c_sources += [ + "libavcodec/aom_film_grain.c", + "libavcodec/autorename_libavcodec_bswapdsp.c", + "libavcodec/dovi_rpu.c", + "libavcodec/dovi_rpudec.c", + "libavcodec/dynamic_hdr_vivid.c", + "libavcodec/hevc_cabac.c", + "libavcodec/hevc_data.c", + "libavcodec/hevc_filter.c", + "libavcodec/hevc_mvs.c", + "libavcodec/hevc_parse.c", + "libavcodec/hevc_parser.c", + "libavcodec/hevc_ps.c", + "libavcodec/hevc_refs.c", + "libavcodec/hevc_sei.c", + "libavcodec/hevcdec.c", + "libavcodec/hevcdsp.c", + "libavcodec/hevcpred.c" + ] + ffmpeg_c_sources += [ "libavcodec/atsc_a53.c", "libavcodec/autorename_libavcodec_videodsp.c", @@ -304,6 +325,19 @@ if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || } if (current_cpu == "arm64" && ffmpeg_branding == "Chrome") { + + ffmpeg_c_sources += [ + "libavcodec/aarch64/hevcdsp_init_aarch64.c" + ] + + ffmpeg_gas_sources += [ + "libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_idct_neon.S", + "libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_sao_neon.S", + "libavcodec/aarch64/hevcdsp_deblock_neon.S", + "libavcodec/aarch64/hevcdsp_epel_neon.S", + "libavcodec/aarch64/hevcdsp_qpel_neon.S" + ] + ffmpeg_c_sources += [ "libavcodec/aarch64/aacpsdsp_init_aarch64.c", "libavcodec/aarch64/autorename_libavcodec_aarch64_videodsp_init.c", @@ -397,6 +431,11 @@ if (current_cpu == "arm64") { if ((use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome")) { + + ffmpeg_c_sources += [ + "libavcodec/arm/hevcdsp_init_arm.c" + ] + ffmpeg_c_sources += [ "libavcodec/arm/h264chroma_init_arm.c", "libavcodec/arm/h264dsp_init_arm.c", @@ -415,6 +454,24 @@ if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { + + ffmpeg_c_sources += [ + "libavcodec/x86/bswapdsp_init.c", + "libavcodec/x86/hevcdsp_init.c", + "libavcodec/x86/h26x/h2656dsp.c" + ] + + ffmpeg_asm_sources += [ + "libavcodec/x86/bswapdsp.asm", + "libavcodec/x86/hevc_add_res.asm", + "libavcodec/x86/hevc_deblock.asm", + "libavcodec/x86/hevc_idct.asm", + "libavcodec/x86/hevc_mc.asm", + "libavcodec/x86/hevc_sao.asm", + "libavcodec/x86/hevc_sao_10bit.asm", + "libavcodec/x86/h26x/h2656_inter.asm" + ] + ffmpeg_c_sources += [ "libavcodec/x86/aacpsdsp_init.c", "libavcodec/x86/h264_intrapred_init.c", @@ -428,6 +485,18 @@ if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || if (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") { + + ffmpeg_c_sources += [ + "libavcodec/arm/hevcdsp_init_neon.c" + ] + + ffmpeg_gas_sources += [ + "libavcodec/arm/hevcdsp_deblock_neon.S", + "libavcodec/arm/hevcdsp_idct_neon.S", + "libavcodec/arm/hevcdsp_qpel_neon.S", + "libavcodec/arm/hevcdsp_sao_neon.S" + ] + ffmpeg_gas_sources += [ "libavcodec/arm/h264cmc_neon.S", "libavcodec/arm/h264dsp_neon.S", diff --git a/libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_idct_neon.S b/libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_idct_neon.S new file mode 100644 index 0000000000..26b255b3a2 --- /dev/null +++ b/libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_idct_neon.S @@ -0,0 +1,2 @@ +// File automatically generated. See crbug.com/495833. +#include "hevcdsp_idct_neon.S" \ No newline at end of file diff --git a/libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_sao_neon.S b/libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_sao_neon.S new file mode 100644 index 0000000000..9479c7f4a5 --- /dev/null +++ b/libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_sao_neon.S @@ -0,0 +1,2 @@ +// File automatically generated. See crbug.com/495833. +#include "hevcdsp_sao_neon.S" \ No newline at end of file diff --git a/libavcodec/autorename_libavcodec_bswapdsp.c b/libavcodec/autorename_libavcodec_bswapdsp.c new file mode 100644 index 0000000000..3accbac3e4 --- /dev/null +++ b/libavcodec/autorename_libavcodec_bswapdsp.c @@ -0,0 +1,2 @@ +// File automatically generated. See crbug.com/495833. +#include "bswapdsp.c" \ No newline at end of file -- 2.39.3 (Apple Git-146)