Skip to content

Commit

Permalink
Bug 1909234 - Vendor libwebrtc from e0b28a6a81
Browse files Browse the repository at this point in the history
Upstream commit: https://webrtc.googlesource.com/src/+/e0b28a6a81a989c1f5c89e30fcd247870047390d
    [Merge 127] Reset the speech encoder when creating a comfort noise encoder.

    This is to make sure that the two encoders are "in sync" (the CNG
    encoder can be created from an existing speech encoder).

    This is a speculative fix for a crash in the CNG encoder where a packet
    is unexpectedly emitted from the speech encoder.

    (cherry picked from commit 0fd67312ea078b3b997306d56284b85492b37650)

    Bug: webrtc:42225071, chromium:338342746
    Change-Id: I42571e56e032897f7f083f04d785f6a08ebfb813
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/355160
    Commit-Queue: Jakob Ivarsson‎ <[email protected]>
    Reviewed-by: Tomas Lundqvist <[email protected]>
    Cr-Original-Commit-Position: refs/heads/main@{#42516}
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/355863
    Reviewed-by: Daniel Johansson <[email protected]>
    Cr-Commit-Position: refs/branch-heads/6533@{#1}
    Cr-Branched-From: 63c380918687cd4c233e9eb856e98ba4c0589722-refs/heads/main@{#42455}
  • Loading branch information
docfaraday committed Jul 29, 2024
1 parent e4ca143 commit 37df662
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
3 changes: 3 additions & 0 deletions third_party/libwebrtc/README.moz-ff-commit
Original file line number Diff line number Diff line change
Expand Up @@ -31140,3 +31140,6 @@ c24ccd866e
# MOZ_LIBWEBRTC_SRC=/home/bcampen/checkouts/elm/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
63c3809186
# MOZ_LIBWEBRTC_SRC=/home/bcampen/checkouts/elm/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
e0b28a6a81
2 changes: 2 additions & 0 deletions third_party/libwebrtc/README.mozilla
Original file line number Diff line number Diff line change
Expand Up @@ -20784,3 +20784,5 @@ libwebrtc updated from /home/bcampen/checkouts/elm/.moz-fast-forward/moz-libwebr
libwebrtc updated from /home/bcampen/checkouts/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2024-07-29T17:51:53.908742.
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/bcampen/checkouts/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
libwebrtc updated from /home/bcampen/checkouts/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2024-07-29T17:53:00.327522.
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/bcampen/checkouts/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
libwebrtc updated from /home/bcampen/checkouts/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2024-07-29T17:54:04.799952.
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ AudioEncoderCng::AudioEncoderCng(AudioEncoderCngConfig&& config)
: CreateVad(config.vad_mode)),
cng_encoder_(new ComfortNoiseEncoder(SampleRateHz(),
sid_frame_interval_ms_,
num_cng_coefficients_)) {}
num_cng_coefficients_)) {
speech_encoder_->Reset();
}

AudioEncoderCng::~AudioEncoderCng() = default;

Expand Down

0 comments on commit 37df662

Please sign in to comment.