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

Side by Side Diff: ppapi/cpp/private/content_decryptor_private.h

Issue 10914028: Add CDM allocator interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: It works, and this removes a copy in Decrypt/DeliverBlock. Created 8 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 | 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 PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_ 5 #ifndef PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_
6 #define PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_ 6 #define PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_
7 7
8 #include "ppapi/c/private/pp_content_decryptor.h" 8 #include "ppapi/c/private/pp_content_decryptor.h"
9 #include "ppapi/c/private/ppb_content_decryptor_private.h" 9 #include "ppapi/c/private/ppb_content_decryptor_private.h"
10 #include "ppapi/c/private/ppp_content_decryptor_private.h" 10 #include "ppapi/c/private/ppp_content_decryptor_private.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 void KeyAdded(const std::string& key_system, 48 void KeyAdded(const std::string& key_system,
49 const std::string& session_id); 49 const std::string& session_id);
50 void KeyMessage(const std::string& key_system, 50 void KeyMessage(const std::string& key_system,
51 const std::string& session_id, 51 const std::string& session_id,
52 pp::Buffer_Dev message, 52 pp::Buffer_Dev message,
53 const std::string& default_url); 53 const std::string& default_url);
54 void KeyError(const std::string& key_system, 54 void KeyError(const std::string& key_system,
55 const std::string& session_id, 55 const std::string& session_id,
56 int32_t media_error, 56 int32_t media_error,
57 int32_t system_code); 57 int32_t system_code);
58 void DeliverBlock(pp::Buffer_Dev decrypted_block, 58 void DeliverBlock(PP_Resource decrypted_block,
Tom Finegan 2012/09/01 05:00:09 Changed this back to PP_Resource to avoid construc
59 const PP_DecryptedBlockInfo& decrypted_block_info); 59 const PP_DecryptedBlockInfo& decrypted_block_info);
60 void DeliverFrame(pp::Buffer_Dev decrypted_frame, 60 void DeliverFrame(pp::Buffer_Dev decrypted_frame,
61 const PP_DecryptedBlockInfo& decrypted_block_info); 61 const PP_DecryptedBlockInfo& decrypted_block_info);
62 void DeliverSamples(pp::Buffer_Dev decrypted_samples, 62 void DeliverSamples(pp::Buffer_Dev decrypted_samples,
63 const PP_DecryptedBlockInfo& decrypted_block_info); 63 const PP_DecryptedBlockInfo& decrypted_block_info);
64 64
65 private: 65 private:
66 InstanceHandle associated_instance_; 66 InstanceHandle associated_instance_;
67 }; 67 };
68 68
69 } // namespace pp 69 } // namespace pp
70 70
71 #endif // PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_ 71 #endif // PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_
OLDNEW
« no previous file with comments | « no previous file | ppapi/cpp/private/content_decryptor_private.cc » ('j') | webkit/media/crypto/ppapi/cdm_allocator.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698