Revert of Refactor MediaCodecBridge to add support for NDK APIs

media/base/android/media_codec_audio_decoder.cc

 // Copyright 2015 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/media_codec_audio_decoder.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
+#include "media/base/android/media_codec_bridge.h"
 #include "media/base/android/media_statistics.h"
-#include "media/base/android/sdk_media_codec_bridge.h"
 #include "media/base/audio_timestamp_helper.h"
 #include "media/base/demuxer_stream.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 116 matching lines @@
     DVLOG(0) << class_name() << "::" << __FUNCTION__
              << " configuration parameters are required";
     return kConfigFailure;
   }
 
   media_codec_bridge_.reset(AudioCodecBridge::Create(configs_.audio_codec));
   if (!media_codec_bridge_)
     return kConfigFailure;
 
   if (!(static_cast<AudioCodecBridge*>(media_codec_bridge_.get()))
-           ->ConfigureAndStart(
-               configs_.audio_codec, configs_.audio_sampling_rate,
-               configs_.audio_channels, &configs_.audio_extra_data[0],
-               configs_.audio_extra_data.size(), configs_.audio_codec_delay_ns,
-               configs_.audio_seek_preroll_ns, true, media_crypto)) {
+           ->Start(
+               configs_.audio_codec,
+               configs_.audio_sampling_rate,
+               configs_.audio_channels,
+               &configs_.audio_extra_data[0],
+               configs_.audio_extra_data.size(),
+               configs_.audio_codec_delay_ns,
+               configs_.audio_seek_preroll_ns,
+               true,
+               media_crypto)) {
     DVLOG(0) << class_name() << "::" << __FUNCTION__
              << " failed: cannot start audio codec";
 
     media_codec_bridge_.reset();
     return kConfigFailure;
   }
 
   DVLOG(0) << class_name() << "::" << __FUNCTION__ << " succeeded";
 
   SetVolumeInternal();
@@ skipping 118 matching lines @@
   if (audio_timestamp_helper_)
     base_timestamp_ = audio_timestamp_helper_->GetTimestamp();
 
   audio_timestamp_helper_.reset(
       new AudioTimestampHelper(configs_.audio_sampling_rate));
 
   audio_timestamp_helper_->SetBaseTimestamp(base_timestamp_);
 }
 
 }  // namespace media