Encrypted Media: No NeedKey if --enable-encrypted-media is not set.

webkit/media/filter_helpers.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/filter_helpers.h"
 
 #include "base/bind.h"
 #include "media/base/filter_collection.h"
 #include "media/base/message_loop_factory.h"
 #include "media/filters/decrypting_audio_decoder.h"
@@ skipping 18 matching lines @@
 // DecryptingVideoDecoder only supports encrypted video stream.
 static void AddDefaultDecodersToCollection(
     media::MessageLoopFactory* message_loop_factory,
     media::FilterCollection* filter_collection,
     ProxyDecryptor* proxy_decryptor) {
   scoped_refptr<media::FFmpegAudioDecoder> ffmpeg_audio_decoder =
       new media::FFmpegAudioDecoder(
           base::Bind(&media::MessageLoopFactory::GetMessageLoop,
                      base::Unretained(message_loop_factory),
                      media::MessageLoopFactory::kPipeline));
+  filter_collection->GetAudioDecoders()->push_back(ffmpeg_audio_decoder);
 
-  scoped_refptr<media::DecryptingAudioDecoder> decrypting_audio_decoder =
-      new media::DecryptingAudioDecoder(
-          base::Bind(&media::MessageLoopFactory::GetMessageLoop,
-                     base::Unretained(message_loop_factory),
-                     media::MessageLoopFactory::kPipeline),
-          base::Bind(&ProxyDecryptor::RequestDecryptorNotification,
-                     base::Unretained(proxy_decryptor)));
+  if (proxy_decryptor) {
+    scoped_refptr<media::DecryptingAudioDecoder> decrypting_audio_decoder =
+        new media::DecryptingAudioDecoder(
+            base::Bind(&media::MessageLoopFactory::GetMessageLoop,
+                       base::Unretained(message_loop_factory),
+                       media::MessageLoopFactory::kPipeline),
+            base::Bind(&ProxyDecryptor::RequestDecryptorNotification,
+                       base::Unretained(proxy_decryptor)));
+    filter_collection->GetAudioDecoders()->push_back(decrypting_audio_decoder);
 
-  filter_collection->GetAudioDecoders()->push_back(ffmpeg_audio_decoder);
-  filter_collection->GetAudioDecoders()->push_back(decrypting_audio_decoder);
-
-  scoped_refptr<media::DecryptingVideoDecoder> decrypting_video_decoder =
-      new media::DecryptingVideoDecoder(
-          base::Bind(&media::MessageLoopFactory::GetMessageLoop,
-                     base::Unretained(message_loop_factory),
-                     media::MessageLoopFactory::kPipeline),
-          base::Bind(&ProxyDecryptor::RequestDecryptorNotification,
-                     base::Unretained(proxy_decryptor)));
+    scoped_refptr<media::DecryptingVideoDecoder> decrypting_video_decoder =
+        new media::DecryptingVideoDecoder(
+            base::Bind(&media::MessageLoopFactory::GetMessageLoop,
+                       base::Unretained(message_loop_factory),
+                       media::MessageLoopFactory::kPipeline),
+            base::Bind(&ProxyDecryptor::RequestDecryptorNotification,
+                       base::Unretained(proxy_decryptor)));
+    // TODO(xhwang): Ideally we should have decrypting video decoder after
+    // regular video decoder since in the real world most videos are not
+    // encrypted. For now FFmpegVideoDecoder can also do decryption
+    // (decrypt-only), and we perfer DecryptingVideoDecoder (decrypt-and-decode)
+    // to FFmpegVideoDecoder. Fix this order when we move decryption out of
+    // FFmpegVideoDecoder.
+    filter_collection->GetVideoDecoders()->push_back(decrypting_video_decoder);
+  }
 
   scoped_refptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder =
       new media::FFmpegVideoDecoder(
           base::Bind(&media::MessageLoopFactory::GetMessageLoop,
                      base::Unretained(message_loop_factory),
                      media::MessageLoopFactory::kPipeline),
           proxy_decryptor);
 
-  // TODO(xhwang): Ideally we should have decrypting video decoder after
-  // regular video decoder since in the real world most videos are not
-  // encrypted. For now FFmpegVideoDecoder can also do decryption
-  // (decrypt-only), and we perfer DecryptingVideoDecoder (decrypt-and-decode)
-  // to FFmpegVideoDecoder. Fix this order when we move decryption out of
-  // FFmpegVideoDecoder.
-  filter_collection->GetVideoDecoders()->push_back(decrypting_video_decoder);
   filter_collection->GetVideoDecoders()->push_back(ffmpeg_video_decoder);
 }
 
 bool BuildMediaStreamCollection(const WebKit::WebURL& url,
                                 MediaStreamClient* client,
                                 media::MessageLoopFactory* message_loop_factory,
                                 media::FilterCollection* filter_collection) {
   if (!client)
     return false;
 
@@ skipping 38 matching lines @@
   filter_collection->SetDemuxer(new media::FFmpegDemuxer(
       message_loop_factory->GetMessageLoop(
           media::MessageLoopFactory::kPipeline),
       data_source));
 
   AddDefaultDecodersToCollection(message_loop_factory, filter_collection,
                                  proxy_decryptor);
 }
 
 }  // webkit_media