Roll FFMpeg for M26. Fix ffmpeg float audio decoding.

media/filters/ffmpeg_audio_decoder_unittest.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 <deque>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "media/base/decoder_buffer.h"
@@ skipping 36 matching lines @@
       }
 
       buffer->SetDuration(base::TimeDelta());
       encoded_audio_.push_back(buffer);
     }
 
     // Push in an EOS buffer.
     encoded_audio_.push_back(DecoderBuffer::CreateEOSBuffer());
 
     config_.Initialize(kCodecVorbis,
-                       16,
+                       kSampleFormatPlanarF32,
                        CHANNEL_LAYOUT_STEREO,
                        44100,
                        vorbis_extradata_->GetData(),
                        vorbis_extradata_->GetDataSize(),
                        false,  // Not encrypted.
                        true);
   }
 
   virtual ~FFmpegAudioDecoderTest() {}
 
@@ skipping 53 matching lines @@
 
   std::deque<scoped_refptr<DecoderBuffer> > encoded_audio_;
   std::deque<scoped_refptr<Buffer> > decoded_audio_;
 
   AudioDecoderConfig config_;
 };
 
 TEST_F(FFmpegAudioDecoderTest, Initialize) {
   Initialize();
 
-  EXPECT_EQ(16, decoder_->bits_per_channel());
-  EXPECT_EQ(CHANNEL_LAYOUT_STEREO, decoder_->channel_layout());
-  EXPECT_EQ(44100, decoder_->samples_per_second());
+  EXPECT_EQ(config_.bits_per_channel(), decoder_->bits_per_channel());
+  EXPECT_EQ(config_.channel_layout(), decoder_->channel_layout());
+  EXPECT_EQ(config_.samples_per_second(), decoder_->samples_per_second());
 }
 
 TEST_F(FFmpegAudioDecoderTest, ProduceAudioSamples) {
   Initialize();
 
   // Vorbis requires N+1 packets to produce audio data for N packets.
   //
   // This will should result in the demuxer receiving three reads for two
   // requests to produce audio samples.
   EXPECT_CALL(*demuxer_, Read(_))
@@ skipping 25 matching lines @@
 
   EXPECT_CALL(*demuxer_, Read(_))
       .WillOnce(InvokeReadPacket(this));
   Read();
 
   EXPECT_EQ(decoded_audio_.size(), 1u);
   EXPECT_TRUE(decoded_audio_[0].get() ==  NULL);
 }
 
 }  // namespace media