Update libaom up to M115

https://bugs.webkit.org/show_bug.cgi?id=257959
rdar://problem/110645667

Reviewed by Eric Carlson.

* Source/ThirdParty/libwebrtc/Source/third_party/libaom: Resynced.
* Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj: Update list of files to compile

Canonical link: https://commits.webkit.org/265114@main

Author: youennf

Source/ThirdParty/libwebrtc/Source/third_party/libaom/BUILD.gn

@@ -1,4 +1,4 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
+# Copyright 2014 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -36,6 +36,10 @@ if (current_cpu == "x86") {
   } else {
     cpu_arch_full = "arm"
   }
+} else if (current_cpu == "riscv64") {
+  cpu_arch_full = "generic"
+} else if (current_cpu == "loong64") {
+  cpu_arch_full = "generic"
 } else {
   cpu_arch_full = current_cpu
 }
@@ -197,9 +201,7 @@ if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" ||
     }
     configs += [ ":libaom_config" ]
 
-    # https://bugs.chromium.org/p/aomedia/issues/detail?id=2294
-    sources = [ "//third_party/libaom/source/libaom/aom_ports/arm_cpudetect.c" ]
-    sources += aom_av1_common_intrin_neon
+    sources = aom_av1_common_intrin_neon
     sources += aom_dsp_common_intrin_neon
     sources += aom_av1_encoder_intrin_neon
     sources += aom_dsp_encoder_intrin_neon
