zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Speculative fix for division by zero in Vp8EncoderImpl.

Browse Source 
BUG=chromium:597139
R=sprang@webrtc.org

Review-Url: https://codereview.webrtc.org/2743543004 .
Cr-Commit-Position: refs/heads/master@{#17167}
This commit is contained in:
Stefan Holmer
2017-03-10 15:08:26 +01:00
parent 60dcda4943
commit 144475b328
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/common_types.h
View File

@ -637,7 +637,7 @@ class VideoCodec {
unsigned int minBitrate; // kilobits/sec. unsigned int minBitrate; // kilobits/sec.
unsigned int targetBitrate; // kilobits/sec. unsigned int targetBitrate; // kilobits/sec.
unsigned char maxFramerate; uint32_t maxFramerate;
unsigned int qpMax; unsigned int qpMax;
unsigned char numberOfSimulcastStreams; unsigned char numberOfSimulcastStreams;

6
webrtc/modules/video_coding/media_optimization.cc
View File

@ -10,6 +10,8 @@
#include "webrtc/modules/video_coding/media_optimization.h" #include "webrtc/modules/video_coding/media_optimization.h"
#include <limits>
#include "webrtc/base/logging.h" #include "webrtc/base/logging.h"
#include "webrtc/modules/video_coding/utility/frame_dropper.h" #include "webrtc/modules/video_coding/utility/frame_dropper.h"
#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/clock.h"
@ -129,7 +131,9 @@ uint32_t MediaOptimization::InputFrameRate() {
uint32_t MediaOptimization::InputFrameRateInternal() { uint32_t MediaOptimization::InputFrameRateInternal() {
ProcessIncomingFrameRate(clock_->TimeInMilliseconds()); 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() { uint32_t MediaOptimization::SentFrameRate() {