diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 14:54:59 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 14:54:59 +0000 |
| commit | a3e2867b33d282e1e6a33f9e493285ed0f57920f (patch) | |
| tree | 86fd4532a2a2695704c0366ca755acec93fd87c8 /webkit/media | |
| parent | ceffbde06c69531745924a6374b4392f34c22e51 (diff) | |
| download | chromium_src-a3e2867b33d282e1e6a33f9e493285ed0f57920f.zip chromium_src-a3e2867b33d282e1e6a33f9e493285ed0f57920f.tar.gz chromium_src-a3e2867b33d282e1e6a33f9e493285ed0f57920f.tar.bz2 | |
Make AudioDecoderConfig copyable.
This is a follow-up CL of r187702.
BUG=177543
TEST=All tests pass.
Review URL: https://chromiumcodereview.appspot.com/12638030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188072 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/crypto/ppapi_decryptor.cc | 11 | ||||
| -rw-r--r-- | webkit/media/crypto/ppapi_decryptor.h | 5 |
2 files changed, 7 insertions, 9 deletions
diff --git a/webkit/media/crypto/ppapi_decryptor.cc b/webkit/media/crypto/ppapi_decryptor.cc index 8e066dc..ac07ba3 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; diff --git a/webkit/media/crypto/ppapi_decryptor.h b/webkit/media/crypto/ppapi_decryptor.h index 75e270c..b57adf5 100644 --- a/webkit/media/crypto/ppapi_decryptor.h +++ b/webkit/media/crypto/ppapi_decryptor.h @@ -57,9 +57,8 @@ class PpapiDecryptor : public media::Decryptor { const scoped_refptr<media::DecoderBuffer>& encrypted, const DecryptCB& decrypt_cb) OVERRIDE; virtual void CancelDecrypt(StreamType stream_type) OVERRIDE; - virtual void InitializeAudioDecoder( - scoped_ptr<media::AudioDecoderConfig> config, - const DecoderInitCB& init_cb) OVERRIDE; + virtual void InitializeAudioDecoder(const media::AudioDecoderConfig& config, + const DecoderInitCB& init_cb) OVERRIDE; virtual void InitializeVideoDecoder(const media::VideoDecoderConfig& config, const DecoderInitCB& init_cb) OVERRIDE; virtual void DecryptAndDecodeAudio( |