Commit 0ff7bd26 authored by Byron Campen's avatar Byron Campen
Browse files

Bug 1822194 - Vendor libwebrtc from d742382eb0 

Upstream commit: https://webrtc.googlesource.com/src/+/d742382eb0c576efd7ac2fac0e239177b31cc52b
    Limit numer of pending probes.

    Created probes are currently timed out after 5s. But to be safe, also limit the number of pending probes to 5.

    Bug: webrtc:14392, b/259541308
    Change-Id: Ibf630704ffe14cb165ab849b881cf75857376f82
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/284080


    Reviewed-by: default avatarErik Språng <sprang@webrtc.org>
    Commit-Queue: Per Kjellander <perkj@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#38697}
parent f75e9d8d

third_party/libwebrtc/README.moz-ff-commit

+3 −0
Original line number Diff line number Diff line
@@ -19692,3 +19692,6 @@ bbdb768989 
# MOZ_LIBWEBRTC_SRC=/home/bcampen/checkouts/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh

# base of lastest vendoring

79beaa7f38

# MOZ_LIBWEBRTC_SRC=/home/bcampen/checkouts/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh

# base of lastest vendoring

d742382eb0

third_party/libwebrtc/README.mozilla

+2 −0
Original line number Diff line number Diff line
@@ -13150,3 +13150,5 @@ libwebrtc updated from /home/bcampen/checkouts/moz-libwebrtc commit mozpatches o 
libwebrtc updated from /home/bcampen/checkouts/moz-libwebrtc commit mozpatches on 2023-03-31T23:23:28.976516.

# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/bcampen/checkouts/moz-libwebrtc --commit mozpatches libwebrtc

libwebrtc updated from /home/bcampen/checkouts/moz-libwebrtc commit mozpatches on 2023-03-31T23:24:49.776664.

# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/bcampen/checkouts/moz-libwebrtc --commit mozpatches libwebrtc

libwebrtc updated from /home/bcampen/checkouts/moz-libwebrtc commit mozpatches on 2023-03-31T23:26:09.334389.

third_party/libwebrtc/modules/pacing/bitrate_prober.cc

+4 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ namespace webrtc { 


namespace {

constexpr TimeDelta kProbeClusterTimeout = TimeDelta::Seconds(5);

constexpr size_t kMaxPendingProbeClusters = 5;



}  // namespace
@@ -84,8 +85,9 @@ void BitrateProber::CreateProbeCluster( 


  total_probe_count_++;

  while (!clusters_.empty() &&

         cluster_config.at_time - clusters_.front().requested_at >

             kProbeClusterTimeout) {

         (cluster_config.at_time - clusters_.front().requested_at >

              kProbeClusterTimeout ||

          clusters_.size() > kMaxPendingProbeClusters)) {

    clusters_.pop();

    total_failed_probe_count_++;

  }

third_party/libwebrtc/modules/pacing/bitrate_prober_unittest.cc

+37 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#include <algorithm>



#include "api/units/data_rate.h"

#include "api/units/time_delta.h"

#include "api/units/timestamp.h"

#include "test/explicit_key_value_config.h"

#include "test/gtest.h"
@@ -143,6 +145,41 @@ TEST(BitrateProberTest, DiscardsDelayedProbes) { 
  EXPECT_FALSE(prober.CurrentCluster(now).has_value());

}



TEST(BitrateProberTest, LimitsNumberOfPendingProbeClusters) {

  const FieldTrialBasedConfig config;

  BitrateProber prober(config);

  const DataSize kProbeSize = DataSize::Bytes(1000);

  Timestamp now = Timestamp::Zero();

  prober.CreateProbeCluster({.at_time = now,

                             .target_data_rate = DataRate::KilobitsPerSec(900),

                             .target_duration = TimeDelta::Millis(15),

                             .target_probe_count = 5,

                             .id = 0});

  prober.OnIncomingPacket(kProbeSize);

  ASSERT_TRUE(prober.is_probing());

  ASSERT_EQ(prober.CurrentCluster(now)->probe_cluster_id, 0);



  for (int i = 1; i < 11; ++i) {

    prober.CreateProbeCluster(

        {.at_time = now,

         .target_data_rate = DataRate::KilobitsPerSec(900),

         .target_duration = TimeDelta::Millis(15),

         .target_probe_count = 5,

         .id = i});

    prober.OnIncomingPacket(kProbeSize);

  }

  // Expect some clusters has been dropped.

  EXPECT_TRUE(prober.is_probing());

  EXPECT_GE(prober.CurrentCluster(now)->probe_cluster_id, 5);



  Timestamp max_expected_probe_time = now + TimeDelta::Seconds(1);

  while (prober.is_probing() && now < max_expected_probe_time) {

    now = std::max(now, prober.NextProbeTime(now));

    prober.ProbeSent(now, kProbeSize);

  }

  EXPECT_FALSE(prober.is_probing());

}



TEST(BitrateProberTest, DoesntInitializeProbingForSmallPackets) {

  const FieldTrialBasedConfig config;

  BitrateProber prober(config);