OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/client/software_video_renderer.h" | 5 #include "remoting/client/software_video_renderer.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
44 } | 44 } |
45 | 45 |
46 } // namespace | 46 } // namespace |
47 | 47 |
48 SoftwareVideoRenderer::SoftwareVideoRenderer(protocol::FrameConsumer* consumer) | 48 SoftwareVideoRenderer::SoftwareVideoRenderer(protocol::FrameConsumer* consumer) |
49 : consumer_(consumer), weak_factory_(this) { | 49 : consumer_(consumer), weak_factory_(this) { |
50 thread_checker_.DetachFromThread(); | 50 thread_checker_.DetachFromThread(); |
51 } | 51 } |
52 | 52 |
53 SoftwareVideoRenderer::SoftwareVideoRenderer( | 53 SoftwareVideoRenderer::SoftwareVideoRenderer( |
54 std::unique_ptr<protocol::FrameConsumer> consumer) | |
55 : owned_consumer_(std::move(consumer)), | |
Sergey Ulanov
2016/07/20 18:39:26
nit: I think it's better to call the other constru
Yuwei
2016/07/21 00:07:32
Done.
| |
56 consumer_(owned_consumer_.get()), | |
57 weak_factory_(this) { | |
58 thread_checker_.DetachFromThread(); | |
59 } | |
60 | |
61 SoftwareVideoRenderer::SoftwareVideoRenderer( | |
54 scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner, | 62 scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner, |
55 protocol::FrameConsumer* consumer, | 63 protocol::FrameConsumer* consumer, |
56 protocol::FrameStatsConsumer* stats_consumer) | 64 protocol::FrameStatsConsumer* stats_consumer) |
57 : decode_task_runner_(decode_task_runner), | 65 : decode_task_runner_(decode_task_runner), |
58 consumer_(consumer), | 66 consumer_(consumer), |
59 stats_consumer_(stats_consumer), | 67 stats_consumer_(stats_consumer), |
60 weak_factory_(this) {} | 68 weak_factory_(this) {} |
61 | 69 |
62 SoftwareVideoRenderer::~SoftwareVideoRenderer() { | 70 SoftwareVideoRenderer::~SoftwareVideoRenderer() { |
63 if (decoder_) | 71 if (decoder_) |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
187 | 195 |
188 stats->client_stats.time_rendered = base::TimeTicks::Now(); | 196 stats->client_stats.time_rendered = base::TimeTicks::Now(); |
189 if (stats_consumer_) | 197 if (stats_consumer_) |
190 stats_consumer_->OnVideoFrameStats(*stats); | 198 stats_consumer_->OnVideoFrameStats(*stats); |
191 | 199 |
192 if (!done.is_null()) | 200 if (!done.is_null()) |
193 done.Run(); | 201 done.Run(); |
194 } | 202 } |
195 | 203 |
196 } // namespace remoting | 204 } // namespace remoting |
OLD | NEW |