Roll FFMpeg for M26. Fix ffmpeg float audio decoding.

media/mp4/mp4_stream_parser.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/mp4/mp4_stream_parser.h"
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/time.h"
@@ skipping 184 matching lines @@
              entry.sinf.format.format == FOURCC_MP4A))) {
         LOG(ERROR) << "Unsupported audio format.";
         return false;
       }
       // Check if it is MPEG4 AAC defined in ISO 14496 Part 3.
       if (entry.esds.object_type != kISO_14496_3) {
         LOG(ERROR) << "Unsupported audio object type.";
         return false;
       }
 
+      SampleFormat sample_format;
+      if (entry.samplesize == 8) {
+        sample_format = kSampleFormatU8;
+      } else if (entry.samplesize == 16) {
+        sample_format = kSampleFormatS16;
+      } else if (entry.samplesize == 32) {
+        sample_format = kSampleFormatS32;
+      } else {
+        LOG(ERROR) << "Unsupported sample size.";
+        return false;
+      }
+
       bool is_encrypted = entry.sinf.info.track_encryption.is_encrypted;
       audio_config.Initialize(kCodecAAC, entry.samplesize,
                               aac.channel_layout(),
                               aac.GetOutputSamplesPerSecond(has_sbr_),
-                              NULL, 0, is_encrypted, false);
+                              NULL, 0, sample_format, is_encrypted, false);
       has_audio_ = true;
       audio_track_id_ = track->header.track_id;
     }
     if (track->media.handler.type == kVideo && !video_config.IsValidConfig()) {
       RCHECK(!samp_descr.video_entries.empty());
       if (desc_idx >= samp_descr.video_entries.size())
         desc_idx = 0;
       const VideoSampleEntry& entry = samp_descr.video_entries[desc_idx];
 
       if (!(entry.format == FOURCC_AVC1 ||
@@ skipping 279 matching lines @@
   return !err;
 }
 
 void MP4StreamParser::ChangeState(State new_state) {
   DVLOG(2) << "Changing state: " << new_state;
   state_ = new_state;
 }
 
 }  // namespace mp4
 }  // namespace media