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 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 | 325 |
326 BufferedDataSourceHostImpl buffered_data_source_host_; | 326 BufferedDataSourceHostImpl buffered_data_source_host_; |
327 // TODO(sandersd): Remove this cache. http://crbug.com/360254 | 327 // TODO(sandersd): Remove this cache. http://crbug.com/360254 |
328 blink::WebTimeRanges buffered_web_time_ranges_; | 328 blink::WebTimeRanges buffered_web_time_ranges_; |
329 | 329 |
330 // Temporary for EME v0.1. In the future the init data type should be passed | 330 // Temporary for EME v0.1. In the future the init data type should be passed |
331 // through GenerateKeyRequest() directly from WebKit. | 331 // through GenerateKeyRequest() directly from WebKit. |
332 std::string init_data_type_; | 332 std::string init_data_type_; |
333 | 333 |
334 // Video rendering members. | 334 // Video rendering members. |
335 VideoFrameCompositor compositor_; | 335 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; |
| 336 VideoFrameCompositor* compositor_; // Deleted on |compositor_task_runner_|. |
336 media::SkCanvasVideoRenderer skcanvas_video_renderer_; | 337 media::SkCanvasVideoRenderer skcanvas_video_renderer_; |
337 | 338 |
338 // The compositor layer for displaying the video content when using composited | 339 // The compositor layer for displaying the video content when using composited |
339 // playback. | 340 // playback. |
340 scoped_ptr<webkit::WebLayerImpl> video_weblayer_; | 341 scoped_ptr<webkit::WebLayerImpl> video_weblayer_; |
341 | 342 |
342 // Text track objects get a unique index value when they're created. | 343 // Text track objects get a unique index value when they're created. |
343 int text_track_index_; | 344 int text_track_index_; |
344 | 345 |
345 // Manages decryption keys and decrypts encrypted frames. | 346 // Manages decryption keys and decrypts encrypted frames. |
346 scoped_ptr<ProxyDecryptor> proxy_decryptor_; | 347 scoped_ptr<ProxyDecryptor> proxy_decryptor_; |
347 | 348 |
348 // Non-owned pointer to the CDM. Updated via calls to | 349 // Non-owned pointer to the CDM. Updated via calls to |
349 // setContentDecryptionModule(). | 350 // setContentDecryptionModule(). |
350 WebContentDecryptionModuleImpl* web_cdm_; | 351 WebContentDecryptionModuleImpl* web_cdm_; |
351 | 352 |
352 media::DecryptorReadyCB decryptor_ready_cb_; | 353 media::DecryptorReadyCB decryptor_ready_cb_; |
353 | 354 |
354 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); | 355 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); |
355 }; | 356 }; |
356 | 357 |
357 } // namespace content | 358 } // namespace content |
358 | 359 |
359 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ | 360 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ |
OLD | NEW |