diff options
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/client_connection.cc | 2 | ||||
| -rw-r--r-- | remoting/host/differ_unittest.cc | 14 | ||||
| -rw-r--r-- | remoting/host/encoder_verbatim.cc | 2 | ||||
| -rw-r--r-- | remoting/host/session_manager.cc | 4 |
4 files changed, 10 insertions, 12 deletions
diff --git a/remoting/host/client_connection.cc b/remoting/host/client_connection.cc index 23b8b80..d2c0df0 100644 --- a/remoting/host/client_connection.cc +++ b/remoting/host/client_connection.cc @@ -15,7 +15,7 @@ namespace remoting { // Determine how many update streams we should count to find the size of // average update stream. -static const int kAverageUpdateStream = 10; +static const size_t kAverageUpdateStream = 10; ClientConnection::ClientConnection(MessageLoop* message_loop, ProtocolDecoder* decoder, diff --git a/remoting/host/differ_unittest.cc b/remoting/host/differ_unittest.cc index 6973fee..2280407 100644 --- a/remoting/host/differ_unittest.cc +++ b/remoting/host/differ_unittest.cc @@ -145,7 +145,7 @@ class DifferTest : public testing::Test { DirtyRects* dirty = new DirtyRects(); differ_->MergeBlocks(dirty); - ASSERT_EQ(1, dirty->size()); + ASSERT_EQ(1UL, dirty->size()); CheckDirtyRect(dirty->at(0), x_origin, y_origin, width, height); } @@ -272,7 +272,7 @@ TEST_F(DifferTest, MergeBlocks_Empty) { DirtyRects* dirty = new DirtyRects(); differ_->MergeBlocks(dirty); - EXPECT_EQ(0, dirty->size()); + EXPECT_EQ(0UL, dirty->size()); } TEST_F(DifferTest, MergeBlocks_SingleBlock) { @@ -435,7 +435,7 @@ TEST_F(DifferTest, MergeBlocks_MultiRect) { dirty = new DirtyRects(); differ_->MergeBlocks(dirty); - ASSERT_EQ(3, dirty->size()); + ASSERT_EQ(3UL, dirty->size()); CheckDirtyRect(dirty->at(0), 1, 0, 1, 1); CheckDirtyRect(dirty->at(1), 0, 1, 1, 1); CheckDirtyRect(dirty->at(2), 2, 2, 1, 1); @@ -456,7 +456,7 @@ TEST_F(DifferTest, MergeBlocks_MultiRect) { dirty = new DirtyRects(); differ_->MergeBlocks(dirty); - ASSERT_EQ(2, dirty->size()); + ASSERT_EQ(2UL, dirty->size()); CheckDirtyRect(dirty->at(0), 2, 0, 1, 3); CheckDirtyRect(dirty->at(1), 0, 1, 2, 2); @@ -477,7 +477,7 @@ TEST_F(DifferTest, MergeBlocks_MultiRect) { dirty = new DirtyRects(); differ_->MergeBlocks(dirty); - ASSERT_EQ(3, dirty->size()); + ASSERT_EQ(3UL, dirty->size()); CheckDirtyRect(dirty->at(0), 0, 1, 1, 2); CheckDirtyRect(dirty->at(1), 2, 1, 1, 2); CheckDirtyRect(dirty->at(2), 1, 2, 1, 1); @@ -500,7 +500,7 @@ TEST_F(DifferTest, MergeBlocks_MultiRect) { dirty = new DirtyRects(); differ_->MergeBlocks(dirty); - ASSERT_EQ(4, dirty->size()); + ASSERT_EQ(4UL, dirty->size()); CheckDirtyRect(dirty->at(0), 0, 0, 3, 1); CheckDirtyRect(dirty->at(1), 0, 1, 1, 2); CheckDirtyRect(dirty->at(2), 2, 1, 1, 2); @@ -522,7 +522,7 @@ TEST_F(DifferTest, MergeBlocks_MultiRect) { dirty = new DirtyRects(); differ_->MergeBlocks(dirty); - ASSERT_EQ(2, dirty->size()); + ASSERT_EQ(2UL, dirty->size()); CheckDirtyRect(dirty->at(0), 0, 0, 2, 2); CheckDirtyRect(dirty->at(1), 1, 2, 1, 1); } diff --git a/remoting/host/encoder_verbatim.cc b/remoting/host/encoder_verbatim.cc index f054ae8..e51248c 100644 --- a/remoting/host/encoder_verbatim.cc +++ b/remoting/host/encoder_verbatim.cc @@ -21,8 +21,6 @@ void EncoderVerbatim::Encode(const DirtyRects& dirty_rects, for (int i = 0; i < num_rects; i++) { scoped_refptr<DataBuffer> data; gfx::Rect dirty_rect = dirty_rects[i]; - PixelFormat pixel_format; - UpdateStreamEncoding encoding; scoped_ptr<UpdateStreamPacketHeader> header(new UpdateStreamPacketHeader); if (EncodeRect(dirty_rect, input_data, diff --git a/remoting/host/session_manager.cc b/remoting/host/session_manager.cc index c434742..ec2e7dc 100644 --- a/remoting/host/session_manager.cc +++ b/remoting/host/session_manager.cc @@ -44,9 +44,9 @@ SessionManager::SessionManager( capturer_(capturer), encoder_(encoder), rate_(kDefaultCaptureRate), - max_rate_(kDefaultCaptureRate), started_(false), recordings_(0), + max_rate_(kDefaultCaptureRate), rate_control_started_(false) { DCHECK(capture_loop_); DCHECK(encode_loop_); @@ -308,7 +308,7 @@ void SessionManager::DoRateControl() { } // If |slow_down| equals zero, we have no slow down. - int slow_down = max_pending_update_streams / kSlowDownFactor; + size_t slow_down = max_pending_update_streams / kSlowDownFactor; // Set new_rate to -1 for checking later. double new_rate = -1; // If the slow down is too large. |