OLD | NEW |
---|---|
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 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
423 | 423 |
424 // TODO(xhwang): Remove |cdm_factory_| when prefixed EME is deprecated. See | 424 // TODO(xhwang): Remove |cdm_factory_| when prefixed EME is deprecated. See |
425 // http://crbug.com/249976 | 425 // http://crbug.com/249976 |
426 media::CdmFactory* const cdm_factory_; | 426 media::CdmFactory* const cdm_factory_; |
427 | 427 |
428 media::MediaPermission* media_permission_; | 428 media::MediaPermission* media_permission_; |
429 | 429 |
430 // Player ID assigned by the |player_manager_|. | 430 // Player ID assigned by the |player_manager_|. |
431 int player_id_; | 431 int player_id_; |
432 | 432 |
433 // User created media session id, if any. 0 means the non web | |
mlamouri (slow - plz ping)
2016/02/22 16:58:20
nit: use some const?
philipj_slow
2016/02/23 07:06:56
For player_id_ as well, then?
davve
2016/02/23 08:12:10
Done.
| |
434 // exposed default media session. | |
435 int media_session_id_; | |
436 | |
433 // Current player states. | 437 // Current player states. |
434 blink::WebMediaPlayer::NetworkState network_state_; | 438 blink::WebMediaPlayer::NetworkState network_state_; |
435 blink::WebMediaPlayer::ReadyState ready_state_; | 439 blink::WebMediaPlayer::ReadyState ready_state_; |
436 | 440 |
437 // GL texture ID allocated to the video. | 441 // GL texture ID allocated to the video. |
438 unsigned int texture_id_; | 442 unsigned int texture_id_; |
439 | 443 |
440 // GL texture mailbox for texture_id_ to provide in the VideoFrame, and sync | 444 // GL texture mailbox for texture_id_ to provide in the VideoFrame, and sync |
441 // point for when the mailbox was produced. | 445 // point for when the mailbox was produced. |
442 gpu::Mailbox texture_mailbox_; | 446 gpu::Mailbox texture_mailbox_; |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
560 | 564 |
561 // NOTE: Weak pointers must be invalidated before all other member variables. | 565 // NOTE: Weak pointers must be invalidated before all other member variables. |
562 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; | 566 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; |
563 | 567 |
564 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); | 568 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); |
565 }; | 569 }; |
566 | 570 |
567 } // namespace content | 571 } // namespace content |
568 | 572 |
569 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 573 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
OLD | NEW |