Roll FFMpeg for M26. Fix ffmpeg float audio decoding.

media/base/audio_decoder_config.cc

 // 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.
 
 #include "media/base/audio_decoder_config.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "media/audio/sample_rates.h"
 #include "media/base/limits.h"
 
 namespace media {
 
 AudioDecoderConfig::AudioDecoderConfig()
     : codec_(kUnknownAudioCodec),
       bits_per_channel_(0),
       channel_layout_(CHANNEL_LAYOUT_UNSUPPORTED),
       samples_per_second_(0),
       extra_data_size_(0),
-      is_encrypted_(false) {
+      is_encrypted_(false),
+      sample_format_(kUnknownSampleFormat) {
 }
 
 AudioDecoderConfig::AudioDecoderConfig(AudioCodec codec,
                                        int bits_per_channel,
                                        ChannelLayout channel_layout,
                                        int samples_per_second,
                                        const uint8* extra_data,
                                        size_t extra_data_size,
+                                       SampleFormat sample_format,
                                        bool is_encrypted) {
   Initialize(codec, bits_per_channel, channel_layout, samples_per_second,
-             extra_data, extra_data_size, is_encrypted, true);
+             extra_data, extra_data_size, sample_format, is_encrypted, true);
 }
 
 void AudioDecoderConfig::Initialize(AudioCodec codec,
                                     int bits_per_channel,
                                     ChannelLayout channel_layout,
                                     int samples_per_second,
                                     const uint8* extra_data,
                                     size_t extra_data_size,
+                                    SampleFormat sample_format,
                                     bool is_encrypted,
                                     bool record_stats) {
   CHECK((extra_data_size != 0) == (extra_data != NULL));
 
   if (record_stats) {
     UMA_HISTOGRAM_ENUMERATION("Media.AudioCodec", codec, kAudioCodecMax + 1);
     // Fake enum histogram to get exact integral buckets.  Expect to never see
     // any values over 32 and even that is huge.
     UMA_HISTOGRAM_ENUMERATION("Media.AudioBitsPerChannel", bits_per_channel,
                               40);
     UMA_HISTOGRAM_ENUMERATION("Media.AudioChannelLayout", channel_layout,
                               CHANNEL_LAYOUT_MAX);
     AudioSampleRate asr = media::AsAudioSampleRate(samples_per_second);
     if (asr != kUnexpectedAudioSampleRate) {
       UMA_HISTOGRAM_ENUMERATION("Media.AudioSamplesPerSecond", asr,
                                 kUnexpectedAudioSampleRate);
     } else {
       UMA_HISTOGRAM_COUNTS(
           "Media.AudioSamplesPerSecondUnexpected", samples_per_second);
     }
+
+    // TODO(dalecurtis): Is it worth recording SampleFormat here?  All aac and
+    // vorbis are going to be kFormatFLTP. Float PCM and AMR will be kFormatFLT.

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

is there any way to get the pre-conversion-to-float data?

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

s/kFormat/kSampleFormat/g

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

The data isn't converted to float, it's decoded in float, in older FFMpeg
versions it was immediately converted S16.  Now it's provided as is.

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

Also I don't intend to check this message in, I was more looking for feedback if
it's worth adding them to the UMA collection. WDYT?

[scherkus (not reviewing), 2012/12/11 21:18:47]

What about deprecating AudioBitsPerChannel in favour of recording the
SampleFormat enum otherwise our 32-bit bucket is about to get inflated w/o
anyway to distinguish float vs integer vs planar

[DaleCurtis, 2012/12/12 01:02:57]

Done.

   }
 
   codec_ = codec;
   bits_per_channel_ = bits_per_channel;
   channel_layout_ = channel_layout;
   samples_per_second_ = samples_per_second;
   extra_data_size_ = extra_data_size;
+  sample_format_ = sample_format;
 
   if (extra_data_size_ > 0) {
     extra_data_.reset(new uint8[extra_data_size_]);
     memcpy(extra_data_.get(), extra_data, extra_data_size_);
   } else {
     extra_data_.reset();
   }
 
   is_encrypted_ = is_encrypted;
 }
 
 AudioDecoderConfig::~AudioDecoderConfig() {}
 
 bool AudioDecoderConfig::IsValidConfig() const {
   return codec_ != kUnknownAudioCodec &&
-      channel_layout_ != CHANNEL_LAYOUT_UNSUPPORTED &&
-      bits_per_channel_ > 0 &&
-      bits_per_channel_ <= limits::kMaxBitsPerSample &&
-      samples_per_second_ > 0 &&
-      samples_per_second_ <= limits::kMaxSampleRate;
+         channel_layout_ != CHANNEL_LAYOUT_UNSUPPORTED &&
+         bits_per_channel_ > 0 &&
+         bits_per_channel_ <= limits::kMaxBitsPerSample &&
+         samples_per_second_ > 0 &&
+         samples_per_second_ <= limits::kMaxSampleRate &&
+         sample_format_ != kUnknownSampleFormat;
 }
 
 bool AudioDecoderConfig::Matches(const AudioDecoderConfig& config) const {
   return ((codec() == config.codec()) &&
           (bits_per_channel() == config.bits_per_channel()) &&
           (channel_layout() == config.channel_layout()) &&
           (samples_per_second() == config.samples_per_second()) &&
           (extra_data_size() == config.extra_data_size()) &&
           (!extra_data() || !memcmp(extra_data(), config.extra_data(),
                                     extra_data_size())) &&
-          (is_encrypted() == config.is_encrypted()));
+          (is_encrypted() == config.is_encrypted()) &&
+          (sample_format() == config.sample_format()));
 }
 
 void AudioDecoderConfig::CopyFrom(const AudioDecoderConfig& audio_config) {
   Initialize(audio_config.codec(),
              audio_config.bits_per_channel(),
              audio_config.channel_layout(),
              audio_config.samples_per_second(),
              audio_config.extra_data(),
              audio_config.extra_data_size(),
+             audio_config.sample_format(),
              audio_config.is_encrypted(),
              false);
 }
 
-AudioCodec AudioDecoderConfig::codec() const {
-  return codec_;
-}
-
-int AudioDecoderConfig::bits_per_channel() const {
-  return bits_per_channel_;
-}
-
-ChannelLayout AudioDecoderConfig::channel_layout() const {
-  return channel_layout_;
-}
-
-int AudioDecoderConfig::samples_per_second() const {
-  return samples_per_second_;
-}
-
-uint8* AudioDecoderConfig::extra_data() const {
-  return extra_data_.get();
-}
-
-size_t AudioDecoderConfig::extra_data_size() const {
-  return extra_data_size_;
-}
-
-bool AudioDecoderConfig::is_encrypted() const {
-  return is_encrypted_;
-}
-
 }  // namespace media