Wire up codec_delay() to MP3StreamParser and FFmpegAudioDecoder.

media/base/audio_decoder_config.h

 // Copyright (c) 2012 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.
 
 #ifndef MEDIA_BASE_AUDIO_DECODER_CONFIG_H_
 #define MEDIA_BASE_AUDIO_DECODER_CONFIG_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 45 matching lines @@
 
   // Constructs an initialized object. It is acceptable to pass in NULL for
   // |extra_data|, otherwise the memory is copied.
   AudioDecoderConfig(AudioCodec codec, SampleFormat sample_format,
                      ChannelLayout channel_layout, int samples_per_second,
                      const uint8* extra_data, size_t extra_data_size,
                      bool is_encrypted);
 
   ~AudioDecoderConfig();
 
-  // Resets the internal state of this object.
+  // Resets the internal state of this object.  |codec_delay| is in frames.
   void Initialize(AudioCodec codec, SampleFormat sample_format,
                   ChannelLayout channel_layout, int samples_per_second,
                   const uint8* extra_data, size_t extra_data_size,
                   bool is_encrypted, bool record_stats,
                   base::TimeDelta seek_preroll,
-                  base::TimeDelta codec_delay);
+                  int codec_delay);
 
   // Returns true if this object has appropriate configuration values, false
   // otherwise.
   bool IsValidConfig() const;
 
   // Returns true if all fields in |config| match this config.
   // Note: The contents of |extra_data_| are compared not the raw pointers.
   bool Matches(const AudioDecoderConfig& config) const;
 
   // Returns a human-readable string describing |*this|.  For debugging & test
   // output only.
   std::string AsHumanReadableString() const;
 
   AudioCodec codec() const { return codec_; }
   int bits_per_channel() const { return bytes_per_channel_ * 8; }
   int bytes_per_channel() const { return bytes_per_channel_; }
   ChannelLayout channel_layout() const { return channel_layout_; }
   int samples_per_second() const { return samples_per_second_; }
   SampleFormat sample_format() const { return sample_format_; }
   int bytes_per_frame() const { return bytes_per_frame_; }
   base::TimeDelta seek_preroll() const { return seek_preroll_; }
-  base::TimeDelta codec_delay() const { return codec_delay_; }
+  int codec_delay() const { return codec_delay_; }
 
   // Optional byte data required to initialize audio decoders such as Vorbis
   // codebooks.
   const uint8* extra_data() const {
     return extra_data_.empty() ? NULL : &extra_data_[0];
   }
   size_t extra_data_size() const { return extra_data_.size(); }
 
   // Whether the audio stream is potentially encrypted.
   // Note that in a potentially encrypted audio stream, individual buffers
   // can be encrypted or not encrypted.
   bool is_encrypted() const { return is_encrypted_; }
 
  private:
   AudioCodec codec_;
   SampleFormat sample_format_;
   int bytes_per_channel_;
   ChannelLayout channel_layout_;
   int samples_per_second_;
   int bytes_per_frame_;
   std::vector<uint8> extra_data_;
   bool is_encrypted_;
 
   // |seek_preroll_| is the duration of the data that the decoder must decode
   // before the decoded data is valid.
   base::TimeDelta seek_preroll_;
 
-  // |codec_delay_| is the overall delay overhead added by the codec while
-  // encoding. This value should be subtracted from each block's timestamp to
-  // get the actual timestamp.
-  base::TimeDelta codec_delay_;
+  // |codec_delay_| is the number of frames the decoder should discard before
+  // returning decoded data.  This value can include both decoder delay as well
+  // as padding added during encoding.
+  int codec_delay_;
 
   // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler
   // generated copy constructor and assignment operator. Since the extra data is
   // typically small, the performance impact is minimal.
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_