| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_BROWSER_MEDIA_ANDROID_MEDIA_PLAYER_RENDERER_H_ | 5 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_PLAYER_RENDERER_H_ |
| 6 #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_PLAYER_RENDERER_H_ | 6 #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_PLAYER_RENDERER_H_ |
| 7 | 7 |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
| 11 #include "base/nonce.h" |
| 11 #include "content/common/content_export.h" | 12 #include "content/common/content_export.h" |
| 12 #include "content/public/browser/render_frame_host.h" | 13 #include "content/public/browser/render_frame_host.h" |
| 13 #include "media/base/android/media_player_bridge.h" | 14 #include "media/base/android/media_player_bridge.h" |
| 14 #include "media/base/android/media_player_manager.h" | 15 #include "media/base/android/media_player_manager.h" |
| 15 #include "media/base/demuxer_stream_provider.h" | 16 #include "media/base/demuxer_stream_provider.h" |
| 16 #include "media/base/media_log.h" | 17 #include "media/base/media_log.h" |
| 17 #include "media/base/renderer.h" | 18 #include "media/base/renderer.h" |
| 18 #include "media/base/renderer_client.h" | 19 #include "media/base/renderer_client.h" |
| 19 #include "url/gurl.h" | 20 #include "url/gurl.h" |
| 20 | 21 |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 const base::TimeDelta& current_time) override; | 79 const base::TimeDelta& current_time) override; |
| 79 void OnError(int player_id, int error) override; | 80 void OnError(int player_id, int error) override; |
| 80 void OnVideoSizeChanged(int player_id, int width, int height) override; | 81 void OnVideoSizeChanged(int player_id, int width, int height) override; |
| 81 void OnWaitingForDecryptionKey(int player_id) override; | 82 void OnWaitingForDecryptionKey(int player_id) override; |
| 82 media::MediaPlayerAndroid* GetFullscreenPlayer() override; | 83 media::MediaPlayerAndroid* GetFullscreenPlayer() override; |
| 83 media::MediaPlayerAndroid* GetPlayer(int player_id) override; | 84 media::MediaPlayerAndroid* GetPlayer(int player_id) override; |
| 84 bool RequestPlay(int player_id, | 85 bool RequestPlay(int player_id, |
| 85 base::TimeDelta duration, | 86 base::TimeDelta duration, |
| 86 bool has_audio) override; | 87 bool has_audio) override; |
| 87 | 88 |
| 89 base::Nonce InitiateScopedSurfaceRequest(); |
| 90 void OnScopedSurfaceRequestCompleted(gl::ScopedJavaSurface surface); |
| 91 |
| 88 private: | 92 private: |
| 89 // Used when creating |media_player_|. | 93 // Used when creating |media_player_|. |
| 90 void OnDecoderResourcesReleased(int player_id); | 94 void OnDecoderResourcesReleased(int player_id); |
| 91 | 95 |
| 92 RenderFrameHost* render_frame_host_; | 96 RenderFrameHost* render_frame_host_; |
| 93 media::RendererClient* renderer_client_; | 97 media::RendererClient* renderer_client_; |
| 94 | 98 |
| 95 std::unique_ptr<media::MediaPlayerBridge> media_player_; | 99 std::unique_ptr<media::MediaPlayerBridge> media_player_; |
| 96 | 100 |
| 97 // Current duration of the media. | 101 // Current duration of the media. |
| 98 base::TimeDelta duration_; | 102 base::TimeDelta duration_; |
| 99 | 103 |
| 100 // Indicates if a serious error has been encountered by the |media_player_|. | 104 // Indicates if a serious error has been encountered by the |media_player_|. |
| 101 bool has_error_; | 105 bool has_error_; |
| 102 | 106 |
| 103 gfx::Size video_size_; | 107 gfx::Size video_size_; |
| 104 | 108 |
| 109 base::Nonce surface_request_token_; |
| 110 bool is_waiting_for_surface_; |
| 111 |
| 105 std::unique_ptr<media::MediaResourceGetter> media_resource_getter_; | 112 std::unique_ptr<media::MediaResourceGetter> media_resource_getter_; |
| 106 | 113 |
| 107 // NOTE: Weak pointers must be invalidated before all other member variables. | 114 // NOTE: Weak pointers must be invalidated before all other member variables. |
| 108 base::WeakPtrFactory<MediaPlayerRenderer> weak_factory_; | 115 base::WeakPtrFactory<MediaPlayerRenderer> weak_factory_; |
| 109 | 116 |
| 110 DISALLOW_COPY_AND_ASSIGN(MediaPlayerRenderer); | 117 DISALLOW_COPY_AND_ASSIGN(MediaPlayerRenderer); |
| 111 }; | 118 }; |
| 112 | 119 |
| 113 } // namespace content | 120 } // namespace content |
| 114 | 121 |
| 115 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_PLAYER_RENDERER_H_ | 122 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_PLAYER_RENDERER_H_ |
| OLD | NEW |