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 <jni.h> | 8 #include <jni.h> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
431 // Object for calling back the compositor thread to repaint the video when a | 431 // Object for calling back the compositor thread to repaint the video when a |
432 // frame available. It should be initialized on the compositor thread. | 432 // frame available. It should be initialized on the compositor thread. |
433 // Accessed on main thread and on compositor thread when main thread is | 433 // Accessed on main thread and on compositor thread when main thread is |
434 // blocked. | 434 // blocked. |
435 ScopedStreamTextureProxy stream_texture_proxy_; | 435 ScopedStreamTextureProxy stream_texture_proxy_; |
436 | 436 |
437 // Whether media player needs external surface. | 437 // Whether media player needs external surface. |
438 // Only used for the VIDEO_HOLE logic. | 438 // Only used for the VIDEO_HOLE logic. |
439 bool needs_external_surface_; | 439 bool needs_external_surface_; |
440 | 440 |
441 // Whether valid metadata are available | |
442 bool has_valid_metadata_; | |
443 | |
444 // A pointer back to the compositor to inform it about state changes. This is | 441 // A pointer back to the compositor to inform it about state changes. This is |
445 // not NULL while the compositor is actively using this webmediaplayer. | 442 // not NULL while the compositor is actively using this webmediaplayer. |
446 // Accessed on main thread and on compositor thread when main thread is | 443 // Accessed on main thread and on compositor thread when main thread is |
447 // blocked. | 444 // blocked. |
448 cc::VideoFrameProvider::Client* video_frame_provider_client_; | 445 cc::VideoFrameProvider::Client* video_frame_provider_client_; |
449 | 446 |
450 scoped_ptr<cc_blink::WebLayerImpl> video_weblayer_; | 447 scoped_ptr<cc_blink::WebLayerImpl> video_weblayer_; |
451 | 448 |
452 #if defined(VIDEO_HOLE) | 449 #if defined(VIDEO_HOLE) |
453 // A rectangle represents the geometry of video frame, when computed last | 450 // A rectangle represents the geometry of video frame, when computed last |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
513 | 510 |
514 // NOTE: Weak pointers must be invalidated before all other member variables. | 511 // NOTE: Weak pointers must be invalidated before all other member variables. |
515 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; | 512 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; |
516 | 513 |
517 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); | 514 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); |
518 }; | 515 }; |
519 | 516 |
520 } // namespace content | 517 } // namespace content |
521 | 518 |
522 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 519 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
OLD | NEW |