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 328 matching lines @@
 
   base::TimeDelta duration = kInfiniteDuration();
 
   if (info_parser.duration() > 0) {
     double mult = info_parser.timecode_scale() / 1000.0;
     int64 duration_in_us = info_parser.duration() * mult;
     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;
   }
 
-  if (!config_cb_.Run(config_helper.audio_config(),
-                      config_helper.video_config())) {
-    DVLOG(1) << "New config data isn't allowed.";
-    return -1;
-  }
+  VideoDecoderConfig video_config;
+  video_config.CopyFrom(config_helper.video_config());
 
   // TODO(xhwang): Support decryption of audio (see http://crbug.com/123421).
-  if (!tracks_parser.video_encryption_key_id().empty()) {
+  bool is_video_encrypted = !tracks_parser.video_encryption_key_id().empty();
+  if (is_video_encrypted) {
+    video_config.set_is_encrypted(true);

[acolwell GONE FROM CHROMIUM, 2012/09/17 17:41:17]

Use Initialize() here and CopyFrom() in an else so that you don't need
set_is_encrypted().

[xhwang, 2012/09/17 19:42:25]

Done.

+
+    // Fire needkey event.
     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);

[acolwell GONE FROM CHROMIUM, 2012/09/17 17:41:17]

This should not be a CHECK since it means an "Aw Snap" could be triggered from
JavaScript. If you want this to fail then you should return -1 here.

[xhwang, 2012/09/17 19:42:25]

Hmm, good catch. According to Frank, 2048bytes is the de facto upper limit of
key ID size, but it's not specified anywhere. I propose to remove this check
unless anybody objects.

Also change the CHECK on line 365 to DCHECK as it should always be true based on
our implementation in WebMContentEncodingsClient.

     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);
   }
 
+  if (!config_cb_.Run(config_helper.audio_config(), video_config)) {
+    DVLOG(1) << "New config data isn't allowed.";
+    return -1;
+  }
+
   cluster_parser_.reset(new WebMClusterParser(
       info_parser.timecode_scale(),
       tracks_parser.audio_track_num(),
       tracks_parser.video_track_num(),
       tracks_parser.video_encryption_key_id()));
 
   ChangeState(kParsingClusters);
 
   if (!init_cb_.is_null()) {
     init_cb_.Run(true, duration);
@@ skipping 52 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