Revert of media config: expand is_encrypted to a struct.

media/filters/decrypting_demuxer_stream.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/filters/decrypting_demuxer_stream.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/media_log.h"
-#include "media/base/media_util.h"
 
 namespace media {
 
 static bool IsStreamValidAndEncrypted(DemuxerStream* stream) {
   return ((stream->type() == DemuxerStream::AUDIO &&
            stream->audio_decoder_config().IsValidConfig() &&
            stream->audio_decoder_config().is_encrypted()) ||
           (stream->type() == DemuxerStream::VIDEO &&
            stream->video_decoder_config().IsValidConfig() &&
            stream->video_decoder_config().is_encrypted()));
@@ skipping 315 matching lines @@
 
 void DecryptingDemuxerStream::InitializeDecoderConfig() {
   // The decoder selector or upstream demuxer make sure the stream is valid and
   // potentially encrypted.
   DCHECK(IsStreamValidAndEncrypted(demuxer_stream_));
 
   switch (demuxer_stream_->type()) {
     case AUDIO: {
       AudioDecoderConfig input_audio_config =
           demuxer_stream_->audio_decoder_config();
-      audio_config_.Initialize(
-          input_audio_config.codec(), input_audio_config.sample_format(),
-          input_audio_config.channel_layout(),
-          input_audio_config.samples_per_second(),
-          input_audio_config.extra_data(), Unencrypted(),
-          input_audio_config.seek_preroll(), input_audio_config.codec_delay());
+      audio_config_.Initialize(input_audio_config.codec(),
+                               input_audio_config.sample_format(),
+                               input_audio_config.channel_layout(),
+                               input_audio_config.samples_per_second(),
+                               input_audio_config.extra_data(),
+                               false,  // Output audio is not encrypted.
+                               input_audio_config.seek_preroll(),
+                               input_audio_config.codec_delay());
       break;
     }
 
     case VIDEO: {
       VideoDecoderConfig input_video_config =
           demuxer_stream_->video_decoder_config();
       video_config_.Initialize(
           input_video_config.codec(), input_video_config.profile(),
           input_video_config.format(), input_video_config.color_space(),
           input_video_config.coded_size(), input_video_config.visible_rect(),
           input_video_config.natural_size(), input_video_config.extra_data(),
-          Unencrypted());
+          false);  // Output video is not encrypted.
       break;
     }
 
     default:
       NOTREACHED();
       return;
   }
 }
 
 }  // namespace media