diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 01:08:18 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 01:08:18 +0000 |
| commit | c363d006a8806d1be4be58cd7689359ad24de6f0 (patch) | |
| tree | 79394812b9c873e0dd4e355f5a9aa946f41581bb /remoting/protocol/video_reader.cc | |
| parent | b7f7b7cce0bfa6daa351d95db93e260f4c04d81a (diff) | |
| download | chromium_src-c363d006a8806d1be4be58cd7689359ad24de6f0.zip chromium_src-c363d006a8806d1be4be58cd7689359ad24de6f0.tar.gz chromium_src-c363d006a8806d1be4be58cd7689359ad24de6f0.tar.bz2 | |
Fix 2 crashers in remoting client.
There are two issues:
1) VideoReader::Create() was returning null for VP8 over TCP.
2) InputHandler was trying to send events before InputStub is created.
BUG=None
TEST=remoting client works
Review URL: http://codereview.chromium.org/5327002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67638 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/video_reader.cc')
| -rw-r--r-- | remoting/protocol/video_reader.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/remoting/protocol/video_reader.cc b/remoting/protocol/video_reader.cc index 2c1585a..b3bc5ed 100644 --- a/remoting/protocol/video_reader.cc +++ b/remoting/protocol/video_reader.cc @@ -19,11 +19,14 @@ VideoReader* VideoReader::Create(const SessionConfig* config) { if (video_config.transport == ChannelConfig::TRANSPORT_SRTP) { return new RtpVideoReader(); } else if (video_config.transport == ChannelConfig::TRANSPORT_STREAM) { - if (video_config.codec == ChannelConfig::CODEC_ZIP) + if (video_config.codec == ChannelConfig::CODEC_VP8) + return new ProtobufVideoReader(VideoPacketFormat::ENCODING_VP8); + else 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); } + NOTREACHED(); return NULL; } |