Removing unused method GetDefaultVideoEncoderConfig.
R=pbos@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/27959004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7649 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/media/base/fakemediaengine.h b/talk/media/base/fakemediaengine.h
index db5e2e4..ff6ae16 100644
--- a/talk/media/base/fakemediaengine.h
+++ b/talk/media/base/fakemediaengine.h
@@ -879,9 +879,6 @@
default_encoder_config_ = config;
return true;
}
- VideoEncoderConfig GetDefaultEncoderConfig() const {
- return default_encoder_config_;
- }
const VideoEncoderConfig& default_encoder_config() const {
return default_encoder_config_;
}
diff --git a/talk/media/base/filemediaengine.h b/talk/media/base/filemediaengine.h
index 9cc066d..ba29ab3 100644
--- a/talk/media/base/filemediaengine.h
+++ b/talk/media/base/filemediaengine.h
@@ -93,9 +93,6 @@
virtual bool SetDefaultVideoEncoderConfig(const VideoEncoderConfig& config) {
return true;
}
- virtual VideoEncoderConfig GetDefaultVideoEncoderConfig() const {
- return VideoEncoderConfig();
- }
virtual bool SetSoundDevices(const Device* in_dev, const Device* out_dev) {
return true;
}
diff --git a/talk/media/base/mediaengine.h b/talk/media/base/mediaengine.h
index e7222f2..b8d661c 100644
--- a/talk/media/base/mediaengine.h
+++ b/talk/media/base/mediaengine.h
@@ -99,10 +99,6 @@
// and encode video.
virtual bool SetDefaultVideoEncoderConfig(const VideoEncoderConfig& config)
= 0;
- // Gets the default (maximum) codec/resolution and encoder option used to
- // capture and encode video, as set by SetDefaultVideoEncoderConfig or the
- // default from the video engine if not previously set.
- virtual VideoEncoderConfig GetDefaultVideoEncoderConfig() const = 0;
// Device selection
// TODO(tschmelcher): Add method for selecting the soundclip device.
@@ -219,9 +215,6 @@
virtual bool SetDefaultVideoEncoderConfig(const VideoEncoderConfig& config) {
return video_.SetDefaultEncoderConfig(config);
}
- virtual VideoEncoderConfig GetDefaultVideoEncoderConfig() const {
- return video_.GetDefaultEncoderConfig();
- }
virtual bool SetSoundDevices(const Device* in_device,
const Device* out_device) {
@@ -347,9 +340,6 @@
return NULL;
}
bool SetOptions(const VideoOptions& options) { return true; }
- VideoEncoderConfig GetDefaultEncoderConfig() const {
- return VideoEncoderConfig();
- }
bool SetDefaultEncoderConfig(const VideoEncoderConfig& config) {
return true;
}
diff --git a/talk/media/webrtc/webrtcmediaengine.h b/talk/media/webrtc/webrtcmediaengine.h
index bfcfb2a..b4436cd 100644
--- a/talk/media/webrtc/webrtcmediaengine.h
+++ b/talk/media/webrtc/webrtcmediaengine.h
@@ -130,9 +130,6 @@
const VideoEncoderConfig& config) OVERRIDE {
return delegate_->SetDefaultVideoEncoderConfig(config);
}
- virtual VideoEncoderConfig GetDefaultVideoEncoderConfig() const OVERRIDE {
- return delegate_->GetDefaultVideoEncoderConfig();
- }
virtual bool SetSoundDevices(
const Device* in_device, const Device* out_device) OVERRIDE {
return delegate_->SetSoundDevices(in_device, out_device);
diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc
index a0a8d81..6dacadd 100644
--- a/talk/media/webrtc/webrtcvideoengine.cc
+++ b/talk/media/webrtc/webrtcvideoengine.cc
@@ -1144,17 +1144,6 @@
return SetDefaultCodec(config.max_codec);
}
-VideoEncoderConfig WebRtcVideoEngine::GetDefaultEncoderConfig() const {
- ASSERT(!video_codecs_.empty());
- VideoCodec max_codec(kVideoCodecPrefs[0].payload_type,
- kVideoCodecPrefs[0].name,
- video_codecs_[0].width,
- video_codecs_[0].height,
- video_codecs_[0].framerate,
- 0);
- return VideoEncoderConfig(max_codec);
-}
-
// SetDefaultCodec may be called while the capturer is running. For example, a
// test call is started in a page with QVGA default codec, and then a real call
// is started in another page with VGA default codec. This is the corner case
diff --git a/talk/media/webrtc/webrtcvideoengine.h b/talk/media/webrtc/webrtcvideoengine.h
index eee82c8..d577b4b 100644
--- a/talk/media/webrtc/webrtcvideoengine.h
+++ b/talk/media/webrtc/webrtcvideoengine.h
@@ -108,7 +108,6 @@
int GetCapabilities();
bool SetDefaultEncoderConfig(const VideoEncoderConfig& config);
- VideoEncoderConfig GetDefaultEncoderConfig() const;
// TODO(pbos): Remove when all call sites use VideoOptions.
virtual WebRtcVideoMediaChannel* CreateChannel(
diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc
index 5062fb9..a641a58 100644
--- a/talk/media/webrtc/webrtcvideoengine2.cc
+++ b/talk/media/webrtc/webrtcvideoengine2.cc
@@ -427,10 +427,6 @@
return true;
}
-VideoEncoderConfig WebRtcVideoEngine2::GetDefaultEncoderConfig() const {
- return VideoEncoderConfig(DefaultVideoCodec());
-}
-
WebRtcVideoChannel2* WebRtcVideoEngine2::CreateChannel(
const VideoOptions& options,
VoiceMediaChannel* voice_channel) {
diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/talk/media/webrtc/webrtcvideoengine2.h
index 299ac35..68cacc0 100644
--- a/talk/media/webrtc/webrtcvideoengine2.h
+++ b/talk/media/webrtc/webrtcvideoengine2.h
@@ -145,7 +145,6 @@
int GetCapabilities();
bool SetDefaultEncoderConfig(const VideoEncoderConfig& config);
- VideoEncoderConfig GetDefaultEncoderConfig() const;
WebRtcVideoChannel2* CreateChannel(const VideoOptions& options,
VoiceMediaChannel* voice_channel);
