diff --git a/talk/media/base/fakemediaengine.h b/talk/media/base/fakemediaengine.h index 4789047629..7ca216d3b5 100644 --- a/talk/media/base/fakemediaengine.h +++ b/talk/media/base/fakemediaengine.h @@ -920,10 +920,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 dc8f8d0391..1cd9901c8d 100644 --- a/talk/media/base/filemediaengine.h +++ b/talk/media/base/filemediaengine.h @@ -149,9 +149,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 8186ad1f55..ba4d3ce62f 100644 --- a/talk/media/base/mediaengine.h +++ b/talk/media/base/mediaengine.h @@ -142,8 +142,6 @@ class MediaEngineInterface { VoiceProcessor* video_processor, MediaProcessorDirection direction) = 0; - virtual VideoFormat GetStartCaptureFormat() const = 0; - virtual sigslot::repeater2& SignalVideoCaptureStateChange() = 0; }; @@ -268,9 +266,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_; @@ -349,7 +344,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 044fc0e68c..48da1763b5 100644 --- a/talk/media/webrtc/webrtcmediaengine.h +++ b/talk/media/webrtc/webrtcmediaengine.h @@ -173,9 +173,6 @@ class DelegatingWebRtcMediaEngine : public cricket::MediaEngineInterface { return delegate_->UnregisterVoiceProcessor(ssrc, video_processor, direction); } - 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 8fe6ada6f2..cfd03ea1f7 100644 --- a/talk/media/webrtc/webrtcvideoengine.h +++ b/talk/media/webrtc/webrtcvideoengine.h @@ -180,8 +180,6 @@ class WebRtcVideoEngine : public sigslot::has_slots<> { webrtc::VideoCodec* out_codec); 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 42fe072443..953257fa69 100644 --- a/talk/media/webrtc/webrtcvideoengine2.cc +++ b/talk/media/webrtc/webrtcvideoengine2.cc @@ -363,10 +363,6 @@ void DefaultUnsignalledSsrcHandler::SetDefaultRenderer( WebRtcVideoEngine2::WebRtcVideoEngine2(WebRtcVoiceEngine* voice_engine) : worker_thread_(NULL), voice_engine_(voice_engine), - default_codec_format_(kDefaultVideoMaxWidth, - kDefaultVideoMaxHeight, - FPS_TO_INTERVAL(kDefaultVideoMaxFramerate), - FOURCC_ANY), initialized_(false), call_factory_(&default_call_factory_), external_decoder_factory_(NULL), @@ -434,11 +430,6 @@ bool WebRtcVideoEngine2::SetDefaultEncoderConfig( return false; } - default_codec_format_ = - VideoFormat(codec.width, - codec.height, - VideoFormat::FpsToInterval(codec.framerate), - FOURCC_ANY); return true; } diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/talk/media/webrtc/webrtcvideoengine2.h index 321614dd3e..55c54843c8 100644 --- a/talk/media/webrtc/webrtcvideoengine2.h +++ b/talk/media/webrtc/webrtcvideoengine2.h @@ -152,8 +152,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_; } - private: std::vector GetSupportedCodecs() const; @@ -161,7 +159,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 eb74df6bf3..eca4729563 100644 --- a/talk/session/media/channelmanager.cc +++ b/talk/session/media/channelmanager.cc @@ -1013,11 +1013,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 ae9224a578..ca95f65d3b 100644 --- a/talk/session/media/channelmanager.h +++ b/talk/session/media/channelmanager.h @@ -240,9 +240,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