| Index: content/renderer/media/webmediaplayer_impl.h
|
| diff --git a/content/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h
|
| index d933302c6bd94281fa4a714f7b526fb1723dfc41..5c44988b41bdc33177909b0aa90dc981260da509 100644
|
| --- a/content/renderer/media/webmediaplayer_impl.h
|
| +++ b/content/renderer/media/webmediaplayer_impl.h
|
| @@ -34,6 +34,7 @@ class RenderAudioSourceProvider;
|
|
|
| namespace blink {
|
| class WebContentDecryptionModule;
|
| +class WebContentDecryptionModuleResult;
|
| class WebLocalFrame;
|
| }
|
|
|
| @@ -152,8 +153,15 @@ class WebMediaPlayerImpl
|
| const blink::WebString& key_system,
|
| const blink::WebString& session_id);
|
|
|
| + // TODO(jrummell): Remove this method once Blink updated to use the other
|
| + // two methods.
|
| virtual void setContentDecryptionModule(
|
| blink::WebContentDecryptionModule* cdm);
|
| + virtual void setContentDecryptionModule(
|
| + blink::WebContentDecryptionModule* cdm,
|
| + blink::WebContentDecryptionModuleResult result);
|
| + virtual void setContentDecryptionModuleSync(
|
| + blink::WebContentDecryptionModule* cdm);
|
|
|
| void OnPipelineSeeked(bool time_changed, media::PipelineStatus status);
|
| void OnPipelineEnded();
|
| @@ -229,6 +237,12 @@ class WebMediaPlayerImpl
|
| // NULL immediately and reset.
|
| void SetDecryptorReadyCB(const media::DecryptorReadyCB& decryptor_ready_cb);
|
|
|
| + // Called when the ContentDecryptionModule has been attached to the
|
| + // pipeline/decoders.
|
| + void ContentDecryptionModuleAttached(
|
| + blink::WebContentDecryptionModuleResult result,
|
| + bool success);
|
| +
|
| // Returns the current video frame from |compositor_|. Blocks until the
|
| // compositor can return the frame.
|
| scoped_refptr<media::VideoFrame> GetCurrentFrameFromCompositor();
|
|
|