OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 CONTENT_BROWSER_RENDERER_HOST_SURFACE_TEXTURE_TRANSPORT_CLIENT_ANDROID_H
_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_SURFACE_TEXTURE_TRANSPORT_CLIENT_ANDROID_H
_ |
6 #define CONTENT_BROWSER_RENDERER_HOST_SURFACE_TEXTURE_TRANSPORT_CLIENT_ANDROID_H
_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_SURFACE_TEXTURE_TRANSPORT_CLIENT_ANDROID_H
_ |
7 | 7 |
8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
11 #include "cc/layers/video_frame_provider.h" | 11 #include "cc/layers/video_frame_provider.h" |
| 12 #include "gpu/command_buffer/common/mailbox.h" |
12 #include "ui/gfx/native_widget_types.h" | 13 #include "ui/gfx/native_widget_types.h" |
13 #include "ui/gfx/size.h" | 14 #include "ui/gfx/size.h" |
14 | 15 |
15 struct ANativeWindow; | 16 struct ANativeWindow; |
16 | 17 |
17 namespace cc { | 18 namespace cc { |
18 class Layer; | 19 class Layer; |
19 class VideoLayer; | 20 class VideoLayer; |
20 } | 21 } |
21 | 22 |
(...skipping 19 matching lines...) Expand all Loading... |
41 OVERRIDE; | 42 OVERRIDE; |
42 | 43 |
43 private: | 44 private: |
44 void OnSurfaceTextureFrameAvailable(); | 45 void OnSurfaceTextureFrameAvailable(); |
45 | 46 |
46 scoped_refptr<cc::VideoLayer> video_layer_; | 47 scoped_refptr<cc::VideoLayer> video_layer_; |
47 scoped_refptr<gfx::SurfaceTextureBridge> surface_texture_; | 48 scoped_refptr<gfx::SurfaceTextureBridge> surface_texture_; |
48 ANativeWindow* window_; | 49 ANativeWindow* window_; |
49 scoped_refptr<media::VideoFrame> video_frame_; | 50 scoped_refptr<media::VideoFrame> video_frame_; |
50 uint32 texture_id_; | 51 uint32 texture_id_; |
| 52 gpu::Mailbox texture_mailbox_; |
| 53 uint32 texture_mailbox_sync_point_; |
51 int surface_id_; | 54 int surface_id_; |
52 base::WeakPtrFactory<SurfaceTextureTransportClient> weak_factory_; | 55 base::WeakPtrFactory<SurfaceTextureTransportClient> weak_factory_; |
53 | 56 |
54 DISALLOW_COPY_AND_ASSIGN(SurfaceTextureTransportClient); | 57 DISALLOW_COPY_AND_ASSIGN(SurfaceTextureTransportClient); |
55 }; | 58 }; |
56 | 59 |
57 } // namespace content | 60 } // namespace content |
58 | 61 |
59 #endif // CONTENT_BROWSER_RENDERER_HOST_SURFACE_TEXTURE_TRANSPORT_CLIENT_ANDROI
D_H_ | 62 #endif // CONTENT_BROWSER_RENDERER_HOST_SURFACE_TEXTURE_TRANSPORT_CLIENT_ANDROI
D_H_ |
OLD | NEW |