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

Side by Side Diff: content/renderer/media/android/webmediaplayer_android.h

Issue 105743004: Add gpu::MailboxHolder to hold state for a gpu::Mailbox (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 7694f236 const-ify ReleaseMailboxCB Created 6 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 #if defined(GOOGLE_TV) 228 #if defined(GOOGLE_TV)
229 bool InjectMediaStream(MediaStreamClient* media_stream_client, 229 bool InjectMediaStream(MediaStreamClient* media_stream_client,
230 media::Demuxer* demuxer, 230 media::Demuxer* demuxer,
231 const base::Closure& destroy_demuxer_cb); 231 const base::Closure& destroy_demuxer_cb);
232 #endif 232 #endif
233 233
234 // Can be called on any thread. 234 // Can be called on any thread.
235 static void OnReleaseRemotePlaybackTexture( 235 static void OnReleaseRemotePlaybackTexture(
236 const scoped_refptr<base::MessageLoopProxy>& main_loop, 236 const scoped_refptr<base::MessageLoopProxy>& main_loop,
237 const base::WeakPtr<WebMediaPlayerAndroid>& player, 237 const base::WeakPtr<WebMediaPlayerAndroid>& player,
238 uint32 sync_point); 238 scoped_ptr<gpu::MailboxHolder> mailbox_holder);
239 239
240 protected: 240 protected:
241 // Helper method to update the playing state. 241 // Helper method to update the playing state.
242 void UpdatePlayingState(bool is_playing_); 242 void UpdatePlayingState(bool is_playing_);
243 243
244 // Helper methods for posting task for setting states and update WebKit. 244 // Helper methods for posting task for setting states and update WebKit.
245 void UpdateNetworkState(blink::WebMediaPlayer::NetworkState state); 245 void UpdateNetworkState(blink::WebMediaPlayer::NetworkState state);
246 void UpdateReadyState(blink::WebMediaPlayer::ReadyState state); 246 void UpdateReadyState(blink::WebMediaPlayer::ReadyState state);
247 void TryCreateStreamTextureProxyIfNeeded(); 247 void TryCreateStreamTextureProxyIfNeeded();
248 void DoCreateStreamTexture(); 248 void DoCreateStreamTexture();
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 scoped_ptr<ProxyDecryptor> decryptor_; 447 scoped_ptr<ProxyDecryptor> decryptor_;
448 448
449 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 449 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
450 450
451 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 451 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
452 }; 452 };
453 453
454 } // namespace content 454 } // namespace content
455 455
456 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 456 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698