Android: Propagate sample rate change to audio decoder job

media/base/android/audio_decoder_job.cc

Index: media/base/android/audio_decoder_job.cc
diff --git a/media/base/android/audio_decoder_job.cc b/media/base/android/audio_decoder_job.cc
index e3769200abd473e9981a29ca680ed795ae1baf6b..dc92bb0ff5a9ff30289b45b471437af5fc67f3c3 100644
--- a/media/base/android/audio_decoder_job.cc
+++ b/media/base/android/audio_decoder_job.cc
@@ -40,9 +40,10 @@ AudioDecoderJob::AudioDecoderJob(
                       on_demuxer_config_changed_cb),
       audio_codec_(kUnknownAudioCodec),
       num_channels_(0),
-      sampling_rate_(0),
+      config_sampling_rate_(0),
       volume_(-1.0),
-      bytes_per_frame_(0) {
+      bytes_per_frame_(0),
+      output_sampling_rate_(0) {
 }
 
 AudioDecoderJob::~AudioDecoderJob() {}
@@ -56,10 +57,13 @@ void AudioDecoderJob::SetDemuxerConfigs(const DemuxerConfigs& configs) {
   // can simply store the stucture here.
   audio_codec_ = configs.audio_codec;
   num_channels_ = configs.audio_channels;
-  sampling_rate_ = configs.audio_sampling_rate;
+  config_sampling_rate_ = configs.audio_sampling_rate;
   set_is_content_encrypted(configs.is_audio_encrypted);
   audio_extra_data_ = configs.audio_extra_data;
   bytes_per_frame_ = kBytesPerAudioOutputSample * num_channels_;
+  if (!media_codec_bridge_) {
+    output_sampling_rate_ = config_sampling_rate_;
+  }
 }
 
 void AudioDecoderJob::SetVolume(double volume) {
@@ -74,6 +78,14 @@ void AudioDecoderJob::SetBaseTimestamp(base::TimeDelta base_timestamp) {
     audio_timestamp_helper_->SetBaseTimestamp(base_timestamp_);
 }
 
+void AudioDecoderJob::ResetTimestampHelper() {
+  if (audio_timestamp_helper_)
+    base_timestamp_ = audio_timestamp_helper_->GetTimestamp();
+  audio_timestamp_helper_.reset(
+      new AudioTimestampHelper(output_sampling_rate_));
+  audio_timestamp_helper_->SetBaseTimestamp(base_timestamp_);
+}
+
 void AudioDecoderJob::ReleaseOutputBuffer(
     int output_buffer_index,
     size_t size,
@@ -109,7 +121,7 @@ bool AudioDecoderJob::AreDemuxerConfigsChanged(
     const DemuxerConfigs& configs) const {
   return audio_codec_ != configs.audio_codec ||
      num_channels_ != configs.audio_channels ||
-     sampling_rate_ != configs.audio_sampling_rate ||
+     config_sampling_rate_ != configs.audio_sampling_rate ||
      is_content_encrypted() != configs.is_audio_encrypted ||
      audio_extra_data_.size() != configs.audio_extra_data.size() ||
      !std::equal(audio_extra_data_.begin(),
@@ -123,7 +135,7 @@ bool AudioDecoderJob::CreateMediaCodecBridgeInternal() {
     return false;
 
   if (!(static_cast<AudioCodecBridge*>(media_codec_bridge_.get()))->Start(
-      audio_codec_, sampling_rate_, num_channels_, &audio_extra_data_[0],
+      audio_codec_, config_sampling_rate_, num_channels_, &audio_extra_data_[0],
       audio_extra_data_.size(), true, GetMediaCrypto().obj())) {
     media_codec_bridge_.reset();
     return false;
@@ -132,10 +144,8 @@ bool AudioDecoderJob::CreateMediaCodecBridgeInternal() {
   SetVolumeInternal();
 
   // Need to pass the base timestamp to the new decoder.
-  if (audio_timestamp_helper_)
-    base_timestamp_ = audio_timestamp_helper_->GetTimestamp();
-  audio_timestamp_helper_.reset(new AudioTimestampHelper(sampling_rate_));
-  audio_timestamp_helper_->SetBaseTimestamp(base_timestamp_);
+  ResetTimestampHelper();
+
   return true;
 }
 
@@ -146,4 +156,18 @@ void AudioDecoderJob::SetVolumeInternal() {
   }
 }
 
+bool AudioDecoderJob::UpdateOutputFormat() {
+  if (!media_codec_bridge_)
+    return false;
+
+  int old_sampling_rate = output_sampling_rate_;
+  media_codec_bridge_->GetOutputSamplingRate(&output_sampling_rate_);
+  if (output_sampling_rate_ == old_sampling_rate)
+    return false;
+
+  ResetTimestampHelper();

[gunsch, 2015/01/12 16:30:51]

Thought: it might also be a good idea to call reconfigureAudioTrack from here.

With this addition and the previous CL in MediaCodecBridge.java, there are now
two paths for reconfiguring AudioDecoderJob on a STATUS_FORMAT_CHANGED:

1) (this class) UpdateOutputFormat --> ResetTimestampHelper
2) (MediaCodecBridge.java) dequeueOutputBuffer --> reconfigureAudioTrack

It would probably be better to essentially revert the changes to
dequeueOutputBuffer from the previous CL, add a @CalledFromNative to
reconfigureAudioTrack, and also invoke that here.

[kjoswiak, 2015/01/12 19:44:48]

Hmm, maybe. I would have to add/change codepath to handle error condition of
failing the reconfigure. Will look into if I can do this cleanly

+
+  return true;
+}
+
 }  // namespace media