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

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

Issue 594713002: Pass initial CDM to CreateMediaPlayer() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes for android + mojo Created 6 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ 5 #ifndef MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_
6 #define MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ 6 #define MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_
7 7
8 #include "media/base/decryptor.h" 8 #include "media/base/decryptor.h"
9 #include "media/base/demuxer.h" 9 #include "media/base/demuxer.h"
10 #include "media/base/media_export.h" 10 #include "media/base/media_export.h"
(...skipping 28 matching lines...) Expand all
39 const unsigned char* init_data, 39 const unsigned char* init_data,
40 unsigned init_data_length, 40 unsigned init_data_length,
41 const blink::WebString& session_id) = 0; 41 const blink::WebString& session_id) = 0;
42 42
43 virtual blink::WebMediaPlayer::MediaKeyException CancelKeyRequest( 43 virtual blink::WebMediaPlayer::MediaKeyException CancelKeyRequest(
44 const blink::WebString& key_system, 44 const blink::WebString& key_system,
45 const blink::WebString& session_id) = 0; 45 const blink::WebString& session_id) = 0;
46 46
47 47
48 // Unprefixed API methods. 48 // Unprefixed API methods.
49 virtual void SetInitialContentDecryptionModule(
50 blink::WebContentDecryptionModule* initial_cdm) = 0;
49 virtual void SetContentDecryptionModule( 51 virtual void SetContentDecryptionModule(
50 blink::WebContentDecryptionModule* cdm) = 0; 52 blink::WebContentDecryptionModule* cdm) = 0;
51 virtual void SetContentDecryptionModule( 53 virtual void SetContentDecryptionModule(
52 blink::WebContentDecryptionModule* cdm, 54 blink::WebContentDecryptionModule* cdm,
53 blink::WebContentDecryptionModuleResult result) = 0; 55 blink::WebContentDecryptionModuleResult result) = 0;
54 virtual void SetContentDecryptionModuleSync(
55 blink::WebContentDecryptionModule* cdm) = 0;
56 56
57 57
58 // Callback factory and notification methods used by WebMediaPlayerImpl. 58 // Callback factory and notification methods used by WebMediaPlayerImpl.
59 59
60 // Creates a callback that Demuxers can use to signal that the content 60 // Creates a callback that Demuxers can use to signal that the content
61 // requires a key. This method make sure the callback returned can be safely 61 // requires a key. This method make sure the callback returned can be safely
62 // invoked from any thread. 62 // invoked from any thread.
63 virtual Demuxer::NeedKeyCB CreateNeedKeyCB() = 0; 63 virtual Demuxer::NeedKeyCB CreateNeedKeyCB() = 0;
64 64
65 // Creates a callback that renderers can use to set decryptor 65 // Creates a callback that renderers can use to set decryptor
66 // ready callback. This method make sure the callback returned can be safely 66 // ready callback. This method make sure the callback returned can be safely
67 // invoked from any thread. 67 // invoked from any thread.
68 virtual SetDecryptorReadyCB CreateSetDecryptorReadyCB() = 0; 68 virtual SetDecryptorReadyCB CreateSetDecryptorReadyCB() = 0;
69 69
70 // Called to inform this object that the media pipeline encountered 70 // Called to inform this object that the media pipeline encountered
71 // and handled a decryption error. 71 // and handled a decryption error.
72 virtual void OnPipelineDecryptError() = 0; 72 virtual void OnPipelineDecryptError() = 0;
73 73
74 private: 74 private:
75 DISALLOW_COPY_AND_ASSIGN(EncryptedMediaPlayerSupport); 75 DISALLOW_COPY_AND_ASSIGN(EncryptedMediaPlayerSupport);
76 }; 76 };
77 77
78 } // namespace media 78 } // namespace media
79 79
80 #endif // MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ 80 #endif // MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | media/blink/null_encrypted_media_player_support.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698