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

Remove SignalCaptureStateChange from MediaEngine.

Browse Source 
It's no longer used by anything.

R=juberti@google.com

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

Cr-Commit-Position: refs/heads/master@{#8994}
This commit is contained in:
Peter Thatcher 2015-04-13 17:17:41 -07:00
parent 575a8024bc
commit 56d50288e0
5 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
talk/media/base/fakemediaengine.h
View File

@ -921,8 +921,6 @@ class FakeVideoEngine : public FakeBaseEngine {
return true;
}
sigslot::repeater2<VideoCapturer*, CaptureState> SignalCaptureStateChange;
private:
std::vector<FakeVideoMediaChannel*> channels_;
std::vector<VideoCodec> codecs_;

10
talk/media/base/mediaengine.h
View File

@ -141,9 +141,6 @@ class MediaEngineInterface {
virtual bool UnregisterVoiceProcessor(uint32 ssrc,
VoiceProcessor* video_processor,
MediaProcessorDirection direction) = 0;
virtual sigslot::repeater2<VideoCapturer*, CaptureState>&
SignalVideoCaptureStateChange() = 0;
};
@ -179,7 +176,6 @@ class CompositeMediaEngine : public MediaEngineInterface {
voice_.Terminate();
return false;
}
SignalVideoCaptureStateChange().repeat(video_.SignalCaptureStateChange);
return true;
}
virtual void Terminate() {
@ -266,15 +262,10 @@ class CompositeMediaEngine : public MediaEngineInterface {
MediaProcessorDirection direction) {
return voice_.UnregisterProcessor(ssrc, processor, direction);
}
virtual sigslot::repeater2<VideoCapturer*, CaptureState>&
SignalVideoCaptureStateChange() {
return signal_state_change_;
}
protected:
VOICE voice_;
VIDEO video_;
sigslot::repeater2<VideoCapturer*, CaptureState> signal_state_change_;
};
// NullVoiceEngine can be used with CompositeMediaEngine in the case where only
@ -345,7 +336,6 @@ class NullVideoEngine {
}
void SetLogging(int min_sev, const char* filter) {}
sigslot::signal2<VideoCapturer*, CaptureState> SignalCaptureStateChange;
private:
std::vector<VideoCodec> codecs_;
std::vector<RtpHeaderExtension> rtp_header_extensions_;

2
talk/media/webrtc/webrtcvideoengine.h
View File

@ -128,8 +128,6 @@ class WebRtcVideoEngine : public sigslot::has_slots<> {
const std::vector<RtpHeaderExtension>& rtp_header_extensions() const;
void SetLogging(int min_sev, const char* filter);
sigslot::repeater2<VideoCapturer*, CaptureState> SignalCaptureStateChange;
// Set a WebRtcVideoDecoderFactory for external decoding. Video engine does
// not take the ownership of |decoder_factory|. The caller needs to make sure
// that |decoder_factory| outlives the video engine.

2
talk/media/webrtc/webrtcvideoengine2.h
View File

@ -142,8 +142,6 @@ class WebRtcVideoEngine2 : public sigslot::has_slots<> {
WebRtcVideoEncoderFactory* encoder_factory);
bool EnableTimedRender();
// This is currently ignored.
sigslot::repeater2<VideoCapturer*, CaptureState> SignalCaptureStateChange;
bool FindCodec(const VideoCodec& in);
bool CanSendCodec(const VideoCodec& in,

4
talk/session/media/channelmanager.cc
View File

@ -131,10 +131,6 @@ void ChannelManager::Construct(MediaEngineInterface* me,
SignalDevicesChange.repeat(device_manager_->SignalDevicesChange);
device_manager_->Init();
// Camera is started asynchronously, request callbacks when startup
// completes to be able to forward them to the rendering manager.
media_engine_->SignalVideoCaptureStateChange().connect(
this, &ChannelManager::OnVideoCaptureStateChange);
capture_manager_->SignalCapturerStateChange.connect(
this, &ChannelManager::OnVideoCaptureStateChange);
}