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

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

Issue 1417853006: gpu: introduce glSetStreamTextureSizeCHROMIUM(GLuint texture, GLint stream_id, GLsizei width, GLsiz… Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android_webview.test failure Created 5 years, 1 month 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
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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 private: 289 private:
290 void InitializePlayer(const GURL& url, 290 void InitializePlayer(const GURL& url,
291 const GURL& first_party_for_cookies, 291 const GURL& first_party_for_cookies,
292 bool allowed_stored_credentials, 292 bool allowed_stored_credentials,
293 int demuxer_client_id); 293 int demuxer_client_id);
294 void Pause(bool is_media_related_action); 294 void Pause(bool is_media_related_action);
295 void DrawRemotePlaybackText(const std::string& remote_playback_message); 295 void DrawRemotePlaybackText(const std::string& remote_playback_message);
296 void ReallocateVideoFrame(); 296 void ReallocateVideoFrame();
297 void SetCurrentFrameInternal(scoped_refptr<media::VideoFrame>& frame); 297 void SetCurrentFrameInternal(scoped_refptr<media::VideoFrame>& frame);
298 void RemoveSurfaceTextureAndProxy(); 298 void RemoveSurfaceTextureAndProxy();
299 void UpdateStreamTextureSize();
299 void DidLoadMediaInfo(MediaInfoLoader::Status status, 300 void DidLoadMediaInfo(MediaInfoLoader::Status status,
300 const GURL& redirected_url, 301 const GURL& redirected_url,
301 const GURL& first_party_for_cookies, 302 const GURL& first_party_for_cookies,
302 bool allow_stored_credentials); 303 bool allow_stored_credentials);
303 bool IsKeySystemSupported(const std::string& key_system); 304 bool IsKeySystemSupported(const std::string& key_system);
304 bool IsLocalResource(); 305 bool IsLocalResource();
305 306
306 // Actually do the work for generateKeyRequest/addKey so they can easily 307 // Actually do the work for generateKeyRequest/addKey so they can easily
307 // report results to UMA. 308 // report results to UMA.
308 MediaKeyException GenerateKeyRequestInternal(const std::string& key_system, 309 MediaKeyException GenerateKeyRequestInternal(const std::string& key_system,
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 blink::WebMediaPlayer::ReadyState ready_state_; 426 blink::WebMediaPlayer::ReadyState ready_state_;
426 427
427 // GL texture ID allocated to the video. 428 // GL texture ID allocated to the video.
428 unsigned int texture_id_; 429 unsigned int texture_id_;
429 430
430 // GL texture mailbox for texture_id_ to provide in the VideoFrame, and sync 431 // GL texture mailbox for texture_id_ to provide in the VideoFrame, and sync
431 // point for when the mailbox was produced. 432 // point for when the mailbox was produced.
432 gpu::Mailbox texture_mailbox_; 433 gpu::Mailbox texture_mailbox_;
433 434
434 // Stream texture ID allocated to the video. 435 // Stream texture ID allocated to the video.
435 unsigned int stream_id_; 436 int32 stream_id_;
436 437
437 // Whether the media player has been initialized. 438 // Whether the media player has been initialized.
438 bool is_player_initialized_; 439 bool is_player_initialized_;
439 440
440 // Whether the media player is playing. 441 // Whether the media player is playing.
441 bool is_playing_; 442 bool is_playing_;
442 443
443 // Whether media player needs to re-establish the surface texture peer. 444 // Whether media player needs to re-establish the surface texture peer.
444 bool needs_establish_peer_; 445 bool needs_establish_peer_;
445 446
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 532
532 // NOTE: Weak pointers must be invalidated before all other member variables. 533 // NOTE: Weak pointers must be invalidated before all other member variables.
533 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 534 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
534 535
535 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 536 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
536 }; 537 };
537 538
538 } // namespace content 539 } // namespace content
539 540
540 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 541 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698