From 818b7b3ac982e9e1f579904c5f160103da046dcf Mon Sep 17 00:00:00 2001 From: "buildbot@webrtc.org" Date: Fri, 5 Sep 2014 00:14:03 +0000 Subject: [PATCH] (Auto)update libjingle 74825084-> 74825992 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7074 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/base/fakemediaengine.h | 4 --- talk/media/base/filemediaengine.h | 3 --- talk/media/base/mediaengine.h | 6 ----- talk/media/webrtc/webrtcmediaengine.h | 3 --- talk/media/webrtc/webrtcvideoengine.h | 2 -- talk/media/webrtc/webrtcvideoengine2.cc | 9 ------- talk/media/webrtc/webrtcvideoengine2.h | 3 --- talk/session/media/channelmanager.cc | 33 +++++++++++++++---------- talk/session/media/channelmanager.h | 7 +++--- 9 files changed, 23 insertions(+), 47 deletions(-) diff --git a/talk/media/base/fakemediaengine.h b/talk/media/base/fakemediaengine.h index a6eabef2f0..8963aa730e 100644 --- a/talk/media/base/fakemediaengine.h +++ b/talk/media/base/fakemediaengine.h @@ -930,10 +930,6 @@ class FakeVideoEngine : public FakeBaseEngine { capture_ = capture; return true; } - VideoFormat GetStartCaptureFormat() const { - return VideoFormat(640, 480, cricket::VideoFormat::FpsToInterval(30), - FOURCC_I420); - } sigslot::repeater2 SignalCaptureStateChange; diff --git a/talk/media/base/filemediaengine.h b/talk/media/base/filemediaengine.h index 981e945c7f..ad6c93860e 100644 --- a/talk/media/base/filemediaengine.h +++ b/talk/media/base/filemediaengine.h @@ -150,9 +150,6 @@ class FileMediaEngine : public MediaEngineInterface { MediaProcessorDirection direction) { return true; } - VideoFormat GetStartCaptureFormat() const { - return VideoFormat(); - } virtual sigslot::repeater2& SignalVideoCaptureStateChange() { diff --git a/talk/media/base/mediaengine.h b/talk/media/base/mediaengine.h index 25f7eb3368..9daa05d092 100644 --- a/talk/media/base/mediaengine.h +++ b/talk/media/base/mediaengine.h @@ -147,8 +147,6 @@ class MediaEngineInterface { VoiceProcessor* video_processor, MediaProcessorDirection direction) = 0; - virtual VideoFormat GetStartCaptureFormat() const = 0; - virtual sigslot::repeater2& SignalVideoCaptureStateChange() = 0; }; @@ -278,9 +276,6 @@ class CompositeMediaEngine : public MediaEngineInterface { MediaProcessorDirection direction) { return voice_.UnregisterProcessor(ssrc, processor, direction); } - virtual VideoFormat GetStartCaptureFormat() const { - return video_.GetStartCaptureFormat(); - } virtual sigslot::repeater2& SignalVideoCaptureStateChange() { return signal_state_change_; @@ -361,7 +356,6 @@ class NullVideoEngine { return rtp_header_extensions_; } void SetLogging(int min_sev, const char* filter) {} - VideoFormat GetStartCaptureFormat() const { return VideoFormat(); } sigslot::signal2 SignalCaptureStateChange; private: diff --git a/talk/media/webrtc/webrtcmediaengine.h b/talk/media/webrtc/webrtcmediaengine.h index 2a8c66cc14..1700878ddd 100644 --- a/talk/media/webrtc/webrtcmediaengine.h +++ b/talk/media/webrtc/webrtcmediaengine.h @@ -185,9 +185,6 @@ class DelegatingWebRtcMediaEngine : public cricket::MediaEngineInterface { return delegate_->UnregisterVoiceProcessor(ssrc, video_processor, direction); } - virtual VideoFormat GetStartCaptureFormat() const OVERRIDE { - return delegate_->GetStartCaptureFormat(); - } virtual sigslot::repeater2& SignalVideoCaptureStateChange() { return delegate_->SignalVideoCaptureStateChange(); diff --git a/talk/media/webrtc/webrtcvideoengine.h b/talk/media/webrtc/webrtcvideoengine.h index 4e41809c75..b6c37afb61 100644 --- a/talk/media/webrtc/webrtcvideoengine.h +++ b/talk/media/webrtc/webrtcvideoengine.h @@ -169,8 +169,6 @@ class WebRtcVideoEngine : public sigslot::has_slots<>, bool ShouldIgnoreTrace(const std::string& trace); int GetNumOfChannels(); - VideoFormat GetStartCaptureFormat() const { return default_codec_format_; } - rtc::CpuMonitor* cpu_monitor() { return cpu_monitor_.get(); } protected: diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc index 44c1bf8ad6..d63e8f401a 100644 --- a/talk/media/webrtc/webrtcvideoengine2.cc +++ b/talk/media/webrtc/webrtcvideoengine2.cc @@ -286,10 +286,6 @@ WebRtcVideoEngine2::WebRtcVideoEngine2() : worker_thread_(NULL), voice_engine_(NULL), video_codecs_(DefaultVideoCodecs()), - default_codec_format_(kDefaultVideoCodecPref.width, - kDefaultVideoCodecPref.height, - FPS_TO_INTERVAL(kDefaultFramerate), - FOURCC_ANY), initialized_(false), cpu_monitor_(new rtc::CpuMonitor(NULL)), channel_factory_(NULL) { @@ -358,11 +354,6 @@ bool WebRtcVideoEngine2::SetDefaultEncoderConfig( return false; } - default_codec_format_ = - VideoFormat(codec.width, - codec.height, - VideoFormat::FpsToInterval(codec.framerate), - FOURCC_ANY); video_codecs_.clear(); video_codecs_.push_back(codec); return true; diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/talk/media/webrtc/webrtcvideoengine2.h index d77afb9d2f..ab644d08e5 100644 --- a/talk/media/webrtc/webrtcvideoengine2.h +++ b/talk/media/webrtc/webrtcvideoengine2.h @@ -168,8 +168,6 @@ class WebRtcVideoEngine2 : public sigslot::has_slots<> { // Check whether the supplied trace should be ignored. bool ShouldIgnoreTrace(const std::string& trace); - VideoFormat GetStartCaptureFormat() const { return default_codec_format_; } - rtc::CpuMonitor* cpu_monitor() { return cpu_monitor_.get(); } virtual WebRtcVideoEncoderFactory2* GetVideoEncoderFactory(); @@ -179,7 +177,6 @@ class WebRtcVideoEngine2 : public sigslot::has_slots<> { WebRtcVoiceEngine* voice_engine_; std::vector video_codecs_; std::vector rtp_header_extensions_; - VideoFormat default_codec_format_; bool initialized_; diff --git a/talk/session/media/channelmanager.cc b/talk/session/media/channelmanager.cc index 45e7e4764a..2803a7e124 100644 --- a/talk/session/media/channelmanager.cc +++ b/talk/session/media/channelmanager.cc @@ -724,16 +724,28 @@ bool ChannelManager::SetCaptureDevice_w(const Device* cam_device) { } bool ChannelManager::SetDefaultVideoEncoderConfig(const VideoEncoderConfig& c) { - bool ret = true; + return worker_thread_->Invoke( + Bind(&ChannelManager::SetDefaultVideoEncoderConfig_w, this, c)); +} + +VideoEncoderConfig ChannelManager::GetDefaultVideoEncoderConfig() const { + return worker_thread_->Invoke( + Bind(&ChannelManager::GetDefaultVideoEncoderConfig_w, this)); +} + +bool ChannelManager::SetDefaultVideoEncoderConfig_w( + const VideoEncoderConfig& c) { if (initialized_) { - ret = worker_thread_->Invoke( - Bind(&MediaEngineInterface::SetDefaultVideoEncoderConfig, - media_engine_.get(), c)); + if (!media_engine_->SetDefaultVideoEncoderConfig(c)) { + return false; + } } - if (ret) { - default_video_encoder_config_ = c; - } - return ret; + default_video_encoder_config_ = c; + return true; +} + +VideoEncoderConfig ChannelManager::GetDefaultVideoEncoderConfig_w() const { + return default_video_encoder_config_; } bool ChannelManager::SetLocalMonitor(bool enable) { @@ -945,11 +957,6 @@ void ChannelManager::SetVideoCaptureDeviceMaxFormat( device_manager_->SetVideoCaptureDeviceMaxFormat(usb_id, max_format); } -VideoFormat ChannelManager::GetStartCaptureFormat() { - return worker_thread_->Invoke( - Bind(&MediaEngineInterface::GetStartCaptureFormat, media_engine_.get())); -} - bool ChannelManager::StartAecDump(rtc::PlatformFile file) { return worker_thread_->Invoke( Bind(&MediaEngineInterface::StartAecDump, media_engine_.get(), file)); diff --git a/talk/session/media/channelmanager.h b/talk/session/media/channelmanager.h index fa7901417c..47cb6e5a79 100644 --- a/talk/session/media/channelmanager.h +++ b/talk/session/media/channelmanager.h @@ -163,6 +163,7 @@ class ChannelManager : public rtc::MessageHandler, VideoCapturer* CreateScreenCapturer(const ScreencastId& screenid); bool SetCaptureDevice(const std::string& cam_device); bool SetDefaultVideoEncoderConfig(const VideoEncoderConfig& config); + VideoEncoderConfig GetDefaultVideoEncoderConfig() const; // RTX will be enabled/disabled in engines that support it. The supporting // engines will start offering an RTX codec. Must be called before Init(). bool SetVideoRtxEnabled(bool enable); @@ -230,10 +231,6 @@ class ChannelManager : public rtc::MessageHandler, // This API is mainly a hook used by unittests. const std::string& video_device_name() const { return video_device_name_; } - // TODO(hellner): Remove this function once the engine capturer has been - // removed. - VideoFormat GetStartCaptureFormat(); - protected: // Adds non-transient parameters which can only be changed through the // options store. @@ -282,6 +279,8 @@ class ChannelManager : public rtc::MessageHandler, bool UnregisterVideoProcessor_w(VideoCapturer* capturer, VideoProcessor* processor); bool IsScreencastRunning_w() const; + bool SetDefaultVideoEncoderConfig_w(const VideoEncoderConfig& config); + VideoEncoderConfig GetDefaultVideoEncoderConfig_w() const; virtual void OnMessage(rtc::Message *message); rtc::scoped_ptr media_engine_;