Index: talk/media/base/videocapturer.cc |
diff --git a/talk/media/base/videocapturer.cc b/talk/media/base/videocapturer.cc |
index 5d9a7e022a78b2a3a8aa1e0df0b4e46d6399e5c7..f40f41f956729078c0df359a916f274c7f2a2861 100644 |
--- a/talk/media/base/videocapturer.cc |
+++ b/talk/media/base/videocapturer.cc |
@@ -121,7 +121,6 @@ void VideoCapturer::Construct() { |
SignalFrameCaptured.connect(this, &VideoCapturer::OnFrameCaptured); |
scaled_width_ = 0; |
scaled_height_ = 0; |
- screencast_max_pixels_ = 0; |
muted_ = false; |
black_frame_count_down_ = kNumBlackFramesOnMute; |
enable_video_adapter_ = true; |
@@ -360,16 +359,11 @@ void VideoCapturer::OnFrameCaptured(VideoCapturer*, |
if (IsScreencast()) { |
int scaled_width, scaled_height; |
- if (screencast_max_pixels_ > 0) { |
- ComputeScaleMaxPixels(captured_frame->width, captured_frame->height, |
- screencast_max_pixels_, &scaled_width, &scaled_height); |
- } else { |
- int desired_screencast_fps = capture_format_.get() ? |
- VideoFormat::IntervalToFps(capture_format_->interval) : |
- kDefaultScreencastFps; |
- ComputeScale(captured_frame->width, captured_frame->height, |
- desired_screencast_fps, &scaled_width, &scaled_height); |
- } |
+ int desired_screencast_fps = capture_format_.get() ? |
+ VideoFormat::IntervalToFps(capture_format_->interval) : |
+ kDefaultScreencastFps; |
+ ComputeScale(captured_frame->width, captured_frame->height, |
+ desired_screencast_fps, &scaled_width, &scaled_height); |
if (FOURCC_ARGB == captured_frame->fourcc && |
(scaled_width != captured_frame->width || |