Speex encoding/decoding.

remoting/protocol/content_description.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/content_description.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/authenticator.h"
@@ skipping 25 matching lines @@
 const char kDeprecatedWidthAttr[] = "width";
 const char kDeprecatedHeightAttr[] = "height";
 
 const char kStreamTransport[] = "stream";
 const char kDatagramTransport[] = "datagram";
 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) {
     case ChannelConfig::TRANSPORT_STREAM:
       return kStreamTransport;
     case ChannelConfig::TRANSPORT_DATAGRAM:
       return kDatagramTransport;
     case ChannelConfig::TRANSPORT_NONE:
       return kNoneTransport;
   }
   NOTREACHED();
   return NULL;
 }
 
 const char* GetCodecName(ChannelConfig::Codec type) {
   switch (type) {
     case ChannelConfig::CODEC_VERBATIM:
       return kVerbatimCodec;
     case ChannelConfig::CODEC_VP8:
       return kVp8Codec;
     case ChannelConfig::CODEC_ZIP:
       return kZipCodec;
-    case ChannelConfig::CODEC_VORBIS:
-      return kVorbisCodec;
+    case ChannelConfig::CODEC_SPEEX:
+      return kSpeexCodec;
     default:
       break;
   }
   NOTREACHED();
   return NULL;
 }
 
 
 // Format a channel configuration tag for chromotocol session description,
 // e.g. for video channel:
@@ skipping 31 matching lines @@
   return true;
 }
 
 bool ParseCodecName(const std::string& value, ChannelConfig::Codec* codec) {
   if (value == kVerbatimCodec) {
     *codec = ChannelConfig::CODEC_VERBATIM;
   } else if (value == kVp8Codec) {
     *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;
   }
   return true;
 }
 
 // Returns false if the element is invalid.
 bool ParseChannelConfig(const XmlElement* element, bool codec_required,
                         ChannelConfig* config) {
   if (!ParseTransportName(element->Attr(QName(kDefaultNs, kTransportAttr)),
@@ skipping 33 matching lines @@
   scoped_ptr<XmlElement> message(new XmlElement(*authenticator_message_));
   return new ContentDescription(candidate_config_->Clone(), message.Pass());
 }
 
 // ToXml() creates content description for chromoting session. The
 // description looks as follows:
 //   <description xmlns="google:remoting">
 //     <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>
 //   </description>
 //
 XmlElement* ContentDescription::ToXml() const {
   XmlElement* root = new XmlElement(
       QName(kChromotingXmlNamespace, kDescriptionTag), true);
 
   std::vector<ChannelConfig>::const_iterator it;
@@ skipping 86 matching lines @@
   const XmlElement* child = Authenticator::FindAuthenticatorMessage(element);
   if (child)
     authenticator_message.reset(new XmlElement(*child));
 
   return scoped_ptr<ContentDescription>(
       new ContentDescription(config.Pass(), authenticator_message.Pass()));
 }
 
 }  // namespace protocol
 }  // namespace remoting