Improving the decoder pipeline.

remoting/protocol/content_description.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

[Wez, 2012/02/07 01:56:31]

These look like changes from an earlier CL?

 // 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"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
@@ skipping 21 matching lines @@
 const char kVersionAttr[] = "version";
 const char kCodecAttr[] = "codec";
 const char kDeprecatedWidthAttr[] = "width";
 const char kDeprecatedHeightAttr[] = "height";
 
 const char kStreamTransport[] = "stream";
 const char kDatagramTransport[] = "datagram";
 const char kSrtpTransport[] = "srtp";
 const char kRtpDtlsTransport[] = "rtp-dtls";
 
+const char kVerbatimCodec[] = "verbatim";
 const char kVp8Codec[] = "vp8";
 const char kZipCodec[] = "zip";
 
 const char* GetTransportName(ChannelConfig::TransportType type) {
   switch (type) {
     case ChannelConfig::TRANSPORT_STREAM:
       return kStreamTransport;
     case ChannelConfig::TRANSPORT_DATAGRAM:
       return kDatagramTransport;
     case ChannelConfig::TRANSPORT_SRTP:
       return kSrtpTransport;
     case ChannelConfig::TRANSPORT_RTP_DTLS:
       return kRtpDtlsTransport;
   }
   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;
     default:
       break;
   }
   NOTREACHED();
   return NULL;
 }
@@ skipping 31 matching lines @@
     *transport = ChannelConfig::TRANSPORT_SRTP;
   } else if (value == kRtpDtlsTransport) {
     *transport = ChannelConfig::TRANSPORT_RTP_DTLS;
   } else {
     return false;
   }
   return true;
 }
 
 bool ParseCodecName(const std::string& value, ChannelConfig::Codec* codec) {
-  if (value == kVp8Codec) {
+  if (value == kVerbatimCodec) {
+    *codec = ChannelConfig::CODEC_VERBATIM;
+  } else if (value == kVp8Codec) {
     *codec = ChannelConfig::CODEC_VP8;
   } else if (value == kZipCodec) {
     *codec = ChannelConfig::CODEC_ZIP;
   } else {
     return false;
   }
   return true;
 }
 
 // Returns false if the element is invalid.
@@ skipping 123 matching lines @@
       authenticator_message.reset(new XmlElement(*child));
 
     return new ContentDescription(config.Pass(), authenticator_message.Pass());
   }
   LOG(ERROR) << "Invalid description: " << element->Str();
   return NULL;
 }
 
 }  // namespace protocol
 }  // namespace remoting