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

Side by Side Diff: content/renderer/media/crypto/ppapi_decryptor.h

Issue 835683002: media: Always define |cdm_id| in CdmContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 5 years, 9 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
« no previous file with comments | « no previous file | content/renderer/media/crypto/ppapi_decryptor.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
6 #define CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 int response_length, 67 int response_length,
68 scoped_ptr<media::SimpleCdmPromise> promise) override; 68 scoped_ptr<media::SimpleCdmPromise> promise) override;
69 void CloseSession(const std::string& session_id, 69 void CloseSession(const std::string& session_id,
70 scoped_ptr<media::SimpleCdmPromise> promise) override; 70 scoped_ptr<media::SimpleCdmPromise> promise) override;
71 void RemoveSession(const std::string& session_id, 71 void RemoveSession(const std::string& session_id,
72 scoped_ptr<media::SimpleCdmPromise> promise) override; 72 scoped_ptr<media::SimpleCdmPromise> promise) override;
73 CdmContext* GetCdmContext() override; 73 CdmContext* GetCdmContext() override;
74 74
75 // media::CdmContext implementation. 75 // media::CdmContext implementation.
76 Decryptor* GetDecryptor() override; 76 Decryptor* GetDecryptor() override;
77 int GetCdmId() const override;
77 78
78 // media::Decryptor implementation. 79 // media::Decryptor implementation.
79 void RegisterNewKeyCB(StreamType stream_type, 80 void RegisterNewKeyCB(StreamType stream_type,
80 const NewKeyCB& key_added_cb) override; 81 const NewKeyCB& key_added_cb) override;
81 void Decrypt(StreamType stream_type, 82 void Decrypt(StreamType stream_type,
82 const scoped_refptr<media::DecoderBuffer>& encrypted, 83 const scoped_refptr<media::DecoderBuffer>& encrypted,
83 const DecryptCB& decrypt_cb) override; 84 const DecryptCB& decrypt_cb) override;
84 void CancelDecrypt(StreamType stream_type) override; 85 void CancelDecrypt(StreamType stream_type) override;
85 void InitializeAudioDecoder(const media::AudioDecoderConfig& config, 86 void InitializeAudioDecoder(const media::AudioDecoderConfig& config,
86 const DecoderInitCB& init_cb) override; 87 const DecoderInitCB& init_cb) override;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 155
155 // NOTE: Weak pointers must be invalidated before all other member variables. 156 // NOTE: Weak pointers must be invalidated before all other member variables.
156 base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_; 157 base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_;
157 158
158 DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor); 159 DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor);
159 }; 160 };
160 161
161 } // namespace content 162 } // namespace content
162 163
163 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 164 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/crypto/ppapi_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698