Revert of media config: expand is_encrypted to a struct.

media/filters/opus_audio_decoder.cc

 // Copyright 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/opus_audio_decoder.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <cmath>
@@ skipping 251 matching lines @@
                 << config_.codec_delay();
     return false;
   }
 
   if (config_.codec_delay() != opus_extra_data.skip_samples) {
     DLOG(WARNING) << "Invalid file. Codec Delay in container does not match "
                   << "the value in Opus Extra Data. " << config_.codec_delay()
                   << " vs " << opus_extra_data.skip_samples;
     config_.Initialize(config_.codec(), config_.sample_format(),
                        config_.channel_layout(), config_.samples_per_second(),
-                       config_.extra_data(), config_.encryption_scheme(),
+                       config_.extra_data(), config_.is_encrypted(),
                        config_.seek_preroll(), opus_extra_data.skip_samples);
   }
 
   uint8_t channel_mapping[OPUS_MAX_VORBIS_CHANNELS] = {0};
   memcpy(&channel_mapping, kDefaultOpusChannelLayout,
          OPUS_MAX_CHANNELS_WITH_DEFAULT_LAYOUT);
 
   if (channel_count > OPUS_MAX_CHANNELS_WITH_DEFAULT_LAYOUT) {
     RemapOpusChannelLayout(opus_extra_data.stream_map,
                            channel_count,
@@ skipping 76 matching lines @@
     output_buffer->get()->TrimEnd(trim_frames);
 
   // Handles discards and timestamping.  Discard the buffer if more data needed.
   if (!discard_helper_->ProcessBuffers(input, *output_buffer))
     *output_buffer = nullptr;
 
   return true;
 }
 
 }  // namespace media