media config: expand is_encrypted to a struct.

media/formats/webm/webm_audio_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_audio_client.h"
 
 #include "media/base/audio_decoder_config.h"
 #include "media/base/channel_layout.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/formats/webm/webm_constants.h"
 
 namespace media {
 
 WebMAudioClient::WebMAudioClient(const scoped_refptr<MediaLog>& media_log)
     : media_log_(media_log) {
   Reset();
 }
 
 WebMAudioClient::~WebMAudioClient() {
 }
 
 void WebMAudioClient::Reset() {
   channels_ = -1;
   samples_per_second_ = -1;
   output_samples_per_second_ = -1;
 }
 
 bool WebMAudioClient::InitializeConfig(
     const std::string& codec_id,
     const std::vector<uint8_t>& codec_private,
     int64_t seek_preroll,
     int64_t codec_delay,
-    bool is_encrypted,
+    const EncryptionScheme& encryption_scheme,
     AudioDecoderConfig* config) {
   DCHECK(config);
   SampleFormat sample_format = kSampleFormatPlanarF32;
 
   AudioCodec audio_codec = kUnknownAudioCodec;
   if (codec_id == "A_VORBIS") {
     audio_codec = kCodecVorbis;
   } else if (codec_id == "A_OPUS") {
     audio_codec = kCodecOpus;
   } else {
@@ skipping 28 matching lines @@
 
   // Convert |codec_delay| from nanoseconds into frames.
   int codec_delay_in_frames = 0;
   if (codec_delay != -1) {
     codec_delay_in_frames =
         0.5 +
         samples_per_second * (static_cast<double>(codec_delay) /
                               base::Time::kNanosecondsPerSecond);
   }
 
-  config->Initialize(
-      audio_codec,
-      sample_format,
-      channel_layout,
-      samples_per_second,
-      codec_private,
-      is_encrypted,
-      base::TimeDelta::FromMicroseconds(
-          (seek_preroll != -1 ? seek_preroll : 0) / 1000),
-      codec_delay_in_frames);
+  config->Initialize(audio_codec, sample_format, channel_layout,
+                     samples_per_second, codec_private, encryption_scheme,
+                     base::TimeDelta::FromMicroseconds(
+                         (seek_preroll != -1 ? seek_preroll : 0) / 1000),
+                     codec_delay_in_frames);
   return config->IsValidConfig();
 }
 
 bool WebMAudioClient::OnUInt(int id, int64_t val) {
   if (id == kWebMIdChannels) {
     if (channels_ != -1) {
       MEDIA_LOG(ERROR, media_log_) << "Multiple values for id " << std::hex
                                    << id << " specified. (" << channels_
                                    << " and " << val << ")";
       return false;
@@ skipping 26 matching lines @@
                                  << " specified (" << *dst << " and " << val
                                  << ")";
     return false;
   }
 
   *dst = val;
   return true;
 }
 
 }  // namespace media