Android: moves media/ to use long for JNI

BUG=317523

Review URL: https://codereview.chromium.org/67163002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234278 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 23 insertions, 23 deletions

diff --git a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
index 21a8a21..6d4f7a1 100644
--- a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
+++ b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
@@ -35,7 +35,7 @@ class MediaDrmBridge {
     private static final String PRIVACY_MODE = "privacyMode";
     private MediaDrm mMediaDrm;
     private UUID mSchemeUUID;
-    private int mNativeMediaDrmBridge;
+    private long mNativeMediaDrmBridge;
     // TODO(qinmin): we currently only support one session per DRM bridge.
     // Change this to a HashMap if we start to support multiple sessions.
     private String mSessionId;
@@ -60,7 +60,7 @@ class MediaDrmBridge {
         return new UUID(mostSigBits, leastSigBits);
     }
 
-    private MediaDrmBridge(UUID schemeUUID, String securityLevel, int nativeMediaDrmBridge)
+    private MediaDrmBridge(UUID schemeUUID, String securityLevel, long nativeMediaDrmBridge)
             throws android.media.UnsupportedSchemeException {
         mSchemeUUID = schemeUUID;
         mMediaDrm = new MediaDrm(schemeUUID);
@@ -495,15 +495,15 @@ class MediaDrmBridge {
         }
     }
 
-    private native void nativeOnMediaCryptoReady(int nativeMediaDrmBridge);
+    private native void nativeOnMediaCryptoReady(long nativeMediaDrmBridge);
 
-    private native void nativeOnKeyMessage(int nativeMediaDrmBridge, String sessionId,
+    private native void nativeOnKeyMessage(long nativeMediaDrmBridge, String sessionId,
                                            byte[] message, String destinationUrl);
 
-    private native void nativeOnKeyAdded(int nativeMediaDrmBridge, String sessionId);
+    private native void nativeOnKeyAdded(long nativeMediaDrmBridge, String sessionId);
 
-    private native void nativeOnKeyError(int nativeMediaDrmBridge, String sessionId);
+    private native void nativeOnKeyError(long nativeMediaDrmBridge, String sessionId);
 
     private native void nativeOnResetDeviceCredentialsCompleted(
-            int nativeMediaDrmBridge, boolean success);
+            long nativeMediaDrmBridge, boolean success);
 }
diff --git a/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java b/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java
index 3c68589..c302585 100644
--- a/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java
+++ b/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java
@@ -35,10 +35,10 @@ class MediaPlayerListener implements MediaPlayer.OnPreparedListener,
     public static final int MEDIA_ERROR_TIMED_OUT = -110;
 
     // Used to determine the class instance to dispatch the native call to.
-    private int mNativeMediaPlayerListener = 0;
+    private long mNativeMediaPlayerListener = 0;
     private final Context mContext;
 
-    private MediaPlayerListener(int nativeMediaPlayerListener, Context context) {
+    private MediaPlayerListener(long nativeMediaPlayerListener, Context context) {
         mNativeMediaPlayerListener = nativeMediaPlayerListener;
         mContext = context;
     }
@@ -148,22 +148,22 @@ class MediaPlayerListener implements MediaPlayer.OnPreparedListener,
      * See media/base/android/media_player_listener.cc for all the following functions.
      */
     private native void nativeOnMediaError(
-            int nativeMediaPlayerListener,
+            long nativeMediaPlayerListener,
             int errorType);
 
     private native void nativeOnVideoSizeChanged(
-            int nativeMediaPlayerListener,
+            long nativeMediaPlayerListener,
             int width, int height);
 
     private native void nativeOnBufferingUpdate(
-            int nativeMediaPlayerListener,
+            long nativeMediaPlayerListener,
             int percent);
 
-    private native void nativeOnMediaPrepared(int nativeMediaPlayerListener);
+    private native void nativeOnMediaPrepared(long nativeMediaPlayerListener);
 
-    private native void nativeOnPlaybackComplete(int nativeMediaPlayerListener);
+    private native void nativeOnPlaybackComplete(long nativeMediaPlayerListener);
 
-    private native void nativeOnSeekComplete(int nativeMediaPlayerListener);
+    private native void nativeOnSeekComplete(long nativeMediaPlayerListener);
 
-    private native void nativeOnMediaInterrupted(int nativeMediaPlayerListener);
+    private native void nativeOnMediaInterrupted(long nativeMediaPlayerListener);
 }
diff --git a/media/base/android/java/src/org/chromium/media/VideoCapture.java b/media/base/android/java/src/org/chromium/media/VideoCapture.java
index 446d50e..b17cfa1 100644
--- a/media/base/android/java/src/org/chromium/media/VideoCapture.java
+++ b/media/base/android/java/src/org/chromium/media/VideoCapture.java
@@ -68,7 +68,7 @@ public class VideoCapture implements PreviewCallback, OnFrameAvailableListener {
     private int mExpectedFrameSize = 0;
     private int mId = 0;
     // Native callback context variable.
-    private int mNativeVideoCaptureDeviceAndroid = 0;
+    private long mNativeVideoCaptureDeviceAndroid = 0;
     private int[] mGlTextures = null;
     private SurfaceTexture mSurfaceTexture = null;
     private static final int GL_TEXTURE_EXTERNAL_OES = 0x8D65;
@@ -82,12 +82,12 @@ public class VideoCapture implements PreviewCallback, OnFrameAvailableListener {
 
     @CalledByNative
     public static VideoCapture createVideoCapture(
-            Context context, int id, int nativeVideoCaptureDeviceAndroid) {
+            Context context, int id, long nativeVideoCaptureDeviceAndroid) {
         return new VideoCapture(context, id, nativeVideoCaptureDeviceAndroid);
     }
 
     public VideoCapture(
-            Context context, int id, int nativeVideoCaptureDeviceAndroid) {
+            Context context, int id, long nativeVideoCaptureDeviceAndroid) {
         mContext = context;
         mId = id;
         mNativeVideoCaptureDeviceAndroid = nativeVideoCaptureDeviceAndroid;
@@ -410,7 +410,7 @@ public class VideoCapture implements PreviewCallback, OnFrameAvailableListener {
     }
 
     private native void nativeOnFrameAvailable(
-            int nativeVideoCaptureDeviceAndroid,
+            long nativeVideoCaptureDeviceAndroid,
             byte[] data,
             int length,
             int rotation,
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 17720e6..005b2b1 100644
--- a/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
+++ b/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
@@ -34,7 +34,7 @@ class WebAudioMediaCodecBridge {
 
     @CalledByNative
     private static boolean decodeAudioFile(Context ctx,
-                                           int nativeMediaCodecBridge,
+                                           long nativeMediaCodecBridge,
                                            int inputFD,
                                            long dataSize) {
 
@@ -183,11 +183,11 @@ class WebAudioMediaCodecBridge {
     }
 
     private static native void nativeOnChunkDecoded(
-        int nativeWebAudioMediaCodecBridge, ByteBuffer buf, int size,
+        long nativeWebAudioMediaCodecBridge, ByteBuffer buf, int size,
         int inputChannelCount, int outputChannelCount);
 
     private static native void nativeInitializeDestination(
-        int nativeWebAudioMediaCodecBridge,
+        long nativeWebAudioMediaCodecBridge,
         int inputChannelCount,
         int sampleRate,
         long durationMicroseconds);