Revert of Refactor MediaCodecBridge to add support for NDK APIs

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/sdk_media_codec_bridge.h"
+#include "media/base/android/media_codec_bridge.h"
 #include "media/base/audio_timestamp_helper.h"
 #include "media/base/timestamp_constants.h"
 
 namespace {
 
 // Use 16bit PCM for audio output. Keep this value in sync with the output
 // format we passed to AudioTrack in MediaCodecBridge.
 const int kBytesPerAudioOutputSample = 2;
 }
 
@@ skipping 133 matching lines @@
                  audio_extra_data_.end(),
                  configs.audio_extra_data.begin());
 }
 
 MediaDecoderJob::MediaDecoderJobStatus
     AudioDecoderJob::CreateMediaCodecBridgeInternal() {
   media_codec_bridge_.reset(AudioCodecBridge::Create(audio_codec_));
   if (!media_codec_bridge_)
     return STATUS_FAILURE;
 
-  if (!(static_cast<AudioCodecBridge*>(media_codec_bridge_.get()))
-           ->ConfigureAndStart(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())) {
+  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())) {
     media_codec_bridge_.reset();
     return STATUS_FAILURE;
   }
 
   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