@@ -226,7 +228,7 @@ static_library("libaom") {
   sources += aom_util_sources
   sources += aom_av1_encoder_sources
   sources += aom_dsp_encoder_sources
-  if (use_libfuzzer) {
+  if (use_fuzzing_engine) {
     # Note this is inherited from OSS-Fuzz where the fuzzers were being run
     # with a 2 GB total allocation limit.
     if (is_msan) {
@@ -256,13 +258,36 @@ static_library("libaom") {
       cpu_arch_full == "arm-neon-cpu-detect") {
     deps += [ ":libaom_intrinsics_neon" ]
   }
+  if (current_cpu == "arm64" || current_cpu == "arm") {
+    # This is needed by all arm boards due to aom_arm_cpu_caps()
+    sources +=
+        [ "//third_party/libaom/source/libaom/aom_ports/arm_cpudetect.c" ]
+  }
   if (is_android) {
     deps += [ "//third_party/android_ndk:cpu_features" ]
   }
   public_configs = [ ":libaom_external_config" ]
   public_deps = [ ":libaom_buildflags" ]
 }
 
+static_library("libaomrc") {
+  if (!is_debug && is_win) {
+    configs -= [ "//build/config/compiler:default_optimization" ]
+    configs += [ "//build/config/compiler:optimize_max" ]
+  }
+
+  sources = [
+    "//third_party/libaom/source/libaom/av1/ratectrl_rtc.cc",
+    "//third_party/libaom/source/libaom/av1/ratectrl_rtc.h",
+  ]
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
+  configs += [ ":libaom_config" ]
+
+  public_configs = [ ":libaom_external_config" ]
+  public_deps = [ ":libaom" ]
+}
+
 fuzzer_test("libaom_av1_dec_fuzzer") {
   sources = [ "source/libaom/examples/av1_dec_fuzzer.cc" ]
   seed_corpus = "fuzz/av1_dec_fuzzer_corpus"

Source/ThirdParty/libwebrtc/Source/third_party/libaom/OWNERS

@@ -1,5 +1,4 @@
-tomfinegan@chromium.org
-johannkoenig@google.com
+# Primary OWNERS
 jzern@chromium.org
 jzern@google.com
 wtc@google.com

Source/ThirdParty/libwebrtc/Source/third_party/libaom/README.chromium

@@ -1,10 +1,10 @@
 Name: Alliance for Open Media Video Codec
 Short Name: libaom
 URL: https://aomedia.googlesource.com/aom/
-Version: 3.4.0
-Date: Sunday August 07 2022
-Revision: 121f3851459d5ee2ca1b5b23c6187bda79984eb2
-CPEPrefix: cpe:/a:aomedia:aomedia:3.4.0
+Version: 0
+Date: Wednesday May 10 2023
+Revision: 5f516275fb8761562bd877f2a8f185cd76c2a274
+CPEPrefix: cpe:/a:aomedia:aomedia:3.6.0
 License: BSD
 License File: source/libaom/LICENSE
 Security Critical: yes
@@ -25,6 +25,16 @@ Please follow these steps to update libaom source code:
 
    Use the generated commit message for the roll.
 
+Note: When running roll_dep.py on a Chrome release branch, we get the
+error message:
+   error: Ensure chromium/src is clean first (no non-merged commits).
+
+because the is_prestine() function in roll_dep.py runs git diff against
+origin/main. A workaround is to edit roll_dep.py and change
+'origin/main' to the release branch, e.g., 'branch-heads/5414' for the
+Chrome M109 release branch. Remember to change it back to 'origin/main'
+after running roll_dep.py.
+
 2. Generate the config files:
      # See prerequisites in file comments.
      ./cmake_update.sh

Source/ThirdParty/libwebrtc/Source/third_party/libaom/cmake_update.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2018 The Chromium Authors. All rights reserved.
+# Copyright 2018 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -22,8 +22,8 @@
 # - gcc-aarch64-linux-gnu
 # - g++-aarch64-linux-gnu
 # 32bit build environment for cmake. Including but potentially not limited to:
-# - lib32gcc-11-dev
-# - lib32stdc++-11-dev
+# - lib32gcc-12-dev
+# - lib32stdc++-12-dev
 # Alternatively: treat 32bit builds like Windows and manually tweak aom_config.h
 
 set -eE
@@ -35,13 +35,13 @@ BASE=$(pwd)
 SRC="${BASE}/source/libaom"
 CFG="${BASE}/source/config"
 
-function clean {
+function cleanup() {
   rm -rf "${TMP}"
 }
 
 # Create empty temp and config directories.
 # $1 - Header file directory.
-function reset_dirs {
+function reset_dirs() {
   cd ..
   rm -rf "${TMP}"
   mkdir "${TMP}"
@@ -52,7 +52,7 @@ function reset_dirs {
   mkdir -p "${CFG}/${1}/config"
 }
 
-if [ $# -ne 0 ]; then
+if [[ $# -ne 0 ]]; then
   echo "Unknown option(s): ${@}"
   exit 1
 fi
@@ -64,13 +64,13 @@ fi
 # Generate Config files.
 # $1 - Header file directory.
 # $2 - cmake options.
-function gen_config_files {
+function gen_config_files() {
   cmake "${SRC}" ${2} &> cmake.txt
 
   case "${1}" in
     *x64*|*ia32*)
-      egrep "#define [A-Z0-9_]+ [01]" config/aom_config.h | \
-        awk '{print "%define " $2 " " $3}' > config/aom_config.asm
+      egrep "#define [A-Z0-9_]+ [01]" config/aom_config.h \
+        | awk '{print "%define " $2 " " $3}' > config/aom_config.asm
       ;;
   esac
 
@@ -79,7 +79,7 @@ function gen_config_files {
   cp config/*_rtcd.h "${CFG}/${1}/config/"
 }
 
-function update_readme {
+function update_readme() {
   local IFS=$'\n'
   # Split git log output '<date>\n<commit hash>' on the newline to produce 2
   # array entries.
@@ -102,7 +102,7 @@ EOF
 # generate VS project files on linux.
 #
 # $1 - File to modify.
-function convert_to_windows {
+function convert_to_windows() {
   sed -i.bak \
     -e 's/\(#define[[:space:]]INLINE[[:space:]]*\)inline/\1 __inline/' \
     -e 's/\(#define[[:space:]]HAVE_PTHREAD_H[[:space:]]*\)1/\1 0/' \
@@ -119,7 +119,7 @@ TMP=$(mktemp -d "${BASE}/build.XXXX")
 cd "${TMP}"
 
 trap '{
-  [ -f ${TMP}/cmake.txt ] && cat ${TMP}/cmake.txt
+  [[ -f ${TMP}/cmake.txt ]] && cat ${TMP}/cmake.txt
   echo "Build directory ${TMP} not removed automatically."
 }' ERR
 
@@ -159,35 +159,47 @@ gen_config_files linux/x64 "${all_platforms}"
 reset_dirs win/ia32
 cp "${CFG}/linux/ia32/config"/* "${CFG}/win/ia32/config/"
 convert_to_windows "${CFG}/win/ia32/config/aom_config.h"
-egrep "#define [A-Z0-9_]+[[:space:]]+[01]" "${CFG}/win/ia32/config/aom_config.h" \
+egrep \
+  "#define [A-Z0-9_]+[[:space:]]+[01]" "${CFG}/win/ia32/config/aom_config.h" \
   | awk '{print "%define " $2 " " $3}' > "${CFG}/win/ia32/config/aom_config.asm"
 
 # Copy linux configurations and modify for Windows.
 reset_dirs win/x64
 cp "${CFG}/linux/x64/config"/* "${CFG}/win/x64/config/"
 convert_to_windows "${CFG}/win/x64/config/aom_config.h"
-egrep "#define [A-Z0-9_]+[[:space:]]+[01]" "${CFG}/win/x64/config/aom_config.h" \
+egrep \
+  "#define [A-Z0-9_]+[[:space:]]+[01]" "${CFG}/win/x64/config/aom_config.h" \
   | awk '{print "%define " $2 " " $3}' > "${CFG}/win/x64/config/aom_config.asm"
 
 reset_dirs linux/arm
 gen_config_files linux/arm \
   "${toolchain}/armv7-linux-gcc.cmake -DENABLE_NEON=0 ${all_platforms}"
 
 reset_dirs linux/arm-neon
-gen_config_files linux/arm-neon "${toolchain}/armv7-linux-gcc.cmake ${all_platforms}"
+gen_config_files linux/arm-neon \
+  "${toolchain}/armv7-linux-gcc.cmake ${all_platforms}"
 
 reset_dirs linux/arm-neon-cpu-detect
 gen_config_files linux/arm-neon-cpu-detect \
-  "${toolchain}/armv7-linux-gcc.cmake -DCONFIG_RUNTIME_CPU_DETECT=1 ${all_platforms}"
+  "${toolchain}/armv7-linux-gcc.cmake -DCONFIG_RUNTIME_CPU_DETECT=1 \
+   ${all_platforms}"
 
 reset_dirs linux/arm64
-gen_config_files linux/arm64 "${toolchain}/arm64-linux-gcc.cmake ${all_platforms}"
+gen_config_files linux/arm64 \
+  "${toolchain}/arm64-linux-gcc.cmake ${all_platforms}"
 
+# CMAKE_INSTALL_NAME_TOOL is set to a non-empty/true value to allow this
+# configuration to complete on platforms without `install_name`. The build
+# commands are not invoked so the value doesn't matter.
 reset_dirs ios/arm-neon
-gen_config_files ios/arm-neon "${toolchain}/armv7-ios.cmake ${all_platforms}"
+gen_config_files ios/arm-neon \
+  "${toolchain}/armv7-ios.cmake -DCMAKE_INSTALL_NAME_TOOL=no-such-command \
+   ${all_platforms}"
 
 reset_dirs ios/arm64
-gen_config_files ios/arm64 "${toolchain}/arm64-ios.cmake ${all_platforms}"
+gen_config_files ios/arm64 \
+  "${toolchain}/arm64-ios.cmake -DCMAKE_INSTALL_NAME_TOOL=no-such-command \
+   ${all_platforms}"
 
 # Copy linux configurations and modify for Windows.
 reset_dirs win/arm64
@@ -200,4 +212,4 @@ update_readme
 git cl format > /dev/null \
   || echo "ERROR: 'git cl format' failed. Please run 'git cl format' manually."
 
-clean
+cleanup