| 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 MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_ | 5 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_ |
| 6 #define MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_ | 6 #define MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "base/memory/ref_counted.h" | 12 #include "base/memory/ref_counted.h" |
| 13 #include "media/blink/media_blink_export.h" | 13 #include "media/blink/media_blink_export.h" |
| 14 #include "media/filters/context_3d.h" | 14 #include "media/filters/context_3d.h" |
| 15 | 15 |
| 16 namespace base { | 16 namespace base { |
| 17 class SingleThreadTaskRunner; | 17 class SingleThreadTaskRunner; |
| 18 class TaskRunner; | 18 class TaskRunner; |
| 19 } | 19 } |
| 20 | 20 |
| 21 namespace blink { | 21 namespace blink { |
| 22 class WebContentDecryptionModule; | 22 class WebContentDecryptionModule; |
| 23 class WebMediaPlayerClient; | 23 class WebMediaPlayerClient; |
| 24 class WebMediaSession; |
| 24 } | 25 } |
| 25 | 26 |
| 26 namespace media { | 27 namespace media { |
| 27 | 28 |
| 28 class RestartableAudioRendererSink; | 29 class RestartableAudioRendererSink; |
| 29 class MediaLog; | 30 class MediaLog; |
| 30 class MediaPermission; | 31 class MediaPermission; |
| 31 class SurfaceManager; | 32 class SurfaceManager; |
| 32 | 33 |
| 33 // Holds parameters for constructing WebMediaPlayerImpl without having | 34 // Holds parameters for constructing WebMediaPlayerImpl without having |
| (...skipping 16 matching lines...) Expand all Loading... |
| 50 const DeferLoadCB& defer_load_cb, | 51 const DeferLoadCB& defer_load_cb, |
| 51 const scoped_refptr<RestartableAudioRendererSink>& audio_renderer_sink, | 52 const scoped_refptr<RestartableAudioRendererSink>& audio_renderer_sink, |
| 52 const scoped_refptr<MediaLog>& media_log, | 53 const scoped_refptr<MediaLog>& media_log, |
| 53 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 54 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
| 54 const scoped_refptr<base::TaskRunner>& worker_task_runner, | 55 const scoped_refptr<base::TaskRunner>& worker_task_runner, |
| 55 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, | 56 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, |
| 56 const Context3DCB& context_3d, | 57 const Context3DCB& context_3d, |
| 57 const AdjustAllocatedMemoryCB& adjust_allocated_memory_cb, | 58 const AdjustAllocatedMemoryCB& adjust_allocated_memory_cb, |
| 58 MediaPermission* media_permission, | 59 MediaPermission* media_permission, |
| 59 blink::WebContentDecryptionModule* initial_cdm, | 60 blink::WebContentDecryptionModule* initial_cdm, |
| 60 SurfaceManager* surface_manager); | 61 SurfaceManager* surface_manager, |
| 62 blink::WebMediaSession* media_session); |
| 61 | 63 |
| 62 ~WebMediaPlayerParams(); | 64 ~WebMediaPlayerParams(); |
| 63 | 65 |
| 64 DeferLoadCB defer_load_cb() const { return defer_load_cb_; } | 66 DeferLoadCB defer_load_cb() const { return defer_load_cb_; } |
| 65 | 67 |
| 66 const scoped_refptr<RestartableAudioRendererSink>& audio_renderer_sink() | 68 const scoped_refptr<RestartableAudioRendererSink>& audio_renderer_sink() |
| 67 const { | 69 const { |
| 68 return audio_renderer_sink_; | 70 return audio_renderer_sink_; |
| 69 } | 71 } |
| 70 | 72 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 92 blink::WebContentDecryptionModule* initial_cdm() const { | 94 blink::WebContentDecryptionModule* initial_cdm() const { |
| 93 return initial_cdm_; | 95 return initial_cdm_; |
| 94 } | 96 } |
| 95 | 97 |
| 96 AdjustAllocatedMemoryCB adjust_allocated_memory_cb() const { | 98 AdjustAllocatedMemoryCB adjust_allocated_memory_cb() const { |
| 97 return adjust_allocated_memory_cb_; | 99 return adjust_allocated_memory_cb_; |
| 98 } | 100 } |
| 99 | 101 |
| 100 SurfaceManager* surface_manager() const { return surface_manager_; } | 102 SurfaceManager* surface_manager() const { return surface_manager_; } |
| 101 | 103 |
| 104 const blink::WebMediaSession* media_session() const { return media_session_; } |
| 105 |
| 102 private: | 106 private: |
| 103 DeferLoadCB defer_load_cb_; | 107 DeferLoadCB defer_load_cb_; |
| 104 scoped_refptr<RestartableAudioRendererSink> audio_renderer_sink_; | 108 scoped_refptr<RestartableAudioRendererSink> audio_renderer_sink_; |
| 105 scoped_refptr<MediaLog> media_log_; | 109 scoped_refptr<MediaLog> media_log_; |
| 106 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_; | 110 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_; |
| 107 scoped_refptr<base::TaskRunner> worker_task_runner_; | 111 scoped_refptr<base::TaskRunner> worker_task_runner_; |
| 108 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; | 112 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; |
| 109 Context3DCB context_3d_cb_; | 113 Context3DCB context_3d_cb_; |
| 110 AdjustAllocatedMemoryCB adjust_allocated_memory_cb_; | 114 AdjustAllocatedMemoryCB adjust_allocated_memory_cb_; |
| 111 | 115 |
| 112 // TODO(xhwang): Remove after prefixed EME API support is removed. | 116 // TODO(xhwang): Remove after prefixed EME API support is removed. |
| 113 MediaPermission* media_permission_; | 117 MediaPermission* media_permission_; |
| 114 blink::WebContentDecryptionModule* initial_cdm_; | 118 blink::WebContentDecryptionModule* initial_cdm_; |
| 115 SurfaceManager* surface_manager_; | 119 SurfaceManager* surface_manager_; |
| 116 | 120 |
| 121 blink::WebMediaSession* media_session_; |
| 122 |
| 117 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams); | 123 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams); |
| 118 }; | 124 }; |
| 119 | 125 |
| 120 } // namespace media | 126 } // namespace media |
| 121 | 127 |
| 122 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_ | 128 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_ |
| OLD | NEW |