Fix initialization of AudioTrack related output parameters

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"
@@ skipping 168 matching lines @@
   if (!(static_cast<AudioCodecBridge*>(media_codec_bridge_.get()))
            ->ConfigureAndStart(audio_codec_, config_sampling_rate_,
                                config_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;
   }
 
+  // ConfigureAndStart() creates AudioTrack with |config_sampling_rate_|
+  // and |config_num_channels_|. Keep |output_...| in sync to detect the changes
+  // that might come with OnOutputFormatChanged().
+  output_sampling_rate_ = config_sampling_rate_;
+  output_num_channels_ = config_num_channels_;
+
   SetVolumeInternal();
 
   // Reset values used to track codec bridge output
   frame_count_ = 0;
   ResetTimestampHelper();
 
   return STATUS_SUCCESS;
 }
 
 void AudioDecoderJob::SetVolumeInternal() {
@@ skipping 35 matching lines @@
       !static_cast<AudioCodecBridge*>(media_codec_bridge_.get())
            ->CreateAudioTrack(output_sampling_rate_, output_num_channels_)) {
     DLOG(ERROR) << __FUNCTION__ << ": cannot create AudioTrack";
     return false;
   }
 
   return true;
 }
 
 }  // namespace media