Index: webrtc/modules/video_coding/media_optimization.cc |
diff --git a/webrtc/modules/video_coding/media_optimization.cc b/webrtc/modules/video_coding/media_optimization.cc |
index a30ac9521abe3371567f427c661d7777e5ee86a7..49757bc366897a56dabe13839dd13bc6d3b75a33 100644 |
--- a/webrtc/modules/video_coding/media_optimization.cc |
+++ b/webrtc/modules/video_coding/media_optimization.cc |
@@ -10,6 +10,9 @@ |
#include "webrtc/modules/video_coding/media_optimization.h" |
+// #include <algorithm> |
sprang_webrtc
2017/03/10 12:38:57
remove
stefan-webrtc
2017/03/10 12:39:41
Done.
|
+#include <limits> |
+ |
#include "webrtc/base/logging.h" |
#include "webrtc/modules/video_coding/utility/frame_dropper.h" |
#include "webrtc/system_wrappers/include/clock.h" |
@@ -129,7 +132,9 @@ uint32_t MediaOptimization::InputFrameRate() { |
uint32_t MediaOptimization::InputFrameRateInternal() { |
ProcessIncomingFrameRate(clock_->TimeInMilliseconds()); |
- return uint32_t(incoming_frame_rate_ + 0.5f); |
+ uint32_t framerate = static_cast<uint32_t>(std::min<float>( |
+ std::numeric_limits<uint32_t>::max(), incoming_frame_rate_ + 0.5f)); |
+ return framerate; |
} |
uint32_t MediaOptimization::SentFrameRate() { |