| 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 "cc/base/cc_export.h" | 10 #include "cc/base/cc_export.h" |
| 11 #include "cc/layers/layer_impl.h" | 11 #include "cc/layers/layer_impl.h" |
| 12 #include "cc/resources/release_callback.h" |
| 12 #include "cc/resources/video_resource_updater.h" | 13 #include "cc/resources/video_resource_updater.h" |
| 13 | 14 |
| 14 namespace media { | 15 namespace media { |
| 15 class VideoFrame; | 16 class VideoFrame; |
| 16 } | 17 } |
| 17 | 18 |
| 18 namespace cc { | 19 namespace cc { |
| 19 class VideoFrameProvider; | 20 class VideoFrameProvider; |
| 20 class VideoFrameProviderClientImpl; | 21 class VideoFrameProviderClientImpl; |
| 21 | 22 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 52 | 53 |
| 53 scoped_refptr<media::VideoFrame> frame_; | 54 scoped_refptr<media::VideoFrame> frame_; |
| 54 | 55 |
| 55 scoped_ptr<VideoResourceUpdater> updater_; | 56 scoped_ptr<VideoResourceUpdater> updater_; |
| 56 VideoFrameExternalResources::ResourceType frame_resource_type_; | 57 VideoFrameExternalResources::ResourceType frame_resource_type_; |
| 57 std::vector<ResourceProvider::ResourceId> frame_resources_; | 58 std::vector<ResourceProvider::ResourceId> frame_resources_; |
| 58 | 59 |
| 59 // TODO(danakj): Remove these, hide software path inside ResourceProvider and | 60 // TODO(danakj): Remove these, hide software path inside ResourceProvider and |
| 60 // ExternalResource (aka TextureMailbox) classes. | 61 // ExternalResource (aka TextureMailbox) classes. |
| 61 std::vector<unsigned> software_resources_; | 62 std::vector<unsigned> software_resources_; |
| 62 TextureMailbox::ReleaseCallback software_release_callback_; | 63 // Called once for each software resource. |
| 64 ReleaseCallback software_release_callback_; |
| 63 | 65 |
| 64 DISALLOW_COPY_AND_ASSIGN(VideoLayerImpl); | 66 DISALLOW_COPY_AND_ASSIGN(VideoLayerImpl); |
| 65 }; | 67 }; |
| 66 | 68 |
| 67 } // namespace cc | 69 } // namespace cc |
| 68 | 70 |
| 69 #endif // CC_LAYERS_VIDEO_LAYER_IMPL_H_ | 71 #endif // CC_LAYERS_VIDEO_LAYER_IMPL_H_ |
| OLD | NEW |