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 WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 5 #ifndef WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
6 #define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 6 #define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
7 | 7 |
8 #include <jni.h> | 8 #include <jni.h> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
11 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
13 #include "base/message_loop.h" | 13 #include "base/message_loop.h" |
14 #include "base/time.h" | 14 #include "base/time.h" |
15 #include "cc/layers/video_frame_provider.h" | 15 #include "cc/layers/video_frame_provider.h" |
| 16 #include "gpu/command_buffer/common/mailbox.h" |
16 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3
D.h" | 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3
D.h" |
17 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" | 18 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" |
18 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" | 19 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" |
19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" | 20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" |
20 #include "ui/gfx/rect_f.h" | 21 #include "ui/gfx/rect_f.h" |
21 #include "webkit/media/android/stream_texture_factory_android.h" | 22 #include "webkit/media/android/stream_texture_factory_android.h" |
22 | 23 |
23 namespace webkit { | 24 namespace webkit { |
24 class WebLayerImpl; | 25 class WebLayerImpl; |
25 } | 26 } |
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
250 // Player ID assigned by the |manager_|. | 251 // Player ID assigned by the |manager_|. |
251 int player_id_; | 252 int player_id_; |
252 | 253 |
253 // Current player states. | 254 // Current player states. |
254 WebKit::WebMediaPlayer::NetworkState network_state_; | 255 WebKit::WebMediaPlayer::NetworkState network_state_; |
255 WebKit::WebMediaPlayer::ReadyState ready_state_; | 256 WebKit::WebMediaPlayer::ReadyState ready_state_; |
256 | 257 |
257 // GL texture ID allocated to the video. | 258 // GL texture ID allocated to the video. |
258 unsigned int texture_id_; | 259 unsigned int texture_id_; |
259 | 260 |
| 261 // GL texture mailbox for texture_id_ to provide in the VideoFrame, and sync |
| 262 // point for when the mailbox was produced. |
| 263 gpu::Mailbox texture_mailbox_; |
| 264 unsigned int texture_mailbox_sync_point_; |
| 265 |
260 // Stream texture ID allocated to the video. | 266 // Stream texture ID allocated to the video. |
261 unsigned int stream_id_; | 267 unsigned int stream_id_; |
262 | 268 |
263 // Whether the mediaplayer is playing. | 269 // Whether the mediaplayer is playing. |
264 bool is_playing_; | 270 bool is_playing_; |
265 | 271 |
266 // Whether media player needs to re-establish the surface texture peer. | 272 // Whether media player needs to re-establish the surface texture peer. |
267 bool needs_establish_peer_; | 273 bool needs_establish_peer_; |
268 | 274 |
269 // Whether the video size info is available. | 275 // Whether the video size info is available. |
(...skipping 20 matching lines...) Expand all Loading... |
290 // time. | 296 // time. |
291 gfx::RectF last_computed_rect_; | 297 gfx::RectF last_computed_rect_; |
292 #endif | 298 #endif |
293 | 299 |
294 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); | 300 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); |
295 }; | 301 }; |
296 | 302 |
297 } // namespace webkit_media | 303 } // namespace webkit_media |
298 | 304 |
299 #endif // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 305 #endif // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
OLD | NEW |