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

Side by Side Diff: content/renderer/media/webmediaplayer_impl.h

Issue 105143010: Connect WebMediaPlayerImpl to WebContentDecryptionModuleImpl for EME WD (Chromium side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nits Created 6 years, 11 months 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 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player. 5 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
6 // It contains Pipeline which is the actual media player pipeline, it glues 6 // It contains Pipeline which is the actual media player pipeline, it glues
7 // the media player pipeline, data source, audio renderer and renderer. 7 // the media player pipeline, data source, audio renderer and renderer.
8 // Pipeline would creates multiple threads and access some public methods 8 // Pipeline would creates multiple threads and access some public methods
9 // of this class, so we need to be extra careful about concurrent access of 9 // of this class, so we need to be extra careful about concurrent access of
10 // methods and members. 10 // methods and members.
(...skipping 29 matching lines...) Expand all
40 #include "skia/ext/platform_canvas.h" 40 #include "skia/ext/platform_canvas.h"
41 #include "third_party/WebKit/public/platform/WebAudioSourceProvider.h" 41 #include "third_party/WebKit/public/platform/WebAudioSourceProvider.h"
42 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" 42 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
43 #include "third_party/WebKit/public/platform/WebMediaPlayer.h" 43 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
44 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" 44 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"
45 #include "url/gurl.h" 45 #include "url/gurl.h"
46 46
47 class RenderAudioSourceProvider; 47 class RenderAudioSourceProvider;
48 48
49 namespace blink { 49 namespace blink {
50 class WebContentDecryptionModule;
50 class WebFrame; 51 class WebFrame;
51 } 52 }
52 53
53 namespace base { 54 namespace base {
54 class MessageLoopProxy; 55 class MessageLoopProxy;
55 } 56 }
56 57
57 namespace media { 58 namespace media {
58 class ChunkDemuxer; 59 class ChunkDemuxer;
59 class GpuVideoAcceleratorFactories; 60 class GpuVideoAcceleratorFactories;
60 class MediaLog; 61 class MediaLog;
61 } 62 }
62 63
63 namespace webkit { 64 namespace webkit {
64 class WebLayerImpl; 65 class WebLayerImpl;
65 } 66 }
66 67
67 namespace content { 68 namespace content {
68 class BufferedDataSource; 69 class BufferedDataSource;
69 class WebAudioSourceProviderImpl; 70 class WebAudioSourceProviderImpl;
71 class WebContentDecryptionModuleImpl;
70 class WebMediaPlayerDelegate; 72 class WebMediaPlayerDelegate;
71 class WebMediaPlayerParams; 73 class WebMediaPlayerParams;
72 class WebTextTrackImpl; 74 class WebTextTrackImpl;
73 75
74 class WebMediaPlayerImpl 76 class WebMediaPlayerImpl
75 : public blink::WebMediaPlayer, 77 : public blink::WebMediaPlayer,
76 public cc::VideoFrameProvider, 78 public cc::VideoFrameProvider,
77 public content::RenderViewObserver, 79 public content::RenderViewObserver,
78 public base::SupportsWeakPtr<WebMediaPlayerImpl> { 80 public base::SupportsWeakPtr<WebMediaPlayerImpl> {
79 public: 81 public:
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 const unsigned char* key, 170 const unsigned char* key,
169 unsigned key_length, 171 unsigned key_length,
170 const unsigned char* init_data, 172 const unsigned char* init_data,
171 unsigned init_data_length, 173 unsigned init_data_length,
172 const blink::WebString& session_id); 174 const blink::WebString& session_id);
173 175
174 virtual MediaKeyException cancelKeyRequest( 176 virtual MediaKeyException cancelKeyRequest(
175 const blink::WebString& key_system, 177 const blink::WebString& key_system,
176 const blink::WebString& session_id); 178 const blink::WebString& session_id);
177 179
180 virtual void setContentDecryptionModule(
181 blink::WebContentDecryptionModule* cdm);
182
178 // content::RenderViewObserver implementation. 183 // content::RenderViewObserver implementation.
179 virtual void OnDestruct() OVERRIDE; 184 virtual void OnDestruct() OVERRIDE;
180 185
181 void Repaint(); 186 void Repaint();
182 187
183 void OnPipelineSeek(media::PipelineStatus status); 188 void OnPipelineSeek(media::PipelineStatus status);
184 void OnPipelineEnded(); 189 void OnPipelineEnded();
185 void OnPipelineError(media::PipelineStatus error); 190 void OnPipelineError(media::PipelineStatus error);
186 void OnPipelineBufferingState( 191 void OnPipelineBufferingState(
187 media::Pipeline::BufferingState buffering_state); 192 media::Pipeline::BufferingState buffering_state);
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 // playback. 368 // playback.
364 scoped_ptr<webkit::WebLayerImpl> video_weblayer_; 369 scoped_ptr<webkit::WebLayerImpl> video_weblayer_;
365 370
366 // A pointer back to the compositor to inform it about state changes. This is 371 // A pointer back to the compositor to inform it about state changes. This is
367 // not NULL while the compositor is actively using this webmediaplayer. 372 // not NULL while the compositor is actively using this webmediaplayer.
368 cc::VideoFrameProvider::Client* video_frame_provider_client_; 373 cc::VideoFrameProvider::Client* video_frame_provider_client_;
369 374
370 // Text track objects get a unique index value when they're created. 375 // Text track objects get a unique index value when they're created.
371 int text_track_index_; 376 int text_track_index_;
372 377
378 // Non-owned pointer to the CDM. Updated via calls to
379 // setContentDecryptionModule().
380 WebContentDecryptionModuleImpl* web_cdm_;
381
373 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 382 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
374 }; 383 };
375 384
376 } // namespace content 385 } // namespace content
377 386
378 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 387 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/media/webcontentdecryptionmodule_impl.cc ('k') | content/renderer/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698