| 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 <memory> | 10 #include <memory> |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 381 // Whether loading has progressed since the last call to didLoadingProgress. | 381 // Whether loading has progressed since the last call to didLoadingProgress. |
| 382 bool did_loading_progress_; | 382 bool did_loading_progress_; |
| 383 | 383 |
| 384 // Manages this object and delegates player calls to the browser process. | 384 // Manages this object and delegates player calls to the browser process. |
| 385 // Owned by RenderFrameImpl. | 385 // Owned by RenderFrameImpl. |
| 386 RendererMediaPlayerManager* const player_manager_; | 386 RendererMediaPlayerManager* const player_manager_; |
| 387 | 387 |
| 388 // Player ID assigned by the |player_manager_|. | 388 // Player ID assigned by the |player_manager_|. |
| 389 int player_id_; | 389 int player_id_; |
| 390 | 390 |
| 391 // User created media session id, if any. | |
| 392 // | |
| 393 // blink::WebMediaSession::DefaultID represents the non web | |
| 394 // exposed default media session. User created session ids are | |
| 395 // greater than blink::WebMediaSession::DefaultID. | |
| 396 const int media_session_id_; | |
| 397 | |
| 398 // Current player states. | 391 // Current player states. |
| 399 blink::WebMediaPlayer::NetworkState network_state_; | 392 blink::WebMediaPlayer::NetworkState network_state_; |
| 400 blink::WebMediaPlayer::ReadyState ready_state_; | 393 blink::WebMediaPlayer::ReadyState ready_state_; |
| 401 | 394 |
| 402 // GL texture ID allocated to the video. | 395 // GL texture ID allocated to the video. |
| 403 unsigned int texture_id_; | 396 unsigned int texture_id_; |
| 404 | 397 |
| 405 // GL texture mailbox for texture_id_ to provide in the VideoFrame, and sync | 398 // GL texture mailbox for texture_id_ to provide in the VideoFrame, and sync |
| 406 // point for when the mailbox was produced. | 399 // point for when the mailbox was produced. |
| 407 gpu::Mailbox texture_mailbox_; | 400 gpu::Mailbox texture_mailbox_; |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 501 | 494 |
| 502 // NOTE: Weak pointers must be invalidated before all other member variables. | 495 // NOTE: Weak pointers must be invalidated before all other member variables. |
| 503 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; | 496 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; |
| 504 | 497 |
| 505 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); | 498 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); |
| 506 }; | 499 }; |
| 507 | 500 |
| 508 } // namespace content | 501 } // namespace content |
| 509 | 502 |
| 510 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 503 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
| OLD | NEW |