Add is_encrypted() in VideoDecoderConfig.

media/webm/webm_stream_parser.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 "media/webm/webm_stream_parser.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 334 matching lines @@
     duration = base::TimeDelta::FromMicroseconds(duration_in_us);
   }
 
   FFmpegConfigHelper config_helper;
 
   if (!config_helper.Parse(data, bytes_parsed)) {
     DVLOG(1) << "Failed to parse config data.";
     return -1;
   }
 
+  // TODO(xhwang): Support decryption of audio (see http://crbug.com/123421).
+  bool is_audio_encrypted = false;
+  bool is_video_encrypted = !tracks_parser.video_encryption_key_id().empty();
+
   if (!config_cb_.Run(config_helper.audio_config(),
-                      config_helper.video_config())) {
+                      config_helper.video_config(),
+                      is_audio_encrypted,
+                      is_video_encrypted)) {
     DVLOG(1) << "New config data isn't allowed.";
     return -1;
   }
 
   // TODO(xhwang): Support decryption of audio (see http://crbug.com/123421).
-  if (!tracks_parser.video_encryption_key_id().empty()) {
+  if (is_video_encrypted) {
     std::string key_id = tracks_parser.video_encryption_key_id();
     int key_id_size = key_id.size();
     CHECK_GT(key_id_size, 0);
     CHECK_LT(key_id_size, 2048);
     scoped_array<uint8> key_id_array(new uint8[key_id_size]);
     memcpy(key_id_array.get(), key_id.data(), key_id_size);
     need_key_cb_.Run(key_id_array.Pass(), key_id_size);
   }
 
   cluster_parser_.reset(new WebMClusterParser(
@@ skipping 61 matching lines @@
   if (!video_buffers.empty() && !video_cb_.Run(video_buffers))
     return -1;
 
   if (cluster_ended)
     end_of_segment_cb_.Run();
 
   return bytes_parsed;
 }
 
 }  // namespace media