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_IMPL_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ |
6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ | 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 27 matching lines...) Expand all Loading... | |
38 } | 38 } |
39 | 39 |
40 namespace base { | 40 namespace base { |
41 class MessageLoopProxy; | 41 class MessageLoopProxy; |
42 } | 42 } |
43 | 43 |
44 namespace media { | 44 namespace media { |
45 class ChunkDemuxer; | 45 class ChunkDemuxer; |
46 class GpuVideoAcceleratorFactories; | 46 class GpuVideoAcceleratorFactories; |
47 class MediaLog; | 47 class MediaLog; |
48 class VideoFrameSchedulerImpl; | |
48 } | 49 } |
49 | 50 |
50 namespace webkit { | 51 namespace webkit { |
51 class WebLayerImpl; | 52 class WebLayerImpl; |
52 } | 53 } |
53 | 54 |
54 namespace content { | 55 namespace content { |
55 class BufferedDataSource; | 56 class BufferedDataSource; |
56 class VideoFrameCompositor; | 57 class VideoFrameCompositor; |
57 class WebAudioSourceProviderImpl; | 58 class WebAudioSourceProviderImpl; |
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
325 | 326 |
326 BufferedDataSourceHostImpl buffered_data_source_host_; | 327 BufferedDataSourceHostImpl buffered_data_source_host_; |
327 // TODO(sandersd): Remove this cache. http://crbug.com/360254 | 328 // TODO(sandersd): Remove this cache. http://crbug.com/360254 |
328 blink::WebTimeRanges buffered_web_time_ranges_; | 329 blink::WebTimeRanges buffered_web_time_ranges_; |
329 | 330 |
330 // Temporary for EME v0.1. In the future the init data type should be passed | 331 // Temporary for EME v0.1. In the future the init data type should be passed |
331 // through GenerateKeyRequest() directly from WebKit. | 332 // through GenerateKeyRequest() directly from WebKit. |
332 std::string init_data_type_; | 333 std::string init_data_type_; |
333 | 334 |
334 // Video rendering members. | 335 // Video rendering members. |
336 scoped_refptr<base::SingleThreadTaskRunner> compositor_runner_; | |
335 VideoFrameCompositor compositor_; | 337 VideoFrameCompositor compositor_; |
336 media::SkCanvasVideoRenderer skcanvas_video_renderer_; | 338 media::SkCanvasVideoRenderer skcanvas_video_renderer_; |
339 media::VideoFrameSchedulerImpl* | |
340 scheduler_; // Deleted on |compositor_runner_|. | |
xhwang
2014/04/24 18:48:44
nit: I am not a fan of this format. Is this done b
scherkus (not reviewing)
2014/04/25 02:04:47
Done.
(it was clang-format)
| |
337 | 341 |
338 // The compositor layer for displaying the video content when using composited | 342 // The compositor layer for displaying the video content when using composited |
339 // playback. | 343 // playback. |
340 scoped_ptr<webkit::WebLayerImpl> video_weblayer_; | 344 scoped_ptr<webkit::WebLayerImpl> video_weblayer_; |
341 | 345 |
342 // Text track objects get a unique index value when they're created. | 346 // Text track objects get a unique index value when they're created. |
343 int text_track_index_; | 347 int text_track_index_; |
344 | 348 |
345 // Manages decryption keys and decrypts encrypted frames. | 349 // Manages decryption keys and decrypts encrypted frames. |
346 scoped_ptr<ProxyDecryptor> proxy_decryptor_; | 350 scoped_ptr<ProxyDecryptor> proxy_decryptor_; |
347 | 351 |
348 // Non-owned pointer to the CDM. Updated via calls to | 352 // Non-owned pointer to the CDM. Updated via calls to |
349 // setContentDecryptionModule(). | 353 // setContentDecryptionModule(). |
350 WebContentDecryptionModuleImpl* web_cdm_; | 354 WebContentDecryptionModuleImpl* web_cdm_; |
351 | 355 |
352 media::DecryptorReadyCB decryptor_ready_cb_; | 356 media::DecryptorReadyCB decryptor_ready_cb_; |
353 | 357 |
354 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); | 358 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); |
355 }; | 359 }; |
356 | 360 |
357 } // namespace content | 361 } // namespace content |
358 | 362 |
359 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ | 363 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ |
OLD | NEW |