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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: media/video/capture/screen/differ_unittest.cc

Issue 16383002: Roll webrtc 4143:4179 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « DEPS ('k') | remoting/codec/codec_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "media/video/capture/screen/differ.h" 6 #include "media/video/capture/screen/differ.h"
7 #include "media/video/capture/screen/differ_block.h" 7 #include "media/video/capture/screen/differ_block.h"
8 #include "testing/gmock/include/gmock/gmock.h" 8 #include "testing/gmock/include/gmock/gmock.h"
9 9
10 namespace media { 10 namespace media {
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
551 dirty.Clear(); 551 dirty.Clear();
552 MergeBlocks(&dirty); 552 MergeBlocks(&dirty);
553 553
554 ASSERT_EQ(3, RegionRectCount(dirty)); 554 ASSERT_EQ(3, RegionRectCount(dirty));
555 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 1, 0, 1, 1)); 555 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 1, 0, 1, 1));
556 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 1, 1, 1)); 556 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 1, 1, 1));
557 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 2, 2, 1, 1)); 557 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 2, 2, 1, 1));
558 558
559 // +---+---+---+---+ +---+---+---+ 559 // +---+---+---+---+ +---+---+---+
560 // | | | X | _ | | | | 0 | 560 // | | | X | _ | | | | 0 |
561 // +---+---+---+---+ +---+---+ + 561 // +---+---+---+---+ +---+---+---+
562 // | X | X | X | _ | | 1 1 | 0 | 562 // | X | X | X | _ | | 1 1 1 |
563 // +---+---+---+---+ => + | + 563 // +---+---+---+---+ => + +
564 // | X | X | X | _ | | 1 1 | 0 | 564 // | X | X | X | _ | | 1 1 1 |
565 // +---+---+---+---+ +---+---+---+ 565 // +---+---+---+---+ +---+---+---+
566 // | _ | _ | _ | _ | 566 // | _ | _ | _ | _ |
567 // +---+---+---+---+ 567 // +---+---+---+---+
568 ClearDiffInfo(); 568 ClearDiffInfo();
569 MarkBlocks(2, 0, 1, 1); 569 MarkBlocks(2, 0, 1, 1);
570 MarkBlocks(0, 1, 3, 2); 570 MarkBlocks(0, 1, 3, 2);
571 571
572 dirty.Clear(); 572 dirty.Clear();
573 MergeBlocks(&dirty); 573 MergeBlocks(&dirty);
574 574
575 ASSERT_EQ(2, RegionRectCount(dirty)); 575 ASSERT_EQ(2, RegionRectCount(dirty));
576 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 2, 0, 1, 3)); 576 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 2, 0, 1, 1));
577 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 1, 2, 2)); 577 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 1, 3, 2));
578 578
579 // +---+---+---+---+ +---+---+---+ 579 // +---+---+---+---+ +---+---+---+
580 // | | | | _ | | | | | 580 // | | | | _ | | | | |
581 // +---+---+---+---+ +---+---+---+ 581 // +---+---+---+---+ +---+---+---+
582 // | X | | X | _ | | 0 | | 1 | 582 // | X | | X | _ | | 0 | | 1 |
583 // +---+---+---+---+ => + +---+ + 583 // +---+---+---+---+ => +---+---+---+
584 // | X | X | X | _ | | 0 | 2 | 1 | 584 // | X | X | X | _ | | 2 2 2 |
585 // +---+---+---+---+ +---+---+---+ 585 // +---+---+---+---+ +---+---+---+
586 // | _ | _ | _ | _ | 586 // | _ | _ | _ | _ |
587 // +---+---+---+---+ 587 // +---+---+---+---+
588 ClearDiffInfo(); 588 ClearDiffInfo();
589 MarkBlocks(0, 1, 1, 1); 589 MarkBlocks(0, 1, 1, 1);
590 MarkBlocks(2, 1, 1, 1); 590 MarkBlocks(2, 1, 1, 1);
591 MarkBlocks(0, 2, 3, 1); 591 MarkBlocks(0, 2, 3, 1);
592 592
593 dirty.Clear(); 593 dirty.Clear();
594 MergeBlocks(&dirty); 594 MergeBlocks(&dirty);
595 595
596 ASSERT_EQ(3, RegionRectCount(dirty)); 596 ASSERT_EQ(3, RegionRectCount(dirty));
597 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 1, 1, 2)); 597 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 1, 1, 1));
598 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 2, 1, 1, 2)); 598 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 2, 1, 1, 1));
599 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 1, 2, 1, 1)); 599 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 2, 3, 1));
600 600
601 // +---+---+---+---+ +---+---+---+ 601 // +---+---+---+---+ +---+---+---+
602 // | X | X | X | _ | | 0 0 0 | 602 // | X | X | X | _ | | 0 0 0 |
603 // +---+---+---+---+ +---+---+---+ 603 // +---+---+---+---+ +---+---+---+
604 // | X | | X | _ | | 1 | | 2 | 604 // | X | | X | _ | | 1 | | 2 |
605 // +---+---+---+---+ => + +---+ + 605 // +---+---+---+---+ => +---+---+---+
606 // | X | X | X | _ | | 1 | 3 | 2 | 606 // | X | X | X | _ | | 3 3 3 |
607 // +---+---+---+---+ +---+---+---+ 607 // +---+---+---+---+ +---+---+---+
608 // | _ | _ | _ | _ | 608 // | _ | _ | _ | _ |
609 // +---+---+---+---+ 609 // +---+---+---+---+
610 ClearDiffInfo(); 610 ClearDiffInfo();
611 MarkBlocks(0, 0, 3, 1); 611 MarkBlocks(0, 0, 3, 1);
612 MarkBlocks(0, 1, 1, 1); 612 MarkBlocks(0, 1, 1, 1);
613 MarkBlocks(2, 1, 1, 1); 613 MarkBlocks(2, 1, 1, 1);
614 MarkBlocks(0, 2, 3, 1); 614 MarkBlocks(0, 2, 3, 1);
615 615
616 dirty.Clear(); 616 dirty.Clear();
617 MergeBlocks(&dirty); 617 MergeBlocks(&dirty);
618 618
619 ASSERT_EQ(4, RegionRectCount(dirty)); 619 ASSERT_EQ(4, RegionRectCount(dirty));
620 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 0, 3, 1)); 620 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 0, 3, 1));
621 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 1, 1, 2)); 621 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 1, 1, 1));
622 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 2, 1, 1, 2)); 622 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 2, 1, 1, 1));
623 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 1, 2, 1, 1)); 623 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 2, 3, 1));
624 624
625 // +---+---+---+---+ +---+---+---+ 625 // +---+---+---+---+ +---+---+---+
626 // | X | X | | _ | | 0 0 | | 626 // | X | X | | _ | | 0 0 | |
627 // +---+---+---+---+ + +---+ 627 // +---+---+---+---+ + +---+
628 // | X | X | | _ | | 0 0 | | 628 // | X | X | | _ | | 0 0 | |
629 // +---+---+---+---+ => +---+---+---+ 629 // +---+---+---+---+ => +---+---+---+
630 // | | X | | _ | | | 1 | | 630 // | | X | | _ | | | 1 | |
631 // +---+---+---+---+ +---+---+---+ 631 // +---+---+---+---+ +---+---+---+
632 // | _ | _ | _ | _ | 632 // | _ | _ | _ | _ |
633 // +---+---+---+---+ 633 // +---+---+---+---+
634 ClearDiffInfo(); 634 ClearDiffInfo();
635 MarkBlocks(0, 0, 2, 2); 635 MarkBlocks(0, 0, 2, 2);
636 MarkBlocks(1, 2, 1, 1); 636 MarkBlocks(1, 2, 1, 1);
637 637
638 dirty.Clear(); 638 dirty.Clear();
639 MergeBlocks(&dirty); 639 MergeBlocks(&dirty);
640 640
641 ASSERT_EQ(2, RegionRectCount(dirty)); 641 ASSERT_EQ(2, RegionRectCount(dirty));
642 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 0, 2, 2)); 642 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 0, 2, 2));
643 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 1, 2, 1, 1)); 643 ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 1, 2, 1, 1));
644 } 644 }
645 645
646 } // namespace media 646 } // namespace media
OLDNEW
« no previous file with comments | « DEPS ('k') | remoting/codec/codec_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698