forked from chromium/chromium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cc: Apply occlusion before creating quads in VideoLayerImpl.
This makes the AppendQuads method query occlusion directly and subtract it from the quads it would create before they are created, skipping quads that are completely occluded and avoiding a malloc/free for them. Depends on: https://codereview.chromium.org/203463015/ R=enne@chromium.org, enne BUG=344962 Review URL: https://codereview.chromium.org/204823003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258365 0039d316-1c4b-4281-b951-d872f2087c98
- Loading branch information
danakj@chromium.org
committed
Mar 20, 2014
1 parent
0a1b984
commit 7c65344
Showing
4 changed files
with
102 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| // Copyright 2014 The Chromium Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #include "cc/layers/video_layer_impl.h" | ||
|
|
||
| #include "cc/output/context_provider.h" | ||
| #include "cc/output/output_surface.h" | ||
| #include "cc/test/fake_video_frame_provider.h" | ||
| #include "cc/test/layer_test_common.h" | ||
| #include "cc/trees/single_thread_proxy.h" | ||
| #include "media/base/video_frame.h" | ||
| #include "testing/gtest/include/gtest/gtest.h" | ||
|
|
||
| namespace cc { | ||
| namespace { | ||
|
|
||
| TEST(VideoLayerImplTest, Occlusion) { | ||
| gfx::Size layer_size(1000, 1000); | ||
| gfx::Size viewport_size(1000, 1000); | ||
|
|
||
| LayerTestCommon::LayerImplTest impl; | ||
| DebugScopedSetImplThreadAndMainThreadBlocked thread(impl.proxy()); | ||
|
|
||
| scoped_refptr<media::VideoFrame> video_frame = | ||
| media::VideoFrame::CreateFrame(media::VideoFrame::YV12, | ||
| gfx::Size(10, 10), | ||
| gfx::Rect(10, 10), | ||
| gfx::Size(10, 10), | ||
| base::TimeDelta()); | ||
| FakeVideoFrameProvider provider; | ||
| provider.set_frame(video_frame); | ||
|
|
||
| VideoLayerImpl* video_layer_impl = | ||
| impl.AddChildToRoot<VideoLayerImpl>(&provider); | ||
| video_layer_impl->SetAnchorPoint(gfx::PointF()); | ||
| video_layer_impl->SetBounds(layer_size); | ||
| video_layer_impl->SetContentBounds(layer_size); | ||
| video_layer_impl->SetDrawsContent(true); | ||
|
|
||
| impl.CalcDrawProps(viewport_size); | ||
|
|
||
| { | ||
| SCOPED_TRACE("No occlusion"); | ||
| gfx::Rect occluded; | ||
| impl.AppendQuadsWithOcclusion(video_layer_impl, occluded); | ||
|
|
||
| LayerTestCommon::VerifyQuadsExactlyCoverRect(impl.quad_list(), | ||
| gfx::Rect(layer_size)); | ||
| EXPECT_EQ(1u, impl.quad_list().size()); | ||
| } | ||
|
|
||
| { | ||
| SCOPED_TRACE("Full occlusion"); | ||
| gfx::Rect occluded(video_layer_impl->visible_content_rect()); | ||
| impl.AppendQuadsWithOcclusion(video_layer_impl, occluded); | ||
|
|
||
| LayerTestCommon::VerifyQuadsExactlyCoverRect(impl.quad_list(), gfx::Rect()); | ||
| EXPECT_EQ(impl.quad_list().size(), 0u); | ||
| } | ||
|
|
||
| { | ||
| SCOPED_TRACE("Partial occlusion"); | ||
| gfx::Rect occluded(200, 0, 800, 1000); | ||
| impl.AppendQuadsWithOcclusion(video_layer_impl, occluded); | ||
|
|
||
| size_t partially_occluded_count = 0; | ||
| LayerTestCommon::VerifyQuadsCoverRectWithOcclusion( | ||
| impl.quad_list(), | ||
| gfx::Rect(layer_size), | ||
| occluded, | ||
| &partially_occluded_count); | ||
| // The layer outputs one quad, which is partially occluded. | ||
| EXPECT_EQ(1u, impl.quad_list().size()); | ||
| EXPECT_EQ(1u, partially_occluded_count); | ||
| } | ||
| } | ||
|
|
||
| } // namespace | ||
| } // namespace cc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters