Handle decoding of vorbis files better on Android

webkit/media/android/audio_decoder_android.cc

Index: webkit/media/android/audio_decoder_android.cc
diff --git a/webkit/media/android/audio_decoder_android.cc b/webkit/media/android/audio_decoder_android.cc
index 6cc52c9636b8c94948ab25dd1496235b692853ba..8d211f1040d64bf5561602dab6677eb03a460c21 100644
--- a/webkit/media/android/audio_decoder_android.cc
+++ b/webkit/media/android/audio_decoder_android.cc
@@ -118,7 +118,7 @@ bool DecodeAudioFileData(WebKit::WebAudioBus* destination_bus, const char* data,
   // 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
@@ -131,15 +131,14 @@ bool DecodeAudioFileData(WebKit::WebAudioBus* destination_bus, const char* data,
   // the bus.
 
   int input_fd = audio_decoder.read_fd();
-  unsigned long info[4];
+  unsigned long info[3];

[DaleCurtis, 2013/04/30 17:44:17]

Since you're reading / writing this structure across files, can you declare the
size somewhere both pieces of code can read it from?  Better yet, convert this
to a struct? :)

[Raymond Toy (Google), 2013/04/30 19:53:16]

Added the struct and a new header file to define it so it can be shared.

 
   DVLOG(1) << "Reading audio file info from fd " << input_fd;
   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];
+           << " 2: number of frames   = " << info[2] << "\n";
 
   if (nread != sizeof(info))
     return false;