Chromium Code Reviews

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

Issue 1308983005: NOT FOR LANDING Implement WebMediaSession (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add forward declaration Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 31 matching lines...)
42 namespace base { 42 namespace base {
43 class SingleThreadTaskRunner; 43 class SingleThreadTaskRunner;
44 } 44 }
45 45
46 namespace blink { 46 namespace blink {
47 class WebContentDecryptionModule; 47 class WebContentDecryptionModule;
48 class WebContentDecryptionModuleResult; 48 class WebContentDecryptionModuleResult;
49 class WebFrame; 49 class WebFrame;
50 class WebMediaPlayerClient; 50 class WebMediaPlayerClient;
51 class WebMediaPlayerEncryptedMediaClient; 51 class WebMediaPlayerEncryptedMediaClient;
52 class WebMediaSession;
52 class WebURL; 53 class WebURL;
53 } 54 }
54 55
55 namespace cc_blink { 56 namespace cc_blink {
56 class WebLayerImpl; 57 class WebLayerImpl;
57 } 58 }
58 59
59 namespace gpu { 60 namespace gpu {
60 struct MailboxHolder; 61 struct MailboxHolder;
61 } 62 }
(...skipping 354 matching lines...)
416 417
417 // TODO(xhwang): Remove |cdm_factory_| when prefixed EME is deprecated. See 418 // TODO(xhwang): Remove |cdm_factory_| when prefixed EME is deprecated. See
418 // http://crbug.com/249976 419 // http://crbug.com/249976
419 media::CdmFactory* const cdm_factory_; 420 media::CdmFactory* const cdm_factory_;
420 421
421 media::MediaPermission* media_permission_; 422 media::MediaPermission* media_permission_;
422 423
423 // Player ID assigned by the |player_manager_|. 424 // Player ID assigned by the |player_manager_|.
424 int player_id_; 425 int player_id_;
425 426
427 // Media Session ID.
428 int session_id_;
429
426 // Current player states. 430 // Current player states.
427 blink::WebMediaPlayer::NetworkState network_state_; 431 blink::WebMediaPlayer::NetworkState network_state_;
428 blink::WebMediaPlayer::ReadyState ready_state_; 432 blink::WebMediaPlayer::ReadyState ready_state_;
429 433
430 // GL texture ID allocated to the video. 434 // GL texture ID allocated to the video.
431 unsigned int texture_id_; 435 unsigned int texture_id_;
432 436
433 // GL texture mailbox for texture_id_ to provide in the VideoFrame, and sync 437 // GL texture mailbox for texture_id_ to provide in the VideoFrame, and sync
434 // point for when the mailbox was produced. 438 // point for when the mailbox was produced.
435 gpu::Mailbox texture_mailbox_; 439 gpu::Mailbox texture_mailbox_;
(...skipping 103 matching lines...)
539 543
540 // NOTE: Weak pointers must be invalidated before all other member variables. 544 // NOTE: Weak pointers must be invalidated before all other member variables.
541 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 545 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
542 546
543 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 547 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
544 }; 548 };
545 549
546 } // namespace content 550 } // namespace content
547 551
548 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 552 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW

Powered by Google App Engine