commit 1aa1d6463a9b59fef3a2a6049624581e748f6e2b
author Per Kjellander <perkj@webrtc.org> Thu Jan 28 07:56:43 2021
committer Commit Bot <commit-bot@chromium.org> Thu Jan 28 12:39:30 2021
tree 510aa538d3fb3f7af049acdf50feba35b137d0cf
parent 37dfddd5e8ab105faf8301b98d8ffeb68290a94e

Ensure VideoLayersAllocation.frame_rate_fps can not overflow

Bug: webrtc:12000
Change-Id: I14d5f0f987fb20bd74e0428b3791bf370476296e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/204220
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33089}

video/video_stream_encoder.cc

diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc
index 4215fd9..c8d6021 100644
--- a/video/video_stream_encoder.cc
+++ b/video/video_stream_encoder.cc
@@ -260,8 +260,9 @@
       // Encoder may drop frames internally if `maxFramerate` is set.
       spatial_layer.frame_rate_fps = std::min<uint8_t>(
           encoder_config.simulcastStream[si].maxFramerate,
-          (current_rate.framerate_fps * frame_rate_fraction) /
-              VideoEncoder::EncoderInfo::kMaxFramerateFraction);
+          rtc::saturated_cast<uint8_t>(
+              (current_rate.framerate_fps * frame_rate_fraction) /
+              VideoEncoder::EncoderInfo::kMaxFramerateFraction));
     }
   } else if (encoder_config.numberOfSimulcastStreams == 1) {
     // TODO(bugs.webrtc.org/12000): Implement support for AV1 with
@@ -329,8 +330,9 @@
       // Encoder may drop frames internally if `maxFramerate` is set.
       spatial_layer.frame_rate_fps = std::min<uint8_t>(
           encoder_config.spatialLayers[si].maxFramerate,
-          (current_rate.framerate_fps * frame_rate_fraction) /
-              VideoEncoder::EncoderInfo::kMaxFramerateFraction);
+          rtc::saturated_cast<uint8_t>(
+              (current_rate.framerate_fps * frame_rate_fraction) /
+              VideoEncoder::EncoderInfo::kMaxFramerateFraction));
     }
   }