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

Unified Diff: media/tools/player_x11/player_x11.cc

Issue 11492003: Encrypted Media: Support Audio Decrypt-Only. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years 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 | « media/media.gyp ('k') | webkit/media/crypto/key_systems.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/tools/player_x11/player_x11.cc
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index 42b891fb450e43325678273e158966d21f08724b..02b9fe9a6ff308ac15783a731dbb9b516d77b73b 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -15,6 +15,7 @@
#include "base/threading/thread.h"
#include "media/audio/audio_manager.h"
#include "media/audio/null_audio_sink.h"
+#include "media/base/decryptor.h"
#include "media/base/filter_collection.h"
#include "media/base/media.h"
#include "media/base/media_log.h"
@@ -125,7 +126,8 @@ bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop,
collection->AddVideoRenderer(g_video_renderer);
collection->AddAudioRenderer(
- new media::AudioRendererImpl(new media::NullAudioSink()));
+ new media::AudioRendererImpl(new media::NullAudioSink(),
+ media::SetDecryptorReadyCB()));
// Create the pipeline and start it.
*pipeline = new media::Pipeline(message_loop, new media::MediaLog());
« no previous file with comments | « media/media.gyp ('k') | webkit/media/crypto/key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698