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

Side by Side Diff: webkit/media/crypto/ppapi/clear_key_cdm.h

Issue 11270057: Add type argument to pepper content decryptor method GenerateKeyRequest(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_ 5 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
6 #define WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_ 6 #define WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 28 matching lines...) Expand all
39 class FFmpegCdmVideoDecoder; 39 class FFmpegCdmVideoDecoder;
40 40
41 // Clear key implementation of the cdm::ContentDecryptionModule interface. 41 // Clear key implementation of the cdm::ContentDecryptionModule interface.
42 class ClearKeyCdm : public cdm::ContentDecryptionModule { 42 class ClearKeyCdm : public cdm::ContentDecryptionModule {
43 public: 43 public:
44 explicit ClearKeyCdm(cdm::Allocator* allocator, cdm::CdmHost*); 44 explicit ClearKeyCdm(cdm::Allocator* allocator, cdm::CdmHost*);
45 virtual ~ClearKeyCdm(); 45 virtual ~ClearKeyCdm();
46 46
47 // ContentDecryptionModule implementation. 47 // ContentDecryptionModule implementation.
48 virtual cdm::Status GenerateKeyRequest( 48 virtual cdm::Status GenerateKeyRequest(
49 const char* mime_type,
50 int mime_type_size,
49 const uint8_t* init_data, 51 const uint8_t* init_data,
50 int init_data_size, 52 int init_data_size,
51 cdm::KeyMessage* key_request) OVERRIDE; 53 cdm::KeyMessage* key_request) OVERRIDE;
52 virtual cdm::Status AddKey(const char* session_id, 54 virtual cdm::Status AddKey(const char* session_id,
53 int session_id_size, 55 int session_id_size,
54 const uint8_t* key, 56 const uint8_t* key,
55 int key_size, 57 int key_size,
56 const uint8_t* key_id, 58 const uint8_t* key_id,
57 int key_id_size) OVERRIDE; 59 int key_id_size) OVERRIDE;
58 virtual cdm::Status CancelKeyRequest(const char* session_id, 60 virtual cdm::Status CancelKeyRequest(const char* session_id,
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 #endif // CLEAR_KEY_CDM_USE_FFMPEG_DECODER 168 #endif // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
167 169
168 #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER) 170 #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
169 cdm::Size video_size_; 171 cdm::Size video_size_;
170 #endif // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER 172 #endif // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
171 }; 173 };
172 174
173 } // namespace webkit_media 175 } // namespace webkit_media
174 176
175 #endif // WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_ 177 #endif // WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698