Revert of media: Enable Opus support in Clank <video> and MSE

media/base/android/audio_decoder_job.cc

 // Copyright 2013 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/base/android/audio_decoder_job.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread.h"
 #include "media/base/android/media_codec_bridge.h"
@@ skipping 48 matching lines @@
 }
 
 void AudioDecoderJob::SetDemuxerConfigs(const DemuxerConfigs& configs) {
   // TODO(qinmin): split DemuxerConfig for audio and video separately so we
   // can simply store the stucture here.
   audio_codec_ = configs.audio_codec;
   num_channels_ = configs.audio_channels;
   config_sampling_rate_ = configs.audio_sampling_rate;
   set_is_content_encrypted(configs.is_audio_encrypted);
   audio_extra_data_ = configs.audio_extra_data;
-  audio_codec_delay_ns_ = configs.audio_codec_delay_ns;
-  audio_seek_preroll_ns_ = configs.audio_seek_preroll_ns;
   bytes_per_frame_ = kBytesPerAudioOutputSample * num_channels_;
   if (!media_codec_bridge_)
     output_sampling_rate_ = config_sampling_rate_;
 }
 
 void AudioDecoderJob::SetVolume(double volume) {
   volume_ = volume;
   SetVolumeInternal();
 }
 
@@ skipping 56 matching lines @@
                  configs.audio_extra_data.begin());
 }
 
 bool AudioDecoderJob::CreateMediaCodecBridgeInternal() {
   media_codec_bridge_.reset(AudioCodecBridge::Create(audio_codec_));
   if (!media_codec_bridge_)
     return false;
 
   if (!(static_cast<AudioCodecBridge*>(media_codec_bridge_.get()))->Start(
       audio_codec_, config_sampling_rate_, num_channels_, &audio_extra_data_[0],
-      audio_extra_data_.size(), audio_codec_delay_ns_, audio_seek_preroll_ns_,
-      true, GetMediaCrypto().obj())) {
+      audio_extra_data_.size(), true, GetMediaCrypto().obj())) {
     media_codec_bridge_.reset();
     return false;
   }
 
   SetVolumeInternal();
 
   // Reset values used to track codec bridge output
   frame_count_ = 0;
   ResetTimestampHelper();
 
@@ skipping 10 matching lines @@
 void AudioDecoderJob::OnOutputFormatChanged() {
   DCHECK(media_codec_bridge_);
 
   int old_sampling_rate = output_sampling_rate_;
   output_sampling_rate_ = media_codec_bridge_->GetOutputSamplingRate();
   if (output_sampling_rate_ != old_sampling_rate)
     ResetTimestampHelper();
 }
 
 }  // namespace media