media: Prefer decrypting pipeline when CDM is attached

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"
@@ skipping 359 matching lines @@
 }
 
 void DecryptingDemuxerStream::InitializeDecoderConfig() {
   // The decoder selector or upstream demuxer make sure the stream is valid.
   DCHECK(IsStreamValid(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_ = demuxer_stream_->audio_decoder_config();

[DaleCurtis, 2017/02/24 18:03:50]

Comments would be helpful for these. As it is, it looks like:

http://i.imgur.com/esTFV36.gif

[xhwang, 2017/02/24 18:18:15]

:)

Done.

+      if (audio_config_.is_encrypted())
+        audio_config_.set_is_encrypted(false);
       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());
+      video_config_ = demuxer_stream_->video_decoder_config();
+      if (video_config_.is_encrypted())
+        video_config_.set_is_encrypted(false);
       break;
     }
 
     default:
       NOTREACHED();
       return;
   }
 }
 
 }  // namespace media