admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the unused NullMediaEngine (and NullVoiceEngine+NullVideoEngine).

Browse Source 
BUG=
R=pthatcher@webrtc.org

Review URL: https://codereview.webrtc.org/1494693003 .

Cr-Commit-Position: refs/heads/master@{#10889}
This commit is contained in:
Fredrik Solenberg 2015-12-04 10:41:07 +01:00
parent f7c5776d42
commit 1a5cf6eab1
1 changed files with 0 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,68 +231,6 @@ class CompositeMediaEngine : public MediaEngineInterface {
VIDEO video_;
};
// NullVoiceEngine can be used with CompositeMediaEngine in the case where only
// a video engine is desired.
class NullVoiceEngine {
public:
bool Init(rtc::Thread* worker_thread) { return true; }
void Terminate() {}
// If you need this to return an actual channel, use FakeMediaEngine instead.
VoiceMediaChannel* CreateChannel(const AudioOptions& options) {
return nullptr;
}
AudioOptions GetOptions() const { return AudioOptions(); }
bool SetOptions(const AudioOptions& options) { return true; }
bool SetDevices(const Device* in_device, const Device* out_device) {
return true;
}
bool GetOutputVolume(int* level) {
*level = 0;
return true;
}
bool SetOutputVolume(int level) { return true; }
int GetInputLevel() { return 0; }
const std::vector<AudioCodec>& codecs() { return codecs_; }
const std::vector<RtpHeaderExtension>& rtp_header_extensions() {
return rtp_header_extensions_;
}
bool StartAecDump(rtc::PlatformFile file) { return false; }
bool StartRtcEventLog(rtc::PlatformFile file) { return false; }
void StopRtcEventLog() {}
private:
std::vector<AudioCodec> codecs_;
std::vector<RtpHeaderExtension> rtp_header_extensions_;
};
// NullVideoEngine can be used with CompositeMediaEngine in the case where only
// a voice engine is desired.
class NullVideoEngine {
public:
bool Init(rtc::Thread* worker_thread) { return true; }
void Terminate() {}
// If you need this to return an actual channel, use FakeMediaEngine instead.
VideoMediaChannel* CreateChannel(
const VideoOptions& options,
VoiceMediaChannel* voice_media_channel) {
return NULL;
}
bool SetOptions(const VideoOptions& options) { return true; }
bool SetDefaultEncoderConfig(const VideoEncoderConfig& config) {
return true;
}
const std::vector<VideoCodec>& codecs() { return codecs_; }
const std::vector<RtpHeaderExtension>& rtp_header_extensions() {
return rtp_header_extensions_;
}
private:
std::vector<VideoCodec> codecs_;
std::vector<RtpHeaderExtension> rtp_header_extensions_;
};
typedef CompositeMediaEngine<NullVoiceEngine, NullVideoEngine> NullMediaEngine;
enum DataChannelType {
DCT_NONE = 0,
DCT_RTP = 1,