Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(398)

Unified Diff: remoting/client/software_video_renderer.cc

Issue 1236663002: Allow shaped-desktop hosts to send shape only when it changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Pepper 2D renderer build Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/client/software_video_renderer.h ('k') | remoting/codec/audio_decoder_opus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/software_video_renderer.cc
diff --git a/remoting/client/software_video_renderer.cc b/remoting/client/software_video_renderer.cc
index 748c2bfa31bd850eec4d90b4b8e2836c56f55620..05edf5bc36ce5f49ba31370f39d28a85ae4252c1 100644
--- a/remoting/client/software_video_renderer.cc
+++ b/remoting/client/software_video_renderer.cc
@@ -80,7 +80,7 @@ class SoftwareVideoRenderer::Core {
public:
Core(scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner,
- scoped_refptr<FrameConsumerProxy> consumer);
+ scoped_ptr<FrameConsumerProxy> consumer);
~Core();
void OnSessionConfig(const protocol::SessionConfig& config);
@@ -104,7 +104,7 @@ class SoftwareVideoRenderer::Core {
scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner_;
- scoped_refptr<FrameConsumerProxy> consumer_;
+ scoped_ptr<FrameConsumerProxy> consumer_;
scoped_ptr<VideoDecoder> decoder_;
// Remote screen size in pixels.
@@ -129,13 +129,12 @@ class SoftwareVideoRenderer::Core {
SoftwareVideoRenderer::Core::Core(
scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner,
- scoped_refptr<FrameConsumerProxy> consumer)
+ scoped_ptr<FrameConsumerProxy> consumer)
: main_task_runner_(main_task_runner),
decode_task_runner_(decode_task_runner),
- consumer_(consumer),
+ consumer_(consumer.Pass()),
paint_scheduled_(false),
- weak_factory_(this) {
-}
+ weak_factory_(this) {}
SoftwareVideoRenderer::Core::~Core() {
}
@@ -242,7 +241,7 @@ void SoftwareVideoRenderer::Core::DoPaint() {
if (!output_region.is_empty()) {
buffers_.pop_front();
consumer_->ApplyBuffer(view_size_, clip_area_, buffer, output_region,
- *decoder_->GetImageShape());
+ decoder_->GetImageShape());
}
}
@@ -315,9 +314,9 @@ void SoftwareVideoRenderer::Core::SetOutputSizeAndClip(
SoftwareVideoRenderer::SoftwareVideoRenderer(
scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner,
- scoped_refptr<FrameConsumerProxy> consumer)
+ scoped_ptr<FrameConsumerProxy> consumer)
: decode_task_runner_(decode_task_runner),
- core_(new Core(main_task_runner, decode_task_runner, consumer)),
+ core_(new Core(main_task_runner, decode_task_runner, consumer.Pass())),
latest_event_timestamp_(0),
weak_factory_(this) {
DCHECK(CalledOnValidThread());
« no previous file with comments | « remoting/client/software_video_renderer.h ('k') | remoting/codec/audio_decoder_opus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698