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

(Auto)update libjingle 74955991-> 75042522

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7106 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-09-08 19:45:36 +00:00
parent 1272ee59b3
commit fd42f9dd6f
7 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,6 @@ class FileMediaEngine : public MediaEngineInterface {
virtual SoundclipMedia* CreateSoundclip() { return NULL; } virtual SoundclipMedia* CreateSoundclip() { return NULL; }
virtual AudioOptions GetAudioOptions() const { return AudioOptions(); } virtual AudioOptions GetAudioOptions() const { return AudioOptions(); }
virtual bool SetAudioOptions(const AudioOptions& options) { return true; } virtual bool SetAudioOptions(const AudioOptions& options) { return true; }
virtual bool SetVideoOptions(const VideoOptions& options) { return true; }
virtual bool SetAudioDelayOffset(int offset) { return true; } virtual bool SetAudioDelayOffset(int offset) { return true; }
virtual bool SetDefaultVideoEncoderConfig(const VideoEncoderConfig& config) { virtual bool SetDefaultVideoEncoderConfig(const VideoEncoderConfig& config) {
return true; return true;

2
talk/media/base/filemediaengine_unittest.cc
View File

@ -223,8 +223,6 @@ TEST_F(FileMediaEngineTest, TestDefaultImplementation) {
EXPECT_TRUE(NULL == engine_->CreateSoundclip()); EXPECT_TRUE(NULL == engine_->CreateSoundclip());
cricket::AudioOptions audio_options; cricket::AudioOptions audio_options;
EXPECT_TRUE(engine_->SetAudioOptions(audio_options)); EXPECT_TRUE(engine_->SetAudioOptions(audio_options));
cricket::VideoOptions video_options;
EXPECT_TRUE(engine_->SetVideoOptions(video_options));
VideoEncoderConfig video_encoder_config; VideoEncoderConfig video_encoder_config;
EXPECT_TRUE(engine_->SetDefaultVideoEncoderConfig(video_encoder_config)); EXPECT_TRUE(engine_->SetDefaultVideoEncoderConfig(video_encoder_config));
EXPECT_TRUE(engine_->SetSoundDevices(NULL, NULL)); EXPECT_TRUE(engine_->SetSoundDevices(NULL, NULL));

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

@ -91,8 +91,6 @@ class MediaEngineInterface {
virtual AudioOptions GetAudioOptions() const = 0; virtual AudioOptions GetAudioOptions() const = 0;
// Sets global audio options. "options" are from AudioOptions, above. // Sets global audio options. "options" are from AudioOptions, above.
virtual bool SetAudioOptions(const AudioOptions& options) = 0; virtual bool SetAudioOptions(const AudioOptions& options) = 0;
// Sets global video options. "options" are from VideoOptions, above.
virtual bool SetVideoOptions(const VideoOptions& options) = 0;
// Sets the value used by the echo canceller to offset delay values obtained // Sets the value used by the echo canceller to offset delay values obtained
// from the OS. // from the OS.
virtual bool SetAudioDelayOffset(int offset) = 0; virtual bool SetAudioDelayOffset(int offset) = 0;
@ -213,9 +211,6 @@ class CompositeMediaEngine : public MediaEngineInterface {
virtual bool SetAudioOptions(const AudioOptions& options) { virtual bool SetAudioOptions(const AudioOptions& options) {
return voice_.SetOptions(options); return voice_.SetOptions(options);
} }
virtual bool SetVideoOptions(const VideoOptions& options) {
return video_.SetOptions(options);
}
virtual bool SetAudioDelayOffset(int offset) { virtual bool SetAudioDelayOffset(int offset) {
return voice_.SetDelayOffset(offset); return voice_.SetDelayOffset(offset);
} }

1
talk/media/other/linphonemediaengine.h
View File

@ -70,7 +70,6 @@ class LinphoneMediaEngine : public MediaEngineInterface {
virtual VideoMediaChannel* CreateVideoChannel(VoiceMediaChannel* voice_ch); virtual VideoMediaChannel* CreateVideoChannel(VoiceMediaChannel* voice_ch);
virtual SoundclipMedia* CreateSoundclip() { return NULL; } virtual SoundclipMedia* CreateSoundclip() { return NULL; }
virtual bool SetAudioOptions(int options) { return true; } virtual bool SetAudioOptions(int options) { return true; }
virtual bool SetVideoOptions(int options) { return true; }
virtual bool SetDefaultVideoEncoderConfig(const VideoEncoderConfig& config) { virtual bool SetDefaultVideoEncoderConfig(const VideoEncoderConfig& config) {
return true; return true;
} }

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

@ -122,9 +122,6 @@ class DelegatingWebRtcMediaEngine : public cricket::MediaEngineInterface {
virtual bool SetAudioOptions(const AudioOptions& options) OVERRIDE { virtual bool SetAudioOptions(const AudioOptions& options) OVERRIDE {
return delegate_->SetAudioOptions(options); return delegate_->SetAudioOptions(options);
} }
virtual bool SetVideoOptions(const VideoOptions& options) OVERRIDE {
return delegate_->SetVideoOptions(options);
}
virtual bool SetAudioDelayOffset(int offset) OVERRIDE { virtual bool SetAudioDelayOffset(int offset) OVERRIDE {
return delegate_->SetAudioDelayOffset(offset); return delegate_->SetAudioDelayOffset(offset);
} }

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

@ -1078,10 +1078,6 @@ int WebRtcVideoEngine::GetCapabilities() {
return VIDEO_RECV | VIDEO_SEND; return VIDEO_RECV | VIDEO_SEND;
} }
bool WebRtcVideoEngine::SetOptions(const VideoOptions &options) {
return true;
}
bool WebRtcVideoEngine::SetDefaultEncoderConfig( bool WebRtcVideoEngine::SetDefaultEncoderConfig(
const VideoEncoderConfig& config) { const VideoEncoderConfig& config) {
return SetDefaultCodec(config.max_codec); return SetDefaultCodec(config.max_codec);

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

@ -108,7 +108,6 @@ class WebRtcVideoEngine : public sigslot::has_slots<>,
void Terminate(); void Terminate();
int GetCapabilities(); int GetCapabilities();
bool SetOptions(const VideoOptions &options);
bool SetDefaultEncoderConfig(const VideoEncoderConfig& config); bool SetDefaultEncoderConfig(const VideoEncoderConfig& config);
VideoEncoderConfig GetDefaultEncoderConfig() const; VideoEncoderConfig GetDefaultEncoderConfig() const;