commit 84d8ae5df727252866e4c30b8a51c2210c28dcb1
author Magnus Jedvert <magjed@webrtc.org> Wed Dec 20 15:12:10 2017 +0100
committer Commit Bot <commit-bot@chromium.org> Wed Dec 20 15:46:06 2017 +0000
tree 96764a8683668d9db5851410608c6948b06fb0a9
parent ec22e3f503ff0d2932f101c6b9d7bd494a9f7178

Android: Use scoped java refs

We currently use raw jobject in our code mixed with sporadic
ScopedLocalRefFrame. This CL moves every jobject into a scoped object,
either local, global, or a parameter. Also, this CL uses the JNI
generation script to generate declaration stubs for the Java->C++
functions so that it no longer becomes possible to mistype them
without getting compilation errors.

TBR=brandt@webrtc.org

Bug: webrtc:8278,webrtc:6969
Change-Id: Ic7bac74a89c11180177d65041086d7db1cdfb516
Reviewed-on: https://webrtc-review.googlesource.com/34655
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21387}

sdk/android/api/org/webrtc/VideoFileRenderer.java

diff --git a/sdk/android/api/org/webrtc/VideoFileRenderer.java b/sdk/android/api/org/webrtc/VideoFileRenderer.java
index 06b433c..20ca839 100644
--- a/sdk/android/api/org/webrtc/VideoFileRenderer.java
+++ b/sdk/android/api/org/webrtc/VideoFileRenderer.java
@@ -22,6 +22,7 @@
 /**
  * Can be used to save the video frames to file.
  */
+@JNINamespace("webrtc::jni")
 public class VideoFileRenderer implements VideoRenderer.Callbacks {
   private static final String TAG = "VideoFileRenderer";
 
@@ -94,7 +95,7 @@
     final float[] texMatrix = RendererCommon.multiplyMatrices(rotatedSamplingMatrix, layoutMatrix);
 
     try {
-      ByteBuffer buffer = JniCommon.allocateNativeByteBuffer(outputFrameSize);
+      ByteBuffer buffer = JniCommon.nativeAllocateByteBuffer(outputFrameSize);
       if (!frame.yuvFrame) {
         yuvConverter.convert(outputFrameBuffer, outputFileWidth, outputFileHeight, outputFileWidth,
             frame.textureId, texMatrix);
@@ -153,7 +154,7 @@
 
         videoOutFile.write(data);
 
-        JniCommon.freeNativeByteBuffer(buffer);
+        JniCommon.nativeFreeByteBuffer(buffer);
       }
       videoOutFile.close();
       Logging.d(TAG, "Video written to disk as " + outputFileName + ". Number frames are "