Date: Wednesday, July 6, 2022 @ 19:36:06 Author: archange Revision: 1246753
upgpkg: electron 19.0.7-1 Sync a bit with current chromium PKGBUILD Added: electron/trunk/chromium-libxml-unbundle.patch electron/trunk/remove-no-opaque-pointers-flag.patch electron/trunk/roll-src-third_party-ffmpeg.patch Modified: electron/trunk/PKGBUILD electron/trunk/std-vector-non-const.patch Deleted: electron/trunk/enable-GlobalMediaControlsCastStartStop.patch electron/trunk/fix-no-member-named-tie-in-namespace-std.patch electron/trunk/iwyu-add-vector-needed-by-statsentry.patch electron/trunk/webcodecs-stop-using-AudioOpusEncoder.patch electron/trunk/webrtc-check-existence-of-cursor-metadata.patch -------------------------------------------------+ PKGBUILD | 93 +++--- chromium-libxml-unbundle.patch | 10 enable-GlobalMediaControlsCastStartStop.patch | 32 -- fix-no-member-named-tie-in-namespace-std.patch | 28 - iwyu-add-vector-needed-by-statsentry.patch | 29 - remove-no-opaque-pointers-flag.patch | 18 + roll-src-third_party-ffmpeg.patch | 333 ++++++++++++++++++++++ std-vector-non-const.patch | 98 ++---- webcodecs-stop-using-AudioOpusEncoder.patch | 49 --- webrtc-check-existence-of-cursor-metadata.patch | 31 -- 10 files changed, 451 insertions(+), 270 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-07-06 19:33:41 UTC (rev 1246752) +++ PKGBUILD 2022-07-06 19:36:06 UTC (rev 1246753) @@ -1,10 +1,10 @@ # Maintainer: Nicola Squartini <[email protected]> _use_suffix=0 -pkgver=18.2.4 -_commit=f4ba63536a3558f814a81015ecbfaf3451be5694 -_chromiumver=100.0.4896.160 -_gcc_patchset=4 +pkgver=19.0.7 +_commit=2f4e7679f826c9c6d8ba08aa860f283e5d52e5ad +_chromiumver=102.0.5005.134 +_gcc_patchset=6 # shellcheck disable=SC2034 pkgrel=1 @@ -35,7 +35,7 @@ 'libappindicator-gtk3: StatusNotifierItem support' 'pipewire: WebRTC desktop sharing under Wayland' 'trash-cli: file deletion support (trash-put)' - "xdg-utils: open URLs with desktop's default (xdg-email, xdg-open)") + 'xdg-utils: open URLs with desktop’s default (xdg-email, xdg-open)') if [[ ${_use_suffix} == 0 ]]; then # shellcheck disable=SC2034 conflicts=("electron${_major_ver}") @@ -52,34 +52,27 @@ "electron.desktop" 'default_app-icon.patch' 'jinja-python-3.10.patch' + 'use-system-libraries-in-node.patch' 'std-vector-non-const.patch' - 'use-system-libraries-in-node.patch' - 'webcodecs-stop-using-AudioOpusEncoder.patch' - 'webrtc-check-existence-of-cursor-metadata.patch' - 'fix-no-member-named-tie-in-namespace-std.patch' - 'iwyu-add-utility-for-std-exchange.patch' - 'iwyu-add-vector-needed-by-statsentry.patch' - 'enable-GlobalMediaControlsCastStartStop.patch' + 'roll-src-third_party-ffmpeg.patch' + 'chromium-libxml-unbundle.patch' 'sql-make-VirtualCursor-standard-layout-type.patch' + 'remove-no-opaque-pointers-flag.patch' ) # shellcheck disable=SC2034 sha256sums=('SKIP' 'SKIP' - 'a6120e7d4eb5e131b87b6ab3b922e0c6cd78e15501e54cfb2019875173688d80' + '23f2a772c4a6e31394d6ee7b8dbb5967d3b92bd859093444913377934bede594' '3953f532a3ea5fce19ee33600c6ead89dcd066df6a01d3c3ab4c24f96e46fca2' '4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae' 'dd2d248831dd4944d385ebf008426e66efe61d6fdf66f8932c963a12167947b4' '55dbe71dbc1f3ab60bf1fa79f7aea7ef1fe76436b1d7df48728a1f8227d2134e' - '880abb38ea94058ad553eaec9989cb33aa3b10c54b44afcfddacef3e975152de' 'c70652a8b24c237bcfd27469de32797a2cb46d9f0d63d897bb6418314a25644c' - '064daaa2b9d95b96ec04d8ddebf4af441f92263d123365b58fe73966866080af' - '88b2c8d9c6c1917f6632453f18aad7a3fd94d605eecb6c77ae2394ac5856ba95' - '7ad0106161bbf25e2e603ae1a723ae4217155ebb26eb4778363ad396e8c14156' - '6f666ef0acb08704ca58cc0d5e97e7ce64d8fea51042e593adae1ce15a61231c' - '0ec88c8022c946ac333cbc1060d6b9cacbef6c4a86fe8763d23add6939a3c490' - '779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6' + '76b969e1534e8c355b8b524a686cbf3b24136eaa6bd40b0c09fdd9866049f159' + '30df59a9e2d95dcb720357ec4a83d9be51e59cc5551365da4c0073e68ccdec44' + 'fd3bf124aacc45f2d0a4f1dd86303fa7f2a3d4f4eeaf33854631d6cb39e12485' 'b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a' - ) + 'e8ea8528ecb119de3380555c60ac8495ebdef502359fa2114c6c5c98f84698cd') _system_libs=('ffmpeg' 'flac' @@ -172,24 +165,24 @@ cd .. echo "Applying local patches..." - # Upstream fixes - patch -Np1 -i ../webcodecs-stop-using-AudioOpusEncoder.patch - patch -Np1 -d third_party/webrtc <../webrtc-check-existence-of-cursor-metadata.patch + # Remove '-Xclang -no-opaque-pointers' flag not supported by our clang + patch -Np1 -i ../remove-no-opaque-pointers-flag.patch - # Upstream fixes - patch -Np1 -i ../fix-no-member-named-tie-in-namespace-std.patch - patch -Np1 -i ../iwyu-add-utility-for-std-exchange.patch - patch -Np1 -i ../iwyu-add-vector-needed-by-statsentry.patch + # Revert ffmpeg roll requiring new channel layout API support + # https://crbug.com/1325301 + patch -Rp1 -i ../roll-src-third_party-ffmpeg.patch - # Revert kGlobalMediaControlsCastStartStop enabled by default - # https://crbug.com/1314342 - patch -Rp1 -F3 -i ../enable-GlobalMediaControlsCastStartStop.patch + # https://chromium-review.googlesource.com/c/chromium/src/+/3488058 + patch -Np1 -i ../chromium-libxml-unbundle.patch # https://chromium-review.googlesource.com/c/chromium/src/+/2862724 patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch # Fixes for building with libstdc++ instead of libc++ - #patch -Np1 -i ../patches/ + patch -Np1 -i ../patches/chromium-102-fenced_frame_utils-include.patch + patch -Np1 -i ../patches/chromium-102-regex_pattern-array.patch + patch -Np1 -i ../patches/chromium-102-swiftshader-template-instantiation.patch + patch -Np1 -i ../patches/chromium-102-symbolize-include.patch # Electron specific fixes patch -d third_party/electron_node/tools/inspector_protocol/jinja2 \ @@ -223,9 +216,25 @@ export AR=ar export NM=nm - CFLAGS="${CFLAGS/-fexceptions/}" - CXXFLAGS="${CXXFLAGS/-fexceptions/}" + # Facilitate deterministic builds (taken from build/config/compiler/BUILD.gn) + CFLAGS+=' -Wno-builtin-macro-redefined' + CXXFLAGS+=' -Wno-builtin-macro-redefined' + CPPFLAGS+=' -D__DATE__= -D__TIME__= -D__TIMESTAMP__=' + # Do not warn about unknown warning options + CFLAGS+=' -Wno-unknown-warning-option' + CXXFLAGS+=' -Wno-unknown-warning-option' + + # Let Chromium set its own symbol level + CFLAGS=${CFLAGS/-g } + CXXFLAGS=${CXXFLAGS/-g } + + # https://github.com/ungoogled-software/ungoogled-chromium-archlinux/issues/123 + CFLAGS=${CFLAGS/-fexceptions} + CFLAGS=${CFLAGS/-fcf-protection} + CXXFLAGS=${CXXFLAGS/-fexceptions} + CXXFLAGS=${CXXFLAGS/-fcf-protection} + # This appears to cause random segfaults when combined with ThinLTO # https://bugs.archlinux.org/task/73518 CFLAGS=${CFLAGS/-fstack-clash-protection} @@ -241,19 +250,19 @@ cd src || exit export CHROMIUM_BUILDTOOLS_PATH="${PWD}/buildtools" GN_EXTRA_ARGS=' - blink_symbol_level = 0 - chrome_pgo_phase = 0 - clang_use_chrome_plugins = false custom_toolchain = "//build/toolchain/linux/unbundle:default" host_toolchain = "//build/toolchain/linux/unbundle:default" - icu_use_data_file = false - is_component_ffmpeg = false + clang_use_chrome_plugins = false + symbol_level = 0 + chrome_pgo_phase = 0 + treat_warnings_as_errors = false + rtc_use_pipewire = true link_pulseaudio = true - rtc_use_pipewire = true - treat_warnings_as_errors = false - use_custom_libcxx = false use_gnome_keyring = false use_sysroot = false + use_custom_libcxx = false + icu_use_data_file = false + is_component_ffmpeg = false ' gn gen out/Release \ --args="import(\"//electron/build/args/release.gn\") ${GN_EXTRA_ARGS}" Added: chromium-libxml-unbundle.patch =================================================================== --- chromium-libxml-unbundle.patch (rev 0) +++ chromium-libxml-unbundle.patch 2022-07-06 19:36:06 UTC (rev 1246753) @@ -0,0 +1,10 @@ +--- a/build/linux/unbundle/libxml.gn ++++ b/build/linux/unbundle/libxml.gn +@@ -19,6 +19,7 @@ static_library("libxml_utils") { + ":xml_reader", + ":xml_writer", + "//base/test:test_support", ++ "//services/data_decoder:lib", + "//services/data_decoder:xml_parser_fuzzer_deps", + ] + sources = [ Deleted: enable-GlobalMediaControlsCastStartStop.patch =================================================================== --- enable-GlobalMediaControlsCastStartStop.patch 2022-07-06 19:33:41 UTC (rev 1246752) +++ enable-GlobalMediaControlsCastStartStop.patch 2022-07-06 19:36:06 UTC (rev 1246753) @@ -1,32 +0,0 @@ -From b58f0f2725a8c1a8a131f9984b5fd53b54119dba Mon Sep 17 00:00:00 2001 -From: Muyao Xu <[email protected]> -Date: Thu, 20 Jan 2022 23:46:21 +0000 -Subject: [PATCH] [Zenith] Enable GlobalMediaControlsCastStartStop flag by - default - -The feature is rolled out to 100% stable through finch for M96+. -This CL enables it by default and fixes some unit tests failures. - -Bug: 1287242, 1287305 -Change-Id: I7e5c9625b77379fef253c41ef292a0dd6fc366fb -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3388416 -Reviewed-by: Takumi Fujimoto <[email protected]> -Commit-Queue: Muyao Xu <[email protected]> -Cr-Commit-Position: refs/heads/main@{#961658} ---- - chrome/browser/media/router/media_router_feature.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc -index f28f9b0b802..a8d544f7d6d 100644 ---- a/chrome/browser/media/router/media_router_feature.cc -+++ b/chrome/browser/media/router/media_router_feature.cc -@@ -33,7 +33,7 @@ const base::Feature kMediaRouter{"MediaRouter", - const base::Feature kCastAllowAllIPsFeature{"CastAllowAllIPs", - base::FEATURE_DISABLED_BY_DEFAULT}; - const base::Feature kGlobalMediaControlsCastStartStop{ -- "GlobalMediaControlsCastStartStop", base::FEATURE_DISABLED_BY_DEFAULT}; -+ "GlobalMediaControlsCastStartStop", base::FEATURE_ENABLED_BY_DEFAULT}; - const base::Feature kAllowAllSitesToInitiateMirroring{ - "AllowAllSitesToInitiateMirroring", base::FEATURE_DISABLED_BY_DEFAULT}; - const base::Feature kDialMediaRouteProvider{"DialMediaRouteProvider", Deleted: fix-no-member-named-tie-in-namespace-std.patch =================================================================== --- fix-no-member-named-tie-in-namespace-std.patch 2022-07-06 19:33:41 UTC (rev 1246752) +++ fix-no-member-named-tie-in-namespace-std.patch 2022-07-06 19:36:06 UTC (rev 1246753) @@ -1,28 +0,0 @@ -From 68c9c63c0b148ff5246a0cdad59000697bbd8645 Mon Sep 17 00:00:00 2001 -From: Maksim Sisov <[email protected]> -Date: Tue, 12 Apr 2022 15:11:34 +0000 -Subject: [PATCH] Fix no member named 'tie' in namespace 'std' - -Bug: None -Change-Id: I8a097af2b16b738fa9bbb8231536bca85522f350 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3581869 -Auto-Submit: Maksim Sisov <[email protected]> -Reviewed-by: Matt Menke <[email protected]> -Commit-Queue: Matt Menke <[email protected]> -Cr-Commit-Position: refs/heads/main@{#991529} ---- - net/base/address_list.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/net/base/address_list.h b/net/base/address_list.h -index 029af1aded3..a93093e41f3 100644 ---- a/net/base/address_list.h -+++ b/net/base/address_list.h -@@ -8,6 +8,7 @@ - #include <stdint.h> - - #include <string> -+#include <tuple> - #include <utility> - #include <vector> - Deleted: iwyu-add-vector-needed-by-statsentry.patch =================================================================== --- iwyu-add-vector-needed-by-statsentry.patch 2022-07-06 19:33:41 UTC (rev 1246752) +++ iwyu-add-vector-needed-by-statsentry.patch 2022-07-06 19:36:06 UTC (rev 1246753) @@ -1,29 +0,0 @@ -From 72b521be7640a1b06adf6881b12277276ab8609d Mon Sep 17 00:00:00 2001 -From: Piotr Tworek <[email protected]> -Date: Wed, 06 Apr 2022 19:34:29 +0000 -Subject: [PATCH] IWYU: Add vector needed by StatsEntry. - -This builds fine with libc++, but fails due to std::vector being -undefined when using libstdc++. Add missing vector include to fix this. - -Bug: 957519 -Change-Id: I12f91636fe9c69046ae36528e48782acf741b66c -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3557455 -Auto-Submit: Piotr Tworek <[email protected]> -Reviewed-by: Chrome Cunningham <[email protected]> -Commit-Queue: Chrome Cunningham <[email protected]> -Cr-Commit-Position: refs/heads/main@{#989578} ---- - -diff --git a/media/capabilities/webrtc_video_stats_db.h b/media/capabilities/webrtc_video_stats_db.h -index 8a5c0cf..0e8653b 100644 ---- a/media/capabilities/webrtc_video_stats_db.h -+++ b/media/capabilities/webrtc_video_stats_db.h -@@ -7,6 +7,7 @@ - - #include <memory> - #include <string> -+#include <vector> - - #include "base/callback_forward.h" - #include "base/check.h" Added: remove-no-opaque-pointers-flag.patch =================================================================== --- remove-no-opaque-pointers-flag.patch (rev 0) +++ remove-no-opaque-pointers-flag.patch 2022-07-06 19:36:06 UTC (rev 1246753) @@ -0,0 +1,18 @@ +--- a/build/config/compiler/BUILD.gn 2022-05-19 10:35:52.991415777 +0000 ++++ b/build/config/compiler/BUILD.gn 2022-05-19 10:36:11.102017131 +0000 +@@ -1538,15 +1538,6 @@ config("default_warnings") { + cflags += [ "-Wno-deprecated-non-prototype" ] + } + +- if (!is_nacl && !(is_chromeos || +- default_toolchain == "//build/toolchain/cros:target")) { +- # TODO(https://crbug.com/1316298): Re-enable once test failure is figured out +- cflags += [ +- "-Xclang", +- "-no-opaque-pointers", +- ] +- } +- + if (is_fuchsia) { + # TODO(https://bugs.chromium.org/p/fuchsia/issues/detail?id=77383) + cflags += [ "-Wno-deprecated-copy" ] Added: roll-src-third_party-ffmpeg.patch =================================================================== --- roll-src-third_party-ffmpeg.patch (rev 0) +++ roll-src-third_party-ffmpeg.patch 2022-07-06 19:36:06 UTC (rev 1246753) @@ -0,0 +1,333 @@ +From 6e554a30893150793c2638e3689cf208ffc8e375 Mon Sep 17 00:00:00 2001 +From: Dale Curtis <[email protected]> +Date: Sat, 2 Apr 2022 05:13:53 +0000 +Subject: [PATCH] Roll src/third_party/ffmpeg/ 574c39cce..32b2d1d526 (1125 + commits) + +https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/574c39cce323..32b2d1d526 + +Created with: + roll-dep src/third_party/ffmpeg + +Fixed: 1293918 +Cq-Include-Trybots: luci.chromium.try:mac_chromium_asan_rel_ng,linux_chromium_asan_rel_ng,linux_chromium_chromeos_asan_rel_ng +Change-Id: I41945d0f963e3d1f65940067bac22f63b68e37d2 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3565647 +Auto-Submit: Dale Curtis <[email protected]> +Reviewed-by: Dan Sanders <[email protected]> +Commit-Queue: Dale Curtis <[email protected]> +Cr-Commit-Position: refs/heads/main@{#988253} +--- + .../clear_key_cdm/ffmpeg_cdm_audio_decoder.cc | 29 ++++++++++--------- + media/ffmpeg/ffmpeg_common.cc | 11 +++---- + media/filters/audio_file_reader.cc | 9 +++--- + media/filters/audio_file_reader_unittest.cc | 6 ++-- + .../filters/audio_video_metadata_extractor.cc | 11 +++++-- + .../filters/ffmpeg_aac_bitstream_converter.cc | 7 +++-- + ...ffmpeg_aac_bitstream_converter_unittest.cc | 2 +- + media/filters/ffmpeg_audio_decoder.cc | 13 +++++---- + 8 files changed, 51 insertions(+), 37 deletions(-) + +diff --git a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc +index e4fc3f460e2..9b1ad9f7675 100644 +--- a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc ++++ b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc +@@ -74,7 +74,7 @@ void CdmAudioDecoderConfigToAVCodecContext( + codec_context->sample_fmt = AV_SAMPLE_FMT_NONE; + } + +- codec_context->channels = config.channel_count; ++ codec_context->ch_layout.nb_channels = config.channel_count; + codec_context->sample_rate = config.samples_per_second; + + if (config.extra_data) { +@@ -124,8 +124,8 @@ void CopySamples(cdm::AudioFormat cdm_format, + case cdm::kAudioFormatPlanarS16: + case cdm::kAudioFormatPlanarF32: { + const int decoded_size_per_channel = +- decoded_audio_size / av_frame.channels; +- for (int i = 0; i < av_frame.channels; ++i) { ++ decoded_audio_size / av_frame.ch_layout.nb_channels; ++ for (int i = 0; i < av_frame.ch_layout.nb_channels; ++i) { + memcpy(output_buffer, av_frame.extended_data[i], + decoded_size_per_channel); + output_buffer += decoded_size_per_channel; +@@ -185,13 +185,14 @@ bool FFmpegCdmAudioDecoder::Initialize( + // Success! + decoding_loop_ = std::make_unique<FFmpegDecodingLoop>(codec_context_.get()); + samples_per_second_ = config.samples_per_second; +- bytes_per_frame_ = codec_context_->channels * config.bits_per_channel / 8; ++ bytes_per_frame_ = ++ codec_context_->ch_layout.nb_channels * config.bits_per_channel / 8; + output_timestamp_helper_ = + std::make_unique<AudioTimestampHelper>(config.samples_per_second); + is_initialized_ = true; + + // Store initial values to guard against midstream configuration changes. +- channels_ = codec_context_->channels; ++ channels_ = codec_context_->ch_layout.nb_channels; + av_sample_format_ = codec_context_->sample_fmt; + + return true; +@@ -291,17 +292,19 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer( + for (auto& frame : audio_frames) { + int decoded_audio_size = 0; + if (frame->sample_rate != samples_per_second_ || +- frame->channels != channels_ || frame->format != av_sample_format_) { ++ frame->ch_layout.nb_channels != channels_ || ++ frame->format != av_sample_format_) { + DLOG(ERROR) << "Unsupported midstream configuration change!" + << " Sample Rate: " << frame->sample_rate << " vs " +- << samples_per_second_ << ", Channels: " << frame->channels +- << " vs " << channels_ << ", Sample Format: " << frame->format +- << " vs " << av_sample_format_; ++ << samples_per_second_ ++ << ", Channels: " << frame->ch_layout.nb_channels << " vs " ++ << channels_ << ", Sample Format: " << frame->format << " vs " ++ << av_sample_format_; + return cdm::kDecodeError; + } + + decoded_audio_size = av_samples_get_buffer_size( +- nullptr, codec_context_->channels, frame->nb_samples, ++ nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples, + codec_context_->sample_fmt, 1); + if (!decoded_audio_size) + continue; +@@ -320,9 +323,9 @@ bool FFmpegCdmAudioDecoder::OnNewFrame( + size_t* total_size, + std::vector<std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame>>* audio_frames, + AVFrame* frame) { +- *total_size += av_samples_get_buffer_size(nullptr, codec_context_->channels, +- frame->nb_samples, +- codec_context_->sample_fmt, 1); ++ *total_size += av_samples_get_buffer_size( ++ nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples, ++ codec_context_->sample_fmt, 1); + audio_frames->emplace_back(av_frame_clone(frame)); + return true; + } +diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc +index 87ca8969626..76f03d6608e 100644 +--- a/media/ffmpeg/ffmpeg_common.cc ++++ b/media/ffmpeg/ffmpeg_common.cc +@@ -345,10 +345,11 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context, + codec_context->sample_fmt, codec_context->codec_id); + + ChannelLayout channel_layout = +- codec_context->channels > 8 ++ codec_context->ch_layout.nb_channels > 8 + ? CHANNEL_LAYOUT_DISCRETE +- : ChannelLayoutToChromeChannelLayout(codec_context->channel_layout, +- codec_context->channels); ++ : ChannelLayoutToChromeChannelLayout( ++ codec_context->ch_layout.u.mask, ++ codec_context->ch_layout.nb_channels); + + int sample_rate = codec_context->sample_rate; + switch (codec) { +@@ -401,7 +402,7 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context, + extra_data, encryption_scheme, seek_preroll, + codec_context->delay); + if (channel_layout == CHANNEL_LAYOUT_DISCRETE) +- config->SetChannelsForDiscrete(codec_context->channels); ++ config->SetChannelsForDiscrete(codec_context->ch_layout.nb_channels); + + #if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO) + // These are bitstream formats unknown to ffmpeg, so they don't have +@@ -470,7 +471,7 @@ void AudioDecoderConfigToAVCodecContext(const AudioDecoderConfig& config, + + // TODO(scherkus): should we set |channel_layout|? I'm not sure if FFmpeg uses + // said information to decode. +- codec_context->channels = config.channels(); ++ codec_context->ch_layout.nb_channels = config.channels(); + codec_context->sample_rate = config.samples_per_second(); + + if (config.extra_data().empty()) { +diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc +index 5f257bdfaa6..e1be5aa9a5b 100644 +--- a/media/filters/audio_file_reader.cc ++++ b/media/filters/audio_file_reader.cc +@@ -113,14 +113,15 @@ bool AudioFileReader::OpenDecoder() { + + // Verify the channel layout is supported by Chrome. Acts as a sanity check + // against invalid files. See http://crbug.com/171962 +- if (ChannelLayoutToChromeChannelLayout(codec_context_->channel_layout, +- codec_context_->channels) == ++ if (ChannelLayoutToChromeChannelLayout( ++ codec_context_->ch_layout.u.mask, ++ codec_context_->ch_layout.nb_channels) == + CHANNEL_LAYOUT_UNSUPPORTED) { + return false; + } + + // Store initial values to guard against midstream configuration changes. +- channels_ = codec_context_->channels; ++ channels_ = codec_context_->ch_layout.nb_channels; + audio_codec_ = CodecIDToAudioCodec(codec_context_->codec_id); + sample_rate_ = codec_context_->sample_rate; + av_sample_format_ = codec_context_->sample_fmt; +@@ -223,7 +224,7 @@ bool AudioFileReader::OnNewFrame( + if (frames_read < 0) + return false; + +- const int channels = frame->channels; ++ const int channels = frame->ch_layout.nb_channels; + if (frame->sample_rate != sample_rate_ || channels != channels_ || + frame->format != av_sample_format_) { + DLOG(ERROR) << "Unsupported midstream configuration change!" +diff --git a/media/filters/audio_file_reader_unittest.cc b/media/filters/audio_file_reader_unittest.cc +index 2aba7927a31..1f45a50cace 100644 +--- a/media/filters/audio_file_reader_unittest.cc ++++ b/media/filters/audio_file_reader_unittest.cc +@@ -121,11 +121,11 @@ class AudioFileReaderTest : public testing::Test { + EXPECT_FALSE(reader_->Open()); + } + +- void RunTestFailingDecode(const char* fn) { ++ void RunTestFailingDecode(const char* fn, int expect_read = 0) { + Initialize(fn); + EXPECT_TRUE(reader_->Open()); + std::vector<std::unique_ptr<AudioBus>> decoded_audio_packets; +- EXPECT_EQ(reader_->Read(&decoded_audio_packets), 0); ++ EXPECT_EQ(reader_->Read(&decoded_audio_packets), expect_read); + } + + void RunTestPartialDecode(const char* fn) { +@@ -219,7 +219,7 @@ TEST_F(AudioFileReaderTest, AAC_ADTS) { + } + + TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) { +- RunTestFailingDecode("midstream_config_change.mp3"); ++ RunTestFailingDecode("midstream_config_change.mp3", 42624); + } + #endif + +diff --git a/media/filters/audio_video_metadata_extractor.cc b/media/filters/audio_video_metadata_extractor.cc +index 185819eb936..69ff508c221 100644 +--- a/media/filters/audio_video_metadata_extractor.cc ++++ b/media/filters/audio_video_metadata_extractor.cc +@@ -113,6 +113,15 @@ bool AudioVideoMetadataExtractor::Extract(DataSource* source, + if (!stream) + continue; + ++ void* display_matrix = ++ av_stream_get_side_data(stream, AV_PKT_DATA_DISPLAYMATRIX, nullptr); ++ if (display_matrix) { ++ rotation_ = VideoTransformation::FromFFmpegDisplayMatrix( ++ static_cast<int32_t*>(display_matrix)) ++ .rotation; ++ info.tags["rotate"] = base::NumberToString(rotation_); ++ } ++ + // Extract dictionary from streams also. Needed for containers that attach + // metadata to contained streams instead the container itself, like OGG. + ExtractDictionary(stream->metadata, &info.tags); +@@ -255,8 +264,6 @@ void AudioVideoMetadataExtractor::ExtractDictionary(AVDictionary* metadata, + if (raw_tags->find(tag->key) == raw_tags->end()) + (*raw_tags)[tag->key] = tag->value; + +- if (ExtractInt(tag, "rotate", &rotation_)) +- continue; + if (ExtractString(tag, "album", &album_)) + continue; + if (ExtractString(tag, "artist", &artist_)) +diff --git a/media/filters/ffmpeg_aac_bitstream_converter.cc b/media/filters/ffmpeg_aac_bitstream_converter.cc +index 6f231c85729..ca5e5fb927d 100644 +--- a/media/filters/ffmpeg_aac_bitstream_converter.cc ++++ b/media/filters/ffmpeg_aac_bitstream_converter.cc +@@ -195,14 +195,15 @@ bool FFmpegAACBitstreamConverter::ConvertPacket(AVPacket* packet) { + if (!header_generated_ || codec_ != stream_codec_parameters_->codec_id || + audio_profile_ != stream_codec_parameters_->profile || + sample_rate_index_ != sample_rate_index || +- channel_configuration_ != stream_codec_parameters_->channels || ++ channel_configuration_ != ++ stream_codec_parameters_->ch_layout.nb_channels || + frame_length_ != header_plus_packet_size) { + header_generated_ = + GenerateAdtsHeader(stream_codec_parameters_->codec_id, + 0, // layer + stream_codec_parameters_->profile, sample_rate_index, + 0, // private stream +- stream_codec_parameters_->channels, ++ stream_codec_parameters_->ch_layout.nb_channels, + 0, // originality + 0, // home + 0, // copyrighted_stream +@@ -214,7 +215,7 @@ bool FFmpegAACBitstreamConverter::ConvertPacket(AVPacket* packet) { + codec_ = stream_codec_parameters_->codec_id; + audio_profile_ = stream_codec_parameters_->profile; + sample_rate_index_ = sample_rate_index; +- channel_configuration_ = stream_codec_parameters_->channels; ++ channel_configuration_ = stream_codec_parameters_->ch_layout.nb_channels; + frame_length_ = header_plus_packet_size; + } + +diff --git a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc +index 1fd4c5ccd7d..f59bcd8fdaf 100644 +--- a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc ++++ b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc +@@ -34,7 +34,7 @@ class FFmpegAACBitstreamConverterTest : public testing::Test { + memset(&test_parameters_, 0, sizeof(AVCodecParameters)); + test_parameters_.codec_id = AV_CODEC_ID_AAC; + test_parameters_.profile = FF_PROFILE_AAC_MAIN; +- test_parameters_.channels = 2; ++ test_parameters_.ch_layout.nb_channels = 2; + test_parameters_.extradata = extradata_header_; + test_parameters_.extradata_size = sizeof(extradata_header_); + } +diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc +index 6a56c675f7d..4615fdeb3fb 100644 +--- a/media/filters/ffmpeg_audio_decoder.cc ++++ b/media/filters/ffmpeg_audio_decoder.cc +@@ -28,7 +28,7 @@ namespace media { + + // Return the number of channels from the data in |frame|. + static inline int DetermineChannels(AVFrame* frame) { +- return frame->channels; ++ return frame->ch_layout.nb_channels; + } + + // Called by FFmpeg's allocation routine to allocate a buffer. Uses +@@ -231,7 +231,7 @@ bool FFmpegAudioDecoder::OnNewFrame(const DecoderBuffer& buffer, + // Translate unsupported into discrete layouts for discrete configurations; + // ffmpeg does not have a labeled discrete configuration internally. + ChannelLayout channel_layout = ChannelLayoutToChromeChannelLayout( +- codec_context_->channel_layout, codec_context_->channels); ++ codec_context_->ch_layout.u.mask, codec_context_->ch_layout.nb_channels); + if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED && + config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE) { + channel_layout = CHANNEL_LAYOUT_DISCRETE; +@@ -348,11 +348,11 @@ bool FFmpegAudioDecoder::ConfigureDecoder(const AudioDecoderConfig& config) { + // Success! + av_sample_format_ = codec_context_->sample_fmt; + +- if (codec_context_->channels != config.channels()) { ++ if (codec_context_->ch_layout.nb_channels != config.channels()) { + MEDIA_LOG(ERROR, media_log_) + << "Audio configuration specified " << config.channels() + << " channels, but FFmpeg thinks the file contains " +- << codec_context_->channels << " channels"; ++ << codec_context_->ch_layout.nb_channels << " channels"; + ReleaseFFmpegResources(); + state_ = DecoderState::kUninitialized; + return false; +@@ -403,7 +403,7 @@ int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s, + if (frame->nb_samples <= 0) + return AVERROR(EINVAL); + +- if (s->channels != channels) { ++ if (s->ch_layout.nb_channels != channels) { + DLOG(ERROR) << "AVCodecContext and AVFrame disagree on channel count."; + return AVERROR(EINVAL); + } +@@ -436,7 +436,8 @@ int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s, + ChannelLayout channel_layout = + config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE + ? CHANNEL_LAYOUT_DISCRETE +- : ChannelLayoutToChromeChannelLayout(s->channel_layout, s->channels); ++ : ChannelLayoutToChromeChannelLayout(s->ch_layout.u.mask, ++ s->ch_layout.nb_channels); + + if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED) { + DLOG(ERROR) << "Unsupported channel layout."; Modified: std-vector-non-const.patch =================================================================== --- std-vector-non-const.patch 2022-07-06 19:33:41 UTC (rev 1246752) +++ std-vector-non-const.patch 2022-07-06 19:36:06 UTC (rev 1246753) @@ -1,15 +1,15 @@ ---- a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch -+++ b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch -@@ -46,7 +46,7 @@ - base::RepeatingCallback<bool(const base::CommandLine& command_line, +--- a/patches/chromium/feat_add_data_parameter_to_processsingleton.patch ++++ b/patches/chromium/feat_add_data_parameter_to_processsingleton.patch +@@ -32,7 +32,7 @@ index 5a64220aaf1309832dc0ad543e353de67fe0a779..e75c4f0d7cf1cac2e5862eb858800359 - const base::FilePath& current_directory)>; + + base::RepeatingCallback<bool(const base::CommandLine& command_line, + const base::FilePath& current_directory, --+ const std::vector<const uint8_t> additional_data, -++ const std::vector<uint8_t> additional_data, - + const NotificationAckCallback& ack_callback)>; +-+ const std::vector<const uint8_t> additional_data)>; +++ const std::vector<uint8_t> additional_data)>; #if BUILDFLAG(IS_WIN) -@@ -112,7 +112,7 @@ + ProcessSingleton(const std::string& program_name, +@@ -73,7 +73,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768 // |reader| is for sending back ACK message. void HandleMessage(const std::string& current_dir, const std::vector<std::string>& argv, @@ -18,7 +18,7 @@ SocketReader* reader); private: -@@ -133,7 +133,7 @@ +@@ -84,7 +84,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768 - const std::string& current_dir, const std::vector<std::string>& argv, + const std::string& current_dir, + const std::vector<std::string>& argv, @@ -27,7 +27,7 @@ SocketReader* reader) { DCHECK(ui_task_runner_->BelongsToCurrentThread()); DCHECK(reader); -@@ -195,7 +195,7 @@ +@@ -114,7 +114,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768 + base::StringToSizeT(tokens[0], &num_args); + std::vector<std::string> command_line(tokens.begin() + 1, tokens.begin() + 1 + num_args); + @@ -36,25 +36,16 @@ + if (tokens.size() >= 3 + num_args) { + size_t additional_data_size; + base::StringToSizeT(tokens[1 + num_args], &additional_data_size); -@@ -204,7 +204,7 @@ +@@ -123,7 +123,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768 + std::string(1, kTokenDelimiter)); + const uint8_t* additional_data_bits = + reinterpret_cast<const uint8_t*>(remaining_args.c_str()); --+ additional_data = std::vector<const uint8_t>(additional_data_bits, -++ additional_data = std::vector<uint8_t>(additional_data_bits, - + additional_data_bits + additional_data_size); +-+ additional_data = std::vector<const uint8_t>( +++ additional_data = std::vector<uint8_t>( + + additional_data_bits, additional_data_bits + additional_data_size); + } + -@@ -301,7 +301,7 @@ - +const DWORD kPipeTimeout = 10000; - +const DWORD kMaxMessageLength = 32 * 1024; - + --+std::unique_ptr<std::vector<const uint8_t>> g_ack_data; -++std::unique_ptr<std::vector<uint8_t>> g_ack_data; - +base::OneShotTimer g_ack_timer; - +HANDLE g_write_ack_pipe; - +bool g_write_ack_callback_called = false; -@@ -314,7 +314,7 @@ +@@ -189,7 +189,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f base::CommandLine* parsed_command_line, - base::FilePath* current_directory) { + base::FilePath* current_directory, @@ -63,7 +54,7 @@ // We should have enough room for the shortest command (min_message_size) // and also be a multiple of wchar_t bytes. The shortest command - // possible is L"START\0\0" (empty current directory and command line). -@@ -355,7 +355,7 @@ +@@ -230,7 +230,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f + msg.substr(fourth_null + 1, fifth_null - fourth_null); + const uint8_t* additional_data_bytes = + reinterpret_cast<const uint8_t*>(additional_data.c_str()); @@ -72,58 +63,47 @@ + additional_data_bytes + additional_data_length); + return true; -@@ -365,7 +365,7 @@ - - +void StoreAck(const base::span<const uint8_t>* ack_data) { - + if (ack_data) { --+ g_ack_data = std::make_unique<std::vector<const uint8_t>>(ack_data->begin(), -++ g_ack_data = std::make_unique<std::vector<uint8_t>>(ack_data->begin(), - + ack_data->end()); - + } else { - + g_ack_data = nullptr; -@@ -414,7 +414,7 @@ +@@ -241,7 +241,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f base::CommandLine parsed_command_line(base::CommandLine::NO_PROGRAM); base::FilePath current_directory; - if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory)) { -+ std::vector<const uint8_t> additional_data; ++ std::vector<uint8_t> additional_data; - + if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory, - + &additional_data)) { + + if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory, &additional_data)) { *result = TRUE; + return true; --- a/shell/browser/api/electron_api_app.cc +++ b/shell/browser/api/electron_api_app.cc -@@ -519,12 +519,12 @@ +@@ -519,10 +519,10 @@ bool NotificationCallbackWrapper( const base::RepeatingCallback< void(const base::CommandLine& command_line, const base::FilePath& current_directory, -- const std::vector<const uint8_t> additional_data, -+ const std::vector<uint8_t> additional_data, - const ProcessSingleton::NotificationAckCallback& ack_callback)>& - callback, +- const std::vector<const uint8_t> additional_data)>& callback, ++ const std::vector<uint8_t> additional_data)>& callback, const base::CommandLine& cmd, const base::FilePath& cwd, -- const std::vector<const uint8_t> additional_data, -+ const std::vector<uint8_t> additional_data, - const ProcessSingleton::NotificationAckCallback& ack_callback) { +- const std::vector<const uint8_t> additional_data) { ++ const std::vector<uint8_t> additional_data) { // Make sure the callback is called after app gets ready. if (Browser::Get()->is_ready()) { -@@ -1118,7 +1118,7 @@ - void App::OnSecondInstance( - const base::CommandLine& cmd, - const base::FilePath& cwd, -- const std::vector<const uint8_t> additional_data, -+ const std::vector<uint8_t> additional_data, - const ProcessSingleton::NotificationAckCallback& ack_callback) { + callback.Run(cmd, cwd, std::move(additional_data)); +@@ -1083,7 +1083,7 @@ std::string App::GetLocaleCountryCode() { + + void App::OnSecondInstance(const base::CommandLine& cmd, + const base::FilePath& cwd, +- const std::vector<const uint8_t> additional_data) { ++ const std::vector<uint8_t> additional_data) { v8::Isolate* isolate = JavascriptEnvironment::GetIsolate(); v8::Locker locker(isolate); + v8::HandleScope handle_scope(isolate); --- a/shell/browser/api/electron_api_app.h +++ b/shell/browser/api/electron_api_app.h -@@ -197,7 +197,7 @@ - void OnSecondInstance( - const base::CommandLine& cmd, - const base::FilePath& cwd, -- const std::vector<const uint8_t> additional_data, -+ const std::vector<uint8_t> additional_data, - const ProcessSingleton::NotificationAckCallback& ack_callback); +@@ -195,7 +195,7 @@ class App : public ElectronBrowserClient::Delegate, + std::string GetLocaleCountryCode(); + void OnSecondInstance(const base::CommandLine& cmd, + const base::FilePath& cwd, +- const std::vector<const uint8_t> additional_data); ++ const std::vector<uint8_t> additional_data); bool HasSingleInstanceLock() const; bool RequestSingleInstanceLock(gin::Arguments* args); + void ReleaseSingleInstanceLock(); Deleted: webcodecs-stop-using-AudioOpusEncoder.patch =================================================================== --- webcodecs-stop-using-AudioOpusEncoder.patch 2022-07-06 19:33:41 UTC (rev 1246752) +++ webcodecs-stop-using-AudioOpusEncoder.patch 2022-07-06 19:36:06 UTC (rev 1246753) @@ -1,49 +0,0 @@ -From 3bd46cb9a51773f103ef52b39d6407740eb0d60a Mon Sep 17 00:00:00 2001 -From: Eugene Zemtsov <[email protected]> -Date: Thu, 24 Feb 2022 23:17:20 +0000 -Subject: [PATCH] webcodecs: Stop using AudioOpusEncoder as backed for mojo - audio encoder - -AudioOpusEncoder was only used here for testing. Let's not let it get -comfortable. We'll use MF AAC encoder here when we have it. (Soon...) - -Bug: 1259883 -Change-Id: Ia1819395c8c8fd6d403d4b8558c12f9a1bf7e761 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3489449 -Commit-Queue: Eugene Zemtsov <[email protected]> -Auto-Submit: Eugene Zemtsov <[email protected]> -Reviewed-by: Dale Curtis <[email protected]> -Commit-Queue: Dale Curtis <[email protected]> -Cr-Commit-Position: refs/heads/main@{#974895} ---- - media/mojo/services/gpu_mojo_media_client.cc | 10 +--------- - 1 file changed, 1 insertion(+), 9 deletions(-) - -diff --git a/media/mojo/services/gpu_mojo_media_client.cc b/media/mojo/services/gpu_mojo_media_client.cc -index 8f83a4d6cf6..40cdaff8d3a 100644 ---- a/media/mojo/services/gpu_mojo_media_client.cc -+++ b/media/mojo/services/gpu_mojo_media_client.cc -@@ -13,7 +13,6 @@ - #include "build/chromeos_buildflags.h" - #include "gpu/ipc/service/gpu_channel.h" - #include "media/audio/audio_features.h" --#include "media/audio/audio_opus_encoder.h" - #include "media/base/audio_decoder.h" - #include "media/base/cdm_factory.h" - #include "media/base/media_switches.h" -@@ -119,14 +118,7 @@ std::unique_ptr<AudioEncoder> GpuMojoMediaClient::CreateAudioEncoder( - scoped_refptr<base::SequencedTaskRunner> task_runner) { - if (!base::FeatureList::IsEnabled(features::kPlatformAudioEncoder)) - return nullptr; -- // TODO(crbug.com/1259883) Right now Opus encoder is all we have, later on -- // we'll create a real platform encoder here. -- auto opus_encoder = std::make_unique<AudioOpusEncoder>(); -- auto encoding_runner = base::ThreadPool::CreateSequencedTaskRunner( -- {base::TaskPriority::USER_BLOCKING}); -- return std::make_unique<OffloadingAudioEncoder>(std::move(opus_encoder), -- std::move(encoding_runner), -- std::move(task_runner)); -+ return nullptr; - } - - VideoDecoderType GpuMojoMediaClient::GetDecoderImplementationType() { Deleted: webrtc-check-existence-of-cursor-metadata.patch =================================================================== --- webrtc-check-existence-of-cursor-metadata.patch 2022-07-06 19:33:41 UTC (rev 1246752) +++ webrtc-check-existence-of-cursor-metadata.patch 2022-07-06 19:36:06 UTC (rev 1246753) @@ -1,31 +0,0 @@ -From c2cd814cdd8cbf8dda6ccec2266327a5321fbde8 Mon Sep 17 00:00:00 2001 -From: Jan Grulich <[email protected]> -Date: Tue, 15 Mar 2022 14:31:55 +0100 -Subject: [PATCH] PipeWire capturer: check existence of cursor metadata - -Check whether there are any cursor metadata before we try to validate -and use them, otherwise we might crash on this. - -Bug: webrtc:13429 -Change-Id: I365da59a189b6b974cebafc94fec49d5b942efae -Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/255601 -Reviewed-by: Alexander Cooper <[email protected]> -Commit-Queue: Alexander Cooper <[email protected]> -Cr-Commit-Position: refs/heads/main@{#36240} ---- - .../desktop_capture/linux/wayland/shared_screencast_stream.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc -index a8c86e26..9e81df4c 100644 ---- a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc -+++ b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc -@@ -650,7 +650,7 @@ void SharedScreenCastStreamPrivate::ProcessBuffer(pw_buffer* buffer) { - const struct spa_meta_cursor* cursor = - static_cast<struct spa_meta_cursor*>(spa_buffer_find_meta_data( - spa_buffer, SPA_META_Cursor, sizeof(*cursor))); -- if (spa_meta_cursor_is_valid(cursor)) { -+ if (cursor && spa_meta_cursor_is_valid(cursor)) { - struct spa_meta_bitmap* bitmap = nullptr; - - if (cursor->bitmap_offset)
