| Index: media/base/android/media_codec_audio_decoder.cc
|
| diff --git a/media/base/android/media_codec_audio_decoder.cc b/media/base/android/media_codec_audio_decoder.cc
|
| index 4b8a0768b82db34e51aeea8654c2585fd55c2da5..f68a07e4fc3ba4c52b91dcaf82856ed3e419b792 100644
|
| --- a/media/base/android/media_codec_audio_decoder.cc
|
| +++ b/media/base/android/media_codec_audio_decoder.cc
|
| @@ -6,8 +6,8 @@
|
|
|
| #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"
|
|
|
| @@ -144,16 +144,11 @@ MediaCodecDecoder::ConfigStatus MediaCodecAudioDecoder::ConfigureInternal(
|
| return kConfigFailure;
|
|
|
| if (!(static_cast<AudioCodecBridge*>(media_codec_bridge_.get()))
|
| - ->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)) {
|
| + ->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)) {
|
| DVLOG(0) << class_name() << "::" << __FUNCTION__
|
| << " failed: cannot start audio codec";
|
|
|
|
|