Roll FFMpeg for M26. Fix ffmpeg float audio decoding.

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 "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/channel_layout.h"
 #include "media/base/media_export.h"
 
 namespace media {
 
 enum AudioCodec {
   // These values are histogrammed over time; do not change their ordinal
   // values.  When deleting a codec replace it with a dummy value; when adding a
-  // codec, do so at the bottom (and update kAudioCodecMax).
+  // codec, do so at the bottom before kAudioCodecMax.
   kUnknownAudioCodec = 0,
   kCodecAAC,
   kCodecMP3,
   kCodecPCM,
   kCodecVorbis,
   // ChromiumOS and ChromeOS specific codecs.
   kCodecFLAC,
   // ChromeOS specific codecs.
   kCodecAMR_NB,
   kCodecAMR_WB,
   kCodecPCM_MULAW,
   kCodecGSM_MS,
   kCodecPCM_S16BE,
   kCodecPCM_S24BE,
   // DO NOT ADD RANDOM AUDIO CODECS!
   //
   // The only acceptable time to add a new codec is if there is production code
   // that uses said codec in the same CL.
 
-  kAudioCodecMax = kCodecPCM_S24BE  // Must equal the last "real" codec above.
+  // Must always be last!
+  kAudioCodecMax
+};
+
+enum SampleFormat {
+  // These values are histogrammed over time; do not change their ordinal
+  // values.  When deleting a sample format replace it with a dummy value; when
+  // adding a sample format, do so at the bottom before kSampleFormatMax.
+  kUnknownSampleFormat = 0,
+  kSampleFormatU8,    // Unsigned 8-bit w/ bias of 128.
+  kSampleFormatS16,   // Signed 16-bit.
+  kSampleFormatS32,   // Signed 32-bit.
+  kSampleFormatF32,   // Float 32-bit.
+  kSampleFormatPlanarF32,  // Float planar.
+
+  // Must always be last!
+  kSampleFormatMax
 };
 
 // TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of
 // |bits_per_channel|, we should switch over since bits are generally confusing
 // to work with.
 class MEDIA_EXPORT AudioDecoderConfig {
  public:
   // Constructs an uninitialized object. Clients should call Initialize() with
   // appropriate values before using.
   AudioDecoderConfig();
 
   // Constructs an initialized object. It is acceptable to pass in NULL for
   // |extra_data|, otherwise the memory is copied.
-  AudioDecoderConfig(AudioCodec codec, int bits_per_channel,
+  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.
-  void Initialize(AudioCodec codec, int bits_per_channel,
+  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);
+                  bool is_encrypted, bool record_stats);
 
   // Deep copies |audio_config|.
   void CopyFrom(const AudioDecoderConfig& audio_config);
 
   // 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;
 
-  AudioCodec codec() const;
-  int bits_per_channel() const;
-  ChannelLayout channel_layout() const;
-  int samples_per_second() const;
-  int bytes_per_frame() const;
+  AudioCodec codec() const { return codec_; }
+  int bits_per_channel() const { return bits_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_; }
 
   // Optional byte data required to initialize audio decoders such as Vorbis
   // codebooks.
-  uint8* extra_data() const;
-  size_t extra_data_size() const;
+  uint8* extra_data() const { return extra_data_.get(); }
+  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;
+  bool is_encrypted() const { return is_encrypted_; }
 
  private:
   AudioCodec codec_;
+  SampleFormat sample_format_;
   int bits_per_channel_;
   ChannelLayout channel_layout_;
   int samples_per_second_;
   int bytes_per_frame_;
 
   scoped_array<uint8> extra_data_;
   size_t extra_data_size_;
 
   bool is_encrypted_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioDecoderConfig);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_