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

Unified Diff: webkit/media/filter_helpers.cc

Issue 11492003: Encrypted Media: Support Audio Decrypt-Only. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: working and not hacky; need to update comments and tests 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
Index: webkit/media/filter_helpers.cc
diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc
index 379e2caad4a2cf7c31ff5b2cd825a747c2e8fc61..6af8ec3e0d7e2d37903624d851d9fe12d478880b 100644
--- a/webkit/media/filter_helpers.cc
+++ b/webkit/media/filter_helpers.cc
@@ -6,9 +6,8 @@
#include "base/bind.h"
#include "media/base/filter_collection.h"
-#include "media/filters/decrypting_audio_decoder.h"
-#include "media/filters/decrypting_video_decoder.h"
#include "media/filters/chunk_demuxer.h"
+#include "media/filters/decrypting_video_decoder.h"
#include "media/filters/dummy_demuxer.h"
#include "media/filters/ffmpeg_audio_decoder.h"
#include "media/filters/ffmpeg_demuxer.h"
@@ -35,13 +34,6 @@ static void AddDefaultDecodersToCollection(
filter_collection->GetAudioDecoders()->push_back(ffmpeg_audio_decoder);
if (proxy_decryptor) {
- scoped_refptr<media::DecryptingAudioDecoder> decrypting_audio_decoder =
- new media::DecryptingAudioDecoder(
- message_loop,
- base::Bind(&ProxyDecryptor::RequestDecryptorNotification,
- base::Unretained(proxy_decryptor)));
- filter_collection->GetAudioDecoders()->push_back(decrypting_audio_decoder);
-
scoped_refptr<media::DecryptingVideoDecoder> decrypting_video_decoder =
new media::DecryptingVideoDecoder(
message_loop,

Powered by Google App Engine
This is Rietveld 408576698