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

Side by Side Diff: content/renderer/media/crypto/encrypted_media_player_support_impl.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, 2 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 CONTENT_RENDERER_MEDIA_CRYPTO_ENCRYPTED_MEDIA_PLAYER_SUPPORT_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_ENCRYPTED_MEDIA_PLAYER_SUPPORT_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_CRYPTO_ENCRYPTED_MEDIA_PLAYER_SUPPORT_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_ENCRYPTED_MEDIA_PLAYER_SUPPORT_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 30 matching lines...) Expand all
41 const unsigned char* key, 41 const unsigned char* key,
42 unsigned key_length, 42 unsigned key_length,
43 const unsigned char* init_data, 43 const unsigned char* init_data,
44 unsigned init_data_length, 44 unsigned init_data_length,
45 const blink::WebString& session_id) OVERRIDE; 45 const blink::WebString& session_id) OVERRIDE;
46 46
47 virtual blink::WebMediaPlayer::MediaKeyException CancelKeyRequest( 47 virtual blink::WebMediaPlayer::MediaKeyException CancelKeyRequest(
48 const blink::WebString& key_system, 48 const blink::WebString& key_system,
49 const blink::WebString& session_id) OVERRIDE; 49 const blink::WebString& session_id) OVERRIDE;
50 50
51 virtual void SetInitialContentDecryptionModule(
52 blink::WebContentDecryptionModule* initial_cdm) OVERRIDE;
53
51 virtual void SetContentDecryptionModule( 54 virtual void SetContentDecryptionModule(
52 blink::WebContentDecryptionModule* cdm) OVERRIDE; 55 blink::WebContentDecryptionModule* cdm) OVERRIDE;
53 virtual void SetContentDecryptionModule( 56 virtual void SetContentDecryptionModule(
54 blink::WebContentDecryptionModule* cdm, 57 blink::WebContentDecryptionModule* cdm,
55 blink::WebContentDecryptionModuleResult result) OVERRIDE; 58 blink::WebContentDecryptionModuleResult result) OVERRIDE;
56 virtual void SetContentDecryptionModuleSync(
57 blink::WebContentDecryptionModule* cdm) OVERRIDE;
58 59
59 virtual media::SetDecryptorReadyCB CreateSetDecryptorReadyCB() OVERRIDE; 60 virtual media::SetDecryptorReadyCB CreateSetDecryptorReadyCB() OVERRIDE;
60 virtual media::Demuxer::NeedKeyCB CreateNeedKeyCB() OVERRIDE; 61 virtual media::Demuxer::NeedKeyCB CreateNeedKeyCB() OVERRIDE;
61 62
62 virtual void OnPipelineDecryptError() OVERRIDE; 63 virtual void OnPipelineDecryptError() OVERRIDE;
63 64
64 private: 65 private:
65 explicit EncryptedMediaPlayerSupportImpl(blink::WebMediaPlayerClient* client); 66 explicit EncryptedMediaPlayerSupportImpl(blink::WebMediaPlayerClient* client);
66 67
67 // Requests that this object notifies when a decryptor is ready through the 68 // Requests that this object notifies when a decryptor is ready through the
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 // setContentDecryptionModule(). 121 // setContentDecryptionModule().
121 WebContentDecryptionModuleImpl* web_cdm_; 122 WebContentDecryptionModuleImpl* web_cdm_;
122 123
123 media::DecryptorReadyCB decryptor_ready_cb_; 124 media::DecryptorReadyCB decryptor_ready_cb_;
124 125
125 DISALLOW_COPY_AND_ASSIGN(EncryptedMediaPlayerSupportImpl); 126 DISALLOW_COPY_AND_ASSIGN(EncryptedMediaPlayerSupportImpl);
126 }; 127 };
127 } 128 }
128 129
129 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_ENCRYPTED_MEDIA_PLAYER_SUPPORT_IMPL_H_ 130 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_ENCRYPTED_MEDIA_PLAYER_SUPPORT_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698