diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-12 20:28:21 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-12 20:28:21 +0000 |
| commit | 0d6b9de51ecd62d56c52c5a5f1d8fa782a1f0873 (patch) | |
| tree | d317abdb14fba65b06c498dbc62011450d8ebe56 /remoting/host/client_session.cc | |
| parent | 65ec6e7c262e144a70d7ac5279ea52eb67dcd035 (diff) | |
| download | chromium_src-0d6b9de51ecd62d56c52c5a5f1d8fa782a1f0873.zip chromium_src-0d6b9de51ecd62d56c52c5a5f1d8fa782a1f0873.tar.gz chromium_src-0d6b9de51ecd62d56c52c5a5f1d8fa782a1f0873.tar.bz2 | |
Remove obsolete audio codecs and channel configurations.
We always use Opus for audio. Removed Speex audio codec.
Also removed non-multiplexed channel configurations for
control, event and audio channels.
R=wez@chromium.org
Review URL: https://codereview.chromium.org/24041005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/client_session.cc')
| -rw-r--r-- | remoting/host/client_session.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/remoting/host/client_session.cc b/remoting/host/client_session.cc index 45439f4..6d424244 100644 --- a/remoting/host/client_session.cc +++ b/remoting/host/client_session.cc @@ -10,7 +10,6 @@ #include "remoting/base/capabilities.h" #include "remoting/codec/audio_encoder.h" #include "remoting/codec/audio_encoder_opus.h" -#include "remoting/codec/audio_encoder_speex.h" #include "remoting/codec/audio_encoder_verbatim.h" #include "remoting/codec/video_encoder.h" #include "remoting/codec/video_encoder_verbatim.h" @@ -433,7 +432,7 @@ scoped_ptr<VideoEncoder> ClientSession::CreateVideoEncoder( return scoped_ptr<VideoEncoder>(new remoting::VideoEncoderVp8()); } - NOTIMPLEMENTED(); + NOTREACHED(); return scoped_ptr<VideoEncoder>(); } @@ -444,13 +443,11 @@ scoped_ptr<AudioEncoder> ClientSession::CreateAudioEncoder( if (audio_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) { return scoped_ptr<AudioEncoder>(new AudioEncoderVerbatim()); - } else if (audio_config.codec == protocol::ChannelConfig::CODEC_SPEEX) { - return scoped_ptr<AudioEncoder>(new AudioEncoderSpeex()); } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { return scoped_ptr<AudioEncoder>(new AudioEncoderOpus()); } - NOTIMPLEMENTED(); + NOTREACHED(); return scoped_ptr<AudioEncoder>(); } |