Revert of media config: expand is_encrypted to a struct.

media/formats/mp2t/es_parser_mpeg1audio.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/mp2t/es_parser_mpeg1audio.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "media/base/audio_timestamp_helper.h"
 #include "media/base/bit_reader.h"
 #include "media/base/channel_layout.h"
-#include "media/base/media_util.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/base/timestamp_constants.h"
 #include "media/formats/common/offset_byte_queue.h"
 #include "media/formats/mp2t/mp2t_common.h"
 #include "media/formats/mpeg/mpeg1_audio_stream_parser.h"
 
 namespace media {
 namespace mp2t {
 
 struct EsParserMpeg1Audio::Mpeg1AudioFrame {
@@ skipping 138 matching lines @@
     const uint8_t* mpeg1audio_header) {
   MPEG1AudioStreamParser::Header header;
   if (!MPEG1AudioStreamParser::ParseHeader(media_log_, mpeg1audio_header,
                                            &header)) {
     return false;
   }
 
   // TODO(damienv): Verify whether Android playback requires the extra data
   // field for Mpeg1 audio. If yes, we should generate this field.
   AudioDecoderConfig audio_decoder_config(
-      kCodecMP3, kSampleFormatS16, header.channel_layout, header.sample_rate,
-      EmptyExtraData(), Unencrypted());
+      kCodecMP3,
+      kSampleFormatS16,
+      header.channel_layout,
+      header.sample_rate,
+      std::vector<uint8_t>(),
+      false);
 
   if (!audio_decoder_config.Matches(last_audio_decoder_config_)) {
     DVLOG(1) << "Sampling frequency: " << header.sample_rate;
     DVLOG(1) << "Channel layout: " << header.channel_layout;
     // Reset the timestamp helper to use a new time scale.
     if (audio_timestamp_helper_ &&
         audio_timestamp_helper_->base_timestamp() != kNoTimestamp()) {
       base::TimeDelta base_timestamp = audio_timestamp_helper_->GetTimestamp();
       audio_timestamp_helper_.reset(
         new AudioTimestampHelper(header.sample_rate));
@@ skipping 11 matching lines @@
 }
 
 void EsParserMpeg1Audio::SkipMpeg1AudioFrame(
     const Mpeg1AudioFrame& mpeg1audio_frame) {
   DCHECK_EQ(mpeg1audio_frame.queue_offset, es_queue_->head());
   es_queue_->Pop(mpeg1audio_frame.size);
 }
 
 }  // namespace mp2t
 }  // namespace media