summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/video_reader.cc
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-09 23:22:20 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-09 23:22:20 +0000
commit3adf1b2a65a85ff7d4b55cd57a4e400f104d27dd (patch)
tree235aee1f595583297e057b058a29d2ed24d9da92 /remoting/protocol/video_reader.cc
parent9db9173baebf27623ce30770696f84a3fec74259 (diff)
downloadchromium_src-3adf1b2a65a85ff7d4b55cd57a4e400f104d27dd.zip
chromium_src-3adf1b2a65a85ff7d4b55cd57a4e400f104d27dd.tar.gz
chromium_src-3adf1b2a65a85ff7d4b55cd57a4e400f104d27dd.tar.bz2
Add VideoPacket struct for video packets. Refactor Decode interface to use it.
Various cleanups. BUG=None TEST=Unittests. Review URL: http://codereview.chromium.org/4476003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/video_reader.cc')
-rw-r--r--remoting/protocol/video_reader.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/remoting/protocol/video_reader.cc b/remoting/protocol/video_reader.cc
index 832eb04..2c1585a 100644
--- a/remoting/protocol/video_reader.cc
+++ b/remoting/protocol/video_reader.cc
@@ -19,7 +19,10 @@ VideoReader* VideoReader::Create(const SessionConfig* config) {
if (video_config.transport == ChannelConfig::TRANSPORT_SRTP) {
return new RtpVideoReader();
} else if (video_config.transport == ChannelConfig::TRANSPORT_STREAM) {
- return new ProtobufVideoReader();
+ if (video_config.codec == ChannelConfig::CODEC_ZIP)
+ return new ProtobufVideoReader(VideoPacketFormat::ENCODING_ZLIB);
+ else if (video_config.codec == ChannelConfig::CODEC_VERBATIM)
+ return new ProtobufVideoReader(VideoPacketFormat::ENCODING_VERBATIM);
}
return NULL;
}