Handle decoding of vorbis files better on Android

webkit/media/android/audio_decoder_android.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 "webkit/media/audio_decoder.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <sys/mman.h>
 #include <unistd.h>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/file_descriptor_posix.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/shared_memory.h"
+#include "media/base/android/webaudio_media_codec_info.h"
 #include "media/base/audio_bus.h"
 #include "media/base/limits.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebAudioBus.h"
 
 namespace webkit_media {
 
 class AudioDecoderIO {
  public:
   AudioDecoderIO(const char* data, size_t data_size);
   ~AudioDecoderIO();
@@ skipping 82 matching lines @@
   base::SharedMemoryHandle encoded_data_handle;
   audio_decoder.ShareEncodedToProcess(&encoded_data_handle);
   base::FileDescriptor fd(audio_decoder.write_fd(), true);
 
   DVLOG(1) << "DecodeAudioFileData: Starting MediaCodec";
 
   // Start MediaCodec processing in the browser which will read from
   // encoded_data_handle for our shared memory and write the decoded
   // PCM samples (16-bit integer) to our pipe.
 
-  runner.Run(encoded_data_handle, fd);
+  runner.Run(encoded_data_handle, fd, data_size);
 
   // First, read the number of channels, the sample rate, and the
   // number of frames and a flag indicating if the file is an
   // ogg/vorbis file.  This must be coordinated with
   // WebAudioMediaCodecBridge!
   //
   // TODO(rtoy): If we know the number of samples, we can create the
   // destination bus directly and do the conversion directly to the
   // bus instead of buffering up everything before saving the data to
   // the bus.
 
   int input_fd = audio_decoder.read_fd();
-  unsigned long info[4];
+  struct media::WebAudioMediaCodecInfo info;
 
   DVLOG(1) << "Reading audio file info from fd " << input_fd;
-  ssize_t nread = HANDLE_EINTR(read(input_fd, info, sizeof(info)));
+  ssize_t nread = HANDLE_EINTR(read(input_fd, &info, sizeof(info)));
   DVLOG(1) << "read:  " << nread << " bytes:\n"
-           << " 0: number of channels = " << info[0] << "\n"
-           << " 1: sample rate        = " << info[1] << "\n"
-           << " 2: number of frames   = " << info[2] << "\n"
-           << " 3: is vorbis          = " << info[3];
+           << " 0: number of channels = " << info.channel_count << "\n"
+           << " 1: sample rate        = " << info.sample_rate << "\n"
+           << " 2: number of frames   = " << info.number_of_frames << "\n";
 
   if (nread != sizeof(info))
     return false;
 
-  unsigned number_of_channels = info[0];
-  double file_sample_rate = static_cast<double>(info[1]);
+  unsigned number_of_channels = info.channel_count;
+  double file_sample_rate = static_cast<double>(info.sample_rate);
 
   // Sanity checks
   if (!number_of_channels ||
       number_of_channels > media::limits::kMaxChannels ||
       file_sample_rate < media::limits::kMinSampleRate ||
       file_sample_rate > media::limits::kMaxSampleRate) {
     return false;
   }
 
   int16_t pipe_data[PIPE_BUF / sizeof(int16_t)];
@@ skipping 29 matching lines @@
       destination_bus->channelData(k)[decoded_frames] =
           sample * (sample < 0 ? kMinScale : kMaxScale);
     }
     ++decoded_frames;
   }
 
   return true;
 }
 
 }  // namespace webkit_media