From 780136008044992f12ce7e4abeb413ab8ced1dc3 Mon Sep 17 00:00:00 2001 From: Alexander Frick Date: Sun, 8 Dec 2024 14:08:03 -0600 Subject: [PATCH] M130 RC3 --- docs/BUILDING_WIN.md | 4 +- docs/FAQ.md | 4 +- infra/THORIUM_DEV_BOOKMARKS.html | 1 + other/add-hevc-ffmpeg-decoder-parser.patch | 522 ++- other/add-hevc-ffmpeg-decoder-parser.patch1 | 3163 +++++++++++++++++ other/thorium-2024-ui.patch | 1039 +++++- setup.sh | 4 + src/chrome/browser/ui/views/tabs/tab.cc | 32 +- src/chrome/browser/ui/views/tabs/tab.h | 303 ++ src/components/flags_ui/flags_state.cc | 18 +- .../neterror/resources/neterror.html | 2 - src/components/neterror/resources/offline.js | 15 + src/media/base/supported_types.cc | 3 +- src/media/ffmpeg/ffmpeg_common.cc | 2 + src/media/filters/ffmpeg_video_decoder.cc | 3 +- 15 files changed, 4593 insertions(+), 522 deletions(-) create mode 100644 other/add-hevc-ffmpeg-decoder-parser.patch1 create mode 100644 src/chrome/browser/ui/views/tabs/tab.h diff --git a/docs/BUILDING_WIN.md b/docs/BUILDING_WIN.md index a99a8fd1..2772e3bd 100644 --- a/docs/BUILDING_WIN.md +++ b/docs/BUILDING_WIN.md @@ -119,8 +119,8 @@ First, configure Git (you may want to backup your current .gitconfig file if it ```shell git config --global user.name "My Name" -git config --global user.email "my-name@chromium.org" -git config --global core.autocrlf false +git config --global user.email "my-name@chromium.org" # Or whatever your Git email is +# git config --global core.autocrlf false # May want to uncomment this git config --global core.filemode false git config --global branch.autosetuprebase always git config --global core.longpaths true diff --git a/docs/FAQ.md b/docs/FAQ.md index dda831cd..dc695d6d 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -14,7 +14,7 @@ __2. Q: Why are Netflix, Spotify, Twitch, etc. not playing?__ piracy by preventing downloading these videos in any format that would be readable by an external application. However, there are various "security levels" for Widevine. There is L3 "software secure", which is the least secure. It is used on Linux. Then there is L2 "VMP secure", which is what Windows and MacOS uses. Then there is L1 "hardware secure", which is only used on specific Windows, MacOS, and ChromeOS devices that are very new - and have a hardware decoding chip for H.264 or H.264 (HEVC) videos that supports integration with Widevine to prevent tampering or circumvention + and have a hardware decoding chip for H.264 or H.265 (HEVC) videos that supports integration with Widevine to prevent tampering or circumvention at the hardware level. Anyway, VMP Secure means that the application has been signed by widevine.org. On Windows with Google Chrome or Firefox, this can be seen by the fact that next to widevine.dll, there is a widevine.sig, and next to the main program .exes, there is a corresponding .sig file. For example firefox.sig or chrome.sig. While Widevine includes the widevine.sig file always, and is publicly available, this only contains the public @@ -49,7 +49,7 @@ __3. Q: Why is Thorium always behind Chromium/Chrome as far as the or something privately relayed to me as per the [SECURITY.md](https://github.com/Alex313031/thorium/blob/main/SECURITY.md) file), I try my best to fix/update it and get releases out as soon as possible. Another thing that people keep suggesting is to use some kind of CI build service. This wouldn't help with the rebasing/development time, and because of the amount of resources needed to compile Thorium, - there are no services that I am aware of that have a free tier with hardware capable of the compilation. Again, this comes down to money and is prohibitively expensive. + there are no services that I am aware of that have a free tier with hardware capable of doing the compilation. Again, this comes down to money and is prohibitively expensive. __4. Q: Why isn't Thorium UnGoogled?__ __A:__ Thorium integrates many patches from UnGoogled Chromium (see [PATCHES.md](https://github.com/Alex313031/thorium/blob/main/docs/PATCHES.md)), but one of the project diff --git a/infra/THORIUM_DEV_BOOKMARKS.html b/infra/THORIUM_DEV_BOOKMARKS.html index f2abf72f..00a1d919 100644 --- a/infra/THORIUM_DEV_BOOKMARKS.html +++ b/infra/THORIUM_DEV_BOOKMARKS.html @@ -201,6 +201,7 @@

Th24

tab.cc - Chromium Code Search +
tab.h - Chromium Code Search
tab_strip.cc - Chromium Code Search
tab_style_views.cc - Chromium Code Search
tab_style_views.h - Chromium Code Search diff --git a/other/add-hevc-ffmpeg-decoder-parser.patch b/other/add-hevc-ffmpeg-decoder-parser.patch index d49142da..31d0f7a0 100644 --- a/other/add-hevc-ffmpeg-decoder-parser.patch +++ b/other/add-hevc-ffmpeg-decoder-parser.patch @@ -8,157 +8,157 @@ 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 | 8 +- - .../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 | 8 +- - .../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 | 8 +- - .../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 | 8 +- - .../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 | 8 +- - .../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 | 8 +- - .../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 | 8 +- - .../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 | 8 +- - .../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 | 8 +- - .../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 | 10 +- - .../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 | 10 +- - .../win-msvc/x64/libavcodec/codec_list.c | 1 + - .../win-msvc/x64/libavcodec/parser_list.c | 1 + - chromium/config/Chromium/win/arm64/config.h | 8 +- - .../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 | 8 +- - .../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 | 8 +- - .../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 + - 151 files changed, 654 insertions(+), 235 deletions(-) + .../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 @@ -230,7 +230,7 @@ index b1e4dd0061..7cdcadbe2f 100644 + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/android/arm64/config.h b/chromium/config/Chrome/android/arm64/config.h -index b600d4acb7..961e1ae41e 100644 +index b600d4acb7..962963edc5 100644 --- a/chromium/config/Chrome/android/arm64/config.h +++ b/chromium/config/Chrome/android/arm64/config.h @@ -1,7 +1,7 @@ @@ -238,7 +238,7 @@ index b600d4acb7..961e1ae41e 100644 #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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264,hevc'" -- 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,h264,hevc' --enable-demuxer=aac --enable-decoder='aac,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" @@ -305,7 +305,7 @@ index 3e4fa9c320..c85087a596 100644 + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/android/ia32/config.h b/chromium/config/Chrome/android/ia32/config.h -index 9389faa398..c5fdeb6332 100644 +index 9389faa398..f6fa752e71 100644 --- a/chromium/config/Chrome/android/ia32/config.h +++ b/chromium/config/Chrome/android/ia32/config.h @@ -1,7 +1,7 @@ @@ -313,7 +313,7 @@ index 9389faa398..c5fdeb6332 100644 #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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264,hevc'" -- 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,h264,hevc' --enable-demuxer=aac --enable-decoder='aac,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" @@ -380,7 +380,7 @@ index 3e4fa9c320..c85087a596 100644 + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/android/x64/config.h b/chromium/config/Chrome/android/x64/config.h -index db53697f2c..33f709784f 100644 +index db53697f2c..10332c717a 100644 --- a/chromium/config/Chrome/android/x64/config.h +++ b/chromium/config/Chrome/android/x64/config.h @@ -1,7 +1,7 @@ @@ -388,7 +388,7 @@ index db53697f2c..33f709784f 100644 #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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264,hevc'" -- 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,h264,hevc' --enable-demuxer=aac --enable-decoder='aac,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" @@ -455,7 +455,7 @@ index 3e4fa9c320..c85087a596 100644 + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/ios/arm64/config.h b/chromium/config/Chrome/ios/arm64/config.h -index 44bab03499..df38ffefc3 100644 +index 44bab03499..cde2ebfebb 100644 --- a/chromium/config/Chrome/ios/arm64/config.h +++ b/chromium/config/Chrome/ios/arm64/config.h @@ -1,7 +1,7 @@ @@ -463,7 +463,7 @@ index 44bab03499..df38ffefc3 100644 #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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264,hevc'" -- 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='\"-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,hevc' --enable-demuxer=aac --enable-decoder='aac,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" @@ -530,7 +530,7 @@ index 3e4fa9c320..c85087a596 100644 + &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..56c4107803 100644 +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 @@ @@ -538,7 +538,7 @@ index f798be9686..56c4107803 100644 #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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264,hevc'" -- 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='\"-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,hevc' --enable-demuxer=aac --enable-decoder='aac,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" @@ -605,7 +605,7 @@ index 3e4fa9c320..c85087a596 100644 + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/linux/arm/config.h b/chromium/config/Chrome/linux/arm/config.h -index 1a4219a9d3..a8aaa6ece0 100644 +index 1a4219a9d3..45de1c09dc 100644 --- a/chromium/config/Chrome/linux/arm/config.h +++ b/chromium/config/Chrome/linux/arm/config.h @@ -1,7 +1,7 @@ @@ -613,7 +613,7 @@ index 1a4219a9d3..a8aaa6ece0 100644 #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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264,hevc'" -- 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='\"-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,hevc' --enable-demuxer=aac --enable-decoder='aac,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 @@ index 3e4fa9c320..c85087a596 100644 + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/linux/arm64/config.h b/chromium/config/Chrome/linux/arm64/config.h -index b27a4c7217..46bf631e4e 100644 +index b27a4c7217..e7707dfb11 100644 --- a/chromium/config/Chrome/linux/arm64/config.h +++ b/chromium/config/Chrome/linux/arm64/config.h @@ -1,7 +1,7 @@ @@ -688,7 +688,7 @@ index b27a4c7217..46bf631e4e 100644 #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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264,hevc'" -- 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='\"-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,hevc' --enable-demuxer=aac --enable-decoder='aac,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" @@ -755,7 +755,7 @@ index 3e4fa9c320..c85087a596 100644 + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/linux/ia32/config.h b/chromium/config/Chrome/linux/ia32/config.h -index e84893e734..137c848742 100644 +index e84893e734..ef8372c777 100644 --- a/chromium/config/Chrome/linux/ia32/config.h +++ b/chromium/config/Chrome/linux/ia32/config.h @@ -1,7 +1,7 @@ @@ -763,7 +763,7 @@ index e84893e734..137c848742 100644 #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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264,hevc'" -- 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='\"-O2\"' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-decoder='aac,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" @@ -830,7 +830,7 @@ index 3e4fa9c320..c85087a596 100644 + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/linux/x64/config.h b/chromium/config/Chrome/linux/x64/config.h -index ad40660dbb..9958b411ef 100644 +index ad40660dbb..0753236c99 100644 --- a/chromium/config/Chrome/linux/x64/config.h +++ b/chromium/config/Chrome/linux/x64/config.h @@ -1,7 +1,7 @@ @@ -838,7 +838,7 @@ index ad40660dbb..9958b411ef 100644 #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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264,hevc'" -- 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='\"-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,hevc' --enable-demuxer=aac --enable-decoder='aac,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" @@ -905,7 +905,7 @@ index 3e4fa9c320..c85087a596 100644 + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/mac/arm64/config.h b/chromium/config/Chrome/mac/arm64/config.h -index 44bab03499..df38ffefc3 100644 +index 44bab03499..cde2ebfebb 100644 --- a/chromium/config/Chrome/mac/arm64/config.h +++ b/chromium/config/Chrome/mac/arm64/config.h @@ -1,7 +1,7 @@ @@ -913,7 +913,7 @@ index 44bab03499..df38ffefc3 100644 #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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264,hevc'" -- 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='\"-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,hevc' --enable-demuxer=aac --enable-decoder='aac,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" @@ -1004,7 +1004,7 @@ index 61fe976c14..c187aae464 100644 %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..ba4d52cd4e 100644 +index 382b19fc1d..8ba62765bb 100644 --- a/chromium/config/Chrome/mac/x64/config.h +++ b/chromium/config/Chrome/mac/x64/config.h @@ -1,7 +1,7 @@ @@ -1012,7 +1012,7 @@ index 382b19fc1d..ba4d52cd4e 100644 #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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264,hevc'" -- 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='\"-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,hevc' --enable-demuxer=aac --enable-decoder='aac,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" @@ -1119,7 +1119,7 @@ index ac13ddabdd..1305cdb704 100644 %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..b3ffbfe76a 100644 +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 @@ @@ -1127,7 +1127,7 @@ index 90497d03b1..b3ffbfe76a 100644 #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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264,hevc'" -- 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='\"-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,hevc' --enable-demuxer=aac --enable-decoder='aac,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" @@ -1228,7 +1228,7 @@ index 49d66ac57d..c3e7f4de28 100644 %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..7c3a88574b 100644 +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 @@ @@ -1236,7 +1236,7 @@ index 359682176a..7c3a88574b 100644 #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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264,hevc'" -- 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='\"-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,hevc' --enable-demuxer=aac --enable-decoder='aac,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" @@ -1297,7 +1297,7 @@ index 19d670aa24..f55c2ca459 100644 + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/win/arm64/config.h b/chromium/config/Chrome/win/arm64/config.h -index 183c93882e..6dc5589050 100644 +index 183c93882e..9896041326 100644 --- a/chromium/config/Chrome/win/arm64/config.h +++ b/chromium/config/Chrome/win/arm64/config.h @@ -1,7 +1,7 @@ @@ -1305,7 +1305,7 @@ index 183c93882e..6dc5589050 100644 #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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264,hevc'" -- 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='\"-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,hevc' --enable-demuxer=aac --enable-decoder='aac,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" @@ -1396,7 +1396,7 @@ index af16ed14a2..a0dc0b90fd 100644 %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..5056309b07 100644 +index 9e849b6271..9cb723846c 100644 --- a/chromium/config/Chrome/win/ia32/config.h +++ b/chromium/config/Chrome/win/ia32/config.h @@ -1,7 +1,7 @@ @@ -1404,7 +1404,7 @@ index 9e849b6271..5056309b07 100644 #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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264,hevc'" -- 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='\"-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,hevc' --enable-demuxer=aac --enable-decoder='aac,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" @@ -1495,7 +1495,7 @@ index c4f94cbc6f..79d7b566c4 100644 %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..f98c415272 100644 +index deabb6f1db..ffb176cad1 100644 --- a/chromium/config/Chrome/win/x64/config.h +++ b/chromium/config/Chrome/win/x64/config.h @@ -1,7 +1,7 @@ @@ -1503,7 +1503,7 @@ index deabb6f1db..f98c415272 100644 #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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264,hevc'" -- 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='\"-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,hevc' --enable-demuxer=aac --enable-decoder='aac,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" @@ -1834,18 +1834,9 @@ index fdc533b38f..520472e237 100644 + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/ios/arm64/config.h b/chromium/config/Chromium/ios/arm64/config.h -index 6e3f4a2652..4a6764b3d8 100644 +index 6e3f4a2652..8b8e56b3f0 100644 --- a/chromium/config/Chromium/ios/arm64/config.h +++ b/chromium/config/Chromium/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'" -- 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'" -- 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 @@ -1909,18 +1900,9 @@ index fdc533b38f..520472e237 100644 + &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..430c9d7bf2 100644 +index 505531f4c6..1dc6286ec4 100644 --- a/chromium/config/Chromium/linux-noasm/x64/config.h +++ b/chromium/config/Chromium/linux-noasm/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 --disable-asm --disable-inline-asm --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld'" -- elide long configuration string from binary */ -+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-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 --disable-asm --disable-inline-asm --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld'" -- elide long configuration string from binary */ - #define FFMPEG_LICENSE "LGPL version 2.1 or later" - #define CONFIG_THIS_YEAR 2024 - #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -680,7 +680,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 @@ -1984,18 +1966,9 @@ index fdc533b38f..520472e237 100644 + &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..33e2eeaa4b 100644 +index 19d5c45a8c..94e1645cb9 100644 --- a/chromium/config/Chromium/linux/arm-neon/config.h +++ b/chromium/config/Chromium/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'" -- 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'" -- 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 @@ -2059,18 +2032,9 @@ index fdc533b38f..520472e237 100644 + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/linux/arm/config.h b/chromium/config/Chromium/linux/arm/config.h -index 43b91c55cc..2189bc232b 100644 +index 43b91c55cc..5af47c2601 100644 --- a/chromium/config/Chromium/linux/arm/config.h +++ b/chromium/config/Chromium/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'" -- 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'" -- 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 @@ -2134,18 +2098,9 @@ index fdc533b38f..520472e237 100644 + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/linux/arm64/config.h b/chromium/config/Chromium/linux/arm64/config.h -index b2c5559211..ff1ca1224f 100644 +index b2c5559211..e36d8bec5d 100644 --- a/chromium/config/Chromium/linux/arm64/config.h +++ b/chromium/config/Chromium/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'" -- 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'" -- 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 @@ -2209,18 +2164,9 @@ index fdc533b38f..520472e237 100644 + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/linux/ia32/config.h b/chromium/config/Chromium/linux/ia32/config.h -index b8cfcf6bb9..e20d00532b 100644 +index b8cfcf6bb9..5082a34b9f 100644 --- a/chromium/config/Chromium/linux/ia32/config.h +++ b/chromium/config/Chromium/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" -- 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" -- 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 @@ -2284,18 +2230,9 @@ index fdc533b38f..520472e237 100644 + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/linux/x64/config.h b/chromium/config/Chromium/linux/x64/config.h -index 6d520db3d7..6441bee133 100644 +index 6d520db3d7..ba38111853 100644 --- a/chromium/config/Chromium/linux/x64/config.h +++ b/chromium/config/Chromium/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'" -- 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'" -- 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 @@ -2359,18 +2296,9 @@ index fdc533b38f..520472e237 100644 + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/mac/arm64/config.h b/chromium/config/Chromium/mac/arm64/config.h -index 6e3f4a2652..4a6764b3d8 100644 +index 6e3f4a2652..8b8e56b3f0 100644 --- a/chromium/config/Chromium/mac/arm64/config.h +++ b/chromium/config/Chromium/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'" -- 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'" -- 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 @@ -2458,18 +2386,9 @@ index 85470e7fa0..57f3039fcf 100644 %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..8345d568f2 100644 +index 2166b98670..b8a22d41b3 100644 --- a/chromium/config/Chromium/mac/x64/config.h +++ b/chromium/config/Chromium/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'" -- 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'" -- 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 @@ -2573,18 +2492,9 @@ index e425512ab2..99eeb26c7f 100644 %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..5381a2ce9f 100644 +index a23d3a6089..b1fb82acc2 100644 --- a/chromium/config/Chromium/win-msvc/ia32/config.h +++ b/chromium/config/Chromium/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'" -- 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'" -- 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 @@ -2682,18 +2592,9 @@ index 3c9bd63728..71c73ca09b 100644 %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..3a63707a10 100644 +index 89d69e4734..81ff36df32 100644 --- a/chromium/config/Chromium/win-msvc/x64/config.h +++ b/chromium/config/Chromium/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'" -- 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'" -- 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 @@ -2751,18 +2652,9 @@ index 4c59b89cdf..8629776838 100644 + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/win/arm64/config.h b/chromium/config/Chromium/win/arm64/config.h -index 932974dbd0..baec29a85d 100644 +index 932974dbd0..ae09b055c4 100644 --- a/chromium/config/Chromium/win/arm64/config.h +++ b/chromium/config/Chromium/win/arm64/config.h -@@ -1,7 +1,7 @@ - /* Automatically generated by configure - do not modify! */ - #ifndef FFMPEG_CONFIG_H - #define FFMPEG_CONFIG_H --/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-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'" -- 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'" -- 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 @@ -2850,18 +2742,9 @@ index 9497c88ac6..494fca0549 100644 %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..ff7358f82d 100644 +index 3236bfea69..db8fea08fb 100644 --- a/chromium/config/Chromium/win/ia32/config.h +++ b/chromium/config/Chromium/win/ia32/config.h -@@ -1,7 +1,7 @@ - /* Automatically generated by configure - do not modify! */ - #ifndef FFMPEG_CONFIG_H - #define FFMPEG_CONFIG_H --/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-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'" -- 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'" -- 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 @@ -2949,18 +2832,9 @@ index 0f407c9972..08cf9aaded 100644 %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..4b8a0cb4e2 100644 +index 1f8cf607c1..e1c0b5cc46 100644 --- a/chromium/config/Chromium/win/x64/config.h +++ b/chromium/config/Chromium/win/x64/config.h -@@ -1,7 +1,7 @@ - /* Automatically generated by configure - do not modify! */ - #ifndef FFMPEG_CONFIG_H - #define FFMPEG_CONFIG_H --/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-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'" -- 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'" -- 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 @@ -3159,5 +3033,5 @@ index 0000000000..3accbac3e4 +#include "bswapdsp.c" \ No newline at end of file -- -2.34.1 +2.39.3 (Apple Git-146) diff --git a/other/add-hevc-ffmpeg-decoder-parser.patch1 b/other/add-hevc-ffmpeg-decoder-parser.patch1 new file mode 100644 index 00000000..d49142da --- /dev/null +++ b/other/add-hevc-ffmpeg-decoder-parser.patch1 @@ -0,0 +1,3163 @@ +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 | 8 +- + .../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 | 8 +- + .../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 | 8 +- + .../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 | 8 +- + .../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 | 8 +- + .../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 | 8 +- + .../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 | 8 +- + .../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 | 8 +- + .../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 | 8 +- + .../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 | 10 +- + .../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 | 10 +- + .../win-msvc/x64/libavcodec/codec_list.c | 1 + + .../win-msvc/x64/libavcodec/parser_list.c | 1 + + chromium/config/Chromium/win/arm64/config.h | 8 +- + .../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 | 8 +- + .../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 | 8 +- + .../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 + + 151 files changed, 654 insertions(+), 235 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..961e1ae41e 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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,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..c5fdeb6332 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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,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..33f709784f 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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,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..df38ffefc3 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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,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..56c4107803 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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,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..a8aaa6ece0 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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,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..46bf631e4e 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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,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..137c848742 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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,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..9958b411ef 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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,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..df38ffefc3 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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,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..ba4d52cd4e 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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,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..b3ffbfe76a 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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,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..7c3a88574b 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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,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..6dc5589050 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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,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..5056309b07 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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,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..f98c415272 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,h264,hevc' --enable-demuxer=aac --enable-parser='aac,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..4a6764b3d8 100644 +--- a/chromium/config/Chromium/ios/arm64/config.h ++++ b/chromium/config/Chromium/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'" -- 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'" -- 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 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..430c9d7bf2 100644 +--- a/chromium/config/Chromium/linux-noasm/x64/config.h ++++ b/chromium/config/Chromium/linux-noasm/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 --disable-asm --disable-inline-asm --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld'" -- elide long configuration string from binary */ ++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-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 --disable-asm --disable-inline-asm --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld'" -- elide long configuration string from binary */ + #define FFMPEG_LICENSE "LGPL version 2.1 or later" + #define CONFIG_THIS_YEAR 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 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..33e2eeaa4b 100644 +--- a/chromium/config/Chromium/linux/arm-neon/config.h ++++ b/chromium/config/Chromium/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'" -- 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'" -- 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 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..2189bc232b 100644 +--- a/chromium/config/Chromium/linux/arm/config.h ++++ b/chromium/config/Chromium/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'" -- 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'" -- 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 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..ff1ca1224f 100644 +--- a/chromium/config/Chromium/linux/arm64/config.h ++++ b/chromium/config/Chromium/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'" -- 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'" -- 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 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..e20d00532b 100644 +--- a/chromium/config/Chromium/linux/ia32/config.h ++++ b/chromium/config/Chromium/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" -- 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" -- 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 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..6441bee133 100644 +--- a/chromium/config/Chromium/linux/x64/config.h ++++ b/chromium/config/Chromium/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'" -- 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'" -- 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 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..4a6764b3d8 100644 +--- a/chromium/config/Chromium/mac/arm64/config.h ++++ b/chromium/config/Chromium/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'" -- 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'" -- 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 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..8345d568f2 100644 +--- a/chromium/config/Chromium/mac/x64/config.h ++++ b/chromium/config/Chromium/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'" -- 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'" -- 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 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..5381a2ce9f 100644 +--- a/chromium/config/Chromium/win-msvc/ia32/config.h ++++ b/chromium/config/Chromium/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'" -- 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'" -- 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 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..3a63707a10 100644 +--- a/chromium/config/Chromium/win-msvc/x64/config.h ++++ b/chromium/config/Chromium/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'" -- 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'" -- 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 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..baec29a85d 100644 +--- a/chromium/config/Chromium/win/arm64/config.h ++++ b/chromium/config/Chromium/win/arm64/config.h +@@ -1,7 +1,7 @@ + /* Automatically generated by configure - do not modify! */ + #ifndef FFMPEG_CONFIG_H + #define FFMPEG_CONFIG_H +-/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-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'" -- 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'" -- 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 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..ff7358f82d 100644 +--- a/chromium/config/Chromium/win/ia32/config.h ++++ b/chromium/config/Chromium/win/ia32/config.h +@@ -1,7 +1,7 @@ + /* Automatically generated by configure - do not modify! */ + #ifndef FFMPEG_CONFIG_H + #define FFMPEG_CONFIG_H +-/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-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'" -- 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'" -- 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 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..4b8a0cb4e2 100644 +--- a/chromium/config/Chromium/win/x64/config.h ++++ b/chromium/config/Chromium/win/x64/config.h +@@ -1,7 +1,7 @@ + /* Automatically generated by configure - do not modify! */ + #ifndef FFMPEG_CONFIG_H + #define FFMPEG_CONFIG_H +-/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-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'" -- 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'" -- 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 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.34.1 + diff --git a/other/thorium-2024-ui.patch b/other/thorium-2024-ui.patch index 7d2da109..520f270e 100644 --- a/other/thorium-2024-ui.patch +++ b/other/thorium-2024-ui.patch @@ -215,6 +215,19 @@ index b103bbe61303d..469611cb36e7a 100644 // Try to read the path using the Chromium-specific registry for Chromium. // If that fails, fallback to Chrome-specific registry key below. +diff --git a/chrome/browser/resources/downloads/item.css b/chrome/browser/resources/downloads/item.css +index f5c2357c5c986..86f18f7c77f8a 100644 +--- a/chrome/browser/resources/downloads/item.css ++++ b/chrome/browser/resources/downloads/item.css +@@ -322,7 +322,7 @@ cr-button { + --cr-icon-button-icon-size: 20px; + --cr-icon-button-margin-end: 0; + --cr-icon-button-margin-start: 0; +- gap: 12px; ++ gap: 6px; + margin-top: 12px; + margin-inline-start: 12px; + margin-inline-end: 12px; diff --git a/chrome/browser/resources/downloads/item.html.ts b/chrome/browser/resources/downloads/item.html.ts index 1e0f2c895d708..64347e17d7e42 100644 --- a/chrome/browser/resources/downloads/item.html.ts @@ -331,10 +344,18 @@ index 40c586fb4f715..9bc0ea94e459a 100644 const GURL url; diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index bc6e4008f2c5a..bd11ac01d442c 100644 +index bc6e4008f2c5a..3aa6a7368c3a2 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -4430,6 +4430,8 @@ static_library("ui") { +@@ -182,6 +182,7 @@ static_library("ui") { + "tab_modal_confirm_dialog.h", + "tab_ui_helper.cc", + "tab_ui_helper.h", ++ "thorium_2024.h", + "toolbar/chrome_labs/chrome_labs_model.cc", + "toolbar/chrome_labs/chrome_labs_model.h", + "toolbar/chrome_labs/chrome_labs_prefs.cc", +@@ -4430,7 +4430,9 @@ static_library("ui") { "views/frame/top_container_view.cc", "views/frame/top_container_view.h", "views/frame/top_controls_slide_controller.h", @@ -344,16 +365,43 @@ index bc6e4008f2c5a..bd11ac01d442c 100644 "views/frame/web_contents_close_handler.h", "views/frame/web_contents_close_handler_delegate.h", diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc -index e7858be996ca8..c0b2695b6e00b 100644 +index e7858be996ca8..c8dd78eab4df0 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils.cc +++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc -@@ -318,8 +318,35 @@ ui::ImageModel GetBookmarkFolderIcon( +@@ -7,6 +7,7 @@ + #include + + #include "base/check.h" ++#include "base/command_line.h" + #include "base/feature_list.h" + #include "base/functional/bind.h" + #include "base/memory/raw_ptr.h" +@@ -292,9 +293,13 @@ gfx::ImageSkia GetBookmarkFolderImageFromVectorIcon( + const gfx::VectorIcon* id; + gfx::ImageSkia folder; + if (icon_type == BookmarkFolderIconType::kNormal) { +- id = &vector_icons::kFolderChromeRefreshIcon; ++ id = features::IsThorium2024() ++ ? &vector_icons::kFolderIcon ++ : &vector_icons::kFolderChromeRefreshIcon; + } else { +- id = &vector_icons::kFolderManagedRefreshIcon; ++ id = features::IsThorium2024() ++ ? &vector_icons::kFolderManagedIcon ++ : &vector_icons::kFolderManagedRefreshIcon; + } + const ui::ThemedVectorIcon icon = + absl::holds_alternative(color) +@@ -318,8 +323,45 @@ ui::ImageModel GetBookmarkFolderIcon( absl::variant color, const ui::ColorProvider* color_provider) { gfx::ImageSkia folder; - folder = - GetBookmarkFolderImageFromVectorIcon(icon_type, color, color_provider); -+ if (features::IsThorium2024()) { ++ if (!features::IsThorium2024()) { ++ folder = GetBookmarkFolderImageFromVectorIcon(icon_type, color, ++ color_provider); ++ } else { +#if BUILDFLAG(IS_WIN) + // TODO(bsep): vectorize the Windows versions: crbug.com/564112 + folder = *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( @@ -374,13 +422,20 @@ index e7858be996ca8..c0b2695b6e00b 100644 + folder = *ui::ResourceBundle::GetSharedInstance() + .GetNativeImageNamed(resource_id) + .ToImageSkia(); ++#elif BUILDFLAG(IS_LINUX) ++ const bool classic_bookmarks = ++ base::CommandLine::ForCurrentProcess()->HasSwitch("classic-bookmarks"); ++ if (classic_bookmarks) { ++ folder = *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( ++ default_id); ++ } else { ++ folder = GetBookmarkFolderImageFromVectorIcon(icon_type, color, ++ color_provider); ++ } +#else + folder = GetBookmarkFolderImageFromVectorIcon(icon_type, color, + color_provider); +#endif -+ } else { -+ folder = -+ GetBookmarkFolderImageFromVectorIcon(icon_type, color, color_provider); + } return gfx::ImageSkia(std::make_unique(folder), folder.size()); @@ -460,10 +515,20 @@ index 86af74569f013..1f9cc1696eda4 100644 enable_tab_search_commands); command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH_CLOSE, diff --git a/chrome/browser/ui/color/chrome_color_mixer.cc b/chrome/browser/ui/color/chrome_color_mixer.cc -index 589c77c52175b..e408764fc6aae 100644 +index 589c77c52175b..28e662fdd8e2f 100644 --- a/chrome/browser/ui/color/chrome_color_mixer.cc +++ b/chrome/browser/ui/color/chrome_color_mixer.cc -@@ -748,8 +748,7 @@ void AddChromeColorMixer(ui::ColorProvider* provider, +@@ -141,8 +141,7 @@ void AddChromeColorMixer(ui::ColorProvider* provider, + gfx::kGoogleGrey500, kColorBookmarkBarBackground, 6.0f); + mixer[kColorBookmarkFolderIcon] = {ui::kColorIcon}; + mixer[kColorBookmarkBarSeparator] = {kColorToolbarSeparator}; +- mixer[kColorBookmarkBarSeparatorChromeRefresh] = { +- kColorTabBackgroundInactiveFrameActive}; ++ mixer[kColorBookmarkBarSeparatorChromeRefresh] = {ui::kColorSysDivider}; + mixer[kColorBookmarkDragImageBackground] = {ui::kColorAccent}; + mixer[kColorBookmarkDragImageCountBackground] = {ui::kColorAlertHighSeverity}; + mixer[kColorBookmarkDragImageCountForeground] = +@@ -748,8 +747,7 @@ void AddChromeColorMixer(ui::ColorProvider* provider, ui::SetAlpha(kColorToolbarInkDrop, std::ceil(0.06f * 255.0f)); mixer[kColorAppMenuChipInkDropHover] = {kColorToolbarInkDropHover}; mixer[kColorAppMenuChipInkDropRipple] = {kColorToolbarInkDropRipple}; @@ -568,7 +633,7 @@ index e4ccd7fab5421..0eadd6bdd8def 100644 // that need to be accessible outside of /browser/ui/views. class WindowFrameUtil { diff --git a/chrome/browser/ui/layout_constants.cc b/chrome/browser/ui/layout_constants.cc -index 87c4ee64068a6..9dd4397f0e88b 100644 +index 87c4ee64068a6..1e86e30ad3280 100644 --- a/chrome/browser/ui/layout_constants.cc +++ b/chrome/browser/ui/layout_constants.cc @@ -7,6 +7,7 @@ @@ -579,14 +644,19 @@ index 87c4ee64068a6..9dd4397f0e88b 100644 #include "chrome/browser/ui/tabs/features.h" #include "chrome/browser/ui/ui_features.h" #include "components/omnibox/common/omnibox_features.h" -@@ -22,20 +23,25 @@ int GetLayoutConstant(LayoutConstant constant) { +@@ -20,22 +21,29 @@ + + int GetLayoutConstant(LayoutConstant constant) { const bool touch_ui = ui::TouchUiController::Get()->touch_ui(); ++ static const bool classic_omnibox = ++ base::CommandLine::ForCurrentProcess()->HasSwitch("classic-omnibox"); switch (constant) { case APP_MENU_PROFILE_ROW_AVATAR_ICON_SIZE: - return 24; -+ return features::IsThorium2024() ? 18 : 24; ++ return features::IsThorium2024() ? 16 : 24; case APP_MENU_MAXIMUM_CHARACTER_LENGTH: - return 30; +- return 30; ++ return features::IsThorium2024() ? 28 : 30; case BOOKMARK_BAR_HEIGHT: { // The fixed margin ensures the bookmark buttons appear centered relative // to the white space above and below. @@ -610,13 +680,41 @@ index 87c4ee64068a6..9dd4397f0e88b 100644 case BOOKMARK_BAR_BUTTON_IMAGE_LABEL_PADDING: return 6; case WEB_APP_MENU_BUTTON_SIZE: -@@ -68,11 +74,23 @@ int GetLayoutConstant(LayoutConstant constant) { +@@ -51,7 +59,7 @@ int GetLayoutConstant(LayoutConstant constant) { + case LOCATION_BAR_CHILD_INTERIOR_PADDING: + return 3; + case LOCATION_BAR_CHILD_CORNER_RADIUS: +- return 12; ++ return classic_omnibox ? 4 : 12; + case LOCATION_BAR_CHIP_ICON_SIZE: + return 16; + case LOCATION_BAR_CHIP_PADDING: +@@ -59,20 +67,40 @@ int GetLayoutConstant(LayoutConstant constant) { + case LOCATION_BAR_ELEMENT_PADDING: + return touch_ui ? 3 : 2; + case LOCATION_BAR_PAGE_INFO_ICON_VERTICAL_PADDING: +- return touch_ui ? 3 : 5; ++ if (features::IsThorium2024()) { ++ return touch_ui ? 3 : 4; ++ } else { ++ return touch_ui ? 3 : 5; ++ } + case LOCATION_BAR_LEADING_DECORATION_EDGE_PADDING: + // TODO(manukh): See comment in `LocationBarView::Layout()`. We have too + // many feature permutations that would affect this and other layout + // constants, so instead of spreading the permutation logic here and + // elsewhere, it's consolidated in `Layout()` and will be moved back // here once we decide on a permutation. - NOTREACHED(); +- NOTREACHED(); ++ if (features::IsThorium2024()) { ++ return touch_ui ? 3 : 4; ++ } else { ++ return touch_ui ? 3 : 5; ++ } case LOCATION_BAR_TRAILING_DECORATION_EDGE_PADDING: - return touch_ui ? 3 : 12; + if (features::IsThorium2024()) { -+ return touch_ui ? 3 : 5; ++ return touch_ui ? 3 : 6; + } else { + return touch_ui ? 3 : 12; + } @@ -630,14 +728,14 @@ index 87c4ee64068a6..9dd4397f0e88b 100644 case LOCATION_BAR_HEIGHT: - return touch_ui ? 36 : 34; + if (features::IsThorium2024()) { -+ return touch_ui ? 34 : 30; ++ return touch_ui ? 34 : 28; + } else { + return touch_ui ? 36 : 34; + } case LOCATION_BAR_ICON_SIZE: return touch_ui ? 20 : 16; case LOCATION_BAR_LEADING_ICON_SIZE: -@@ -85,15 +103,23 @@ int GetLayoutConstant(LayoutConstant constant) { +@@ -85,15 +113,23 @@ int GetLayoutConstant(LayoutConstant constant) { return 16; case TAB_ALERT_INDICATOR_ICON_WIDTH: return touch_ui ? 12 : 16; @@ -663,18 +761,19 @@ index 87c4ee64068a6..9dd4397f0e88b 100644 case TAB_SEPARATOR_HEIGHT: return touch_ui ? 24 : 20; case TAB_PRE_TITLE_PADDING: -@@ -108,13 +134,21 @@ int GetLayoutConstant(LayoutConstant constant) { +@@ -108,27 +144,43 @@ int GetLayoutConstant(LayoutConstant constant) { } return 1; case TOOLBAR_BUTTON_HEIGHT: - return touch_ui ? 48 : 34; + if (features::IsThorium2024()) { -+ return touch_ui ? 46 : 30; ++ return touch_ui ? 46 : 28; + } else { + return touch_ui ? 48 : 34; + } case TOOLBAR_DIVIDER_CORNER_RADIUS: - return 1; +- return 1; ++ return 1.0f; case TOOLBAR_DIVIDER_HEIGHT: - return touch_ui ? 20 : 16; + if (features::IsThorium2024()) { @@ -688,9 +787,14 @@ index 87c4ee64068a6..9dd4397f0e88b 100644 case TOOLBAR_DIVIDER_WIDTH: return 2; case TOOLBAR_ELEMENT_PADDING: -@@ -122,13 +156,17 @@ int GetLayoutConstant(LayoutConstant constant) { + return touch_ui ? 0 : 4; case TOOLBAR_ICON_DEFAULT_MARGIN: - return touch_ui ? 0 : 2; +- return touch_ui ? 0 : 2; ++ if (features::IsThorium2024()) { ++ return touch_ui ? 0 : 2; ++ } else { ++ return touch_ui ? 0 : 2; ++ } case TOOLBAR_STANDARD_SPACING: - return touch_ui ? 12 : 9; + if (features::IsThorium2024()) { @@ -699,29 +803,35 @@ index 87c4ee64068a6..9dd4397f0e88b 100644 + return touch_ui ? 12 : 9; + } case PAGE_INFO_ICON_SIZE: - return 20; +- return 20; ++ return features::IsThorium2024() ? 18 : 20; case DOWNLOAD_ICON_SIZE: - return 20; +- return 20; ++ return features::IsThorium2024() ? 18 : 20; case TOOLBAR_CORNER_RADIUS: - return 8; + return 0; default: break; } -@@ -146,7 +184,11 @@ gfx::Insets GetLayoutInsets(LayoutInset inset) { - return gfx::Insets::VH(8, 20); +@@ -143,10 +195,14 @@ gfx::Insets GetLayoutInsets(LayoutInset inset) { + return gfx::Insets(4); + + case DOWNLOAD_ROW: +- return gfx::Insets::VH(8, 20); ++ return gfx::Insets::VH(8, features::IsThorium2024() ? 18 : 20); case LOCATION_BAR_ICON_INTERIOR_PADDING: - return gfx::Insets::VH(2, 2); + if (features::IsThorium2024()) { -+ return touch_ui ? gfx::Insets::VH(5, 10) : gfx::Insets::VH(4, 8); ++ return touch_ui ? gfx::Insets::VH(5, 10) : gfx::Insets::VH(4, 4); + } else { + return gfx::Insets::VH(2, 2); + } case LOCATION_BAR_PAGE_INFO_ICON_PADDING: return touch_ui ? gfx::Insets::VH(5, 10) : gfx::Insets::VH(4, 4); -@@ -161,27 +203,36 @@ gfx::Insets GetLayoutInsets(LayoutInset inset) { +@@ -161,27 +217,36 @@ gfx::Insets GetLayoutInsets(LayoutInset inset) { } case TOOLBAR_BUTTON: @@ -748,7 +858,7 @@ index 87c4ee64068a6..9dd4397f0e88b 100644 case TOOLBAR_INTERIOR_MARGIN: - return touch_ui ? gfx::Insets() : gfx::Insets::VH(6, 5); + if (features::IsThorium2024()) { -+ return touch_ui ? gfx::Insets() : gfx::Insets::VH(4, 6); ++ return touch_ui ? gfx::Insets() : gfx::Insets::VH(3, 7); + } else { + return touch_ui ? gfx::Insets() : gfx::Insets::VH(6, 5); + } @@ -789,6 +899,31 @@ index a35795ee8cc11..60577ba01a5fd 100644 // Padding before the tab title. TAB_PRE_TITLE_PADDING, +diff --git a/chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc b/chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc +index 3ae6b02a62d64..85c9e9ee1b724 100644 +--- a/chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc ++++ b/chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc +@@ -25,6 +25,7 @@ + #include "components/search/search.h" + #include "components/strings/grit/components_strings.h" + #include "components/vector_icons/vector_icons.h" ++#include "ui/base/ui_base_features.h" + + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) + #include "chrome/app/vector_icons/vector_icons.h" +@@ -1977,7 +1978,11 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { + #elif BUILDFLAG(IS_WIN) + return omnibox::kShareWinChromeRefreshIcon; + #elif BUILDFLAG(IS_LINUX) +- return omnibox::kShareLinuxChromeRefreshIcon; ++ if (features::IsThorium2024()) { ++ return omnibox::kShareChromeRefreshIcon; ++ } else { ++ return omnibox::kShareLinuxChromeRefreshIcon; ++ } + #else + return omnibox::kShareChromeRefreshIcon; + #endif diff --git a/chrome/browser/ui/status_bubble.h b/chrome/browser/ui/status_bubble.h index 74a00df155806..c8e4a81911d80 100644 --- a/chrome/browser/ui/status_bubble.h @@ -1121,7 +1256,7 @@ index fb9afeed5a60e..d40af6311e073 100644 VIEW_ID_MAXIMIZE_BUTTON, VIEW_ID_RESTORE_BUTTON, diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -index 9cecb25b41d3b..65fd377e98ae6 100644 +index 9cecb25b41d3b..558faaaf1b816 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -56,6 +56,7 @@ @@ -1148,15 +1283,26 @@ index 9cecb25b41d3b..65fd377e98ae6 100644 int x = GetLeadingMargin(); - static constexpr int kBookmarkBarTrailingMargin = 8; -+ static const int kBookmarkBarTrailingMargin = features::IsThorium2024() ? 0 : 8; ++ static const int kBookmarkBarTrailingMargin = features::IsThorium2024() ? -4 : 8; int width = View::width() - x - kBookmarkBarTrailingMargin; const int button_height = GetLayoutConstant(BOOKMARK_BAR_BUTTON_HEIGHT); +@@ -902,6 +903,9 @@ void BookmarkBarView::Layout(PassKey) { + x = max_x + bookmark_bar_button_padding; + + // The overflow button. ++ if (features::IsThorium2024() && all_bookmarks_button_->GetVisible()) { ++ x -= 14; ++ } + overflow_button_->SetBounds(x, y, overflow_pref.width(), button_height); + overflow_button_->SetVisible(show_bookmarks_overflow); + x += overflow_pref.width(); + diff --git a/chrome/browser/ui/views/chrome_layout_provider.cc b/chrome/browser/ui/views/chrome_layout_provider.cc -index 9b189df8d8ffd..7c2ae3a3c94fa 100644 +index 9b189df8d8ffd..74de08124e803 100644 --- a/chrome/browser/ui/views/chrome_layout_provider.cc +++ b/chrome/browser/ui/views/chrome_layout_provider.cc -@@ -7,6 +7,7 @@ +@@ -7,9 +7,11 @@ #include #include "base/feature_list.h" @@ -1164,15 +1310,145 @@ index 9b189df8d8ffd..7c2ae3a3c94fa 100644 #include "chrome/browser/ui/views/chrome_typography.h" #include "components/omnibox/common/omnibox_features.h" #include "ui/base/pointer/touch_ui_controller.h" -@@ -157,7 +158,7 @@ int ChromeLayoutProvider::GetDistanceMetric(int metric) const { ++#include "ui/base/ui_base_features.h" + #include "ui/gfx/shadow_value.h" + + namespace { +@@ -47,10 +49,12 @@ gfx::Insets ChromeLayoutProvider::GetInsetsMetric(int metric) const { + switch (metric) { + case views::INSETS_DIALOG: + case views::INSETS_DIALOG_SUBSECTION: { +- return gfx::Insets::VH(20, 20); ++ return features::IsThorium2024() ? gfx::Insets(16) ++ : gfx::Insets::VH(20, 20); + } + case views::INSETS_DIALOG_FOOTNOTE: { +- return gfx::Insets::TLBR(10, 20, 15, 20); ++ return features::IsThorium2024() ? gfx::Insets(16) ++ : gfx::Insets::TLBR(10, 20, 15, 20); + } + case views::INSETS_CHECKBOX_RADIO_BUTTON: { + gfx::Insets insets = LayoutProvider::GetInsetsMetric(metric); +@@ -76,7 +80,10 @@ gfx::Insets ChromeLayoutProvider::GetInsetsMetric(int metric) const { + case INSETS_PAGE_INFO_HOVER_BUTTON: { + const gfx::Insets insets = + LayoutProvider::GetInsetsMetric(views::INSETS_LABEL_BUTTON); +- const int horizontal_padding = 20; ++ const int horizontal_padding = ++ features::IsThorium2024() ++ ? 16 ++ : 20; + // Hover button in page info requires double the height compared to the + // label button because it behaves like a menu control. + return gfx::Insets::VH(insets.height(), horizontal_padding); +@@ -103,7 +110,7 @@ int ChromeLayoutProvider::GetDistanceMetric(int metric) const { + case DISTANCE_EXTENSIONS_MENU_WIDTH: + return kMediumDialogWidth; + case DISTANCE_EXTENSIONS_MENU_BUTTON_ICON_SIZE: +- return 20; ++ return features::IsThorium2024() ? 16 : 20; + case DISTANCE_EXTENSIONS_MENU_BUTTON_ICON_SMALL_SIZE: + return 16; + case DISTANCE_EXTENSIONS_MENU_EXTENSION_ICON_SIZE: +@@ -141,7 +148,7 @@ int ChromeLayoutProvider::GetDistanceMetric(int metric) const { + case DISTANCE_BETWEEN_PRIMARY_AND_SECONDARY_LABELS_HORIZONTAL: + return 24; + case DISTANCE_OMNIBOX_CELL_VERTICAL_PADDING: +- return 12; ++ return features::IsThorium2024() ? 8 : 12; + case DISTANCE_OMNIBOX_TWO_LINE_CELL_VERTICAL_PADDING: + return 4; + case DISTANCE_SIDE_PANEL_HEADER_VECTOR_ICON_SIZE: +@@ -151,17 +158,19 @@ int ChromeLayoutProvider::GetDistanceMetric(int metric) const { + case DISTANCE_SIDE_PANEL_HEADER_INTERIOR_MARGIN_HORIZONTAL: + return 4; + case DISTANCE_HORIZONTAL_SEPARATOR_PADDING_PAGE_INFO_VIEW: +- return 20; ++ return features::IsThorium2024() ? 4 : 20; + case DISTANCE_INFOBAR_HORIZONTAL_ICON_LABEL_PADDING: +- return 16; ++ return features::IsThorium2024() ? 12 : 16; case DISTANCE_INFOBAR_HEIGHT: // Spec says height of button should be 36dp, vertical padding on both - // top and bottom should be 8dp. +- // top and bottom should be 8dp. - return 36 + 2 * 8; -+ return features::IsThorium2024() ? 44 : 36 + 2 * 8; ++ // top and bottom should be 8dp, 2dp in Th24 case. ++ return features::IsThorium2024() ++ ? 36 + 2 * 2 ++ : 36 + 2 * 8; case DISTANCE_PERMISSION_PROMPT_HORIZONTAL_ICON_LABEL_PADDING: - return 8; +- return 8; ++ return features::IsThorium2024() ? 12 : 8; case DISTANCE_RICH_HOVER_BUTTON_ICON_HORIZONTAL: +- return 8; ++ return features::IsThorium2024() ? 12 : 8; + case DISTANCE_TOAST_BUBBLE_BETWEEN_CHILD_SPACING: + return 4; + case DISTANCE_TOAST_BUBBLE_BETWEEN_LABEL_ACTION_BUTTON_SPACING: +diff --git a/chrome/browser/ui/views/download/bubble/download_bubble_primary_view.cc b/chrome/browser/ui/views/download/bubble/download_bubble_primary_view.cc +index 147193abed0f0..3a4acb12b6d5f 100644 +--- a/chrome/browser/ui/views/download/bubble/download_bubble_primary_view.cc ++++ b/chrome/browser/ui/views/download/bubble/download_bubble_primary_view.cc +@@ -21,6 +21,7 @@ + #include "components/vector_icons/vector_icons.h" + #include "ui/base/l10n/l10n_util.h" + #include "ui/base/metadata/metadata_impl_macros.h" ++#include "ui/base/ui_base_features.h" + #include "ui/color/color_provider.h" + #include "ui/views/background.h" + #include "ui/views/border.h" +@@ -129,8 +130,9 @@ void DownloadBubblePrimaryView::MaybeAddOtrInfoRow(Browser* browser) { + } + + int DownloadBubblePrimaryView::DefaultPreferredWidth() const { +- return ChromeLayoutProvider::Get()->GetDistanceMetric( +- views::DISTANCE_BUBBLE_PREFERRED_WIDTH); ++ return ChromeLayoutProvider::Get()->GetDistanceMetric(features::IsThorium2024() ++ ? views::DISTANCE_MODAL_DIALOG_PREFERRED_WIDTH ++ : views::DISTANCE_BUBBLE_PREFERRED_WIDTH); + } + + DownloadBubbleRowView* DownloadBubblePrimaryView::GetRow( +diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc +index 31a271a03e5e6..efaa798cb9e6d 100644 +--- a/chrome/browser/ui/views/download/download_item_view.cc ++++ b/chrome/browser/ui/views/download/download_item_view.cc +@@ -67,6 +67,7 @@ + #include "ui/base/text/bytes_formatting.h" + #include "ui/base/themed_vector_icon.h" + #include "ui/base/ui_base_types.h" ++#include "ui/base/ui_base_features.h" + #include "ui/color/color_id.h" + #include "ui/color/color_provider.h" + #include "ui/compositor/layer.h" +@@ -113,7 +114,7 @@ namespace { + constexpr int kTextWidth = 140; + + // Padding before the icon and at end of the item. +-constexpr int kStartPadding = 12; ++constexpr int kStartPadding = 8; + constexpr int kEndPadding = 6; + + // Horizontal padding between progress indicator and filename/status text. +@@ -585,6 +586,9 @@ gfx::Size DownloadItemView::CalculatePreferredSize( + } + } + ++ if (features::IsThorium2024()) { ++ height -= 12; ++ } + // The normal height of the item which may be exceeded if text is large. + constexpr int kDefaultDownloadItemHeight = 48; + return gfx::Size(width, std::max(kDefaultDownloadItemHeight, +@@ -596,7 +600,7 @@ void DownloadItemView::OnPaintBackground(gfx::Canvas* canvas) { + + // Draw the separator as part of the background. It will be covered by the + // focus ring when the view has focus. +- gfx::Rect rect(width() - 1, 0, 1, height()); ++ gfx::Rect rect(width() + 1, 0, 1, height()); + rect.Inset(gfx::Insets::VH(kTopBottomPadding, 0)); + canvas->FillRect(GetMirroredRect(rect), + GetColorProvider()->GetColor(kColorToolbarSeparator)); diff --git a/chrome/browser/ui/views/frame/browser_caption_button_container_win.cc b/chrome/browser/ui/views/frame/browser_caption_button_container_win.cc index b4ed00fe214a9..cbd69f5565a61 100644 --- a/chrome/browser/ui/views/frame/browser_caption_button_container_win.cc @@ -1276,7 +1552,7 @@ index 84930758ab743..8b762a0c37582 100644 + return (!features::IsThorium2024() && delegate_->IsTabStripVisible()) ? 0 : kExtraTopBorder; } diff --git a/chrome/browser/ui/views/frame/browser_frame_view_win.cc b/chrome/browser/ui/views/frame/browser_frame_view_win.cc -index eabc844883aca..291633d064be4 100644 +index eabc844883aca..d5e58befa0166 100644 --- a/chrome/browser/ui/views/frame/browser_frame_view_win.cc +++ b/chrome/browser/ui/views/frame/browser_frame_view_win.cc @@ -259,6 +259,10 @@ void BrowserFrameViewWin::WindowControlsOverlayEnabledChanged() { @@ -1290,30 +1566,38 @@ index eabc844883aca..291633d064be4 100644 void BrowserFrameViewWin::PaintAsActiveChanged() { BrowserNonClientFrameView::PaintAsActiveChanged(); -@@ -321,7 +325,9 @@ int BrowserFrameViewWin::NonClientHitTest(const gfx::Point& point) { +@@ -321,7 +325,10 @@ int BrowserFrameViewWin::NonClientHitTest(const gfx::Point& point) { // pixels at the end of the top and bottom edges trigger diagonal resizing. constexpr int kResizeCornerWidth = 16; - const int top_border_thickness = GetLayoutConstant(TAB_STRIP_PADDING); + const int top_border_thickness = features::IsThorium2024() ++ // Alex313031: Maybe use INACTIVE_PADDING or simply 1 + ? FrameTopBorderThickness(false) + : GetLayoutConstant(TAB_STRIP_PADDING); const int window_component = GetHTComponentForFrame( point, gfx::Insets::TLBR(top_border_thickness, 0, 0, 0), -@@ -501,7 +507,7 @@ int BrowserFrameViewWin::FrameTopBorderThickness(bool restored) const { +@@ -501,7 +508,7 @@ int BrowserFrameViewWin::FrameTopBorderThickness(bool restored) const { // default. When maximized, the OS sizes the window such that the border // extends beyond the screen edges. In that case, we must return the // default value. - const int kTopResizeFrameArea = 0; -+ const int kTopResizeFrameArea = features::IsThorium2024() ? 5 : 0; ++ const int kTopResizeFrameArea = features::IsThorium2024() ? 8 : 0; return kTopResizeFrameArea; } -@@ -561,6 +567,22 @@ int BrowserFrameViewWin::TopAreaHeight(bool restored) const { +@@ -561,8 +568,26 @@ int BrowserFrameViewWin::TopAreaHeight(bool restored) const { return top; } +- // The tabstrip controls its own top padding. +- return top; ++ // In Cr23, the tabstrip controls its own top padding. ++ if (!features::IsThorium2024()) { ++ return top; ++ } ++ + // In maximized mode, we do not add any additional thickness to the grab + // handle above the tabs; just return the frame thickness. + if (maximized) { @@ -1327,13 +1611,12 @@ index eabc844883aca..291633d064be4 100644 + if (EverHasVisibleBackgroundTabShapes() && features::IsThorium2024()) { + thickness = + std::max(thickness, BrowserNonClientFrameView::kMinimumDragHeight); -+ return top + thickness; + } -+ - // The tabstrip controls its own top padding. - return top; ++ return top + thickness; } -@@ -810,17 +832,30 @@ void BrowserFrameViewWin::LayoutCaptionButtons() { + + int BrowserFrameViewWin::TitlebarMaximizedVisualHeight() const { +@@ -810,17 +835,30 @@ void BrowserFrameViewWin::LayoutCaptionButtons() { const gfx::Size preferred_size = caption_button_container_->GetPreferredSize(); @@ -1613,7 +1896,7 @@ index 4c5356d8f20f6..ccbe7a8ead81e 100644 void OpaqueBrowserFrameView::UpdateThrobber(bool running) { diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc -index 5c82d24686e9f..2e7d5d0bbf04e 100644 +index 5c82d24686e9f..6d577bf74d5e2 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc @@ -78,7 +78,7 @@ gfx::Rect OpaqueBrowserFrameViewLayout::GetBoundsForTabStripRegion( @@ -1702,7 +1985,7 @@ index 707226e0e8c70..5e1a2b4dd9921 100644 void SetWindowControlsOverlayEnabled(bool enabled, views::View* host); diff --git a/chrome/browser/ui/views/frame/tab_strip_region_view.cc b/chrome/browser/ui/views/frame/tab_strip_region_view.cc -index e7660352853f2..e36d7b187168d 100644 +index e7660352853f2..1d51369d271f7 100644 --- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc +++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc @@ -19,6 +19,7 @@ @@ -1713,17 +1996,18 @@ index e7660352853f2..e36d7b187168d 100644 #include "chrome/browser/ui/views/tab_search_bubble_host.h" #include "chrome/browser/ui/views/tabs/new_tab_button.h" #include "chrome/browser/ui/views/tabs/tab_drag_controller.h" -@@ -115,7 +116,8 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr tab_strip) +@@ -115,7 +116,9 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr tab_strip) // Add and configure the TabSearchContainer. std::unique_ptr tab_search_container; - if (browser && browser->is_type_normal()) { -+ if (browser && browser->is_type_normal() && -+ !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button")) { ++ static const bool remove_tabsearch_button = ++ base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button"); ++ if (browser && browser->is_type_normal() && !remove_tabsearch_button) { tab_search_container = std::make_unique( tab_strip_->controller(), browser->tab_strip_model(), render_tab_search_before_tab_strip_, this, -@@ -192,7 +194,10 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr tab_strip) +@@ -192,7 +195,10 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr tab_strip) tab_strip_->controller(), base::BindRepeating(&TabStrip::NewTabButtonPressed, base::Unretained(tab_strip_)), @@ -1735,7 +2019,7 @@ index e7660352853f2..e36d7b187168d 100644 tab_strip_control_button->SetProperty(views::kElementIdentifierKey, kNewTabButtonElementId); -@@ -205,12 +210,10 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr tab_strip) +@@ -205,12 +211,10 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr tab_strip) // TODO(crbug.com/40118868): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -1748,7 +2032,7 @@ index e7660352853f2..e36d7b187168d 100644 } reserved_grab_handle_space_ = -@@ -223,7 +226,9 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr tab_strip) +@@ -223,7 +227,9 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr tab_strip) SetProperty(views::kElementIdentifierKey, kTabStripRegionElementId); @@ -1759,7 +2043,7 @@ index e7660352853f2..e36d7b187168d 100644 if (product_specifications_button) { product_specifications_button_ = AddChildView(std::move(product_specifications_button)); -@@ -231,7 +236,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr tab_strip) +@@ -231,7 +237,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr tab_strip) tab_search_container_ = AddChildView(std::move(tab_search_container)); tab_search_container_->SetProperty( views::kMarginsKey, @@ -1768,7 +2052,7 @@ index e7660352853f2..e36d7b187168d 100644 } UpdateTabStripMargin(); -@@ -369,27 +374,49 @@ void TabStripRegionView::Layout(PassKey) { +@@ -369,27 +375,48 @@ void TabStripRegionView::Layout(PassKey) { // The NTB needs to be layered on top of the tabstrip to achieve negative // margins. gfx::Size new_tab_button_size = new_tab_button_->GetPreferredSize(); @@ -1793,45 +2077,57 @@ index e7660352853f2..e36d7b187168d 100644 } } - gfx::Point new_tab_button_new_position = gfx::Point(x, 0); -+ gfx::Point new_tab_button_new_position = gfx::Point(x, GetLayoutConstant(TAB_BUTTON_OFFSET)); ++ const gfx::Point new_tab_button_new_position = gfx::Point(x, GetLayoutConstant(TAB_BUTTON_OFFSET)); - gfx::Rect new_tab_button_new_bounds = + const gfx::Rect new_tab_button_new_bounds = gfx::Rect(new_tab_button_new_position, new_tab_button_size); // If the tabsearch button is before the tabstrip container, then manually - // set the bounds. +- // set the bounds. ++ // set the NTB bounds. Also bump it up 1 DIP for Th24 new_tab_button_->SetBoundsRect(new_tab_button_new_bounds); } + -+ if (tab_search_container_ && !render_tab_search_before_tab_strip_ && features::IsThorium2024()) { ++ if (tab_search_container_ && features::IsThorium2024()) { + gfx::Size tab_search_container_size = tab_search_container_->GetPreferredSize(); + const int tab_search_container_width = tab_search_container_->GetPreferredSize().width(); -+ gfx::Point tab_search_container_new_position = -+ gfx::Point(tab_search_container_->bounds().right() - ++ gfx::Point tab_search_button_new_position = ++ gfx::Point(tab_search_container_->bounds().right() - + tab_search_container_width, + GetLayoutConstant(TAB_BUTTON_OFFSET)); + + const gfx::Rect tab_search_container_new_bounds = -+ gfx::Rect(tab_search_container_new_position, tab_search_container_size); ++ gfx::Rect(tab_search_button_new_position, tab_search_container_size); + -+ // If the tabsearch button is before the tabstrip container, then manually -+ // set the bounds. ++ // Also bump the TSB up 1 DIP for Th24 + tab_search_container_->SetBoundsRect(tab_search_container_new_bounds); + } } bool TabStripRegionView::CanDrop(const OSExchangeData& data) { -@@ -519,7 +546,7 @@ void TabStripRegionView::UpdateTabStripMargin() { +@@ -468,9 +495,10 @@ void TabStripRegionView::ReportCaptionHitTestInReservedGrabHandleSpace( + } + + void TabStripRegionView::UpdateButtonBorders() { ++ constexpr gfx::Size kNTBButtonSize = {28, 28}; + const int extra_vertical_space = GetLayoutConstant(TAB_STRIP_HEIGHT) - + GetLayoutConstant(TABSTRIP_TOOLBAR_OVERLAP) - +- NewTabButton::kButtonSize.height(); ++ kNTBButtonSize.height(); + const int top_inset = extra_vertical_space / 2; + const int bottom_inset = extra_vertical_space - top_inset + + GetLayoutConstant(TABSTRIP_TOOLBAR_OVERLAP); +@@ -519,7 +547,7 @@ void TabStripRegionView::UpdateTabStripMargin() { new_tab_button_->SetProperty(views::kViewIgnoredByLayoutKey, true); tab_strip_right_margin = new_tab_button_->GetPreferredSize().width() + - GetLayoutConstant(TAB_STRIP_PADDING); -+ GetLayoutConstant(TAB_MARGIN); ++ GetLayoutConstant(TAB_INACTIVE_PADDING); } // If the tab search button is before the tab strip, it also overlaps the -@@ -545,8 +572,8 @@ void TabStripRegionView::UpdateTabStripMargin() { +@@ -545,8 +573,8 @@ void TabStripRegionView::UpdateTabStripMargin() { // should have 6 px of padding between it and the tab_search button (not // including the corner radius). tab_strip_left_margin = tab_strip_left_margin.value() + @@ -1842,7 +2138,7 @@ index e7660352853f2..e36d7b187168d 100644 TabStyle::Get()->GetBottomCornerRadius(); } -@@ -564,7 +591,7 @@ void TabStripRegionView::AdjustViewBoundsRect(View* view, int offset) { +@@ -564,7 +592,7 @@ void TabStripRegionView::AdjustViewBoundsRect(View* view, int offset) { const gfx::Size view_size = view->GetPreferredSize(); const int x = tab_strip_container_->x() + TabStyle::Get()->GetBottomCornerRadius() - @@ -1969,10 +2265,10 @@ index d8000f801d188..7f69dd091d42a 100644 NOTREACHED(); } diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc -index eca41f6f37b37..cb07f8510f298 100644 +index eca41f6f37b37..d5dc0cba25bf3 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc -@@ -199,18 +199,23 @@ LocationBarView::LocationBarView(Browser* browser, +@@ -199,18 +199,24 @@ LocationBarView::LocationBarView(Browser* browser, is_popup_mode_(is_popup_mode) { set_suppress_default_focus_handling(); if (!is_popup_mode_) { @@ -2001,14 +2297,15 @@ index eca41f6f37b37..cb07f8510f298 100644 + })); + views::FocusRing::Get(this)->SetOutsetFocusRingDisabled(true); + } -+ static const bool classic_omnibox = base::CommandLine::ForCurrentProcess()->HasSwitch("classic-omnibox"); ++ static const bool classic_omnibox = ++ base::CommandLine::ForCurrentProcess()->HasSwitch("classic-omnibox"); + if (!classic_omnibox) { + views::InstallPillHighlightPathGenerator(this); + } #if BUILDFLAG(OS_LEVEL_GEOLOCATION_PERMISSION_SUPPORTED) if (features::IsOsLevelGeolocationPermissionSupportEnabled()) { -@@ -258,10 +263,16 @@ void LocationBarView::Init() { +@@ -258,10 +264,16 @@ void LocationBarView::Init() { const gfx::FontList& font_list = typography_provider.GetFont( CONTEXT_OMNIBOX_PRIMARY, views::style::STYLE_PRIMARY); @@ -2029,7 +2326,7 @@ index eca41f6f37b37..cb07f8510f298 100644 auto location_icon_view = std::make_unique(omnibox_chip_font_list, this, this); -@@ -400,12 +411,17 @@ void LocationBarView::Init() { +@@ -400,12 +412,17 @@ void LocationBarView::Init() { } } @@ -2044,17 +2341,18 @@ index eca41f6f37b37..cb07f8510f298 100644 params.icon_color = color_provider->GetColor(kColorPageActionIcon); - params.between_icon_spacing = 8; -+ params.between_icon_spacing = features::IsThorium2024() ? 6 : 8; ++ params.between_icon_spacing = features::IsThorium2024() ? 4 : 8; params.font_list = &page_action_font_list; params.browser = browser_; params.command_updater = command_updater(); -@@ -438,8 +454,13 @@ bool LocationBarView::IsInitialized() const { +@@ -438,8 +455,14 @@ bool LocationBarView::IsInitialized() const { } int LocationBarView::GetBorderRadius() const { - return ChromeLayoutProvider::Get()->GetCornerRadiusMetric( - views::Emphasis::kMaximum, size()); -+ static const bool classic_omnibox = base::CommandLine::ForCurrentProcess()->HasSwitch("classic-omnibox"); ++ static const bool classic_omnibox = ++ base::CommandLine::ForCurrentProcess()->HasSwitch("classic-omnibox"); + if (classic_omnibox) { + return 4; + } else { @@ -2064,27 +2362,80 @@ index eca41f6f37b37..cb07f8510f298 100644 } std::unique_ptr LocationBarView::CreateRoundRectBackground( -@@ -703,7 +724,7 @@ void LocationBarView::Layout(PassKey) { +@@ -703,18 +726,18 @@ void LocationBarView::Layout(PassKey) { // The padding between the left edges of the location bar and the LHS icon // (e.g. the page info icon, the google G icon, the selected suggestion icon, // etc) - int icon_left = 5; -+ int icon_left = features::IsThorium2024() ? 4 : 5; ++ int icon_left = GetLayoutConstant(LOCATION_BAR_LEADING_DECORATION_EDGE_PADDING); // The padding between the LHS icon and the text. - int text_left = 8; +- int text_left = 8; ++ int text_left = features::IsThorium2024() ? 0 : 8; // Indentation to match the suggestion icons & texts. -@@ -738,7 +759,9 @@ void LocationBarView::Layout(PassKey) { - // positioned relative to them (e.g. the "bookmark added" bubble if the user - // hits ctrl-d). - const int vertical_padding = -- GetLayoutConstant(LOCATION_BAR_PAGE_INFO_ICON_VERTICAL_PADDING); -+ features::IsThorium2024() -+ ? 4 -+ : GetLayoutConstant(LOCATION_BAR_PAGE_INFO_ICON_VERTICAL_PADDING); - const int trailing_decorations_edge_padding = - GetLayoutConstant(LOCATION_BAR_TRAILING_DECORATION_EDGE_PADDING); +- int icon_indent = 7; +- int text_indent = 6; ++ int icon_indent = features::IsThorium2024() ? 9 : 7; ++ int text_indent = features::IsThorium2024() ? 1 : 6; + // Indentation to match the suggestion icons & texts when in keyword mode. +- int icon_keyword_indent = 9; +- int text_keyword_indent = -9; ++ int icon_keyword_indent = features::IsThorium2024() ? 10 : 9; ++ int text_keyword_indent = features::IsThorium2024() ? -10 : -9; + // Indentation add padding when the permission chip is visible and replacing + // the LHS icon. +- int text_overriding_permission_chip_indent = 0; ++ int text_overriding_permission_chip_indent = features::IsThorium2024() ? 4 : 0; + if (should_indent) { + icon_left += icon_indent; + text_left += text_indent; +@@ -805,12 +828,14 @@ void LocationBarView::Layout(PassKey) { + add_trailing_decoration(page_action_icon_container_, + /*intra_item_padding=*/0); + for (ContentSettingImageView* view : base::Reversed(content_setting_views_)) { +- int intra_item_padding = kContentSettingIntraItemPadding; ++ int intra_item_padding = ++ features::IsThorium2024() ? 4 : kContentSettingIntraItemPadding; + add_trailing_decoration(view, intra_item_padding); + } -@@ -1135,6 +1158,7 @@ gfx::Rect LocationBarView::GetLocalBoundsWithoutEndcaps() const { + if (intent_chip_) { +- int intra_item_padding = kIntentChipIntraItemPadding; ++ int intra_item_padding = ++ features::IsThorium2024() ? 6 : kIntentChipIntraItemPadding; + add_trailing_decoration(intent_chip_, intra_item_padding); + } + +@@ -1011,12 +1036,18 @@ SkColor LocationBarView::GetIconLabelBubbleSurroundingForegroundColor() const { + // will inherit the selected "surrounding foreground color". + const auto color_id = ShouldShowKeywordBubble() + ? kColorOmniboxKeywordSeparator +- : kColorPageActionIcon; ++ : (features::IsThorium2024() ++ ? kColorOmniboxText ++ : kColorPageActionIcon); + return GetColorProvider()->GetColor(color_id); + } + + SkAlpha LocationBarView::GetIconLabelBubbleSeparatorAlpha() const { +- return 0xFF; ++ if (features::IsThorium2024()) { ++ return IconLabelBubbleView::Delegate::GetIconLabelBubbleSeparatorAlpha(); ++ } else { ++ return 0xFF; ++ } + } + + SkColor LocationBarView::GetIconLabelBubbleBackgroundColor() const { +@@ -1091,7 +1122,7 @@ bool LocationBarView::IsVirtualKeyboardVisible(views::Widget* widget) { + // static + int LocationBarView::GetAvailableTextHeight() { + return std::max(0, GetLayoutConstant(LOCATION_BAR_HEIGHT) - +- 2 * GetLayoutConstant(LOCATION_BAR_ELEMENT_PADDING)); ++ GetLayoutConstant(LOCATION_BAR_ELEMENT_PADDING)); + } + + // static +@@ -1135,6 +1166,7 @@ gfx::Rect LocationBarView::GetLocalBoundsWithoutEndcaps() const { void LocationBarView::RefreshBackground() { const double opacity = hover_animation_.GetCurrentValue(); const bool is_caret_visible = omnibox_view_->model()->is_caret_visible(); @@ -2092,25 +2443,122 @@ index eca41f6f37b37..cb07f8510f298 100644 const bool input_in_progress = omnibox_view_->model()->user_input_in_progress(); const bool high_contrast = GetNativeTheme()->UserHasContrastPreference(); -@@ -1160,6 +1184,18 @@ void LocationBarView::RefreshBackground() { +@@ -1150,7 +1182,7 @@ void LocationBarView::RefreshBackground() { + // Match the background color to the popup if the Omnibox is visibly + // focused. + background_color = color_provider->GetColor(kColorOmniboxResultsBackground); +- } else if (input_in_progress && !high_contrast) { ++ } else if (!features::IsThorium2024() && input_in_progress && !high_contrast) { + // Under CR23 guidelines, if the Omnibox is unfocused, but still contains + // in-progress user input, the background color matches the popup (unless + // high-contrast mode is enabled). +@@ -1160,6 +1192,17 @@ void LocationBarView::RefreshBackground() { } SkColor border_color = SK_ColorTRANSPARENT; + -+ static const bool classic_omnibox = base::CommandLine::ForCurrentProcess()->HasSwitch("classic-omnibox"); -+ if (classic_omnibox && !is_caret_visible) { -+ border_color = color_provider->GetColor(kColorLocationBarBorderOnMismatch); ++ static const bool classic_omnibox = ++ base::CommandLine::ForCurrentProcess()->HasSwitch("classic-omnibox"); ++ if ((classic_omnibox) && !is_caret_visible ) { ++ border_color = color_provider->GetColor(kColorLocationBarBorderOnMismatch); + } + -+ if (features::IsThorium2024()) { -+ if (is_caret_visible && !is_open) { -+ border_color = color_provider->GetColor(ui::kColorFocusableBorderFocused); -+ } ++ if (is_caret_visible && !is_open && features::IsThorium2024()) { ++ border_color = color_provider->GetColor(ui::kColorFocusableBorderFocused); + } + if (high_contrast) { // High contrast schemes get a border stroke even on a rounded omnibox. border_color = +diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc +index c00c86f254dd5..ff92f81f91bec 100644 +--- a/chrome/browser/ui/views/location_bar/location_icon_view.cc ++++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc +@@ -75,8 +75,10 @@ LocationIconView::LocationIconView( + + SetAccessibleProperties(/*is_initialization*/ true); + ++ if (!features::IsThorium2024()) { + ConfigureInkDropForRefresh2023(this, kColorPageInfoIconHover, + kColorPageInfoIconPressed); ++ } + + UpdateBorder(); + } +@@ -110,7 +112,7 @@ SkColor LocationIconView::GetForegroundColor() const { + } + + bool LocationIconView::ShouldShowSeparator() const { +- return false; ++ return features::IsThorium2024(); + } + + bool LocationIconView::ShouldShowLabelAfterAnimation() const { +@@ -320,6 +322,7 @@ void LocationIconView::UpdateIcon() { + } + + void LocationIconView::UpdateBackground() { ++ if (!features::IsThorium2024()) { + CHECK(GetColorProvider()); + const std::u16string& display_text = GetText(); + const bool is_text_dangerous = +@@ -341,6 +344,9 @@ void LocationIconView::UpdateBackground() { + ConfigureInkDropForRefresh2023(this, kColorPageInfoIconHover, + kColorPageInfoIconPressed); + } ++ } else { ++ IconLabelBubbleView::UpdateBackground(); ++ } + } + + void LocationIconView::OnIconFetched(const gfx::Image& image) { +@@ -361,7 +367,7 @@ void LocationIconView::Update(bool suppress_animations, + // level. + UpdateLabelColors(); + +- if (force_hide_background) { ++ if (force_hide_background && !features::IsThorium2024()) { + SetBackground( + views::CreateRoundedRectBackground(SK_ColorTRANSPARENT, height() / 2)); + } +@@ -419,20 +425,24 @@ void LocationIconView::UpdateBorder() { + // the bubble should be smaller, so use an empty border to shrink down the + // content bounds so the background gets painted correctly. + gfx::Insets insets = GetLayoutInsets(LOCATION_BAR_PAGE_INFO_ICON_PADDING); +- if (ShouldShowLabel()) { +- SecurityLevel level = GetSecurityLevel(); +- if (level == security_state::DANGEROUS) { +- // Extra space between the left edge and label. +- const int kLeftHorizontalPadding = 6; +- // Extra space between the label and right edge. +- const int kRightHorizontalPadding = 10; +- insets.set_left(kLeftHorizontalPadding); +- insets.set_right(kRightHorizontalPadding); +- } else { +- // An extra space between chip's label and right edge. +- const int kExtraRightPadding = 4; +- insets.set_right(insets.right() + kExtraRightPadding); ++ if (!features::IsThorium2024()) { ++ if (ShouldShowLabel()) { ++ SecurityLevel level = GetSecurityLevel(); ++ if (level == security_state::DANGEROUS) { ++ // Extra space between the left edge and label. ++ const int kLeftHorizontalPadding = 6; ++ // Extra space between the label and right edge. ++ const int kRightHorizontalPadding = 10; ++ insets.set_left(kLeftHorizontalPadding); ++ insets.set_right(kRightHorizontalPadding); ++ } else { ++ // An extra space between chip's label and right edge. ++ const int kExtraRightPadding = 4; ++ insets.set_right(insets.right() + kExtraRightPadding); ++ } + } ++ } else { ++ IconLabelBubbleView::UpdateBorder(); + } + SetBorder(views::CreateEmptyBorder(insets)); + } diff --git a/chrome/browser/ui/views/omnibox/omnibox_suggestion_button_row_view.cc b/chrome/browser/ui/views/omnibox/omnibox_suggestion_button_row_view.cc index 5530486ee3bb3..352aacdbfe227 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_suggestion_button_row_view.cc @@ -2141,7 +2589,7 @@ index 5530486ee3bb3..352aacdbfe227 100644 auto* const ink_drop = views::InkDrop::Get(this); SetAnimationDuration(base::TimeDelta()); diff --git a/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc b/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc -index 4bc8f9177f416..5a11b008a76bc 100644 +index 4bc8f9177f416..bc262eb86f94e 100644 --- a/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc +++ b/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc @@ -244,6 +244,7 @@ RoundedOmniboxResultsFrame::RoundedOmniboxResultsFrame( @@ -2166,7 +2614,7 @@ index 4bc8f9177f416..5a11b008a76bc 100644 + return gfx::Insets::TLBR(6, 1, 5, 1); + } + if (features::IsThorium2024()) { -+ return gfx::Insets::VH(4, 6); ++ return gfx::Insets::VH(3, 6); + } + return gfx::Insets::VH(5, 6); +} @@ -2191,7 +2639,7 @@ index d134918c8538e..7262833fbb715 100644 static gfx::Insets GetShadowInsets(); diff --git a/chrome/browser/ui/views/side_panel/side_panel_resize_area.cc b/chrome/browser/ui/views/side_panel/side_panel_resize_area.cc -index e65fda1bf0161..4942eeab45861 100644 +index e65fda1bf0161..ede48f5cf2ea8 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_resize_area.cc +++ b/chrome/browser/ui/views/side_panel/side_panel_resize_area.cc @@ -12,6 +12,7 @@ @@ -2202,15 +2650,25 @@ index e65fda1bf0161..4942eeab45861 100644 #include "ui/color/color_provider.h" #include "ui/compositor/layer.h" #include "ui/gfx/geometry/size.h" -@@ -32,7 +33,7 @@ SidePanelResizeHandle::SidePanelResizeHandle(SidePanel* side_panel) - SetCanProcessEventsWithinSubtree(false); - SetFocusBehavior(FocusBehavior::ALWAYS); - FocusRing::Install(this); -- if (lens::features::IsLensOverlayEnabled()) { -+ if (lens::features::IsLensOverlayEnabled() && !features::IsThorium2024()) { +@@ -36,7 +37,8 @@ SidePanelResizeHandle::SidePanelResizeHandle(SidePanel* side_panel) const int resize_handle_left_margin = 2; SetProperty(views::kMarginsKey, gfx::Insets().set_left(resize_handle_left_margin)); +- } else { ++ } ++ if (features::IsThorium2024()) { + constexpr int kIconSize = 16; + SetImage(ui::ImageModel::FromVectorIcon( + kDragHandleIcon, kColorSidePanelResizeAreaHandle, kIconSize)); +@@ -47,7 +49,7 @@ SidePanelResizeHandle::SidePanelResizeHandle(SidePanel* side_panel) + } + + void SidePanelResizeHandle::UpdateVisibility(bool visible) { +- if (visible) { ++ if (visible && !features::IsThorium2024()) { + const SkColor resize_handle_color = + GetColorProvider()->GetColor(kColorSidePanelHoverResizeAreaHandle); + SetBackground(CreateRoundedRectBackground(resize_handle_color, 2)); diff --git a/chrome/browser/ui/views/tab_search_bubble_host.cc b/chrome/browser/ui/views/tab_search_bubble_host.cc index fa14797259775..6031b27d539e6 100644 --- a/chrome/browser/ui/views/tab_search_bubble_host.cc @@ -2238,7 +2696,7 @@ index ac335a68f3fd0..8eef7a2f256c8 100644 } // namespace diff --git a/chrome/browser/ui/views/tabs/tab_search_button.cc b/chrome/browser/ui/views/tabs/tab_search_button.cc -index a42855ead9dbe..ba8b4271de1d7 100644 +index a42855ead9dbe..6bc354f89e5e3 100644 --- a/chrome/browser/ui/views/tabs/tab_search_button.cc +++ b/chrome/browser/ui/views/tabs/tab_search_button.cc @@ -21,6 +21,7 @@ @@ -2260,14 +2718,18 @@ index a42855ead9dbe..ba8b4271de1d7 100644 flat_edge), tab_search_bubble_host_(std::make_unique( this, -@@ -42,9 +45,11 @@ TabSearchButton::TabSearchButton(TabStripController* tab_strip_controller, +@@ -40,11 +43,13 @@ TabSearchButton::TabSearchButton(TabStripController* tab_strip_controller, + GetViewAccessibility().SetName( + l10n_util::GetStringUTF16(IDS_ACCNAME_TAB_SEARCH)); - SetForegroundFrameActiveColorId(kColorNewTabButtonForegroundFrameActive); - SetForegroundFrameInactiveColorId(kColorNewTabButtonForegroundFrameInactive); +- SetForegroundFrameActiveColorId(kColorNewTabButtonForegroundFrameActive); +- SetForegroundFrameInactiveColorId(kColorNewTabButtonForegroundFrameInactive); - SetBackgroundFrameActiveColorId(kColorNewTabButtonCRBackgroundFrameActive); - SetBackgroundFrameInactiveColorId( - kColorNewTabButtonCRBackgroundFrameInactive); + if (!features::IsThorium2024()) { ++ SetForegroundFrameActiveColorId(kColorNewTabButtonForegroundFrameActive); ++ SetForegroundFrameInactiveColorId(kColorNewTabButtonForegroundFrameInactive); + SetBackgroundFrameActiveColorId(kColorNewTabButtonCRBackgroundFrameActive); + SetBackgroundFrameInactiveColorId( + kColorNewTabButtonCRBackgroundFrameInactive); @@ -2292,6 +2754,33 @@ index a42855ead9dbe..ba8b4271de1d7 100644 } int TabSearchButton::GetFlatCornerRadius() const { +diff --git a/chrome/browser/ui/views/tabs/tab_strip_control_button.cc b/chrome/browser/ui/views/tabs/tab_strip_control_button.cc +index d0ee903b51d37..b23a8f1037956 100644 +--- a/chrome/browser/ui/views/tabs/tab_strip_control_button.cc ++++ b/chrome/browser/ui/views/tabs/tab_strip_control_button.cc +@@ -6,6 +6,7 @@ + + #include + ++#include "base/command_line.h" + #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" + #include "chrome/browser/ui/views/tabs/tab_strip.h" + #include "chrome/browser/ui/views/tabs/tab_strip_controller.h" +@@ -225,7 +226,13 @@ void TabStripControlButton::UpdateBackground() { + } + + int TabStripControlButton::GetCornerRadius() const { +- return TabStripControlButton::kButtonSize.width() / 2; ++ static const bool rectangular_tabs = ++ base::CommandLine::ForCurrentProcess()->HasSwitch("rectangular-tabs"); ++ if (rectangular_tabs) { ++ return 4; ++ } else { ++ return TabStripControlButton::kButtonSize.width() / 2; ++ } + } + + int TabStripControlButton::GetFlatCornerRadius() const { diff --git a/chrome/browser/ui/views/tabs/tab_style_views.cc b/chrome/browser/ui/views/tabs/tab_style_views.cc index 65676013fece9..d45fc4f3e1754 100644 --- a/chrome/browser/ui/views/tabs/tab_style_views.cc @@ -2615,6 +3104,41 @@ index 0000000000000..43b9476bb127c +}; + +#endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_RESTORE_TAB_BUTTON_H_ +diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc +index 36ba4fcfc2683..584c2b6e10941 100644 +--- a/chrome/browser/ui/views/toolbar/toolbar_button.cc ++++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc +@@ -176,7 +176,7 @@ void ToolbarButton::UpdateColorsAndInsets() { + + // ToolbarButton height is constrained by the height of the location bar. + const int extra_height = std::max( +- 0, target_size.height() - GetLayoutConstant(LOCATION_BAR_HEIGHT)); ++ 0, target_size.height() - GetLayoutConstant(TOOLBAR_BUTTON_HEIGHT)); + const gfx::Insets paint_insets = + gfx::Insets(extra_height / 2) + *GetProperty(views::kInternalPaddingKey); + +@@ -262,6 +262,9 @@ int ToolbarButton::GetIconSize() const { + if (ui::TouchUiController::Get()->touch_ui()) { + return kDefaultTouchableIconSize; + } ++ if (features::IsThorium2024()) { ++ return kDefaultIconSizeThorium2024; ++ } + + return kDefaultIconSizeChromeRefresh; + } +diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.h b/chrome/browser/ui/views/toolbar/toolbar_button.h +index d85292e244d48..65bf4d40a6363 100644 +--- a/chrome/browser/ui/views/toolbar/toolbar_button.h ++++ b/chrome/browser/ui/views/toolbar/toolbar_button.h +@@ -226,6 +226,7 @@ class ToolbarButton : public views::LabelButton, + + static constexpr int kDefaultIconSize = 16; + static constexpr int kDefaultIconSizeChromeRefresh = 20; ++ static constexpr int kDefaultIconSizeThorium2024 = 22; + static constexpr int kDefaultTouchableIconSize = 24; + + private: diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc index 577215577d9ac..3d63a1a714ef3 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc @@ -2930,7 +3454,7 @@ index d1a8dc8342177..a407f00138376 100644 inline constexpr char kChromeUIAboutURL[] = "chrome://about/"; inline constexpr char kChromeUIAccessCodeCastHost[] = "access-code-cast"; diff --git a/components/lens/lens_features.cc b/components/lens/lens_features.cc -index e821793248fe3..9a890315945d7 100644 +index e821793248fe3..7815ad6d1d167 100644 --- a/components/lens/lens_features.cc +++ b/components/lens/lens_features.cc @@ -7,6 +7,7 @@ @@ -2941,20 +3465,15 @@ index e821793248fe3..9a890315945d7 100644 namespace lens::features { -@@ -44,12 +45,7 @@ BASE_FEATURE(kEnableContextMenuInLensSidePanel, - - BASE_FEATURE(kLensOverlay, - "LensOverlay", --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) -- base::FEATURE_DISABLED_BY_DEFAULT --#else +@@ -47,7 +48,7 @@ BASE_FEATURE(kLensOverlay, + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) + base::FEATURE_DISABLED_BY_DEFAULT + #else - base::FEATURE_ENABLED_BY_DEFAULT --#endif --); -+ base::FEATURE_DISABLED_BY_DEFAULT); ++ base::FEATURE_DISABLED_BY_DEFAULT + #endif + ); - BASE_FEATURE(kLensOverlayTranslateButton, - "LensOverlayTranslateButton", diff --git a/components/resources/search_engine_choice_scaled_resources.grdp b/components/resources/search_engine_choice_scaled_resources.grdp index 87d186a04e66c..01beccd365540 100644 --- a/components/resources/search_engine_choice_scaled_resources.grdp @@ -3058,7 +3577,7 @@ index d21456ab73faa..de14c868fcc26 100644 return SystemTheme::kDefault; } diff --git a/ui/views/controls/button/toggle_button.cc b/ui/views/controls/button/toggle_button.cc -index 1380921296fcf..cacb1c78add37 100644 +index 1380921296fcf..c7e8a29577398 100644 --- a/ui/views/controls/button/toggle_button.cc +++ b/ui/views/controls/button/toggle_button.cc @@ -11,6 +11,7 @@ @@ -3069,14 +3588,16 @@ index 1380921296fcf..cacb1c78add37 100644 #include "third_party/skia/include/core/SkRect.h" #include "ui/accessibility/ax_enums.mojom.h" #include "ui/accessibility/ax_node_data.h" -@@ -42,6 +43,13 @@ namespace { +@@ -41,7 +42,14 @@ namespace views { + namespace { // Constants are measured in dip. - constexpr gfx::Size kTrackSize = gfx::Size(26, 16); +-constexpr gfx::Size kTrackSize = gfx::Size(26, 16); ++constexpr gfx::Size kTrackSize = gfx::Size(28, 16); +constexpr gfx::Size kTh24TrackSize = gfx::Size(30, 12); + +constexpr int kTrackVerticalMargin = 5; -+constexpr int kTrackHorizontalMargin = 6; ++constexpr int kTrackHorizontalMargin = 4; + +// Insets from the rounded edge of the thumb to the rounded edge of the track. +constexpr int kTh24ThumbInset = 2; @@ -3342,8 +3863,51 @@ index 5c465d0f8377c..637e853bec669 100644 // Button: void PaintButtonContents(gfx::Canvas* canvas) override; +diff --git a/ui/views/controls/combobox/combobox_util.cc b/ui/views/controls/combobox/combobox_util.cc +index dafb3fb1502e3..9a350bade5c3c 100644 +--- a/ui/views/controls/combobox/combobox_util.cc ++++ b/ui/views/controls/combobox/combobox_util.cc +@@ -30,13 +30,19 @@ const int kComboboxArrowPaddingWidth = 4; + int GetComboboxArrowContainerWidthAndMargins() { + // add extra margins between combobox arrow container and edge of the + // combobox. +- return GetComboboxArrowContainerWidth() + +- LayoutProvider::Get()->GetDistanceMetric( +- DISTANCE_TEXTFIELD_HORIZONTAL_TEXT_PADDING); ++ return features::IsThorium2024() ++ ? GetComboboxArrowContainerWidth() + ++ LayoutProvider::Get()->GetDistanceMetric( ++ DISTANCE_TEXTFIELD_HORIZONTAL_TEXT_PADDING) ++ : GetComboboxArrowContainerWidth() + ++ kComboboxArrowPaddingWidth; + } + + int GetComboboxArrowContainerWidth() { +- return ComboboxArrowSize().width() + kComboboxArrowPaddingWidth * 2; ++ const int combobox_padding = features::IsThorium2024() ++ ? 8 * 2 ++ : kComboboxArrowPaddingWidth * 2; ++ return ComboboxArrowSize().width() + combobox_padding; + } + + void PaintComboboxArrow(SkColor color, +diff --git a/ui/views/controls/editable_combobox/editable_combobox.cc b/ui/views/controls/editable_combobox/editable_combobox.cc +index 81bd9ac032b1f..da73d1d14d456 100644 +--- a/ui/views/controls/editable_combobox/editable_combobox.cc ++++ b/ui/views/controls/editable_combobox/editable_combobox.cc +@@ -622,7 +622,9 @@ void EditableCombobox::UpdateTextfieldInsets() { + textfield_->SetExtraInsets(gfx::Insets::TLBR( + 0, 0, 0, + std::max(control_elements_container_->GetPreferredSize({}).width() - +- kComboboxArrowPaddingWidth, ++ (features::IsThorium2024() ++ ? kComboboxArrowPaddingWidth ++ : kComboboxArrowPaddingWidth), + 0))); + } + diff --git a/ui/views/controls/menu/menu_config.cc b/ui/views/controls/menu/menu_config.cc -index cc2b21432f010..21cf9ba102902 100644 +index cc2b21432f010..d2aeab2198423 100644 --- a/ui/views/controls/menu/menu_config.cc +++ b/ui/views/controls/menu/menu_config.cc @@ -6,6 +6,7 @@ @@ -3354,18 +3918,26 @@ index cc2b21432f010..21cf9ba102902 100644 #include "ui/base/ui_base_features.h" #include "ui/views/controls/menu/menu_controller.h" #include "ui/views/controls/menu/menu_item_view.h" -@@ -73,12 +74,12 @@ void MenuConfig::InitCommon() { +@@ -71,14 +72,16 @@ void MenuConfig::InitCommon() { + context_menu_font_list = font_list = TypographyProvider::Get().GetFont( + style::CONTEXT_MENU, style::STYLE_BODY_3); reserve_dedicated_arrow_column = false; - menu_horizontal_border_size = 0; - submenu_horizontal_overlap = 0; +- menu_horizontal_border_size = 0; +- submenu_horizontal_overlap = 0; - item_vertical_margin = 6; -+ item_vertical_margin = features::IsThorium2024() ? 4 : 6; - item_horizontal_border_padding = 12; - arrow_size = 16; +- item_horizontal_border_padding = 12; +- arrow_size = 16; - separator_height = 17; - separator_spacing_height = 4; - use_outer_border = false; -+ separator_height = features::IsThorium2024() ? 11 : 17; ++ menu_horizontal_border_size = features::IsThorium2024() ++ ? 1 ++ : 0; ++ submenu_horizontal_overlap = features::IsThorium2024() ? -1 : 0; ++ item_vertical_margin = features::IsThorium2024() ? 4 : 6; ++ item_horizontal_border_padding = features::IsThorium2024() ? 0 : 12; ++ arrow_size = features::IsThorium2024() ? 16 : 16; ++ separator_height = features::IsThorium2024() ? 11 : 13; + separator_spacing_height = features::IsThorium2024() ? 3 : 4; + use_outer_border = features::IsThorium2024() ? true : false; } @@ -3384,14 +3956,44 @@ index b087f25b78c94..415c96a2ba60b 100644 // Radius of the rounded corners of the menu border. Must be >= 0. int corner_radius = LayoutProvider::Get()->GetCornerRadiusMetric( -diff --git a/ui/views/controls/menu/menu_config_linux.cc b/ui/views/controls/menu/menu_config_linux.cc -index 09c03d1e87011..31fda3a23bbf5 100644 ---- a/ui/views/controls/menu/menu_config_linux.cc -+++ b/ui/views/controls/menu/menu_config_linux.cc -@@ -4,12 +4,16 @@ +diff --git a/ui/views/controls/menu/menu_config_chromeos.cc b/ui/views/controls/menu/menu_config_chromeos.cc +index aec943d266793..98ee677630ff3 100644 +--- a/ui/views/controls/menu/menu_config_chromeos.cc ++++ b/ui/views/controls/menu/menu_config_chromeos.cc +@@ -4,8 +4,23 @@ #include "ui/views/controls/menu/menu_config.h" ++#include "ui/base/ui_base_features.h" ++ + namespace views { + + void MenuConfig::InitPlatform() {} +- ++ if (features::IsThorium2024()) { ++ arrow_to_edge_padding = 21; // Undesirable in CR2023. ++ corner_radius = 2; // Overridden in CR2023. ++ minimum_text_item_height = 29; // Undesirable in CR2023. ++ minimum_container_item_height = 29; // Undesirable in CR2023. ++ reserve_dedicated_arrow_column = false; // Default in CR2023. ++ menu_horizontal_border_size = 0; // Default in CR2023. ++ separator_lower_height = 8; // Unused in CR2023. ++ separator_spacing_height = 7; // Overridden in CR2023. ++ separator_upper_height = 8; // Unused in CR2023. ++ submenu_horizontal_overlap = 1; // Overridden in CR2023. ++ use_outer_border = true; // Default in Th24. ++ } ++ //use_bubble_border = corner_radius > 0; + } // namespace views +diff --git a/ui/views/controls/menu/menu_config_linux.cc b/ui/views/controls/menu/menu_config_linux.cc +index 09c03d1e87011..cd97a0558557e 100644 +--- a/ui/views/controls/menu/menu_config_linux.cc ++++ b/ui/views/controls/menu/menu_config_linux.cc +@@ -4,12 +4,26 @@ + + #include "ui/views/controls/menu/menu_config.h" + ++#include "base/logging.h" +#include "chrome/browser/ui/thorium_2024.h" +#include "ui/base/ui_base_features.h" #include "ui/ozone/public/ozone_platform.h" @@ -3400,17 +4002,26 @@ index 09c03d1e87011..31fda3a23bbf5 100644 void MenuConfig::InitPlatform() { - use_bubble_border = true; -+ use_bubble_border = features::IsThorium2024() ? false : corner_radius > 0; -+ arrow_to_edge_padding = features::IsThorium2024() ? 2 : 8; -+ separator_height = features::IsThorium2024() ? 7 : 17; ++ use_bubble_border = corner_radius > 0; ++ use_outer_border = true; ++ menu_horizontal_border_size = features::IsThorium2024() ++ ? 2 ++ : 0; ++ submenu_horizontal_overlap = features::IsThorium2024() ? 1 : 0; ++ arrow_to_edge_padding = features::IsThorium2024() ? 0 : 8; ++ separator_height = features::IsThorium2024() ? 5 : 13; ++ separator_upper_height = features::IsThorium2024() ? 3 : 3; ++ separator_lower_height = features::IsThorium2024() ? 3 : 4; ++ separator_spacing_height = features::IsThorium2024() ? 2 : 3; ++ nonrounded_menu_vertical_border_size = features::IsThorium2024() ? 3 : 4; } } // namespace views diff --git a/ui/views/controls/menu/menu_config_mac.mm b/ui/views/controls/menu/menu_config_mac.mm -index eabfb364890d3..c17ad57190ef1 100644 +index eabfb364890d3..b31a7d3867a31 100644 --- a/ui/views/controls/menu/menu_config_mac.mm +++ b/ui/views/controls/menu/menu_config_mac.mm -@@ -1,17 +1,55 @@ +@@ -1,17 +1,60 @@ -// Copyright 2014 The Chromium Authors +// Copyright 2024 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be @@ -3452,6 +4063,10 @@ index eabfb364890d3..c17ad57190ef1 100644 namespace views { void MenuConfig::InitPlatform() { ++ if (features::IsThorium2024()) { ++ context_menu_font_list = font_list = gfx::FontList(gfx::Font( ++ new gfx::PlatformFontMac(gfx::PlatformFontMac::SystemFontType::kMenu))); ++ } check_selected_combobox_item = true; - arrow_key_selection_wraps = false; + arrow_key_selection_wraps = true; @@ -3460,9 +4075,10 @@ index eabfb364890d3..c17ad57190ef1 100644 + show_context_menu_accelerators = features::IsThorium2024() ? true : false; all_menus_use_prefix_selection = true; + if (features::IsThorium2024()) { -+ menu_horizontal_border_size = 0; ++ menu_horizontal_border_size = 1; ++ use_outer_border = true; ++ //use_bubble_border = corner_radius > 0; + } -+ use_outer_border = features::IsThorium2024() ? true : false; + if (features::IsThorium2024()) { + InitMaterialMenuConfig(this); + } @@ -3470,7 +4086,7 @@ index eabfb364890d3..c17ad57190ef1 100644 } // namespace views diff --git a/ui/views/controls/menu/menu_config_win.cc b/ui/views/controls/menu/menu_config_win.cc -index a2dae078ccbd3..9df79901422ee 100644 +index a2dae078ccbd3..03acda295f50b 100644 --- a/ui/views/controls/menu/menu_config_win.cc +++ b/ui/views/controls/menu/menu_config_win.cc @@ -8,6 +8,8 @@ @@ -3482,9 +4098,22 @@ index a2dae078ccbd3..9df79901422ee 100644 #include "ui/gfx/system_fonts_win.h" namespace views { -@@ -21,10 +23,43 @@ void MenuConfig::InitPlatform() { - (SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &show_cues, 0) && - show_cues == TRUE); +@@ -16,15 +18,54 @@ void MenuConfig::InitPlatform() { + context_menu_font_list = font_list = + gfx::FontList(gfx::win::GetSystemFont(gfx::win::SystemFont::kMenu)); + +- BOOL show_cues; +- show_mnemonics = +- (SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &show_cues, 0) && +- show_cues == TRUE); ++ if (features::IsThorium2024()) { ++ show_mnemonics = true; ++ } else { ++ BOOL show_cues; ++ show_mnemonics = ++ (SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &show_cues, 0) && ++ show_cues == TRUE); ++ } - SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &show_delay, 0); - separator_upper_height = 5; @@ -3492,35 +4121,37 @@ index a2dae078ccbd3..9df79901422ee 100644 + //SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &show_delay, 0); + static const bool is_win11 = base::win::GetVersion() >= base::win::Version::WIN11; -+ use_outer_border = features::IsThorium2024() ? true : false; ++ use_outer_border = true; ++ always_reserve_check_region = false; ++ + + if (features::IsThorium2024()) { ++ nonrounded_menu_vertical_border_size = features::IsThorium2024() ? 3 : 4; ++ use_outer_border = true; + if (is_win11) { -+ corner_radius = 4; ++ corner_radius = 8; + arrow_to_edge_padding = 4; + menu_horizontal_border_size = 4; + submenu_horizontal_overlap = 1; + rounded_menu_vertical_border_size = 4; -+ item_horizontal_padding = 1; ++ item_horizontal_padding = 12; + between_item_vertical_padding = 2; + separator_height = 1; + separator_upper_height = 1; + separator_lower_height = 1; + item_corner_radius = 4; -+ use_outer_border = true; + } else { + corner_radius = 0; + arrow_to_edge_padding = 2; + menu_horizontal_border_size = 3; ++ submenu_horizontal_overlap = 0; + nonrounded_menu_vertical_border_size = 3; + item_vertical_margin = 3; -+ item_horizontal_border_padding = -2; ++ item_horizontal_border_padding = 0; + icon_label_spacing = 10; -+ always_reserve_check_region = true; -+ separator_height = 7; -+ separator_upper_height = 4; ++ separator_height = 5; ++ separator_upper_height = 3; + separator_lower_height = 4; -+ use_outer_border = true; + } + } else { + separator_upper_height = 5; @@ -3529,6 +4160,34 @@ index a2dae078ccbd3..9df79901422ee 100644 use_bubble_border = corner_radius > 0; } +diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc +index 81fabd16b2ce3..072ff8a5381b7 100644 +--- a/ui/views/controls/menu/menu_item_view.cc ++++ b/ui/views/controls/menu/menu_item_view.cc +@@ -30,6 +30,7 @@ + #include "ui/base/metadata/metadata_impl_macros.h" + #include "ui/base/models/image_model.h" + #include "ui/base/models/menu_model.h" ++#include "ui/base/thorium_2024.h" + #include "ui/base/ui_base_features.h" + #include "ui/color/color_id.h" + #include "ui/color/color_provider.h" +@@ -1465,8 +1466,13 @@ void MenuItemView::UpdateSelectionBasedState(bool paint_as_selected) { + last_paint_as_selected_ = paint_as_selected; + const Colors colors = CalculateColors(paint_as_selected); + if (submenu_arrow_image_view_) { +- submenu_arrow_image_view_->SetImage(ui::ImageModel::FromVectorIcon( +- vector_icons::kSubmenuArrowChromeRefreshIcon, colors.icon_color)); ++ if (features::IsThorium2024()) { ++ submenu_arrow_image_view_->SetImage(ui::ImageModel::FromVectorIcon( ++ vector_icons::kSubmenuArrowIcon, colors.icon_color)); ++ } else { ++ submenu_arrow_image_view_->SetImage(ui::ImageModel::FromVectorIcon( ++ vector_icons::kSubmenuArrowChromeRefreshIcon, colors.icon_color)); ++ } + } + MenuDelegate* delegate = GetDelegate(); + if (type_ == Type::kCheckbox && delegate && diff --git a/ui/views/controls/tree/tree_view.cc b/ui/views/controls/tree/tree_view.cc index b73bd71742381..0fb6d132bd762 100644 --- a/ui/views/controls/tree/tree_view.cc @@ -3654,7 +4313,7 @@ index cfee7309a95c6..74108649ba65a 100644 std::vector icons_; diff --git a/ui/views/layout/layout_provider.cc b/ui/views/layout/layout_provider.cc -index 2e4623d72bf80..f79efe3597b97 100644 +index 2e4623d72bf80..af82a8ee6b401 100644 --- a/ui/views/layout/layout_provider.cc +++ b/ui/views/layout/layout_provider.cc @@ -8,6 +8,7 @@ @@ -3665,45 +4324,59 @@ index 2e4623d72bf80..f79efe3597b97 100644 #include "ui/base/ui_base_features.h" #include "ui/gfx/font_list.h" #include "ui/views/controls/focus_ring.h" -@@ -214,6 +215,48 @@ ShapeSysTokens GetShapeSysToken(ShapeContextTokens id) { +@@ -89,9 +90,9 @@ int LayoutProvider::GetDistanceMetric(int metric) const { + case DISTANCE_BUTTON_MAX_LINKABLE_WIDTH: + return 112; + case DISTANCE_CLOSE_BUTTON_MARGIN: +- return 20; ++ return features::IsThorium2024() ? 4 : 20; + case DISTANCE_CONTROL_VERTICAL_TEXT_PADDING: +- return 10; ++ return features::IsThorium2024() ? 8 : 10; + case DISTANCE_DIALOG_BUTTON_MINIMUM_WIDTH: + // Minimum label size plus padding. + return 32 + 2 * GetDistanceMetric(DISTANCE_BUTTON_HORIZONTAL_PADDING); +@@ -128,7 +129,7 @@ int LayoutProvider::GetDistanceMetric(int metric) const { + case DISTANCE_TABLE_CELL_HORIZONTAL_MARGIN: + return 12; + case DISTANCE_TEXTFIELD_HORIZONTAL_TEXT_PADDING: +- return 10; ++ return features::IsThorium2024() ? 8 : 10; + case DISTANCE_UNRELATED_CONTROL_HORIZONTAL: + return 16; + case DISTANCE_UNRELATED_CONTROL_VERTICAL: +@@ -214,6 +215,41 @@ ShapeSysTokens GetShapeSysToken(ShapeContextTokens id) { int LayoutProvider::GetCornerRadiusMetric(ShapeContextTokens id, const gfx::Size& size) const { + -+ static const bool classic_omnibox = base::CommandLine::ForCurrentProcess()->HasSwitch("classic-omnibox"); ++ static const bool classic_omnibox = ++ base::CommandLine::ForCurrentProcess()->HasSwitch("classic-omnibox"); + if (features::IsThorium2024()) { + switch (id) { + case ShapeContextTokens::kBadgeRadius: -+ return 4; ++ return 3; + case ShapeContextTokens::kButtonRadius: -+ return 4; + case ShapeContextTokens::kComboboxRadius: -+ return 4; + case ShapeContextTokens::kDialogRadius: -+ return 4; + case ShapeContextTokens::kFindBarViewRadius: -+ return 4; ++ return GetCornerRadiusMetric(Emphasis::kMedium, size); // 4 + case ShapeContextTokens::kMenuRadius: + case ShapeContextTokens::kMenuAuxRadius: -+ return 0; ++ return GetCornerRadiusMetric(Emphasis::kNone); // 0 + case ShapeContextTokens::kMenuTouchRadius: -+ return 8; ++ return GetCornerRadiusMetric(Emphasis::kHigh); // 8 + case ShapeContextTokens::kOmniboxExpandedRadius: { + if (classic_omnibox) { -+ return 4; ++ return 8; + } else { + return 16; + } + } -+ case ShapeContextTokens::kTextfieldRadius: { -+ if (classic_omnibox) { -+ return 4; -+ } else { -+ return 8; -+ } -+ } ++ case ShapeContextTokens::kTextfieldRadius: ++ return 4.0f; // 2.0f normally, should be 4.0f in Th24 + case ShapeContextTokens::kSidePanelContentRadius: -+ return 16; ++ return 16; // 8 + case ShapeContextTokens::kSidePanelPageContentRadius: + return 8; + default: diff --git a/setup.sh b/setup.sh index e2eb5111..0a305725 100755 --- a/setup.sh +++ b/setup.sh @@ -1,4 +1,5 @@ #!/bin/bash +#!/bin/bash # Copyright (c) 2024 Alex313031. @@ -171,6 +172,9 @@ copyMacOS () { case $1 in --mac) copyMacOS; esac +case $1 in + --macos) copyMacOS; +esac # Raspberry Pi Source Files copyRaspi () { diff --git a/src/chrome/browser/ui/views/tabs/tab.cc b/src/chrome/browser/ui/views/tabs/tab.cc index 0f015f27..3103949f 100644 --- a/src/chrome/browser/ui/views/tabs/tab.cc +++ b/src/chrome/browser/ui/views/tabs/tab.cc @@ -70,6 +70,7 @@ #include "ui/base/pointer/touch_ui_controller.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" +#include "ui/base/ui_base_features.h" #include "ui/compositor/clip_recorder.h" #include "ui/compositor/compositor.h" #include "ui/gfx/animation/tween.h" @@ -116,7 +117,9 @@ constexpr int kPinnedTabExtraWidthToRenderAsNormal = 30; // Additional padding of close button to the right of the tab // indicator when `extra_alert_indicator_padding_` is true. constexpr int kTabAlertIndicatorCloseButtonPaddingAdjustmentTouchUI = 8; +constexpr int kTabAlertIndicatorCloseButtonPaddingAdjustmentTh24 = 6; constexpr int kTabAlertIndicatorCloseButtonPaddingAdjustment = 4; +constexpr int kExtraLeftPaddingToBalanceCloseButtonPadding = 2; // When the DiscardRingImprovements feature is enabled, increase the radius of // the discard ring by this amount if there is enough space. @@ -320,12 +323,23 @@ void Tab::Layout(PassKey) { const bool was_showing_icon = showing_icon_; UpdateIconVisibility(); - const int start = contents_rect.x(); + int start = contents_rect.x(); + + if (extra_padding_before_content_ && features::IsThorium2024()) { + start += kExtraLeftPaddingToBalanceCloseButtonPadding; + } // The bounds for the favicon will include extra width for the attention // indicator, but visually it will be smaller at kFaviconSize wide. gfx::Rect favicon_bounds(start, contents_rect.y(), 0, 0); if (showing_icon_) { + // Height should go to the bottom of the tab for the crashed tab animation + // to pop out of the bottom in Thorium 2024 UI. + favicon_bounds.set_y(contents_rect.y() + + Center(features::IsThorium2024() + ? contents_rect.height() + : gfx::kFaviconSize, + gfx::kFaviconSize)); if (center_icon_) { // When centering the favicon, the favicon is allowed to escape the normal // contents rect. @@ -389,7 +403,9 @@ void Tab::Layout(PassKey) { if (extra_alert_indicator_padding_) { right -= ui::TouchUiController::Get()->touch_ui() ? kTabAlertIndicatorCloseButtonPaddingAdjustmentTouchUI - : kTabAlertIndicatorCloseButtonPaddingAdjustment; + : (features::IsThorium2024() + ? kTabAlertIndicatorCloseButtonPaddingAdjustmentTh24 + : kTabAlertIndicatorCloseButtonPaddingAdjustment); } } const gfx::Size image_size = alert_indicator_button_->GetPreferredSize(); @@ -1055,6 +1071,7 @@ void Tab::UpdateIconVisibility() { // a non-narrow tab. if (!closing_) { center_icon_ = false; + extra_padding_before_content_ = false; } showing_icon_ = showing_alert_indicator_ = false; @@ -1082,6 +1099,7 @@ void Tab::UpdateIconVisibility() { // While animating to or from the pinned state, pinned tabs are rendered as // normal tabs. Force the extra padding on so the favicon doesn't jitter // left and then back right again as it resizes through layout regimes. + extra_padding_before_content_ = true; extra_alert_indicator_padding_ = true; return; } @@ -1156,6 +1174,16 @@ void Tab::UpdateIconVisibility() { } } + // Don't update padding while the tab is closing, to avoid glitchy-looking + // behaviour when the close animation causes the tab to get very small + if (!closing_) { + // The extra padding is intended to visually balance the close button, so + // only include it when the close button is shown or will be shown on hover. + // We also check this for active tabs so that the extra padding doesn't pop + // in and out as you switch tabs. + extra_padding_before_content_ = large_enough_for_close_button; + } + extra_alert_indicator_padding_ = showing_alert_indicator_ && showing_close_button_ && large_enough_for_close_button; diff --git a/src/chrome/browser/ui/views/tabs/tab.h b/src/chrome/browser/ui/views/tabs/tab.h new file mode 100644 index 00000000..23b5cdd8 --- /dev/null +++ b/src/chrome/browser/ui/views/tabs/tab.h @@ -0,0 +1,303 @@ +// Copyright 2012 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_ +#define CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_ + +#include +#include +#include + +#include "base/gtest_prod_util.h" +#include "base/memory/raw_ptr.h" +#include "chrome/browser/ui/tabs/tab_enums.h" +#include "chrome/browser/ui/tabs/tab_renderer_data.h" +#include "chrome/browser/ui/views/tabs/tab_slot_view.h" +#include "chrome/browser/ui/views/tabs/tab_style_views.h" +#include "components/performance_manager/public/freezing/freezing.h" +#include "components/tab_groups/tab_group_id.h" +#include "ui/base/metadata/metadata_header_macros.h" +#include "ui/gfx/animation/animation_delegate.h" +#include "ui/gfx/animation/linear_animation.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/paint_throbber.h" +#include "ui/views/context_menu_controller.h" +#include "ui/views/controls/button/button.h" +#include "ui/views/controls/focus_ring.h" +#include "ui/views/masked_targeter_delegate.h" +#include "ui/views/view_observer.h" + +class AlertIndicatorButton; +class TabCloseButton; +class TabSlotController; +class TabIcon; +struct TabSizeInfo; + +namespace gfx { +class Animation; +class LinearAnimation; +} // namespace gfx +namespace views { +class Label; +class View; +} // namespace views + +/////////////////////////////////////////////////////////////////////////////// +// +// A View that renders a Tab in a TabStrip. +// +/////////////////////////////////////////////////////////////////////////////// +class Tab : public gfx::AnimationDelegate, + public views::MaskedTargeterDelegate, + public views::ViewObserver, + public TabSlotView { + METADATA_HEADER(Tab, TabSlotView) + + public: + // When the content's width of the tab shrinks to below this size we should + // hide the close button on inactive tabs. Any smaller and they're too easy + // to hit on accident. + static constexpr int kMinimumContentsWidthForCloseButtons = 68; + static constexpr int kTouchMinimumContentsWidthForCloseButtons = 100; + + // Sets whether hover cards should appear on mouse hover. Used in browser + // tests to prevent them from interfering with unrelated tests. + static void SetShowHoverCardOnMouseHoverForTesting(bool value); + + explicit Tab(TabSlotController* controller); + Tab(const Tab&) = delete; + Tab& operator=(const Tab&) = delete; + ~Tab() override; + + // gfx::AnimationDelegate: + void AnimationEnded(const gfx::Animation* animation) override; + void AnimationProgressed(const gfx::Animation* animation) override; + + // views::MaskedTargeterDelegate: + bool GetHitTestMask(SkPath* mask) const override; + + // TabSlotView: + void Layout(PassKey) override; + bool OnKeyPressed(const ui::KeyEvent& event) override; + bool OnKeyReleased(const ui::KeyEvent& event) override; + bool OnMousePressed(const ui::MouseEvent& event) override; + bool OnMouseDragged(const ui::MouseEvent& event) override; + void OnMouseReleased(const ui::MouseEvent& event) override; + void OnMouseCaptureLost() override; + void OnMouseMoved(const ui::MouseEvent& event) override; + void OnMouseEntered(const ui::MouseEvent& event) override; + void OnMouseExited(const ui::MouseEvent& event) override; + void OnGestureEvent(ui::GestureEvent* event) override; + std::u16string GetTooltipText(const gfx::Point& p) const override; + void GetAccessibleNodeData(ui::AXNodeData* node_data) override; + gfx::Size CalculatePreferredSize( + const views::SizeBounds& available_size) const override; + void PaintChildren(const views::PaintInfo& info) override; + void OnPaint(gfx::Canvas* canvas) override; + void AddedToWidget() override; + void RemovedFromWidget() override; + void OnFocus() override; + void OnBlur() override; + void OnThemeChanged() override; + TabSlotView::ViewType GetTabSlotViewType() const override; + TabSizeInfo GetTabSizeInfo() const override; + + TabSlotController* controller() const { return controller_; } + + // Used to set/check whether this Tab is being animated closed. + void SetClosing(bool closing); + bool closing() const { return closing_; } + + // Returns the color for the tab's group, if any. + std::optional GetGroupColor() const; + + // Returns the color used for the alert indicator icon. + ui::ColorId GetAlertIndicatorColor(TabAlertState state) const; + + // Returns true if this tab is the active tab. + bool IsActive() const; + + // Notifies the AlertIndicatorButton that the active state of this tab has + // changed. + void ActiveStateChanged(); + + // Called when the alert indicator has changed states. + void AlertStateChanged(); + + // Called when the selected state changes. + void SelectedStateChanged(); + + // Returns true if the tab is selected. + bool IsSelected() const; + + // Returns true if this tab is discarded. + bool IsDiscarded() const; + + // Returns true if this tab has captured a thumbnail. + bool HasThumbnail() const; + + // Sets the data this tabs displays. Should only be called after Tab is added + // to widget hierarchy. + void SetData(TabRendererData data); + const TabRendererData& data() const { return data_; } + + // Redraws the loading animation if one is visible. Otherwise, no-op. The + // |elapsed_time| parameter is shared between tabs and used to keep the + // throbbers in sync. + void StepLoadingAnimation(const base::TimeDelta& elapsed_time); + + // Sets the visibility of the indicator shown when the tab needs to indicate + // to the user that it needs their attention. + void SetTabNeedsAttention(bool attention); + + void CreateFreezingVote(content::WebContents* contents); + void ReleaseFreezingVote(); + bool HasFreezingVote() const { return freezing_vote_.has_value(); } + + // Returns the width of the largest part of the tab that is available for the + // user to click to select/activate the tab. + int GetWidthOfLargestSelectableRegion() const; + + bool mouse_hovered() const { return mouse_hovered_; } + + // Returns the TabStyle associated with this tab. + TabStyleViews* tab_style_views() { return tab_style_views_.get(); } + const TabStyleViews* tab_style_views() const { + return tab_style_views_.get(); + } + const TabStyle* tab_style() const { return tab_style_views_->tab_style(); } + + // Returns the text to show in a tab's tooltip: The contents |title|, followed + // by a break, followed by a localized string describing the |alert_state|. + // Exposed publicly for tests. + static std::u16string GetTooltipText( + const std::u16string& title, + std::optional alert_state); + + // Returns an alert state to be shown among given alert states. + static std::optional GetAlertStateToShow( + const std::vector& alert_states); + + bool showing_close_button_for_testing() const { + return showing_close_button_; + } + + raw_ptr close_button() { return close_button_; } + + TabIcon* GetTabIconForTesting() const { return icon_; } + + AlertIndicatorButton* alert_indicator_button_for_testing() { + return alert_indicator_button_; + } + + void SetShouldShowDiscardIndicator(bool enabled); + + private: + class TabCloseButtonObserver; + friend class AlertIndicatorButtonTest; + friend class TabTest; + friend class TabStripTestBase; +#if BUILDFLAG(IS_CHROMEOS_ASH) + FRIEND_TEST_ALL_PREFIXES(TabStripTest, CloseButtonHiddenWhenLockedForOnTask); +#endif + FRIEND_TEST_ALL_PREFIXES(TabStripTest, TabCloseButtonVisibility); + FRIEND_TEST_ALL_PREFIXES(TabTest, TitleTextHasSufficientContrast); + FRIEND_TEST_ALL_PREFIXES(TabHoverCardInteractiveUiTest, + HoverCardVisibleOnTabCloseButtonFocusAfterTabFocus); + + // Invoked from Layout to adjust the position of the favicon or alert + // indicator for pinned tabs. The visual_width parameter is how wide the + // icon looks (rather than how wide the bounds are). + void MaybeAdjustLeftForPinnedTab(gfx::Rect* bounds, int visual_width) const; + + // Computes which icons are visible in the tab. Should be called everytime + // before layout is performed. + void UpdateIconVisibility(); + + // Returns whether the tab should be rendered as a normal tab as opposed to a + // pinned tab. + bool ShouldRenderAsNormalTab() const; + + // Updates the blocked attention state of the |icon_|. This only updates + // state; it is the responsibility of the caller to request a paint. + void UpdateTabIconNeedsAttentionBlocked(); + + // Selects, generates, and applies colors for various foreground elements to + // ensure proper contrast. Elements affected include title text, close button + // and alert icon. + void UpdateForegroundColors(); + + // Considers switching to hovered mode or [re-]showing the hover card based on + // the mouse moving over the tab. If the tab is already hovered or mouse + // events are disabled because of touch input, this is a no-op. + void MaybeUpdateHoverStatus(const ui::MouseEvent& event); + + void CloseButtonPressed(const ui::Event& event); + + // The controller, never nullptr. + const raw_ptr controller_; + + TabRendererData data_; + + std::unique_ptr tab_style_views_; + + // True if the tab is being animated closed. + bool closing_ = false; + + raw_ptr icon_ = nullptr; + raw_ptr alert_indicator_button_ = nullptr; + raw_ptr close_button_ = nullptr; + + raw_ptr title_; + // The title's bounds are animated when switching between showing and hiding + // the tab's favicon/throbber. + gfx::Rect start_title_bounds_; + gfx::Rect target_title_bounds_; + gfx::LinearAnimation title_animation_; + + // For narrow tabs, we show the alert icon or, if there is no alert icon, the + // favicon even if it won't completely fit. In this case, we need to center + // the icon within the tab; it will be clipped to fit. + bool center_icon_ = false; + + // Whether we're showing the icon. It is cached so that we can detect when it + // changes and layout appropriately. + bool showing_icon_ = false; + + // Whether we're showing the alert indicator. It is cached so that we can + // detect when it changes and layout appropriately. + bool showing_alert_indicator_ = false; + + // Whether we are showing the close button. It is cached so that we can + // detect when it changes and layout appropriately. + bool showing_close_button_ = false; + + // Whether the tab is currently animating from a pinned to an unpinned state. + bool is_animating_from_pinned_ = false; + + // If there's room, we add additional padding to the left of the favicon to + // balance the whitespace inside the non-hovered close button image; + // otherwise, the tab contents look too close to the left edge. Once the tabs + // get too small, we let the tab contents take the full width, to maximize + // visible area. + bool extra_padding_before_content_ = false; + + // When both the close button and alert indicator are visible, we add extra + // padding between them to space them out visually. + bool extra_alert_indicator_padding_ = false; + + // Indicates whether the mouse is currently hovered over the tab. This is + // different from View::IsMouseHovered() which does a naive intersection with + // the view bounds. + bool mouse_hovered_ = false; + + std::unique_ptr tab_close_button_observer_; + + // Freezing vote held while the tab is collapsed. + std::optional freezing_vote_; + + base::CallbackListSubscription paint_as_active_subscription_; +}; + +#endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_ diff --git a/src/components/flags_ui/flags_state.cc b/src/components/flags_ui/flags_state.cc index b83cc974..694dbff9 100644 --- a/src/components/flags_ui/flags_state.cc +++ b/src/components/flags_ui/flags_state.cc @@ -228,7 +228,11 @@ std::string GetCombinedOriginListValue(const FlagsStorage& flags_storage, command_line.GetSwitchValueASCII(command_line_switch); const std::string new_value = flags_storage.GetOriginListFlag(internal_entry_name); - if (command_line_switch == "custom-ntp") return existing_value.empty() ? new_value : existing_value; + if (command_line_switch == "custom-ntp") { + return existing_value.empty() + ? new_value + : existing_value; + } return CombineAndSanitizeOriginLists(existing_value, new_value); } @@ -467,8 +471,9 @@ void FlagsState::SetOriginListFlag(const std::string& internal_name, const std::string& value, FlagsStorage* flags_storage) { const std::string new_value = - internal_name == "custom-ntp" ? value : - CombineAndSanitizeOriginLists(std::string(), value); + internal_name == "custom-ntp" + ? value + : CombineAndSanitizeOriginLists(std::string(), value); flags_storage->SetOriginListFlag(internal_name, new_value); #if BUILDFLAG(IS_CHROMEOS_ASH) @@ -664,6 +669,7 @@ void FlagsState::GetFlagFeatureEntries( for (const FeatureEntry& entry : feature_entries_) { std::string desc = entry.visible_description; if (skip_feature_entry.Run(entry)) { + // Alex313031: Comment the next three lines for component builds. if (flags::IsFlagExpired(flags_storage, entry.internal_name)) desc.insert(0, " NOTE: THIS FLAG IS EXPIRED AND MAY STOP FUNCTIONING OR BE REMOVED SOON! "); else @@ -1076,9 +1082,11 @@ bool FlagsState::IsSupportedFeature(const FlagsStorage* storage, continue; if (!entry.InternalNameMatches(name)) continue; - if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry)) + if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry)) { + // Alex313031: Comment this line for component builds. if (!flags::IsFlagExpired(storage, entry.internal_name)) - continue; + continue; + } return true; } return false; diff --git a/src/components/neterror/resources/neterror.html b/src/components/neterror/resources/neterror.html index 7ea95d2b..e3df5b38 100644 --- a/src/components/neterror/resources/neterror.html +++ b/src/components/neterror/resources/neterror.html @@ -7,8 +7,6 @@ $i18n{title} - - diff --git a/src/components/neterror/resources/offline.js b/src/components/neterror/resources/offline.js index c0927f2b..ce6e8335 100644 --- a/src/components/neterror/resources/offline.js +++ b/src/components/neterror/resources/offline.js @@ -439,9 +439,24 @@ Runner.prototype = { // Hide the static icon. document.querySelector('.' + Runner.classes.ICON).style.visibility = 'hidden'; + document.head = document.head || document.getElementsByTagName('head')[0]; + var favicon100 = document.createElement('link'); + var favicon200 = document.createElement('link'); + favicon100.id = 'dynamic-favicon'; + favicon200.id = 'dynamic-favicon'; + favicon100.rel = 'shortcut icon'; + favicon200.rel = 'shortcut icon'; + favicon100.type = 'image/png'; + favicon200.type = 'image/png'; + favicon100.sizes = '16x16'; + favicon200.sizes = '32x32'; + favicon100.href = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA3XAAAN1wFCKJt4AAABCUlEQVQ4y5WSK2/DMBSFv1RFwSuJZIWYBHe0wystTumCRze+/zC84NFqtMHDISaRJZMal27kZqqsm7Q7kiU/7uPc45NxBYV3G6BWnt6CscOS6zgCrVLkCcgW3IZ66uHWApNY/jO+BTogAsMfg8K73YyAIyJwBtZAHoz9vmTwAnwmyR/A48XVEIxt0iaZBP8IvWdgBRyAMomNwAnYj91TDWoglwKlMtEgDQZNxB6ogN2cgsHYbuobH0TdueT7SR8EYyOwB76UmCjUVWSFdyVwJ+cz8A5sZCyALhjbFN6tteILRahW9ltZs8gS06yETRmMfZX7I9AEY3vVyjJCPipceFcp9tVcWgVj+1+cIE8di05TcgAAAABJRU5ErkJggg=='; + favicon200.href = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAA3XAAAN1wFCKJt4AAABxklEQVRYw81XoW7DMBB9mYKKM2LJKjEJTmn4cPFG23/oB+QfGjpePB7a4BCDZZaMiks3cp28yE7s1G13UqUmju13d+/e2QkiGFOyBJB7ft5pLprLQ4o49gpg4/ltDeAXQBLB+2/6ewbQUSQWU/M0FwkAPCGedZqLFYHwtpgAcqbkMYALUTkACnsROilmBGbZwwGkN15/+2gAraVSzvcEcBw8r4agUkNQjgAqzcXBU4DWAHaO4QOAyqYVYykoAGQeG+cASvq5yu6kuWhvRcISwD5WjhKLprckqUPP9wEN508laC7qEB1YMiX3TMnlYPMyYNPGpwRdKcjI0xNTsqd3oZ53mouaKVlMNacxDuyuza/mYjIK/6oXbM2Tyt17AeUsIw7kV6z5FuJIYim3wiKhIbbyFSEXBzrS7C6U+XPmJSOSuwPw4ln/DYAPzUU1WwkdIDaesjuqdqMkJOItXWICoDZk2myrhQ0cNauF5/59CuDZ0dV6OusP31XG2NYCIvfpqsZdwu/ywZT8ZEq+O8Y2V+uAsWAGYG25x1Vz8xxahmc6NrUAvszeYIuAx9gkCXOj1BrNRWc5TNYGBxAw5izxS8kmDgB3sx9qpKWGIYm9DgAAAABJRU5ErkJggg=='; if (this.isArcadeMode()) { document.title = 'Thorium Dino Game' + document.head.appendChild(favicon100); + document.head.appendChild(favicon200); } this.adjustDimensions(); diff --git a/src/media/base/supported_types.cc b/src/media/base/supported_types.cc index e8196966..836846ce 100644 --- a/src/media/base/supported_types.cc +++ b/src/media/base/supported_types.cc @@ -226,8 +226,9 @@ bool IsHevcProfileSupported(const VideoType& type) { #if BUILDFLAG(IS_ANDROID) if (base::FeatureList::IsEnabled(kBuiltInH264Decoder)) { return true; + } else { + return GetSupplementalProfileCache()->IsProfileSupported(type.profile); } - return GetSupplementalProfileCache()->IsProfileSupported(type.profile); #else return true; #endif // BUILDFLAG(IS_ANDROID) diff --git a/src/media/ffmpeg/ffmpeg_common.cc b/src/media/ffmpeg/ffmpeg_common.cc index 22119846..a425799b 100644 --- a/src/media/ffmpeg/ffmpeg_common.cc +++ b/src/media/ffmpeg/ffmpeg_common.cc @@ -134,10 +134,12 @@ AVCodecID AudioCodecToCodecID(AudioCodec audio_codec, switch (audio_codec) { case AudioCodec::kAAC: return AV_CODEC_ID_AAC; +#if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO) case AudioCodec::kAC3: return AV_CODEC_ID_AC3; case AudioCodec::kEAC3: return AV_CODEC_ID_EAC3; +#endif case AudioCodec::kALAC: return AV_CODEC_ID_ALAC; case AudioCodec::kMP3: diff --git a/src/media/filters/ffmpeg_video_decoder.cc b/src/media/filters/ffmpeg_video_decoder.cc index 40534a2e..afd52a44 100644 --- a/src/media/filters/ffmpeg_video_decoder.cc +++ b/src/media/filters/ffmpeg_video_decoder.cc @@ -29,6 +29,7 @@ #include "media/base/supported_types.h" #include "media/base/timestamp_constants.h" #include "media/base/video_aspect_ratio.h" +#include "media/base/video_codecs.h" #include "media/base/video_frame.h" #include "media/base/video_util.h" #include "media/ffmpeg/ffmpeg_common.h" @@ -84,6 +85,7 @@ static int GetFFmpegVideoDecoderThreadCount(const VideoDecoderConfig& config) { case VideoCodec::kMPEG2: case VideoCodec::kVP9: case VideoCodec::kAV1: + case VideoCodec::kDolbyVision: case VideoCodec::kTheora: case VideoCodec::kMPEG4: case VideoCodec::kVP8: @@ -92,7 +94,6 @@ static int GetFFmpegVideoDecoderThreadCount(const VideoDecoderConfig& config) { case VideoCodec::kH264: case VideoCodec::kHEVC: - case VideoCodec::kDolbyVision: // Normalize to three threads for 1080p content, then scale linearly // with number of pixels. // Examples: