Revert of media config: expand is_encrypted to a struct.

media/formats/webm/webm_tracks_parser.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_tracks_parser.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "media/base/media_util.h"
 #include "media/base/timestamp_constants.h"
 #include "media/formats/webm/webm_constants.h"
 #include "media/formats/webm/webm_content_encodings.h"
 
 namespace media {
 
 static TextKind CodecIdToTextKind(const std::string& codec_id) {
   if (codec_id == kWebMCodecSubtitles)
     return kTextSubtitles;
 
@@ skipping 166 matching lines @@
 
     std::string encryption_key_id;
     if (track_content_encodings_client_) {
       DCHECK(!track_content_encodings_client_->content_encodings().empty());
       // If we have multiple ContentEncoding in one track. Always choose the
       // key id in the first ContentEncoding as the key id of the track.
       encryption_key_id = track_content_encodings_client_->
           content_encodings()[0]->encryption_key_id();
     }
 
-    EncryptionScheme encryption_scheme =
-        encryption_key_id.empty() ? Unencrypted() : AesCtrEncryptionScheme();
-
     if (track_type_ == kWebMTrackTypeAudio) {
       if (audio_track_num_ == -1) {
         audio_track_num_ = track_num_;
         audio_encryption_key_id_ = encryption_key_id;
 
         if (default_duration_ == 0) {
           MEDIA_LOG(ERROR, media_log_) << "Illegal 0ns audio TrackEntry "
                                           "DefaultDuration";
           return false;
         }
         audio_default_duration_ = default_duration_;
 
         DCHECK(!audio_decoder_config_.IsValidConfig());
         if (!audio_client_.InitializeConfig(
                 codec_id_, codec_private_, seek_preroll_, codec_delay_,
-                encryption_scheme, &audio_decoder_config_)) {
+                !audio_encryption_key_id_.empty(), &audio_decoder_config_)) {
           return false;
         }
         media_tracks_->AddAudioTrack(audio_decoder_config_,
                                      base::Uint64ToString(track_num_), "main",
                                      track_name_, track_language_);
       } else {
         MEDIA_LOG(DEBUG, media_log_) << "Ignoring audio track " << track_num_;
         ignored_tracks_.insert(track_num_);
       }
     } else if (track_type_ == kWebMTrackTypeVideo) {
       if (video_track_num_ == -1) {
         video_track_num_ = track_num_;
         video_encryption_key_id_ = encryption_key_id;
 
         if (default_duration_ == 0) {
           MEDIA_LOG(ERROR, media_log_) << "Illegal 0ns video TrackEntry "
                                           "DefaultDuration";
           return false;
         }
         video_default_duration_ = default_duration_;
 
         DCHECK(!video_decoder_config_.IsValidConfig());
-        if (!video_client_.InitializeConfig(codec_id_, codec_private_,
-                                            encryption_scheme,
-                                            &video_decoder_config_)) {
+        if (!video_client_.InitializeConfig(
+                codec_id_, codec_private_, !video_encryption_key_id_.empty(),
+                &video_decoder_config_)) {
           return false;
         }
         media_tracks_->AddVideoTrack(video_decoder_config_,
                                      base::Uint64ToString(track_num_), "main",
                                      track_name_, track_language_);
       } else {
         MEDIA_LOG(DEBUG, media_log_) << "Ignoring video track " << track_num_;
         ignored_tracks_.insert(track_num_);
       }
     } else if (track_type_ == kWebMTrackTypeSubtitlesOrCaptions ||
@@ skipping 104 matching lines @@
     } else {
       track_language_ = str;
     }
     return true;
   }
 
   return true;
 }
 
 }  // namespace media