Fix/suppress new warnings introduced in Chromium roll.
TBR=henrika@webrtc.org Bug: webrtc:6597 Change-Id: Id26945a7be05250673b58de8220f78bc62886688 Reviewed-on: https://webrtc-review.googlesource.com/16860 Commit-Queue: Sami Kalliomäki <sakal@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20477}
This commit is contained in:
committed by
Commit Bot
parent
1d4c152a38
commit
bde473e4fa
@ -47,7 +47,7 @@ public class CaptureQualityController implements SeekBar.OnSeekBarChangeListener
|
||||
int firstFps = calculateFramerate(targetBandwidth, first);
|
||||
int secondFps = calculateFramerate(targetBandwidth, second);
|
||||
|
||||
if (firstFps >= FRAMERATE_THRESHOLD && secondFps >= FRAMERATE_THRESHOLD
|
||||
if ((firstFps >= FRAMERATE_THRESHOLD && secondFps >= FRAMERATE_THRESHOLD)
|
||||
|| firstFps == secondFps) {
|
||||
// Compare resolution.
|
||||
return first.width * first.height - second.width * second.height;
|
||||
|
||||
Reference in New Issue
Block a user