Connect WebMediaPlayerImpl to WebContentDecryptionModuleImpl for EME WD (Chromium side)

content/renderer/media/webmediaplayer_impl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
 // It contains Pipeline which is the actual media player pipeline, it glues
 // the media player pipeline, data source, audio renderer and renderer.
 // Pipeline would creates multiple threads and access some public methods
 // of this class, so we need to be extra careful about concurrent access of
 // methods and members.
@@ skipping 29 matching lines @@
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/WebAudioSourceProvider.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"
 #include "url/gurl.h"
 
 class RenderAudioSourceProvider;
 
 namespace blink {
+class WebContentDecryptionModule;
 class WebFrame;
 }
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace media {
 class ChunkDemuxer;
 class GpuVideoAcceleratorFactories;
 class MediaLog;
 }
 
 namespace webkit {
 class WebLayerImpl;
 }
 
 namespace content {
 class BufferedDataSource;
 class WebAudioSourceProviderImpl;
+class WebContentDecryptionModuleImpl;
 class WebMediaPlayerDelegate;
 class WebMediaPlayerParams;
 class WebTextTrackImpl;
 
 class WebMediaPlayerImpl
     : public blink::WebMediaPlayer,
       public cc::VideoFrameProvider,
       public content::RenderViewObserver,
       public base::SupportsWeakPtr<WebMediaPlayerImpl> {
  public:
@@ skipping 88 matching lines @@
                                    const unsigned char* key,
                                    unsigned key_length,
                                    const unsigned char* init_data,
                                    unsigned init_data_length,
                                    const blink::WebString& session_id);
 
   virtual MediaKeyException cancelKeyRequest(
       const blink::WebString& key_system,
       const blink::WebString& session_id);
 
+  virtual void contentDecryptionModuleChanged(
+      blink::WebContentDecryptionModule* cdm);
+
   // content::RenderViewObserver implementation.
   virtual void OnDestruct() OVERRIDE;
 
   void Repaint();
 
   void OnPipelineSeek(media::PipelineStatus status);
   void OnPipelineEnded();
   void OnPipelineError(media::PipelineStatus error);
   void OnPipelineBufferingState(
       media::Pipeline::BufferingState buffering_state);
@@ skipping 178 matching lines @@
   // playback.
   scoped_ptr<webkit::WebLayerImpl> video_weblayer_;
 
   // A pointer back to the compositor to inform it about state changes. This is
   // not NULL while the compositor is actively using this webmediaplayer.
   cc::VideoFrameProvider::Client* video_frame_provider_client_;
 
   // Text track objects get a unique index value when they're created.
   int text_track_index_;
 
+  // Non-owned pointer to the CDM. Updated via calls to
+  // contentDecryptionModuleChanged().
+  WebContentDecryptionModuleImpl* cdm_;

[ddorwin, 2013/12/20 05:26:14]

Because we have multiple levels of CDM, it might be helpful to call this
web_cdm_. WDYT?

[jrummell, 2013/12/20 23:32:10]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_