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

Unified Diff: webkit/media/crypto/content_decryptor.cc

Issue 10827280: Add PPAPI decryptor implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Partially address xhwang's comments, and fix some StringVar crashiness Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: webkit/media/crypto/content_decryptor.cc
diff --git a/webkit/media/crypto/content_decryptor.cc b/webkit/media/crypto/content_decryptor.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a17f14388b3c41c778ecbeefd41d16a59b258541
--- /dev/null
+++ b/webkit/media/crypto/content_decryptor.cc
@@ -0,0 +1,235 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
ddorwin 2012/08/15 22:03:22 Filename is misleading. It should be cdm_wrapper o
Tom Finegan 2012/08/16 16:15:45 Renamed to cdm_wrapper.cc; moved file to ppapi sub
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <cassert>
ddorwin 2012/08/15 22:03:22 Why not use DCHECK? Can we not use it in plugins?
Tom Finegan 2012/08/16 16:15:45 Removed.
+#include <cstdio> // stderr; debugging via fprintf.
ddorwin 2012/08/15 22:03:22 TODO: Remove some of these.
Tom Finegan 2012/08/16 03:10:48 Done.
+#include <cstring> // std::memcpy
+#include <sstream> // std::ostringstream
+
+#include "base/compiler_specific.h" // for OVERRIDE.
+#include "ppapi/c/pp_errors.h"
+#include "ppapi/c/pp_stdint.h"
+#include "ppapi/cpp/completion_callback.h"
+#include "ppapi/cpp/core.h"
+#include "ppapi/cpp/instance.h"
+#include "ppapi/cpp/module.h"
+#include "ppapi/cpp/pass_ref.h"
+#include "ppapi/cpp/resource.h"
+#include "ppapi/cpp/var.h"
+#include "ppapi/cpp/var_array_buffer.h"
+#include "ppapi/cpp/dev/buffer_dev.h"
+#include "ppapi/cpp/private/content_decryptor_private.h"
+#include "ppapi/utility/completion_callback_factory.h"
+
+namespace {
+
+struct DecryptorMessage {
+ DecryptorMessage() : media_error(0), system_code(0) {}
+ std::string key_system;
+ std::string session_id;
+ std::string default_url;
+ std::string message_data;
+ int32_t media_error;
+ int32_t system_code;
+};
+
+struct DecryptedBlock {
+ DecryptedBlock() : request_id(0) {}
+ int32_t request_id;
+ std::string data;
+};
+
+void CallOnMain(pp::CompletionCallback cb) {
+ pp::Module::Get()->core()->CallOnMainThread(0, cb, PP_OK);
+}
+
+} // namespace
+
+
+// A wrapper class responsible for managing interaction between the browser and
ddorwin 2012/08/15 22:03:22 Maybe something like: ... for abstracting away PPA
Tom Finegan 2012/08/16 16:15:45 Done.
+// a Content Decryption Module (CDM).
+class CDMWrapper : public pp::Instance,
+ public pp::ContentDecryptor_Private {
+ public:
+ CDMWrapper(PP_Instance instance, pp::Module* module);
+ virtual ~CDMWrapper() {}
+
+ // PPP_ContentDecryptor_Private methods
+ virtual bool GenerateKeyRequest(const std::string& key_system,
+ pp::VarArrayBuffer init_data) OVERRIDE;
+ virtual bool AddKey(const std::string& session_id,
+ pp::VarArrayBuffer key) OVERRIDE;
+ virtual bool CancelKeyRequest(const std::string& session_id) OVERRIDE;
+ virtual bool Decrypt(pp::Buffer_Dev encrypted_buffer,
+ int32_t request_id) OVERRIDE;
+
+ virtual bool DecryptAndDecode(pp::Buffer_Dev encrypted_buffer,
+ int32_t request_id) OVERRIDE {
+ return false;
+ }
+
+ virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]) {
+ return true;
+ }
+
+ private:
+ PP_Resource StringToBufferResource(const std::string& str);
+
+ // <code>PPB_ContentDecryptor_Private</code> dispatchers. These are passed to
+ // <code>callback_factory_</code> to ensure that calls into
+ // <code>PPP_ContentDecryptor_Private</code> are asynchronous.
+ void NeedKey(int32_t result, const DecryptorMessage& decryptor_message);
+ void KeyAdded(int32_t result, const DecryptorMessage& decryptor_message);
+ void KeyMessage(int32_t result, const DecryptorMessage& decryptor_message);
+ void KeyError(int32_t result, const DecryptorMessage& decryptor_message);
+ void DeliverBlock(int32_t result, const DecryptedBlock& decrypted_block);
+
+ pp::CompletionCallbackFactory<CDMWrapper> callback_factory_;
+};
+
+CDMWrapper::CDMWrapper(PP_Instance instance,
+ pp::Module* module)
+ : pp::Instance(instance),
+ pp::ContentDecryptor_Private(this) {
+ callback_factory_.Initialize(this);
+}
+
+bool CDMWrapper::GenerateKeyRequest(const std::string& key_system,
+ pp::VarArrayBuffer init_data) {
+
+ // TODO(tomfinegan): Testing only implementation; init_data will not always
+ // be the key ID, and this will be handled by the decryptor module anyway.
+ const std::string key_id(reinterpret_cast<char*>(init_data.Map()),
+ init_data.ByteLength());
+ if (key_id.empty() || key_system.empty())
+ return false;
+
+ DecryptorMessage decryptor_message;
+ decryptor_message.key_system = key_system;
+ decryptor_message.session_id = "0";
+ decryptor_message.default_url = "http://www.google.com";
+ decryptor_message.message_data = "key request";
+
+ CallOnMain(callback_factory_.NewCallback(&CDMWrapper::KeyMessage,
+ decryptor_message));
+ return true;
+}
+
+bool CDMWrapper::AddKey(const std::string& session_id,
+ pp::VarArrayBuffer key) {
+ const std::string key_string(reinterpret_cast<char*>(key.Map()),
+ key.ByteLength());
+
+ if (session_id.empty() || key_string.empty())
+ return false;
+
+ DecryptorMessage decryptor_message;
+ decryptor_message.session_id = session_id;
+ decryptor_message.message_data = key_string;
+ CallOnMain(callback_factory_.NewCallback(&CDMWrapper::KeyAdded,
+ decryptor_message));
+ return true;
+}
+
+bool CDMWrapper::CancelKeyRequest(const std::string& session_id) {
+ if (session_id.empty())
+ return false;
+
+ // TODO(tomfinegan): cancel pending key request in CDM.
+
+ DecryptorMessage decryptor_message;
+ decryptor_message.session_id = session_id;
+ decryptor_message.message_data = "CancelKeyRequest";
+ CallOnMain(callback_factory_.NewCallback(&CDMWrapper::KeyMessage,
+ decryptor_message));
+
+ return true;
+}
+
+bool CDMWrapper::Decrypt(pp::Buffer_Dev encrypted_buffer,
+ int32_t request_id) {
+ if (!encrypted_buffer.data())
+ return false;
+
+ DecryptedBlock decrypted_block;
+ decrypted_block.request_id = request_id;
+ decrypted_block.data = "Pretend I'm decrypted data!";
+ CallOnMain(callback_factory_.NewCallback(&CDMWrapper::DeliverBlock,
+ decrypted_block));
+ return true;
+}
+
+PP_Resource CDMWrapper::StringToBufferResource(const std::string& str) {
+ if (str.empty())
+ return 0;
+
+ pp::Buffer_Dev buffer(this, str.size());
+ if (!buffer.data())
+ return 0;
+
+ std::memcpy(buffer.data(), str.data(), str.size());
+ return buffer.detach();
+}
+
+void CDMWrapper::NeedKey(int32_t result,
+ const DecryptorMessage& decryptor_message) {
+ pp::ContentDecryptor_Private::NeedKey(decryptor_message.key_system,
+ decryptor_message.session_id,
+ decryptor_message.message_data);
+}
+
+void CDMWrapper::KeyAdded(int32_t result,
+ const DecryptorMessage& decryptor_message) {
+ pp::ContentDecryptor_Private::KeyAdded(decryptor_message.key_system,
+ decryptor_message.session_id);
+}
+
+void CDMWrapper::KeyMessage(int32_t result,
+ const DecryptorMessage& decryptor_message) {
+ pp::Buffer_Dev message_buffer(
+ StringToBufferResource(decryptor_message.message_data));
+ fprintf(stderr,
ddorwin 2012/08/15 22:03:22 Use the PPB_Console_Dev interface instead?
Tom Finegan 2012/08/16 16:15:45 Mainly because the output sent to PPB_Console_Dev
+ "CDMWrapper::KeyMessage sending KeyMessage via cpp wrapper!\n");
+ pp::ContentDecryptor_Private::KeyMessage(decryptor_message.key_system,
+ decryptor_message.session_id,
+ message_buffer,
+ decryptor_message.default_url);
+}
+
+void CDMWrapper::KeyError(int32_t result,
+ const DecryptorMessage& decryptor_message) {
+ pp::ContentDecryptor_Private::KeyError(decryptor_message.key_system,
+ decryptor_message.session_id,
+ decryptor_message.media_error,
+ decryptor_message.system_code);
+}
+
+void CDMWrapper::DeliverBlock(int32_t result,
+ const DecryptedBlock& decrypted_block) {
+ pp::Buffer_Dev decrypted_buffer(
+ StringToBufferResource(decrypted_block.data));
+ pp::ContentDecryptor_Private::DeliverBlock(decrypted_buffer,
+ decrypted_block.request_id);
+}
+
+// This object is the global object representing this plugin library as long
+// as it is loaded.
+class MyModule : public pp::Module {
+ public:
+ MyModule() : pp::Module() {}
+ virtual ~MyModule() {}
+
+ virtual pp::Instance* CreateInstance(PP_Instance instance) {
+ return new CDMWrapper(instance, this);
+ }
+};
+
+namespace pp {
+
+// Factory function for your specialization of the Module object.
+Module* CreateModule() {
+ return new MyModule();
+}
+
+} // namespace pp

Powered by Google App Engine
This is Rietveld 408576698