Speex encoding/decoding.

remoting/protocol/content_description.cc

Index: remoting/protocol/content_description.cc
diff --git a/remoting/protocol/content_description.cc b/remoting/protocol/content_description.cc
index 70ba05b570ae48b4747ec83b0f998368fff7562a..8b6262d3e62465cdbb21f46e96af3be90ad08a8d 100644
--- a/remoting/protocol/content_description.cc
+++ b/remoting/protocol/content_description.cc
@@ -43,7 +43,7 @@ const char kNoneTransport[] = "none";
 const char kVerbatimCodec[] = "verbatim";
 const char kVp8Codec[] = "vp8";
 const char kZipCodec[] = "zip";
-const char kVorbisCodec[] = "vorbis";
+const char kSpeexCodec[] = "speex";

[Sergey Ulanov, 2012/08/10 20:41:37]

No need to remove vorbis - we will still plug it in eventually

[kxing, 2012/08/13 21:39:45]

Done.

 
 const char* GetTransportName(ChannelConfig::TransportType type) {
   switch (type) {
@@ -66,8 +66,8 @@ const char* GetCodecName(ChannelConfig::Codec type) {
       return kVp8Codec;
     case ChannelConfig::CODEC_ZIP:
       return kZipCodec;
-    case ChannelConfig::CODEC_VORBIS:
-      return kVorbisCodec;
+    case ChannelConfig::CODEC_SPEEX:
+      return kSpeexCodec;
     default:
       break;
   }
@@ -119,8 +119,8 @@ bool ParseCodecName(const std::string& value, ChannelConfig::Codec* codec) {
     *codec = ChannelConfig::CODEC_VP8;
   } else if (value == kZipCodec) {
     *codec = ChannelConfig::CODEC_ZIP;
-  } else if (value == kVorbisCodec) {
-    *codec = ChannelConfig::CODEC_VORBIS;
+  } else if (value == kSpeexCodec) {
+    *codec = ChannelConfig::CODEC_SPEEX;
   } else {
     return false;
   }
@@ -174,7 +174,7 @@ ContentDescription* ContentDescription::Copy() const {
 //     <control transport="stream" version="1" />
 //     <event transport="datagram" version="1" />
 //     <video transport="stream" codec="vp8" version="1" />
-//     <audio transport="stream" codec="vorbis" version="1" />
+//     <audio transport="stream" codec="speex" version="1" />
 //     <authentication>
 //      Message created by Authenticator implementation.
 //     </authentication>