diff options
author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-03 08:28:54 +0000 |
---|---|---|
committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-03 08:28:54 +0000 |
commit | 0a364972ead03ee3560d473d5324fd93e3d55672 (patch) | |
tree | 2df4a17905634bc1d05bb88bb2920a75f3090204 /remoting/protocol | |
parent | 5ce7cd43ea4834d89c38f6ac94eee10fe00bd053 (diff) | |
download | chromium_src-0a364972ead03ee3560d473d5324fd93e3d55672.zip chromium_src-0a364972ead03ee3560d473d5324fd93e3d55672.tar.gz chromium_src-0a364972ead03ee3560d473d5324fd93e3d55672.tar.bz2 |
Allow verbatim codec to be negotiated for a Chromoting session since having another codec helps testing the coder/decoder pipeline.
BUG=109938
Review URL: http://codereview.chromium.org/9315046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
-rw-r--r-- | remoting/protocol/content_description.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/remoting/protocol/content_description.cc b/remoting/protocol/content_description.cc index 5e157ad..e2e3a9e 100644 --- a/remoting/protocol/content_description.cc +++ b/remoting/protocol/content_description.cc @@ -40,6 +40,7 @@ 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"; @@ -60,6 +61,8 @@ const char* GetTransportName(ChannelConfig::TransportType type) { const char* GetCodecName(ChannelConfig::Codec type) { switch (type) { + case ChannelConfig::CODEC_VERBATIM: + return kVerbatimCodec; case ChannelConfig::CODEC_VP8: return kVp8Codec; case ChannelConfig::CODEC_ZIP: @@ -111,7 +114,9 @@ bool ParseTransportName(const std::string& value, } 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; |