Bug 1892299 - Vendor libwebrtc from 4edf7bab66

Upstream commit: https://webrtc.googlesource.com/src/+/4edf7bab66dcef8191a8275e007baedee5ff1374
    [M124] Adjust min vp9 simulcast bitrate to closer mimic SVC behaviour

    If SVC is used, the minimum bitrate would be 30kbps, instead of 49, as
    configured in svc_config.h, because the overall stream will get min_bitrate
    from the default VP8 simulcast configuration, and this 30kbps will be
    allocated to the stream for svc_rate_allocator to divide between layers.

    However, with the configuration before this change, 49kbps would be always
    allocated to the lowest simulcast stream.

    (cherry picked from commit f49a8262cc4b89549375cde7b962bbf5ee3c0d07)

    Bug: webrtc:15852, chromium:330672089
    Change-Id: I1c77f45654af8850180a83f8e3f4428cc42d086e
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/343760
    Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
    Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
    Cr-Original-Commit-Position: refs/heads/main@{#41940}
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/343981
    Cr-Commit-Position: refs/branch-heads/6367@{#1}
    Cr-Branched-From: 802552a8030d82ad07b72aa738f814f3a0030810-refs/heads/main@{#41921}
This commit is contained in:
Nico Grunbaum 2024-05-02 02:54:30 -07:00
parent 5830b18af0
commit a85c8fce91
4 changed files with 6 additions and 2 deletions

View file

@ -29520,3 +29520,6 @@ bdb867f163
# MOZ_LIBWEBRTC_SRC=/Users/ng/dev/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
802552a803
# MOZ_LIBWEBRTC_SRC=/Users/ng/dev/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
4edf7bab66

View file

@ -19704,3 +19704,5 @@ libwebrtc updated from /Users/ng/dev/elm/.moz-fast-forward/moz-libwebrtc commit
libwebrtc updated from /Users/ng/dev/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2024-05-02T09:50:48.490803.
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /Users/ng/dev/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
libwebrtc updated from /Users/ng/dev/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2024-05-02T09:52:03.786909.
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /Users/ng/dev/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
libwebrtc updated from /Users/ng/dev/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2024-05-02T09:54:14.297719.

View file

@ -123,7 +123,7 @@ constexpr const SimulcastFormat kSimulcastFormatsVP9[] = {
webrtc::DataRate::KilobitsPerSec(121)},
{320, 180, 1, webrtc::DataRate::KilobitsPerSec(142),
webrtc::DataRate::KilobitsPerSec(142),
webrtc::DataRate::KilobitsPerSec(49)},
webrtc::DataRate::KilobitsPerSec(30)},
{240, 135, 1, webrtc::DataRate::KilobitsPerSec(101),
webrtc::DataRate::KilobitsPerSec(101),
webrtc::DataRate::KilobitsPerSec(30)},

View file

@ -548,7 +548,6 @@ TEST(SimulcastTest, BitratesBasedOnCodec) {
EXPECT_NE(streams_vp9[0].max_bitrate_bps, streams_vp8[0].max_bitrate_bps);
EXPECT_NE(streams_vp9[0].target_bitrate_bps,
streams_vp8[0].target_bitrate_bps);
EXPECT_NE(streams_vp9[0].min_bitrate_bps, streams_vp8[0].min_bitrate_bps);
EXPECT_NE(streams_vp9[1].max_bitrate_bps, streams_vp8[1].max_bitrate_bps);
EXPECT_NE(streams_vp9[1].target_bitrate_bps,