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

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

Issue 12638030: Make AudioDecoderConfig copyable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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
« no previous file with comments | « webkit/media/crypto/ppapi_decryptor.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/crypto/ppapi_decryptor.cc
diff --git a/webkit/media/crypto/ppapi_decryptor.cc b/webkit/media/crypto/ppapi_decryptor.cc
index 8e066dcc966206b5764bbfc4d2a7af7384eb767e..ac07ba39859481add8b76140b18072dfc9a0bc92 100644
--- a/webkit/media/crypto/ppapi_decryptor.cc
+++ b/webkit/media/crypto/ppapi_decryptor.cc
@@ -141,21 +141,20 @@ void PpapiDecryptor::CancelDecrypt(StreamType stream_type) {
}
void PpapiDecryptor::InitializeAudioDecoder(
- scoped_ptr<media::AudioDecoderConfig> config,
+ const media::AudioDecoderConfig& config,
const DecoderInitCB& init_cb) {
if (!render_loop_proxy_->BelongsToCurrentThread()) {
render_loop_proxy_->PostTask(FROM_HERE, base::Bind(
- &PpapiDecryptor::InitializeAudioDecoder, weak_this_,
- base::Passed(&config), init_cb));
+ &PpapiDecryptor::InitializeAudioDecoder, weak_this_, config, init_cb));
return;
}
DVLOG(2) << "InitializeAudioDecoder()";
- DCHECK(config->is_encrypted());
- DCHECK(config->IsValidConfig());
+ DCHECK(config.is_encrypted());
+ DCHECK(config.IsValidConfig());
audio_decoder_init_cb_ = init_cb;
- if (!plugin_cdm_delegate_->InitializeAudioDecoder(*config, base::Bind(
+ if (!plugin_cdm_delegate_->InitializeAudioDecoder(config, base::Bind(
&PpapiDecryptor::OnDecoderInitialized, weak_this_, kAudio))) {
base::ResetAndReturn(&audio_decoder_init_cb_).Run(false);
return;
« no previous file with comments | « webkit/media/crypto/ppapi_decryptor.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698