Chromium Code Reviews| 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_WEBMEDIAPLAYER_MS_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ |
| 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ | 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 213 | 213 |
| 214 std::unique_ptr<MediaStreamRendererFactory> renderer_factory_; | 214 std::unique_ptr<MediaStreamRendererFactory> renderer_factory_; |
| 215 | 215 |
| 216 const scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_; | 216 const scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_; |
| 217 const scoped_refptr<base::TaskRunner> worker_task_runner_; | 217 const scoped_refptr<base::TaskRunner> worker_task_runner_; |
| 218 media::GpuVideoAcceleratorFactories* gpu_factories_; | 218 media::GpuVideoAcceleratorFactories* gpu_factories_; |
| 219 | 219 |
| 220 // Used for DCHECKs to ensure methods calls executed in the correct thread. | 220 // Used for DCHECKs to ensure methods calls executed in the correct thread. |
| 221 base::ThreadChecker thread_checker_; | 221 base::ThreadChecker thread_checker_; |
| 222 | 222 |
| 223 // WebMediaPlayerMS owns |compositor_| and destroys it on | 223 scoped_refptr<WebMediaPlayerMSCompositor> compositor_; |
|
DaleCurtis
2016/12/03 01:17:54
Can we avoid this?
emircan
2016/12/03 01:42:13
I can think of a way of avoiding this, but I menti
DaleCurtis
2016/12/06 01:00:42
Is this true? Or would it be sufficient to just ge
| |
| 224 // |compositor_task_runner_|. | |
| 225 std::unique_ptr<WebMediaPlayerMSCompositor> compositor_; | |
| 226 | 224 |
| 227 const scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; | 225 const scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; |
| 228 | 226 |
| 229 const std::string initial_audio_output_device_id_; | 227 const std::string initial_audio_output_device_id_; |
| 230 const url::Origin initial_security_origin_; | 228 const url::Origin initial_security_origin_; |
| 231 | 229 |
| 232 // The last volume received by setVolume() and the last volume multiplier from | 230 // The last volume received by setVolume() and the last volume multiplier from |
| 233 // OnVolumeMultiplierUpdate(). The multiplier is typical 1.0, but may be less | 231 // OnVolumeMultiplierUpdate(). The multiplier is typical 1.0, but may be less |
| 234 // if the WebMediaPlayerDelegate has requested a volume reduction (ducking) | 232 // if the WebMediaPlayerDelegate has requested a volume reduction (ducking) |
| 235 // for a transient sound. Playout volume is derived by volume * multiplier. | 233 // for a transient sound. Playout volume is derived by volume * multiplier. |
| 236 double volume_; | 234 double volume_; |
| 237 double volume_multiplier_; | 235 double volume_multiplier_; |
| 238 | 236 |
| 239 // True if playback should be started upon the next call to OnShown(). Only | 237 // True if playback should be started upon the next call to OnShown(). Only |
| 240 // used on Android. | 238 // used on Android. |
| 241 bool should_play_upon_shown_; | 239 bool should_play_upon_shown_; |
| 242 | 240 |
| 243 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); | 241 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); |
| 244 }; | 242 }; |
| 245 | 243 |
| 246 } // namespace content | 244 } // namespace content |
| 247 | 245 |
| 248 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ | 246 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ |
| OLD | NEW |