Support for parsing encrypted WebM streams by src.

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"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_glue.h"
 #include "media/filters/in_memory_url_protocol.h"
 #include "media/webm/webm_cluster_parser.h"
 #include "media/webm/webm_constants.h"
 #include "media/webm/webm_content_encodings.h"
+#include "media/webm/webm_crypto_helpers.h"
 #include "media/webm/webm_info_parser.h"
 #include "media/webm/webm_tracks_parser.h"
 
 namespace media {
 
-// TODO(xhwang): Figure out the init data type appropriately once it's spec'ed.
-static const char kWebMInitDataType[] = "video/webm";
-
 // Helper class that uses FFmpeg to create AudioDecoderConfig &
 // VideoDecoderConfig objects.
 //
 // This dependency on FFmpeg can be removed once we update WebMTracksParser
 // to parse the necessary data to construct AudioDecoderConfig &
 // VideoDecoderConfig objects. http://crbug.com/108756
 class FFmpegConfigHelper {
  public:
   FFmpegConfigHelper();
   ~FFmpegConfigHelper();
@@ skipping 114 matching lines @@
 
   bool no_supported_streams = true;
   for (size_t i = 0; i < format_context->nb_streams; ++i) {
     AVStream* stream = format_context->streams[i];
     AVCodecContext* codec_context = stream->codec;
     AVMediaType codec_type = codec_context->codec_type;
 
     if (codec_type == AVMEDIA_TYPE_AUDIO &&
         stream->codec->codec_id == CODEC_ID_VORBIS &&
         !audio_config_.IsValidConfig()) {
-      AVCodecContextToAudioDecoderConfig(stream->codec, &audio_config_);
+      AVCodecContextToAudioDecoderConfig(stream->codec, false, &audio_config_);

[ddorwin, 2013/03/10 21:29:39]

Just call AVStreamToAudioDecoderConfig like the video path below?

[fgalligan1, 2013/03/12 00:42:42]

Done.

       no_supported_streams = false;
       continue;
     }
 
     if (codec_type == AVMEDIA_TYPE_VIDEO &&
         stream->codec->codec_id == CODEC_ID_VP8 &&
         !video_config_.IsValidConfig()) {
       AVStreamToVideoDecoderConfig(stream, &video_config_);
       no_supported_streams = false;
       continue;
@@ skipping 296 matching lines @@
     end_of_segment_cb_.Run();
 
   return bytes_parsed;
 }
 
 void WebMStreamParser::FireNeedKey(const std::string& key_id) {
   int key_id_size = key_id.size();
   DCHECK_GT(key_id_size, 0);
   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(kWebMInitDataType, key_id_array.Pass(), key_id_size);
+  need_key_cb_.Run(kWebMEncryptInitDataType, key_id_array.Pass(), key_id_size);
 }
 
 }  // namespace media