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

Side by Side Diff: webkit/media/android/webmediaplayer_android.h

Issue 14199002: Send hardware video frames with mailboxes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: No ifdefs Created 7 years, 8 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 | Annotate | Revision Log
OLDNEW
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/WebSize.h" 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
17 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" 18 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
19 #include "webkit/media/android/stream_texture_factory_android.h" 20 #include "webkit/media/android/stream_texture_factory_android.h"
20 21
21 namespace webkit { 22 namespace webkit {
22 class WebLayerImpl; 23 class WebLayerImpl;
23 } 24 }
24 25
25 namespace webkit_media { 26 namespace webkit_media {
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 // Player ID assigned by the |manager_|. 232 // Player ID assigned by the |manager_|.
232 int player_id_; 233 int player_id_;
233 234
234 // Current player states. 235 // Current player states.
235 WebKit::WebMediaPlayer::NetworkState network_state_; 236 WebKit::WebMediaPlayer::NetworkState network_state_;
236 WebKit::WebMediaPlayer::ReadyState ready_state_; 237 WebKit::WebMediaPlayer::ReadyState ready_state_;
237 238
238 // GL texture ID allocated to the video. 239 // GL texture ID allocated to the video.
239 unsigned int texture_id_; 240 unsigned int texture_id_;
240 241
242 // GL texture mailbox for texture_id_ to provide in the VideoFrame, and sync
243 // point for when the mailbox was produced.
244 gpu::Mailbox texture_mailbox_;
245 unsigned int texture_mailbox_sync_point_;
246
241 // Stream texture ID allocated to the video. 247 // Stream texture ID allocated to the video.
242 unsigned int stream_id_; 248 unsigned int stream_id_;
243 249
244 // Whether the mediaplayer is playing. 250 // Whether the mediaplayer is playing.
245 bool is_playing_; 251 bool is_playing_;
246 252
247 // Whether media player needs to re-establish the surface texture peer. 253 // Whether media player needs to re-establish the surface texture peer.
248 bool needs_establish_peer_; 254 bool needs_establish_peer_;
249 255
250 // Whether the video size info is available. 256 // Whether the video size info is available.
(...skipping 14 matching lines...) Expand all
265 cc::VideoFrameProvider::Client* video_frame_provider_client_; 271 cc::VideoFrameProvider::Client* video_frame_provider_client_;
266 272
267 scoped_ptr<webkit::WebLayerImpl> video_weblayer_; 273 scoped_ptr<webkit::WebLayerImpl> video_weblayer_;
268 274
269 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 275 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
270 }; 276 };
271 277
272 } // namespace webkit_media 278 } // namespace webkit_media
273 279
274 #endif // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 280 #endif // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698