Bug 1828517 - Vendor libwebrtc from 416bc06a6a

Upstream commit: https://webrtc.googlesource.com/src/+/416bc06a6aa3735e33edcec5c1ffb68beb310924
    Disable stop CNG after a timeout.

    This is still a behavior that we want, but a more careful rollout is needed.

    (cherry picked from commit 48d784225972b7dd0542acfad7cd2d0eed25ad1c)

    No-Try: True
    Bug: webrtc:12790, chromium:1418687
    Change-Id: Ic74c7b4945c0cdeda2b17f52301069424ad91162
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/293860
    Commit-Queue: Jakob Ivarsson‎ <jakobi@webrtc.org>
    Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
    Cr-Original-Commit-Position: refs/heads/main@{#39333}
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/294760
    Reviewed-by: Alessio Bazzica <alessiob@webrtc.org>
    Cr-Commit-Position: refs/branch-heads/5563@{#3}
    Cr-Branched-From: 6c032cb8356b0d3f717c4fcf50796241f2bba6c2-refs/heads/main@{#39207}
This commit is contained in:
Michael Froman 2023-04-24 18:06:17 -05:00
Родитель 9616fe67d7
Коммит 670093eb5c
4 изменённых файлов: 9 добавлений и 1 удалений

3
third_party/libwebrtc/README.moz-ff-commit поставляемый
Просмотреть файл

@ -21246,3 +21246,6 @@ dcb09ff218
# MOZ_LIBWEBRTC_SRC=/home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
cb954cdb08
# MOZ_LIBWEBRTC_SRC=/home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
416bc06a6a

2
third_party/libwebrtc/README.mozilla поставляемый
Просмотреть файл

@ -14186,3 +14186,5 @@ libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-l
libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-04-24T23:03:58.539902.
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-04-24T23:05:07.746116.
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-04-24T23:06:05.350524.

Просмотреть файл

@ -175,7 +175,7 @@ class DecisionLogic : public NetEqController {
int reinit_after_expands = 100;
int deceleration_target_level_offset_ms = 85;
int packet_history_size_ms = 2000;
absl::optional<int> cng_timeout_ms = 1000;
absl::optional<int> cng_timeout_ms;
};
Config config_;
std::unique_ptr<DelayManager> delay_manager_;

Просмотреть файл

@ -18,6 +18,7 @@
#include "modules/audio_coding/neteq/delay_manager.h"
#include "modules/audio_coding/neteq/mock/mock_buffer_level_filter.h"
#include "modules/audio_coding/neteq/mock/mock_delay_manager.h"
#include "test/field_trial.h"
#include "test/gtest.h"
namespace webrtc {
@ -53,6 +54,8 @@ using ::testing::Return;
class DecisionLogicTest : public ::testing::Test {
protected:
DecisionLogicTest() {
test::ScopedFieldTrials trials(
"WebRTC-Audio-NetEqDecisionLogicConfig/cng_timeout_ms:1000/");
NetEqController::Config config;
config.tick_timer = &tick_timer_;
config.allow_time_stretching = true;