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

Side by Side Diff: content/renderer/media/crypto/ppapi_decryptor.cc

Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update unittest. Created 5 years, 7 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 #include "content/renderer/media/crypto/ppapi_decryptor.h" 5 #include "content/renderer/media/crypto/ppapi_decryptor.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/message_loop/message_loop_proxy.h" 12 #include "base/message_loop/message_loop_proxy.h"
13 #include "content/renderer/media/crypto/cdm_initialized_promise.h" 13 #include "content/renderer/media/crypto/cdm_initialized_promise.h"
14 #include "content/renderer/pepper/content_decryptor_delegate.h" 14 #include "content/renderer/pepper/content_decryptor_delegate.h"
15 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" 15 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
16 #include "media/base/audio_decoder_config.h" 16 #include "media/base/audio_decoder_config.h"
17 #include "media/base/cdm_key_information.h" 17 #include "media/base/cdm_key_information.h"
18 #include "media/base/data_buffer.h" 18 #include "media/base/data_buffer.h"
19 #include "media/base/decoder_buffer.h" 19 #include "media/base/decoder_buffer.h"
20 #include "media/base/key_systems.h" 20 #include "media/base/key_systems.h"
21 #include "media/base/video_decoder_config.h" 21 #include "media/base/video_decoder_config.h"
22 #include "media/base/video_frame.h" 22 #include "media/base/video_frame.h"
23 23
24 namespace content { 24 namespace content {
25 25
26 void PpapiDecryptor::Create( 26 void PpapiDecryptor::Create(
27 const std::string& key_system, 27 const std::string& key_system,
28 const GURL& security_origin,
28 bool allow_distinctive_identifier, 29 bool allow_distinctive_identifier,
29 bool allow_persistent_state, 30 bool allow_persistent_state,
30 const GURL& security_origin,
31 const CreatePepperCdmCB& create_pepper_cdm_cb, 31 const CreatePepperCdmCB& create_pepper_cdm_cb,
32 const media::SessionMessageCB& session_message_cb, 32 const media::SessionMessageCB& session_message_cb,
33 const media::SessionClosedCB& session_closed_cb, 33 const media::SessionClosedCB& session_closed_cb,
34 const media::LegacySessionErrorCB& legacy_session_error_cb, 34 const media::LegacySessionErrorCB& legacy_session_error_cb,
35 const media::SessionKeysChangeCB& session_keys_change_cb, 35 const media::SessionKeysChangeCB& session_keys_change_cb,
36 const media::SessionExpirationUpdateCB& session_expiration_update_cb, 36 const media::SessionExpirationUpdateCB& session_expiration_update_cb,
37 const media::CdmCreatedCB& cdm_created_cb) { 37 const media::CdmCreatedCB& cdm_created_cb) {
38 std::string plugin_type = media::GetPepperType(key_system); 38 std::string plugin_type = media::GetPepperType(key_system);
39 DCHECK(!plugin_type.empty()); 39 DCHECK(!plugin_type.empty());
40 scoped_ptr<PepperCdmWrapper> pepper_cdm_wrapper = 40 scoped_ptr<PepperCdmWrapper> pepper_cdm_wrapper =
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 DCHECK(render_loop_proxy_->BelongsToCurrentThread()); 457 DCHECK(render_loop_proxy_->BelongsToCurrentThread());
458 pepper_cdm_wrapper_.reset(); 458 pepper_cdm_wrapper_.reset();
459 } 459 }
460 460
461 ContentDecryptorDelegate* PpapiDecryptor::CdmDelegate() { 461 ContentDecryptorDelegate* PpapiDecryptor::CdmDelegate() {
462 DCHECK(render_loop_proxy_->BelongsToCurrentThread()); 462 DCHECK(render_loop_proxy_->BelongsToCurrentThread());
463 return (pepper_cdm_wrapper_) ? pepper_cdm_wrapper_->GetCdmDelegate() : NULL; 463 return (pepper_cdm_wrapper_) ? pepper_cdm_wrapper_->GetCdmDelegate() : NULL;
464 } 464 }
465 465
466 } // namespace content 466 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698