summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-03 00:57:30 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-03 00:57:30 +0000
commitefff195424b347f56b9d56f8a1466a8b8d1334fd (patch)
tree502b9a78b67e162a33fc0a8a8f675b63a5f52334
parentd49c07e7b1c1d80b3c41bdb7c8860dfa99c088eb (diff)
downloadchromium_src-efff195424b347f56b9d56f8a1466a8b8d1334fd.zip
chromium_src-efff195424b347f56b9d56f8a1466a8b8d1334fd.tar.gz
chromium_src-efff195424b347f56b9d56f8a1466a8b8d1334fd.tar.bz2
Fix CapturerFake for Chromoting
CapturerFake doesn't report the dirty rect. Hence the encoder can't encode it correctly. TBR=dmaclach Review URL: http://codereview.chromium.org/2853029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51580 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--remoting/host/capturer_fake.cc1
-rw-r--r--remoting/host/session_manager.cc1
2 files changed, 2 insertions, 0 deletions
diff --git a/remoting/host/capturer_fake.cc b/remoting/host/capturer_fake.cc
index 32121d2..9ffe5bf 100644
--- a/remoting/host/capturer_fake.cc
+++ b/remoting/host/capturer_fake.cc
@@ -31,6 +31,7 @@ void CapturerFake::CaptureRects(const RectVector& rects,
width_,
height_,
pixel_format_));
+ capture_data->mutable_dirty_rects() = rects;
FinishCapture(capture_data, callback);
}
diff --git a/remoting/host/session_manager.cc b/remoting/host/session_manager.cc
index e9a73d3..8e1dd86 100644
--- a/remoting/host/session_manager.cc
+++ b/remoting/host/session_manager.cc
@@ -220,6 +220,7 @@ void SessionManager::DoCapture() {
void SessionManager::CaptureDoneCallback(
scoped_refptr<Capturer::CaptureData> capture_data) {
+ // TODO(hclam): There is a bug if the capturer doesn't produce any dirty rects.
DCHECK_EQ(capture_loop_, MessageLoop::current());
encode_loop_->PostTask(
FROM_HERE,