OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "remoting/protocol/video_reader.h" | 5 #include "remoting/protocol/video_reader.h" |
6 | 6 |
7 #include "remoting/protocol/session_config.h" | 7 #include "remoting/protocol/session_config.h" |
8 #include "remoting/protocol/protobuf_video_reader.h" | 8 #include "remoting/protocol/protobuf_video_reader.h" |
9 | 9 |
10 namespace remoting { | 10 namespace remoting { |
11 namespace protocol { | 11 namespace protocol { |
12 | 12 |
13 VideoReader::~VideoReader() { } | 13 VideoReader::~VideoReader() { } |
14 | 14 |
15 // static | 15 // static |
16 VideoReader* VideoReader::Create(const SessionConfig& config) { | 16 scoped_ptr<VideoReader> VideoReader::Create(const SessionConfig& config) { |
17 const ChannelConfig& video_config = config.video_config(); | 17 const ChannelConfig& video_config = config.video_config(); |
18 if (video_config.transport == ChannelConfig::TRANSPORT_STREAM) { | 18 if (video_config.transport == ChannelConfig::TRANSPORT_STREAM) { |
19 if (video_config.codec == ChannelConfig::CODEC_VP8) { | 19 if (video_config.codec == ChannelConfig::CODEC_VP8) { |
20 return new ProtobufVideoReader(VideoPacketFormat::ENCODING_VP8); | 20 return scoped_ptr<VideoReader>( |
| 21 new ProtobufVideoReader(VideoPacketFormat::ENCODING_VP8)); |
21 } else if (video_config.codec == ChannelConfig::CODEC_ZIP) { | 22 } else if (video_config.codec == ChannelConfig::CODEC_ZIP) { |
22 return new ProtobufVideoReader(VideoPacketFormat::ENCODING_ZLIB); | 23 return scoped_ptr<VideoReader>( |
| 24 new ProtobufVideoReader(VideoPacketFormat::ENCODING_ZLIB)); |
23 } else if (video_config.codec == ChannelConfig::CODEC_VERBATIM) { | 25 } else if (video_config.codec == ChannelConfig::CODEC_VERBATIM) { |
24 return new ProtobufVideoReader(VideoPacketFormat::ENCODING_VERBATIM); | 26 return scoped_ptr<VideoReader>( |
| 27 new ProtobufVideoReader(VideoPacketFormat::ENCODING_VERBATIM)); |
25 } | 28 } |
26 } | 29 } |
27 NOTREACHED(); | 30 NOTREACHED(); |
28 return NULL; | 31 return scoped_ptr<VideoReader>(NULL); |
29 } | 32 } |
30 | 33 |
31 } // namespace protocol | 34 } // namespace protocol |
32 } // namespace remoting | 35 } // namespace remoting |
OLD | NEW |