Handle decoding of vorbis files better on Android

media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java

Index: media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
diff --git a/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java b/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
index 2802439149c759dc5598ad5bba27f0c9099d60a3..4ae23582ff9099f58b8f77934dc9e0cd1fce91c9 100644
--- a/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
+++ b/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
@@ -26,13 +26,16 @@ class WebAudioMediaCodecBridge {
     // from a file in memory?
     static final long TIMEOUT_MICROSECONDS = 500;
     @CalledByNative
-    private static boolean decodeAudioFile(Context ctx, int nativeMediaCodecBridge, int inputFD) {
+    private static boolean decodeAudioFile(Context ctx,
+                                           int nativeMediaCodecBridge,
+                                           int inputFD,
+                                           long dataSize) {

[palmer, 2013/04/26 22:53:31]

A Java long is guaranteed to be a signed 64-bit integer; the size_t that you
receive from the C++ world is guaranteed to be unsigned, and may be 32 or 64
bits. Thus there is a chance that some maniac could feed this function a value
that, to Java, would be negative. (It would be an absurdly/impossibly huge value
in C++ land, too.)

In the ultimate callee, which seems to be MediaExtractor.setDataSource, it might
make sense to do a sanity check on the dataSize.

         MediaExtractor extractor = new MediaExtractor();
 
         ParcelFileDescriptor encodedFD;
         encodedFD = ParcelFileDescriptor.adoptFd(inputFD);
         try {
-            extractor.setDataSource(encodedFD.getFileDescriptor());
+            extractor.setDataSource(encodedFD.getFileDescriptor(), 0, dataSize);
         } catch (Exception e) {
             e.printStackTrace();
             encodedFD.detachFd();
@@ -76,8 +79,7 @@ class WebAudioMediaCodecBridge {
         nativeInitializeDestination(nativeMediaCodecBridge,
                                     channelCount,
                                     sampleRate,
-                                    duration_microseconds,
-                                    mime.equals("audio/vorbis"));
+                                    duration_microseconds);

[bulach, 2013/04/29 13:16:25]

nit: durationMicroseconds

 
         // Create decoder
         MediaCodec codec = MediaCodec.createDecoderByType(mime);
@@ -161,6 +163,5 @@ class WebAudioMediaCodecBridge {
         int nativeWebAudioMediaCodecBridge,
         int channelCount,
         int sampleRate,
-        long duration_microseconds,
-        boolean is_vorbis);
+        long duration_microseconds);

[bulach, 2013/04/29 13:16:25]

nit: durationMicroseconds

 }