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/video_decoder_config.h"

[ddorwin, 2016/03/01 02:17:42]

 #include "media/base/encryption_scheme.h"

[dougsteed, 2016/03/02 18:07:53]

Done.

 #include "media/formats/webm/webm_constants.h"
 
 namespace media {
 
 WebMVideoClient::WebMVideoClient(const scoped_refptr<MediaLog>& media_log)
     : media_log_(media_log) {
   Reset();
 }
 
 WebMVideoClient::~WebMVideoClient() {
@@ skipping 68 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);
+                     EncryptionScheme(is_encrypted));

[ddorwin, 2016/03/01 02:17:42]

ditto

[dougsteed, 2016/03/02 18:07:53]

Done.

   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