From f19c7caeb5beb8e86977381ba1e45e4e1c3c01ca Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Thu, 1 Feb 2024 12:19:40 +0100 Subject: [PATCH] Fix crash when rolling libaom. The crash is caused by https://aomedia.googlesource.com/aom.git/+/77cf417565ad2c527d5c351927f11db3764fd93c%5E%21 Example of the test failure: https://ci.chromium.org/ui/p/webrtc/builders/try/linux_rel/72442/overview Bug: None Change-Id: I088bf7e45452cdaa71802802e431119e755eca24 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/337320 Commit-Queue: Jeremy Leconte Reviewed-by: Marco Paniconi Cr-Commit-Position: refs/heads/main@{#41659} --- DEPS | 2 +- modules/video_coding/codecs/av1/libaom_av1_unittest.cc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 6cafb926b4..99f2727827 100644 --- a/DEPS +++ b/DEPS @@ -296,7 +296,7 @@ deps = { 'src/third_party/dav1d/libdav1d': 'https://chromium.googlesource.com/external/github.com/videolan/dav1d.git@47107e384bd1dc25674acf04d000a8cdc6195234', 'src/third_party/libaom/source/libaom': - 'https://aomedia.googlesource.com/aom.git@1a72ea323d65e46eb90d08d492c04891abb91926', + 'https://aomedia.googlesource.com/aom.git@77cf417565ad2c527d5c351927f11db3764fd93c', 'src/third_party/libunwindstack': { 'url': 'https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git@a3bb4cd02e0e984a235069f812cbef2b37c389e5', 'condition': 'checkout_android', diff --git a/modules/video_coding/codecs/av1/libaom_av1_unittest.cc b/modules/video_coding/codecs/av1/libaom_av1_unittest.cc index d486c1d062..6a135e2bab 100644 --- a/modules/video_coding/codecs/av1/libaom_av1_unittest.cc +++ b/modules/video_coding/codecs/av1/libaom_av1_unittest.cc @@ -62,6 +62,7 @@ VideoCodec DefaultCodecSettings() { codec_settings.height = kHeight; codec_settings.maxFramerate = kFramerate; codec_settings.maxBitrate = 1000; + codec_settings.startBitrate = 1; codec_settings.qpMax = 63; return codec_settings; }