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