Roll FFMpeg for M26. Fix ffmpeg float audio decoding.

media/filters/audio_renderer_impl_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 "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/gtest_prod_util.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "media/base/audio_timestamp_helper.h"
@@ skipping 21 matching lines @@
 static uint8 kPlayingAudio = 0x99;
 
 class AudioRendererImplTest : public ::testing::Test {
  public:
   // Give the decoder some non-garbage media properties.
   AudioRendererImplTest()
       : renderer_(new AudioRendererImpl(new NiceMock<MockAudioRendererSink>(),
                                         SetDecryptorReadyCB())),
         demuxer_stream_(new MockDemuxerStream()),
         decoder_(new MockAudioDecoder()),
-        audio_config_(kCodecVorbis, 16, CHANNEL_LAYOUT_STEREO,
-                      44100, NULL, 0, false) {
+        audio_config_(kCodecVorbis, kSampleFormatPlanarF32,
+                      CHANNEL_LAYOUT_STEREO, 44100, NULL, 0, false) {
     EXPECT_CALL(*demuxer_stream_, type())
         .WillRepeatedly(Return(DemuxerStream::AUDIO));
     EXPECT_CALL(*demuxer_stream_, audio_decoder_config())
         .WillRepeatedly(ReturnRef(audio_config_));
 
     // Queue all reads from the decoder by default.
     ON_CALL(*decoder_, Read(_))
         .WillByDefault(Invoke(this, &AudioRendererImplTest::SaveReadCallback));
 
     // Set up audio properties.
     SetSupportedAudioDecoderProperties();
     EXPECT_CALL(*decoder_, bits_per_channel())
         .Times(AnyNumber());
     EXPECT_CALL(*decoder_, channel_layout())
         .Times(AnyNumber());
     EXPECT_CALL(*decoder_, samples_per_second())
         .Times(AnyNumber());
 
     decoders_.push_back(decoder_);
   }
 
   virtual ~AudioRendererImplTest() {
     message_loop_.RunUntilIdle();
     renderer_->Stop(NewExpectedClosure());
   }
 
   void SetSupportedAudioDecoderProperties() {
     ON_CALL(*decoder_, bits_per_channel())
-        .WillByDefault(Return(16));
+        .WillByDefault(Return(audio_config_.bits_per_channel()));
     ON_CALL(*decoder_, channel_layout())
         .WillByDefault(Return(CHANNEL_LAYOUT_MONO));
     ON_CALL(*decoder_, samples_per_second())
-        .WillByDefault(Return(44100));
+        .WillByDefault(Return(audio_config_.samples_per_second()));
   }
 
   void SetUnsupportedAudioDecoderProperties() {
     ON_CALL(*decoder_, bits_per_channel())
         .WillByDefault(Return(3));
     ON_CALL(*decoder_, channel_layout())
         .WillByDefault(Return(CHANNEL_LAYOUT_UNSUPPORTED));
     ON_CALL(*decoder_, samples_per_second())
         .WillByDefault(Return(0));
   }
@@ skipping 395 matching lines @@
   EXPECT_TRUE(ConsumeBufferedData(bytes_buffered() / 2, NULL));
 
   renderer_->Pause(NewExpectedClosure());
 
   AbortPendingRead();
 
   Preroll(base::TimeDelta::FromSeconds(1));
 }
 
 }  // namespace media