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

Side by Side Diff: cc/layers/video_layer_impl.h

Issue 1142343008: cc: Rework overlays to not use the ResourceProvider and pass texture size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix more tests Created 5 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
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 #ifndef CC_LAYERS_VIDEO_LAYER_IMPL_H_ 5 #ifndef CC_LAYERS_VIDEO_LAYER_IMPL_H_
6 #define CC_LAYERS_VIDEO_LAYER_IMPL_H_ 6 #define CC_LAYERS_VIDEO_LAYER_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "cc/base/cc_export.h" 10 #include "cc/base/cc_export.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 const char* LayerTypeAsString() const override; 55 const char* LayerTypeAsString() const override;
56 56
57 scoped_refptr<VideoFrameProviderClientImpl> provider_client_impl_; 57 scoped_refptr<VideoFrameProviderClientImpl> provider_client_impl_;
58 58
59 scoped_refptr<media::VideoFrame> frame_; 59 scoped_refptr<media::VideoFrame> frame_;
60 60
61 media::VideoRotation video_rotation_; 61 media::VideoRotation video_rotation_;
62 62
63 scoped_ptr<VideoResourceUpdater> updater_; 63 scoped_ptr<VideoResourceUpdater> updater_;
64 VideoFrameExternalResources::ResourceType frame_resource_type_; 64 VideoFrameExternalResources::ResourceType frame_resource_type_;
65 std::vector<ResourceId> frame_resources_; 65 struct FrameResource {
66 FrameResource(ResourceId id, gfx::Size size_in_pixels, bool allow_overlay)
67 : id(id),
68 size_in_pixels(size_in_pixels),
69 allow_overlay(allow_overlay) {}
70 ResourceId id;
71 gfx::Size size_in_pixels;
72 bool allow_overlay;
73 };
74 std::vector<FrameResource> frame_resources_;
66 75
67 // TODO(danakj): Remove these, hide software path inside ResourceProvider and 76 // TODO(danakj): Remove these, hide software path inside ResourceProvider and
68 // ExternalResource (aka TextureMailbox) classes. 77 // ExternalResource (aka TextureMailbox) classes.
69 std::vector<unsigned> software_resources_; 78 std::vector<unsigned> software_resources_;
70 // Called once for each software resource. 79 // Called once for each software resource.
71 ReleaseCallbackImpl software_release_callback_; 80 ReleaseCallbackImpl software_release_callback_;
72 81
73 DISALLOW_COPY_AND_ASSIGN(VideoLayerImpl); 82 DISALLOW_COPY_AND_ASSIGN(VideoLayerImpl);
74 }; 83 };
75 84
76 } // namespace cc 85 } // namespace cc
77 86
78 #endif // CC_LAYERS_VIDEO_LAYER_IMPL_H_ 87 #endif // CC_LAYERS_VIDEO_LAYER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698