generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unrevert 5590 "description"(=(Auto)update libjingle 61834300->61901702).

Browse Source 
BUG=N/A
R=xians@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5595 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2014-02-21 15:51:43 +00:00
parent 125a66adc2
commit a7b981843f
20 changed files with 686 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
talk/media/base/videocapturer.cc
View File

@@ -111,6 +111,7 @@ void VideoCapturer::Construct() {
screencast_max_pixels_ = 0;
muted_ = false;
black_frame_count_down_ = kNumBlackFramesOnMute;
enable_video_adapter_ = true;
}
const std::vector<VideoFormat>* VideoCapturer::GetSupportedFormats() const {
@@ -477,9 +478,9 @@ void VideoCapturer::OnFrameCaptured(VideoCapturer*,
}
VideoFrame* adapted_frame = &i420_frame;
if (!SignalAdaptFrame.is_empty() && !IsScreencast()) {
if (enable_video_adapter_ && !IsScreencast()) {
VideoFrame* out_frame = NULL;
SignalAdaptFrame(this, adapted_frame, &out_frame);
video_adapter_.AdaptFrame(adapted_frame, &out_frame);
if (!out_frame) {
return; // VideoAdapter dropped the frame.
}