diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-17 23:07:06 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-17 23:07:06 +0000 |
| commit | 7004b73275d96ecd87f04644ccae0c9954adb09a (patch) | |
| tree | b6e7d86631aea8cec61fb1cfd2aa77ab204ae810 /media/tools | |
| parent | be7c1ac4c494b6f3de8297e915e87787ba561017 (diff) | |
| download | chromium_src-7004b73275d96ecd87f04644ccae0c9954adb09a.zip chromium_src-7004b73275d96ecd87f04644ccae0c9954adb09a.tar.gz chromium_src-7004b73275d96ecd87f04644ccae0c9954adb09a.tar.bz2 | |
Encrypted Media: Refactor Video Decrypt-Only to use DecryptingDemuxerStream.
- Add VideoDecoderSelector to facilitate VideoDecoder initialization/selection.
- Add VideoDecoderSelectorTest.
- Remove DecryptingVideoDecoder from default decoder list.
- Disable decryption in FFmpegVideoDecoder.
- Updated all unittests.
After this CL, FFmpegVideoDecoder and ProxyDecryptor need to be cleaned.
BUG=141786
TEST=all tests pass; EME demos work.
Review URL: https://codereview.chromium.org/11573047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index 02b9fe9..c7cafd7 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -120,6 +120,7 @@ bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop, // Create our video renderer and save a reference to it for painting. g_video_renderer = new media::VideoRendererBase( message_loop, + media::SetDecryptorReadyCB(), base::Bind(&Paint, paint_message_loop, paint_cb), base::Bind(&SetOpaque), true); |