| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 <deque> | 5 #include <deque> |
| 6 #include <stdlib.h> | 6 #include <stdlib.h> |
| 7 | 7 |
| 8 #include "gfx/rect.h" | 8 #include "gfx/rect.h" |
| 9 #include "media/base/video_frame.h" | 9 #include "media/base/video_frame.h" |
| 10 #include "remoting/base/codec_test.h" | 10 #include "remoting/base/codec_test.h" |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 | 259 |
| 260 if (state & Encoder::EncodingInProgress) { | 260 if (state & Encoder::EncodingInProgress) { |
| 261 decoder_tester_->ReceivedMessage(message); | 261 decoder_tester_->ReceivedMessage(message); |
| 262 } | 262 } |
| 263 | 263 |
| 264 if (state & Encoder::EncodingEnded) { | 264 if (state & Encoder::EncodingEnded) { |
| 265 HostMessage* end_update = new HostMessage(); | 265 HostMessage* end_update = new HostMessage(); |
| 266 end_update->mutable_end_update_stream(); | 266 end_update->mutable_end_update_stream(); |
| 267 decoder_tester_->ReceivedMessage(end_update); | 267 decoder_tester_->ReceivedMessage(end_update); |
| 268 } | 268 } |
| 269 » } else { | 269 } else { |
| 270 delete message; | 270 delete message; |
| 271 » } | 271 } |
| 272 } | 272 } |
| 273 | 273 |
| 274 void AddRects(const gfx::Rect* rects, int count) { | 274 void AddRects(const gfx::Rect* rects, int count) { |
| 275 message_tester_->AddRects(rects, count); | 275 message_tester_->AddRects(rects, count); |
| 276 } | 276 } |
| 277 | 277 |
| 278 void set_decoder_tester(DecoderTester* decoder_tester) { | 278 void set_decoder_tester(DecoderTester* decoder_tester) { |
| 279 decoder_tester_ = decoder_tester; | 279 decoder_tester_ = decoder_tester; |
| 280 } | 280 } |
| 281 | 281 |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 EncoderTester tester(&message_tester, &state_tester); | 332 EncoderTester tester(&message_tester, &state_tester); |
| 333 | 333 |
| 334 uint8* memory; | 334 uint8* memory; |
| 335 scoped_refptr<CaptureData> data = | 335 scoped_refptr<CaptureData> data = |
| 336 PrepareEncodeData(PixelFormatRgb32, &memory); | 336 PrepareEncodeData(PixelFormatRgb32, &memory); |
| 337 | 337 |
| 338 TestEncodingRects(encoder, &tester, data, kTestRects, 1); | 338 TestEncodingRects(encoder, &tester, data, kTestRects, 1); |
| 339 TestEncodingRects(encoder, &tester, data, kTestRects + 1, 1); | 339 TestEncodingRects(encoder, &tester, data, kTestRects + 1, 1); |
| 340 TestEncodingRects(encoder, &tester, data, kTestRects + 2, 1); | 340 TestEncodingRects(encoder, &tester, data, kTestRects + 2, 1); |
| 341 TestEncodingRects(encoder, &tester, data, kTestRects + 3, 2); | 341 TestEncodingRects(encoder, &tester, data, kTestRects + 3, 2); |
| 342 delete memory; | 342 delete [] memory; |
| 343 } | 343 } |
| 344 | 344 |
| 345 static void TestEncodingRects(Encoder* encoder, | 345 static void TestEncodingRects(Encoder* encoder, |
| 346 EncoderTester* encoder_tester, | 346 EncoderTester* encoder_tester, |
| 347 DecoderTester* decoder_tester, | 347 DecoderTester* decoder_tester, |
| 348 scoped_refptr<CaptureData> data, | 348 scoped_refptr<CaptureData> data, |
| 349 const gfx::Rect* rects, int count) { | 349 const gfx::Rect* rects, int count) { |
| 350 data->mutable_dirty_rects().clear(); | 350 data->mutable_dirty_rects().clear(); |
| 351 data->mutable_dirty_rects().insert( | 351 data->mutable_dirty_rects().insert( |
| 352 data->mutable_dirty_rects().begin(), rects, rects + count); | 352 data->mutable_dirty_rects().begin(), rects, rects + count); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 375 encoder_tester.set_decoder_tester(&decoder_tester); | 375 encoder_tester.set_decoder_tester(&decoder_tester); |
| 376 | 376 |
| 377 TestEncodingRects(encoder, &encoder_tester, &decoder_tester, data, | 377 TestEncodingRects(encoder, &encoder_tester, &decoder_tester, data, |
| 378 kTestRects, 1); | 378 kTestRects, 1); |
| 379 TestEncodingRects(encoder, &encoder_tester, &decoder_tester, data, | 379 TestEncodingRects(encoder, &encoder_tester, &decoder_tester, data, |
| 380 kTestRects + 1, 1); | 380 kTestRects + 1, 1); |
| 381 TestEncodingRects(encoder, &encoder_tester, &decoder_tester, data, | 381 TestEncodingRects(encoder, &encoder_tester, &decoder_tester, data, |
| 382 kTestRects + 2, 1); | 382 kTestRects + 2, 1); |
| 383 TestEncodingRects(encoder, &encoder_tester, &decoder_tester, data, | 383 TestEncodingRects(encoder, &encoder_tester, &decoder_tester, data, |
| 384 kTestRects + 3, 2); | 384 kTestRects + 3, 2); |
| 385 delete memory; | 385 delete [] memory; |
| 386 } | 386 } |
| 387 | 387 |
| 388 } // namespace remoting | 388 } // namespace remoting |
| 389 | 389 |
| 390 DISABLE_RUNNABLE_METHOD_REFCOUNT(remoting::DecoderTester); | 390 DISABLE_RUNNABLE_METHOD_REFCOUNT(remoting::DecoderTester); |
| OLD | NEW |