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

Removing unused method GetDefaultVideoEncoderConfig.

Browse Source 
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
This commit is contained in:
andresp@webrtc.org 2014-11-06 11:16:32 +00:00
parent 931e3da8f2
commit 19b4741004
8 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -879,9 +879,6 @@ class FakeVideoEngine : public FakeBaseEngine {
default_encoder_config_ = config;
return true;
}
VideoEncoderConfig GetDefaultEncoderConfig() const {
return default_encoder_config_;
}
const VideoEncoderConfig& default_encoder_config() const {
return default_encoder_config_;
}

3
talk/media/base/filemediaengine.h
View File

@ -93,9 +93,6 @@ class FileMediaEngine : public MediaEngineInterface {
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;
}

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

@ -99,10 +99,6 @@ class MediaEngineInterface {
// 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 @@ class CompositeMediaEngine : public MediaEngineInterface {
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 @@ class NullVideoEngine {
return NULL;
}
bool SetOptions(const VideoOptions& options) { return true; }
VideoEncoderConfig GetDefaultEncoderConfig() const {
return VideoEncoderConfig();
}
bool SetDefaultEncoderConfig(const VideoEncoderConfig& config) {
return true;
}

3
talk/media/webrtc/webrtcmediaengine.h
View File

@ -130,9 +130,6 @@ class DelegatingWebRtcMediaEngine : public cricket::MediaEngineInterface {
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);

11
talk/media/webrtc/webrtcvideoengine.cc
View File

@ -1144,17 +1144,6 @@ bool WebRtcVideoEngine::SetDefaultEncoderConfig(
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

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

@ -108,7 +108,6 @@ class WebRtcVideoEngine : public sigslot::has_slots<>,
int GetCapabilities();
bool SetDefaultEncoderConfig(const VideoEncoderConfig& config);
VideoEncoderConfig GetDefaultEncoderConfig() const;
// TODO(pbos): Remove when all call sites use VideoOptions.
virtual WebRtcVideoMediaChannel* CreateChannel(

4
talk/media/webrtc/webrtcvideoengine2.cc
View File

@ -427,10 +427,6 @@ bool WebRtcVideoEngine2::SetDefaultEncoderConfig(
return true;
}
VideoEncoderConfig WebRtcVideoEngine2::GetDefaultEncoderConfig() const {
return VideoEncoderConfig(DefaultVideoCodec());
}
WebRtcVideoChannel2* WebRtcVideoEngine2::CreateChannel(
const VideoOptions& options,
VoiceMediaChannel* voice_channel) {

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

@ -145,7 +145,6 @@ class WebRtcVideoEngine2 : public sigslot::has_slots<> {
int GetCapabilities();
bool SetDefaultEncoderConfig(const VideoEncoderConfig& config);
VideoEncoderConfig GetDefaultEncoderConfig() const;
WebRtcVideoChannel2* CreateChannel(const VideoOptions& options,
VoiceMediaChannel* voice_channel);