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

Side by Side Diff: webkit/media/crypto/ppapi_decryptor.cc

Issue 10704241: Add PpapiDecryptor which wraps a CDM plugin. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add webkit bug in comments. Created 8 years, 5 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
« no previous file with comments | « webkit/media/crypto/ppapi_decryptor.h ('k') | webkit/media/crypto/proxy_decryptor.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
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
3 // found in the LICENSE file.
4
5 #include "webkit/media/crypto/ppapi_decryptor.h"
6
7 #include "base/logging.h"
8 #include "media/base/decoder_buffer.h"
9 #include "media/base/decryptor_client.h"
10 #include "webkit/media/crypto/key_systems.h"
11 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
12
13 namespace webkit_media {
14
15 PpapiDecryptor::PpapiDecryptor(
16 media::DecryptorClient* client,
17 const scoped_refptr<webkit::ppapi::PluginInstance>& plugin_instance)
18 : client_(client),
19 cdm_plugin_(plugin_instance) {
20 }
21
22 PpapiDecryptor::~PpapiDecryptor() {
23 }
24
25 void PpapiDecryptor::GenerateKeyRequest(const std::string& key_system,
26 const uint8* init_data,
27 int init_data_length) {
28 DCHECK(cdm_plugin_);
29 // TODO(xhwang): Enable the following once we have updated PluginInstance.
30 // if (!cdm_plugin_->GenerateKeyRequest(key_system,
31 // init_data, init_data_length)) {
32 // client_->KeyError(key_system, "", media::Decryptor::kUnknownError, 0);
33 // }
34 }
35
36 void PpapiDecryptor::AddKey(const std::string& key_system,
37 const uint8* key,
38 int key_length,
39 const uint8* init_data,
40 int init_data_length,
41 const std::string& session_id) {
42 DCHECK(cdm_plugin_);
43 // TODO(xhwang): Enable the following once we have updated PluginInstance.
44 // if (!cdm_plugin_->AddKey(key_system, key, key_length,
45 // init_data, init_data_length, session_id)) {
46 // client_->KeyError(key_system, session_id, Decryptor::kUnknownError, 0);
47 // }
48 }
49
50 void PpapiDecryptor::CancelKeyRequest(const std::string& key_system,
51 const std::string& session_id) {
52 DCHECK(cdm_plugin_);
53 // TODO(xhwang): Enable the following once we have updated PluginInstance.
54 // if (!cdm_plugin_->CancelKeyRequest(key_system, session_id))
55 // client_->KeyError(key_system, session_id, Decryptor::kUnknownError, 0);
56 }
57
58 void PpapiDecryptor::Decrypt(
59 const scoped_refptr<media::DecoderBuffer>& encrypted,
60 const DecryptCB& decrypt_cb) {
61 DCHECK(cdm_plugin_);
62 // TODO(xhwang): Enable the following once we have updated PluginInstance.
63 // TODO(xhwang): Need to figure out thread safety about PPP calls.
64 // if (!cdm_plugin_->Decrypt(
65 // encrypted, base::Bind(&PpapiDecryptor::DataReady, this, decrypt_cb))) {
66 // decrypt_cb.Run(kError, NULL);
67 // }
68 }
69
70 void PpapiDecryptor::DataReady(const DecryptCB& decrypt_cb,
71 const uint8* data, int data_size ) {
72 DCHECK(!decrypt_cb.is_null());
73 scoped_refptr<media::DecoderBuffer> decrypted_data =
74 media::DecoderBuffer::CopyFrom(data, data_size);
75 decrypt_cb.Run(kSuccess, decrypted_data);
76 }
77
78 } // namespace webkit_media
OLDNEW
« no previous file with comments | « webkit/media/crypto/ppapi_decryptor.h ('k') | webkit/media/crypto/proxy_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698