commit 1f2a3e705809c3d2233eafe9e6cca44d46e9c09a
author Magnus Jedvert <magjed@webrtc.org> Thu Nov 23 16:56:44 2017 +0100
committer Commit Bot <commit-bot@chromium.org> Fri Nov 24 10:08:58 2017 +0000
tree bb2f1fe3ecb6e588b6c4632b52c42b94ddc1b571
parent aea1d1ad3fa1d4225f581e39ceb040fa641b5c7f

Android: Clean up JNI generated code

It's now possible to generate JNI code for constructors and enums
correctly. This CL cleans that up.

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

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

diff --git a/sdk/android/api/org/webrtc/VideoEncoder.java b/sdk/android/api/org/webrtc/VideoEncoder.java
index 30bfaaf..4f97fb0 100644
--- a/sdk/android/api/org/webrtc/VideoEncoder.java
+++ b/sdk/android/api/org/webrtc/VideoEncoder.java
@@ -10,6 +10,8 @@
 
 package org.webrtc;
 
+import org.webrtc.EncodedImage;
+
 /**
  * Interface for a video encoder that can be used with WebRTC. All calls will be made on the
  * encoding thread. The encoder may be constructed on a different thread and changing thread after
@@ -25,6 +27,7 @@
     public final int maxFramerate;
     public final boolean automaticResizeOn;
 
+    @CalledByNative("Settings")
     public Settings(int numberOfCores, int width, int height, int startBitrate, int maxFramerate,
         boolean automaticResizeOn) {
       this.numberOfCores = numberOfCores;
@@ -40,6 +43,7 @@
   public class EncodeInfo {
     public final EncodedImage.FrameType[] frameTypes;
 
+    @CalledByNative("EncodeInfo")
     public EncodeInfo(EncodedImage.FrameType[] frameTypes) {
       this.frameTypes = frameTypes;
     }
@@ -67,6 +71,7 @@
      * Initializes the allocation with a two dimensional array of bitrates. The first index of the
      * array is the spatial layer and the second index in the temporal layer.
      */
+    @CalledByNative("BitrateAllocation")
     public BitrateAllocation(int[][] bitratesBbs) {
       this.bitratesBbs = bitratesBbs;
     }