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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 // blink, so that enterFullscreen() will not be called if another video is | 89 // blink, so that enterFullscreen() will not be called if another video is |
90 // already in fullscreen. | 90 // already in fullscreen. |
91 WebMediaPlayerAndroid( | 91 WebMediaPlayerAndroid( |
92 blink::WebFrame* frame, | 92 blink::WebFrame* frame, |
93 blink::WebMediaPlayerClient* client, | 93 blink::WebMediaPlayerClient* client, |
94 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, | 94 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, |
95 base::WeakPtr<media::WebMediaPlayerDelegate> delegate, | 95 base::WeakPtr<media::WebMediaPlayerDelegate> delegate, |
96 RendererMediaPlayerManager* player_manager, | 96 RendererMediaPlayerManager* player_manager, |
97 media::CdmFactory* cdm_factory, | 97 media::CdmFactory* cdm_factory, |
98 scoped_refptr<StreamTextureFactory> factory, | 98 scoped_refptr<StreamTextureFactory> factory, |
| 99 int frame_id, |
99 const media::WebMediaPlayerParams& params); | 100 const media::WebMediaPlayerParams& params); |
100 virtual ~WebMediaPlayerAndroid(); | 101 virtual ~WebMediaPlayerAndroid(); |
101 | 102 |
102 // blink::WebMediaPlayer implementation. | 103 // blink::WebMediaPlayer implementation. |
103 virtual bool supportsOverlayFullscreenVideo(); | 104 virtual bool supportsOverlayFullscreenVideo(); |
104 virtual void enterFullscreen(); | 105 virtual void enterFullscreen(); |
105 | 106 |
106 // Resource loading. | 107 // Resource loading. |
107 virtual void load(LoadType load_type, | 108 virtual void load(LoadType load_type, |
108 const blink::WebURL& url, | 109 const blink::WebURL& url, |
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
522 | 523 |
523 // base::TickClock used by |interpolator_|. | 524 // base::TickClock used by |interpolator_|. |
524 base::DefaultTickClock default_tick_clock_; | 525 base::DefaultTickClock default_tick_clock_; |
525 | 526 |
526 // Tracks the most recent media time update and provides interpolated values | 527 // Tracks the most recent media time update and provides interpolated values |
527 // as playback progresses. | 528 // as playback progresses. |
528 media::TimeDeltaInterpolator interpolator_; | 529 media::TimeDeltaInterpolator interpolator_; |
529 | 530 |
530 scoped_ptr<MediaSourceDelegate> media_source_delegate_; | 531 scoped_ptr<MediaSourceDelegate> media_source_delegate_; |
531 | 532 |
| 533 int frame_id_; |
| 534 |
532 // NOTE: Weak pointers must be invalidated before all other member variables. | 535 // NOTE: Weak pointers must be invalidated before all other member variables. |
533 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; | 536 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; |
534 | 537 |
535 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); | 538 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); |
536 }; | 539 }; |
537 | 540 |
538 } // namespace content | 541 } // namespace content |
539 | 542 |
540 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 543 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
OLD | NEW |