MediaCodecPlayer implementation (stage 3 - browser seek and surface change)

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/audio_timestamp_helper.h"
@@ skipping 89 matching lines @@
          curr.audio_extra_data.size() != next.audio_extra_data.size() ||
          !std::equal(curr.audio_extra_data.begin(), curr.audio_extra_data.end(),
                      next.audio_extra_data.begin());
 }
 
 MediaCodecDecoder::ConfigStatus MediaCodecAudioDecoder::ConfigureInternal() {
   DCHECK(media_task_runner_->BelongsToCurrentThread());
 
   DVLOG(1) << class_name() << "::" << __FUNCTION__;
 
+  if (configs_.audio_codec == kUnknownAudioCodec) {
+    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 CONFIG_FAILURE;
+    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,
                GetMediaCrypto().obj())) {
     DVLOG(1) << class_name() << "::" << __FUNCTION__ << " failed";
 
     media_codec_bridge_.reset();
-    return CONFIG_FAILURE;
+    return kConfigFailure;
   }
 
   DVLOG(1) << class_name() << "::" << __FUNCTION__ << " succeeded";
 
   SetVolumeInternal();
 
   bytes_per_frame_ = kBytesPerAudioOutputSample * configs_.audio_channels;
   frame_count_ = 0;
   ResetTimestampHelper();
 
-  return CONFIG_OK;
+  return kConfigOk;
 }
 
 void MediaCodecAudioDecoder::OnOutputFormatChanged() {
   DCHECK(decoder_thread_.task_runner()->BelongsToCurrentThread());
 
   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)
@@ skipping 57 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