| OLD | NEW |
| 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 "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 scoped_refptr<VideoFrameProviderClientImpl> provider_client_impl_; | 59 scoped_refptr<VideoFrameProviderClientImpl> provider_client_impl_; |
| 60 | 60 |
| 61 scoped_refptr<media::VideoFrame> frame_; | 61 scoped_refptr<media::VideoFrame> frame_; |
| 62 | 62 |
| 63 media::VideoRotation video_rotation_; | 63 media::VideoRotation video_rotation_; |
| 64 | 64 |
| 65 std::unique_ptr<VideoResourceUpdater> updater_; | 65 std::unique_ptr<VideoResourceUpdater> updater_; |
| 66 VideoFrameExternalResources::ResourceType frame_resource_type_; | 66 VideoFrameExternalResources::ResourceType frame_resource_type_; |
| 67 float frame_resource_offset_; | 67 float frame_resource_offset_; |
| 68 float frame_resource_multiplier_; | 68 float frame_resource_multiplier_; |
| 69 uint32_t frame_bits_per_channel_; |
| 69 | 70 |
| 70 struct FrameResource { | 71 struct FrameResource { |
| 71 FrameResource(ResourceId id, | 72 FrameResource(ResourceId id, |
| 72 gfx::Size size_in_pixels, | 73 gfx::Size size_in_pixels, |
| 73 bool is_overlay_candidate) | 74 bool is_overlay_candidate) |
| 74 : id(id), | 75 : id(id), |
| 75 size_in_pixels(size_in_pixels), | 76 size_in_pixels(size_in_pixels), |
| 76 is_overlay_candidate(is_overlay_candidate) {} | 77 is_overlay_candidate(is_overlay_candidate) {} |
| 77 ResourceId id; | 78 ResourceId id; |
| 78 gfx::Size size_in_pixels; | 79 gfx::Size size_in_pixels; |
| 79 bool is_overlay_candidate; | 80 bool is_overlay_candidate; |
| 80 }; | 81 }; |
| 81 std::vector<FrameResource> frame_resources_; | 82 std::vector<FrameResource> frame_resources_; |
| 82 | 83 |
| 83 // TODO(danakj): Remove these, hide software path inside ResourceProvider and | 84 // TODO(danakj): Remove these, hide software path inside ResourceProvider and |
| 84 // ExternalResource (aka TextureMailbox) classes. | 85 // ExternalResource (aka TextureMailbox) classes. |
| 85 std::vector<unsigned> software_resources_; | 86 std::vector<unsigned> software_resources_; |
| 86 // Called once for each software resource. | 87 // Called once for each software resource. |
| 87 ReleaseCallbackImpl software_release_callback_; | 88 ReleaseCallbackImpl software_release_callback_; |
| 88 | 89 |
| 89 DISALLOW_COPY_AND_ASSIGN(VideoLayerImpl); | 90 DISALLOW_COPY_AND_ASSIGN(VideoLayerImpl); |
| 90 }; | 91 }; |
| 91 | 92 |
| 92 } // namespace cc | 93 } // namespace cc |
| 93 | 94 |
| 94 #endif // CC_LAYERS_VIDEO_LAYER_IMPL_H_ | 95 #endif // CC_LAYERS_VIDEO_LAYER_IMPL_H_ |
| OLD | NEW |