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 MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ | 5 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ |
| 6 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ | 6 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 453 // for a transient sound. Playout volume is derived by volume * multiplier. | 453 // for a transient sound. Playout volume is derived by volume * multiplier. |
| 454 double volume_; | 454 double volume_; |
| 455 double volume_multiplier_; | 455 double volume_multiplier_; |
| 456 | 456 |
| 457 scoped_ptr<RendererFactory> renderer_factory_; | 457 scoped_ptr<RendererFactory> renderer_factory_; |
| 458 | 458 |
| 459 // For requesting surfaces on behalf of the Android H/W decoder in fullscreen. | 459 // For requesting surfaces on behalf of the Android H/W decoder in fullscreen. |
| 460 // This will be null everywhere but Android. | 460 // This will be null everywhere but Android. |
| 461 SurfaceManager* surface_manager_; | 461 SurfaceManager* surface_manager_; |
| 462 | 462 |
| 463 std::vector<blink::WebMediaPlayer::TrackId> blink_audio_tracks_; | |
|
wolenetz
2016/03/11 23:19:54
nit: do we really need the "blink_" prefix on thes
servolk
2016/03/18 18:36:42
The main reason I wanted to include 'blink_' in he
wolenetz
2016/03/23 22:53:03
Acknowledged.
| |
| 464 std::vector<blink::WebMediaPlayer::TrackId> blink_video_tracks_; | |
| 465 | |
| 463 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); | 466 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); |
| 464 }; | 467 }; |
| 465 | 468 |
| 466 } // namespace media | 469 } // namespace media |
| 467 | 470 |
| 468 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ | 471 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ |
| OLD | NEW |