BASELINE: Update Chromium to 102.0.5005.57

Change-Id: I885f714bb40ee724c28f94ca6bd8dbdb39915158
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 66 insertions, 6 deletions

diff --git a/chromium/media/base/video_bitrate_allocation.cc b/chromium/media/base/video_bitrate_allocation.cc
index a988be2f126..cf01aa25da4 100644
--- a/chromium/media/base/video_bitrate_allocation.cc
+++ b/chromium/media/base/video_bitrate_allocation.cc
@@ -11,26 +11,74 @@
 
 #include "base/check_op.h"
 #include "base/numerics/checked_math.h"
+#include "media/base/bitrate.h"
+
+namespace {
+
+static media::Bitrate MakeReplacementBitrate(const media::Bitrate& old,
+                                             uint32_t target_bps,
+                                             uint32_t peak_bps) {
+  switch (old.mode()) {
+    case media::Bitrate::Mode::kConstant:
+      return media::Bitrate::ConstantBitrate(target_bps);
+    case media::Bitrate::Mode::kVariable:
+      return media::Bitrate::VariableBitrate(target_bps, peak_bps);
+  }
+}
+
+}  // namespace
 
 namespace media {
 
 constexpr size_t VideoBitrateAllocation::kMaxSpatialLayers;
 constexpr size_t VideoBitrateAllocation::kMaxTemporalLayers;
 
+VideoBitrateAllocation::VideoBitrateAllocation(Bitrate::Mode mode) {
+  switch (mode) {
+    case Bitrate::Mode::kConstant:
+      sum_bitrate_ = Bitrate::ConstantBitrate(0u);
+      break;
+    case Bitrate::Mode::kVariable:
+      // For variable bitrates, the peak must not be zero as enforced by
+      // Bitrate.
+      sum_bitrate_ = Bitrate::VariableBitrate(0u, 1u);
+      break;
+  }
+}
+
+bool VideoBitrateAllocation::SetPeakBps(uint32_t peak_bps) {
+  if (sum_bitrate_.mode() != Bitrate::Mode::kVariable)
+    return false;
+
+  if (peak_bps == 0u)
+    return false;
+
+  if (sum_bitrate_.target_bps() > peak_bps)
+    return false;
+
+  Bitrate old = sum_bitrate_;
+  sum_bitrate_ = MakeReplacementBitrate(old, old.target_bps(), peak_bps);
+  return true;
+}
+
 bool VideoBitrateAllocation::SetBitrate(size_t spatial_index,
                                         size_t temporal_index,
                                         uint32_t bitrate_bps) {
   CHECK_LT(spatial_index, kMaxSpatialLayers);
   CHECK_LT(temporal_index, kMaxTemporalLayers);
 
-  base::CheckedNumeric<uint32_t> checked_sum = sum_;
-  checked_sum -= bitrates_[spatial_index][temporal_index];
+  base::CheckedNumeric<uint32_t> checked_sum = sum_bitrate_.target_bps();
+  uint32_t old_bitrate_bps = bitrates_[spatial_index][temporal_index];
+  checked_sum -= old_bitrate_bps;
   checked_sum += bitrate_bps;
   if (!checked_sum.IsValid()) {
     return false;  // Would cause overflow of the sum.
   }
 
-  sum_ = checked_sum.ValueOrDie();
+  const uint32_t new_sum_bps = checked_sum.ValueOrDefault(0u);
+  const uint32_t new_peak_bps = std::max(sum_bitrate_.peak_bps(), new_sum_bps);
+  sum_bitrate_ =
+      MakeReplacementBitrate(sum_bitrate_, new_sum_bps, new_peak_bps);
   bitrates_[spatial_index][temporal_index] = bitrate_bps;
   return true;
 }
@@ -43,7 +91,11 @@ uint32_t VideoBitrateAllocation::GetBitrateBps(size_t spatial_index,
 }
 
 uint32_t VideoBitrateAllocation::GetSumBps() const {
-  return sum_;
+  return sum_bitrate_.target_bps();
+}
+
+const Bitrate VideoBitrateAllocation::GetSumBitrate() const {
+  return sum_bitrate_;
 }
 
 std::string VideoBitrateAllocation::ToString() const {
@@ -83,13 +135,21 @@ std::string VideoBitrateAllocation::ToString() const {
     }
     ss << "}";
   }
-  ss << "}";
+  ss << "}, mode ";
+  switch (sum_bitrate_.mode()) {
+    case Bitrate::Mode::kConstant:
+      ss << "CBR";
+      break;
+    case Bitrate::Mode::kVariable:
+      ss << "VBR with peak bps " << sum_bitrate_.peak_bps();
+      break;
+  }
   return ss.str();
 }
 
 bool VideoBitrateAllocation::operator==(
     const VideoBitrateAllocation& other) const {
-  if (sum_ != other.sum_) {
+  if (sum_bitrate_ != other.sum_bitrate_) {
     return false;
   }
   return memcmp(bitrates_, other.bitrates_, sizeof(bitrates_)) == 0;