Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1106)

Side by Side Diff: media/blink/webmediaplayer_impl.h

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)
Patch Set: comments addressed Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <memory> 10 #include <memory>
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 } 63 }
64 64
65 namespace gpu { 65 namespace gpu {
66 namespace gles2 { 66 namespace gles2 {
67 class GLES2Interface; 67 class GLES2Interface;
68 } 68 }
69 } 69 }
70 70
71 namespace media { 71 namespace media {
72 class ChunkDemuxer; 72 class ChunkDemuxer;
73 class MediaKeys; 73 class ContentDecryptionModule;
74 class MediaLog; 74 class MediaLog;
75 class UrlIndex; 75 class UrlIndex;
76 class VideoFrameCompositor; 76 class VideoFrameCompositor;
77 class WatchTimeReporter; 77 class WatchTimeReporter;
78 class WebAudioSourceProviderImpl; 78 class WebAudioSourceProviderImpl;
79 class WebMediaPlayerDelegate; 79 class WebMediaPlayerDelegate;
80 80
81 // The canonical implementation of blink::WebMediaPlayer that's backed by 81 // The canonical implementation of blink::WebMediaPlayer that's backed by
82 // Pipeline. Handles normal resource loading, Media Source, and 82 // Pipeline. Handles normal resource loading, Media Source, and
83 // Encrypted Media. 83 // Encrypted Media.
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 SkCanvasVideoRenderer skcanvas_video_renderer_; 489 SkCanvasVideoRenderer skcanvas_video_renderer_;
490 490
491 // The compositor layer for displaying the video content when using composited 491 // The compositor layer for displaying the video content when using composited
492 // playback. 492 // playback.
493 std::unique_ptr<cc_blink::WebLayerImpl> video_weblayer_; 493 std::unique_ptr<cc_blink::WebLayerImpl> video_weblayer_;
494 494
495 std::unique_ptr<blink::WebContentDecryptionModuleResult> set_cdm_result_; 495 std::unique_ptr<blink::WebContentDecryptionModuleResult> set_cdm_result_;
496 496
497 // If a CDM is attached keep a reference to it, so that it is not destroyed 497 // If a CDM is attached keep a reference to it, so that it is not destroyed
498 // until after the pipeline is done with it. 498 // until after the pipeline is done with it.
499 scoped_refptr<MediaKeys> cdm_; 499 scoped_refptr<ContentDecryptionModule> cdm_;
500 500
501 // Keep track of the CDM while it is in the process of attaching to the 501 // Keep track of the CDM while it is in the process of attaching to the
502 // pipeline. 502 // pipeline.
503 scoped_refptr<MediaKeys> pending_cdm_; 503 scoped_refptr<ContentDecryptionModule> pending_cdm_;
504 504
505 #if defined(OS_ANDROID) // WMPI_CAST 505 #if defined(OS_ANDROID) // WMPI_CAST
506 WebMediaPlayerCast cast_impl_; 506 WebMediaPlayerCast cast_impl_;
507 #endif 507 #endif
508 508
509 // The last volume received by setVolume() and the last volume multiplier from 509 // The last volume received by setVolume() and the last volume multiplier from
510 // OnVolumeMultiplierUpdate(). The multiplier is typical 1.0, but may be less 510 // OnVolumeMultiplierUpdate(). The multiplier is typical 1.0, but may be less
511 // if the WebMediaPlayerDelegate has requested a volume reduction (ducking) 511 // if the WebMediaPlayerDelegate has requested a volume reduction (ducking)
512 // for a transient sound. Playout volume is derived by volume * multiplier. 512 // for a transient sound. Playout volume is derived by volume * multiplier.
513 double volume_; 513 double volume_;
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 578
579 // Whether the player is currently in autoplay muted state. 579 // Whether the player is currently in autoplay muted state.
580 bool autoplay_muted_ = false; 580 bool autoplay_muted_ = false;
581 581
582 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 582 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
583 }; 583 };
584 584
585 } // namespace media 585 } // namespace media
586 586
587 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ 587 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « media/blink/webcontentdecryptionmodulesession_impl.cc ('k') | media/blink/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698