From 0970dd8767d91be5b0872c3210e93ed355107b71 Mon Sep 17 00:00:00 2001 From: "buildbot@webrtc.org" Date: Fri, 20 Jun 2014 00:18:36 +0000 Subject: [PATCH] (Auto)update libjingle 69588608-> 69588980 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6502 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcvideoengine.cc | 3 +-- talk/media/webrtc/webrtcvideoengine.h | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc index 276b5b440..1ca92cf73 100644 --- a/talk/media/webrtc/webrtcvideoengine.cc +++ b/talk/media/webrtc/webrtcvideoengine.cc @@ -3261,7 +3261,7 @@ bool WebRtcVideoMediaChannel::SendFrame( } const VideoFrame* frame_out = frame; talk_base::scoped_ptr processed_frame; - // Disable muting for screencast. + // TODO(hellner): Remove the need for disabling mute when screencasting. const bool mute = (send_channel->muted() && !is_screencast); send_channel->ProcessFrame(*frame_out, mute, processed_frame.use()); if (processed_frame) { @@ -3767,7 +3767,6 @@ bool WebRtcVideoMediaChannel::SetSendCodec( return true; } - static std::string ToString(webrtc::VideoCodecComplexity complexity) { switch (complexity) { case webrtc::kComplexityNormal: diff --git a/talk/media/webrtc/webrtcvideoengine.h b/talk/media/webrtc/webrtcvideoengine.h index 775f4e46d..f9b97710c 100644 --- a/talk/media/webrtc/webrtcvideoengine.h +++ b/talk/media/webrtc/webrtcvideoengine.h @@ -45,7 +45,6 @@ #error "Bogus include." #endif - namespace webrtc { class VideoCaptureModule; class VideoDecoder; @@ -390,7 +389,6 @@ class WebRtcVideoMediaChannel : public talk_base::MessageHandler, } bool RemoveCapturer(uint32 ssrc); - talk_base::MessageQueue* worker_thread() { return engine_->worker_thread(); } void QueueBlackFrame(uint32 ssrc, int64 timestamp, int framerate); void FlushBlackFrame(uint32 ssrc, int64 timestamp);