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

Use std::min and std::max instead of self-defined functions such as rtc::_min/_max.

Browse Source 
R=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/35079004

Cr-Commit-Position: refs/heads/master@{#8347}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8347 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andresp@webrtc.org
2015-02-12 11:54:26 +00:00
parent 9e4e524f38
commit ff689be3c0
46 changed files with 164 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
talk/media/base/videoadapter.cc
View File

@ -28,6 +28,7 @@
#include "talk/media/base/videoadapter.h"
#include <limits.h> // For INT_MAX
#include <algorithm>
#include "talk/media/base/constants.h"
#include "talk/media/base/videocommon.h"
@ -185,8 +186,8 @@ void VideoAdapter::SetInputFormat(const VideoFormat& format) {
rtc::CritScope cs(&critical_section_);
int64 old_input_interval = input_format_.interval;
input_format_ = format;
output_format_.interval = rtc::_max(
output_format_.interval, input_format_.interval);
output_format_.interval =
std::max(output_format_.interval, input_format_.interval);
if (old_input_interval != input_format_.interval) {
LOG(LS_INFO) << "VAdapt input interval changed from "
<< old_input_interval << " to " << input_format_.interval;
@ -227,8 +228,8 @@ void VideoAdapter::SetOutputFormat(const VideoFormat& format) {
int64 old_output_interval = output_format_.interval;
output_format_ = format;
output_num_pixels_ = output_format_.width * output_format_.height;
output_format_.interval = rtc::_max(
output_format_.interval, input_format_.interval);
output_format_.interval =
std::max(output_format_.interval, input_format_.interval);
if (old_output_interval != output_format_.interval) {
LOG(LS_INFO) << "VAdapt output interval changed from "
<< old_output_interval << " to " << output_format_.interval;