media config: expand is_encrypted to a struct.

media/formats/webm/webm_video_client.cc

 // Copyright 2014 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/formats/webm/webm_video_client.h"
 
+#include "media/base/encryption_scheme.h"

[ddorwin, 2016/03/02 23:24:05]

This is no longer necessary since we're just passing through.

[dougsteed, 2016/03/03 04:45:00]

Done.

 #include "media/base/video_decoder_config.h"
 #include "media/formats/webm/webm_constants.h"
 
 namespace media {
 
 WebMVideoClient::WebMVideoClient(const scoped_refptr<MediaLog>& media_log)
     : media_log_(media_log) {
   Reset();
 }
 
 WebMVideoClient::~WebMVideoClient() {
 }
 
 void WebMVideoClient::Reset() {
   pixel_width_ = -1;
   pixel_height_ = -1;
   crop_bottom_ = -1;
   crop_top_ = -1;
   crop_left_ = -1;
   crop_right_ = -1;
   display_width_ = -1;
   display_height_ = -1;
   display_unit_ = -1;
   alpha_mode_ = -1;
 }
 
 bool WebMVideoClient::InitializeConfig(
     const std::string& codec_id,
     const std::vector<uint8_t>& codec_private,
-    bool is_encrypted,
+    const EncryptionScheme& encryption_scheme,
     VideoDecoderConfig* config) {
   DCHECK(config);
 
   VideoCodec video_codec = kUnknownVideoCodec;
   VideoCodecProfile profile = VIDEO_CODEC_PROFILE_UNKNOWN;
   if (codec_id == "V_VP8") {
     video_codec = kCodecVP8;
     profile = VP8PROFILE_ANY;
   } else if (codec_id == "V_VP9") {
     video_codec = kCodecVP9;
@@ skipping 39 matching lines @@
       return false;
   } else {
     MEDIA_LOG(ERROR, media_log_) << "Unsupported display unit type "
                                  << display_unit_;
     return false;
   }
   gfx::Size natural_size = gfx::Size(display_width_, display_height_);
 
   config->Initialize(video_codec, profile, format, COLOR_SPACE_HD_REC709,
                      coded_size, visible_rect, natural_size, codec_private,
-                     is_encrypted);
+                     encryption_scheme);
   return config->IsValidConfig();
 }
 
 bool WebMVideoClient::OnUInt(int id, int64_t val) {
   int64_t* dst = NULL;
 
   switch (id) {
     case kWebMIdPixelWidth:
       dst = &pixel_width_;
       break;
@@ skipping 43 matching lines @@
   // Accept binary fields we don't care about for now.
   return true;
 }
 
 bool WebMVideoClient::OnFloat(int id, double val) {
   // Accept float fields we don't care about for now.
   return true;
 }
 
 }  // namespace media