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.h | |
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.h')
-rw-r--r-- | webkit/media/webmediaplayer_impl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h index 3e7a87a..3b755be 100644 --- a/webkit/media/webmediaplayer_impl.h +++ b/webkit/media/webmediaplayer_impl.h @@ -70,6 +70,7 @@ class WebFrame; } namespace media { +class AesDecryptor; class MediaLog; } @@ -279,6 +280,9 @@ class WebMediaPlayerImpl scoped_refptr<media::Pipeline> pipeline_; bool started_; + // The decryptor that manages decryption keys and decrypts encrypted frames. + scoped_ptr<media::AesDecryptor> decryptor_; + scoped_ptr<media::MessageLoopFactory> message_loop_factory_; // Playback state. |