diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 23:41:38 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 23:41:38 +0000 |
| commit | c80fed54d4925a9bb77741f45ed95f0e83fb073f (patch) | |
| tree | 64add865ae00bef6d077dd3d60a8425e83c24e15 /webkit/media/webmediaplayer_impl.cc | |
| parent | c02f93e47ba08e8dd00c6904e0cc788db647b07e (diff) | |
| download | chromium_src-c80fed54d4925a9bb77741f45ed95f0e83fb073f.zip chromium_src-c80fed54d4925a9bb77741f45ed95f0e83fb073f.tar.gz chromium_src-c80fed54d4925a9bb77741f45ed95f0e83fb073f.tar.bz2 | |
Move AesDecryptor out of FFmpegVideoDecoder.
BUG=130693
TEST=media_unittests
Review URL: https://chromiumcodereview.appspot.com/10500003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140654 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media/webmediaplayer_impl.cc')
| -rw-r--r-- | webkit/media/webmediaplayer_impl.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc index 84c48c8..d42a359 100644 --- a/webkit/media/webmediaplayer_impl.cc +++ b/webkit/media/webmediaplayer_impl.cc @@ -21,6 +21,7 @@ #include "media/base/media_switches.h" #include "media/base/pipeline.h" #include "media/base/video_frame.h" +#include "media/crypto/aes_decryptor.h" #include "media/filters/audio_renderer_impl.h" #include "media/filters/video_renderer_base.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h" @@ -145,6 +146,8 @@ WebMediaPlayerImpl::WebMediaPlayerImpl( // Create default audio renderer. filter_collection_->AddAudioRenderer( new media::AudioRendererImpl(new media::NullAudioSink())); + + decryptor_.reset(new media::AesDecryptor()); } WebMediaPlayerImpl::~WebMediaPlayerImpl() { @@ -224,6 +227,7 @@ void WebMediaPlayerImpl::load(const WebKit::WebURL& url) { if (BuildMediaSourceCollection(url, GetClient()->sourceURL(), proxy_, message_loop_factory_.get(), filter_collection_.get(), + decryptor_.get(), &video_decoder)) { proxy_->set_video_decoder(video_decoder); StartPipeline(); @@ -242,6 +246,7 @@ void WebMediaPlayerImpl::load(const WebKit::WebURL& url) { BuildDefaultCollection(proxy_->data_source(), message_loop_factory_.get(), filter_collection_.get(), + decryptor_.get(), &video_decoder); proxy_->set_video_decoder(video_decoder); } @@ -774,8 +779,7 @@ WebKit::WebMediaPlayer::MediaKeyException WebMediaPlayerImpl::addKey( init_data_length = arraysize(kDummyInitData); } - proxy_->video_decoder()->decryptor()->AddKey(init_data, init_data_length, - key, key_length); + decryptor_->AddKey(init_data, init_data_length, key, key_length); MessageLoop::current()->PostTask(FROM_HERE, base::Bind( &WebKit::WebMediaPlayerClient::keyAdded, |