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

Side by Side Diff: cc/trees/layer_tree_host_unittest_context.cc

Issue 1476523005: Verify returned frames from media::VideoFrame::Wrap*() methods (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: LOG in video_Frame and CHECK/return outside. Created 5 years 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "cc/trees/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "cc/layers/delegated_frame_provider.h" 8 #include "cc/layers/delegated_frame_provider.h"
9 #include "cc/layers/delegated_frame_resource_collection.h" 9 #include "cc/layers/delegated_frame_resource_collection.h"
10 #include "cc/layers/heads_up_display_layer.h" 10 #include "cc/layers/heads_up_display_layer.h"
(...skipping 997 matching lines...) Expand 10 before | Expand all | Expand 10 after
1008 root->AddChild(video_hw); 1008 root->AddChild(video_hw);
1009 1009
1010 scoped_refptr<VideoLayer> video_scaled_hw = VideoLayer::Create( 1010 scoped_refptr<VideoLayer> video_scaled_hw = VideoLayer::Create(
1011 layer_settings_, &scaled_hw_frame_provider_, media::VIDEO_ROTATION_0); 1011 layer_settings_, &scaled_hw_frame_provider_, media::VIDEO_ROTATION_0);
1012 video_scaled_hw->SetBounds(gfx::Size(10, 10)); 1012 video_scaled_hw->SetBounds(gfx::Size(10, 10));
1013 video_scaled_hw->SetIsDrawable(true); 1013 video_scaled_hw->SetIsDrawable(true);
1014 root->AddChild(video_scaled_hw); 1014 root->AddChild(video_scaled_hw);
1015 1015
1016 color_video_frame_ = VideoFrame::CreateColorFrame( 1016 color_video_frame_ = VideoFrame::CreateColorFrame(
1017 gfx::Size(4, 4), 0x80, 0x80, 0x80, base::TimeDelta()); 1017 gfx::Size(4, 4), 0x80, 0x80, 0x80, base::TimeDelta());
1018 CHECK(color_video_frame_);
1018 hw_video_frame_ = VideoFrame::WrapNativeTexture( 1019 hw_video_frame_ = VideoFrame::WrapNativeTexture(
1019 media::PIXEL_FORMAT_ARGB, 1020 media::PIXEL_FORMAT_ARGB,
1020 gpu::MailboxHolder(mailbox, sync_token, GL_TEXTURE_2D), 1021 gpu::MailboxHolder(mailbox, sync_token, GL_TEXTURE_2D),
1021 media::VideoFrame::ReleaseMailboxCB(), gfx::Size(4, 4), 1022 media::VideoFrame::ReleaseMailboxCB(), gfx::Size(4, 4),
1022 gfx::Rect(0, 0, 4, 4), gfx::Size(4, 4), base::TimeDelta()); 1023 gfx::Rect(0, 0, 4, 4), gfx::Size(4, 4), base::TimeDelta());
1024 CHECK(hw_video_frame_);
1023 scaled_hw_video_frame_ = VideoFrame::WrapNativeTexture( 1025 scaled_hw_video_frame_ = VideoFrame::WrapNativeTexture(
1024 media::PIXEL_FORMAT_ARGB, 1026 media::PIXEL_FORMAT_ARGB,
1025 gpu::MailboxHolder(mailbox, sync_token, GL_TEXTURE_2D), 1027 gpu::MailboxHolder(mailbox, sync_token, GL_TEXTURE_2D),
1026 media::VideoFrame::ReleaseMailboxCB(), gfx::Size(4, 4), 1028 media::VideoFrame::ReleaseMailboxCB(), gfx::Size(4, 4),
1027 gfx::Rect(0, 0, 3, 2), gfx::Size(4, 4), base::TimeDelta()); 1029 gfx::Rect(0, 0, 3, 2), gfx::Size(4, 4), base::TimeDelta());
1030 CHECK(scaled_hw_video_frame_);
1028 1031
1029 color_frame_provider_.set_frame(color_video_frame_); 1032 color_frame_provider_.set_frame(color_video_frame_);
1030 hw_frame_provider_.set_frame(hw_video_frame_); 1033 hw_frame_provider_.set_frame(hw_video_frame_);
1031 scaled_hw_frame_provider_.set_frame(scaled_hw_video_frame_); 1034 scaled_hw_frame_provider_.set_frame(scaled_hw_video_frame_);
1032 1035
1033 scoped_refptr<IOSurfaceLayer> io_surface = 1036 scoped_refptr<IOSurfaceLayer> io_surface =
1034 IOSurfaceLayer::Create(layer_settings_); 1037 IOSurfaceLayer::Create(layer_settings_);
1035 io_surface->SetBounds(gfx::Size(10, 10)); 1038 io_surface->SetBounds(gfx::Size(10, 10));
1036 io_surface->SetIsDrawable(true); 1039 io_surface->SetIsDrawable(true);
1037 io_surface->SetIOSurfaceProperties(1, gfx::Size(10, 10)); 1040 io_surface->SetIOSurfaceProperties(1, gfx::Size(10, 10));
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
1627 void AfterTest() override {} 1630 void AfterTest() override {}
1628 1631
1629 bool deferred_; 1632 bool deferred_;
1630 }; 1633 };
1631 1634
1632 SINGLE_AND_MULTI_THREAD_TEST_F( 1635 SINGLE_AND_MULTI_THREAD_TEST_F(
1633 LayerTreeHostContextTestLoseAfterSendingBeginMainFrame); 1636 LayerTreeHostContextTestLoseAfterSendingBeginMainFrame);
1634 1637
1635 } // namespace 1638 } // namespace
1636 } // namespace cc 1639 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698