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"
@@ skipping 20 matching lines @@
   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.
 };
 
+enum SampleFormat {
+  kUnknownSampleFormat = 0,
+  kSampleFormatU8,    // Unsigned 8-bit w/ bias of 128.
+  kSampleFormatS16,   // Signed 16-bit.
+  kSampleFormatS32,   // Signed 32-bit.
+  kSampleFormatFLT,   // Float.

[scherkus (not reviewing), 2012/12/06 17:25:32]

perhaps instead of "FLT" we go with "F32" to denote the size of the float

also I don't find the "P" suffix to be very clear -- F32Planar?

[DaleCurtis, 2012/12/11 03:03:44]

Went with F32 an PlanarF32.

+  kSampleFormatFLTP,  // Float planar.
+};
+
 // 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,

[scherkus (not reviewing), 2012/12/06 17:25:32]

is bits_per_channel still worth carrying around if we now include a SampleFormat
enum?

U8/S16/S32 all specify their bits per channel and float is typically understood
to be 32-bit

what does it mean to pass in 16 + kSampleFormatU8?

[DaleCurtis, 2012/12/06 22:15:41]

Good point, I think it's better to remove bits per channel in favor of the
sample format.

[DaleCurtis, 2012/12/11 03:03:44]

Done.

                      ChannelLayout channel_layout, int samples_per_second,
                      const uint8* extra_data, size_t extra_data_size,
-                     bool is_encrypted);
+                     SampleFormat sample_format, bool is_encrypted);
 
   ~AudioDecoderConfig();
 
   // Resets the internal state of this object.
   void Initialize(AudioCodec codec, int bits_per_channel,
                   ChannelLayout channel_layout, int samples_per_second,
                   const uint8* extra_data, size_t extra_data_size,
-                  bool is_encrypted,
+                  SampleFormat sample_format, 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;
+  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_; }
 
   // 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_;
   int bits_per_channel_;
   ChannelLayout channel_layout_;
   int samples_per_second_;
 
   scoped_array<uint8> extra_data_;
   size_t extra_data_size_;
 
   bool is_encrypted_;
+  SampleFormat sample_format_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioDecoderConfig);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_