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

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: Created 5 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 #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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 int response_length, 63 int response_length,
64 scoped_ptr<media::SimpleCdmPromise> promise) override; 64 scoped_ptr<media::SimpleCdmPromise> promise) override;
65 void CloseSession(const std::string& web_session_id, 65 void CloseSession(const std::string& web_session_id,
66 scoped_ptr<media::SimpleCdmPromise> promise) override; 66 scoped_ptr<media::SimpleCdmPromise> promise) override;
67 void RemoveSession(const std::string& web_session_id, 67 void RemoveSession(const std::string& web_session_id,
68 scoped_ptr<media::SimpleCdmPromise> promise) override; 68 scoped_ptr<media::SimpleCdmPromise> promise) override;
69 CdmContext* GetCdmContext() override; 69 CdmContext* GetCdmContext() override;
70 70
71 // media::CdmContext implementation. 71 // media::CdmContext implementation.
72 Decryptor* GetDecryptor() override; 72 Decryptor* GetDecryptor() override;
73 int GetCdmId() const override;
73 74
74 // media::Decryptor implementation. 75 // media::Decryptor implementation.
75 void RegisterNewKeyCB(StreamType stream_type, 76 void RegisterNewKeyCB(StreamType stream_type,
76 const NewKeyCB& key_added_cb) override; 77 const NewKeyCB& key_added_cb) override;
77 void Decrypt(StreamType stream_type, 78 void Decrypt(StreamType stream_type,
78 const scoped_refptr<media::DecoderBuffer>& encrypted, 79 const scoped_refptr<media::DecoderBuffer>& encrypted,
79 const DecryptCB& decrypt_cb) override; 80 const DecryptCB& decrypt_cb) override;
80 void CancelDecrypt(StreamType stream_type) override; 81 void CancelDecrypt(StreamType stream_type) override;
81 void InitializeAudioDecoder(const media::AudioDecoderConfig& config, 82 void InitializeAudioDecoder(const media::AudioDecoderConfig& config,
82 const DecoderInitCB& init_cb) override; 83 const DecoderInitCB& init_cb) override;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 147
147 // NOTE: Weak pointers must be invalidated before all other member variables. 148 // NOTE: Weak pointers must be invalidated before all other member variables.
148 base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_; 149 base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_;
149 150
150 DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor); 151 DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor);
151 }; 152 };
152 153
153 } // namespace content 154 } // namespace content
154 155
155 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 156 #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') | content/renderer/media/crypto/ppapi_decryptor.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698