Return parsed sample frequency of ADTS header

media/formats/mp2t/es_parser_adts.cc

 // Copyright 2014 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/formats/mp2t/es_parser_adts.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 159 matching lines @@
 
 void EsParserAdts::Flush() {
 }
 
 void EsParserAdts::ResetInternal() {
   last_audio_decoder_config_ = AudioDecoderConfig();
 }
 
 bool EsParserAdts::UpdateAudioConfiguration(const uint8_t* adts_header) {
   AudioDecoderConfig audio_decoder_config;
-  if (!ParseAdtsHeader(adts_header, sbr_in_mimetype_, &audio_decoder_config))
+  size_t orig_sample_rate = 0;
+  if (!ParseAdtsHeader(adts_header, sbr_in_mimetype_, &audio_decoder_config,
+                       &orig_sample_rate))
     return false;
 
   if (!audio_decoder_config.Matches(last_audio_decoder_config_)) {
     DVLOG(1) << "Sampling frequency: "
              << audio_decoder_config.samples_per_second()
              << " SBR=" << sbr_in_mimetype_;
     DVLOG(1) << "Channel layout: "
              << ChannelLayoutToString(audio_decoder_config.channel_layout());
 
     // For AAC audio with SBR (Spectral Band Replication) the sampling rate is
     // doubled in ParseAdtsHeader above, but AudioTimestampHelper should still
     // use the original sample rate to compute audio timestamps and durations
     // correctly.
-    int samples_per_second = sbr_in_mimetype_
-                                 ? audio_decoder_config.samples_per_second() / 2
-                                 : audio_decoder_config.samples_per_second();
+
     // Reset the timestamp helper to use a new time scale.
     if (audio_timestamp_helper_ &&
         audio_timestamp_helper_->base_timestamp() != kNoTimestamp()) {
       base::TimeDelta base_timestamp = audio_timestamp_helper_->GetTimestamp();
-      audio_timestamp_helper_.reset(
-          new AudioTimestampHelper(samples_per_second));
+      audio_timestamp_helper_.reset(new AudioTimestampHelper(orig_sample_rate));
       audio_timestamp_helper_->SetBaseTimestamp(base_timestamp);
     } else {
-      audio_timestamp_helper_.reset(
-          new AudioTimestampHelper(samples_per_second));
+      audio_timestamp_helper_.reset(new AudioTimestampHelper(orig_sample_rate));
     }
     // Audio config notification.
     last_audio_decoder_config_ = audio_decoder_config;
     new_audio_config_cb_.Run(audio_decoder_config);
   }
 
   return true;
 }
 
 }  // namespace mp2t
 }  // namespace media