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/src/jni/videoencoderwrapper.cc

diff --git a/sdk/android/src/jni/videoencoderwrapper.cc b/sdk/android/src/jni/videoencoderwrapper.cc
index 66b54f9..19c00ec 100644
--- a/sdk/android/src/jni/videoencoderwrapper.cc
+++ b/sdk/android/src/jni/videoencoderwrapper.cc
@@ -74,7 +74,7 @@
       automatic_resize_on = true;
   }
 
-  jobject settings = Java_VideoEncoderWrapper_createSettings(
+  jobject settings = Java_Settings_Constructor(
       jni, number_of_cores_, codec_settings_.width, codec_settings_.height,
       codec_settings_.startBitrate, codec_settings_.maxFramerate,
       automatic_resize_on);
@@ -127,8 +127,7 @@
     jobject j_frame_type = NativeToJavaFrameType(jni, (*frame_types)[i]);
     jni->SetObjectArrayElement(j_frame_types, i, j_frame_type);
   }
-  jobject encode_info =
-      Java_VideoEncoderWrapper_createEncodeInfo(jni, j_frame_types);
+  jobject encode_info = Java_EncodeInfo_Constructor(jni, j_frame_types);
 
   FrameExtraInfo info;
   info.capture_time_ns = frame.timestamp_us() * rtc::kNumNanosecsPerMicrosec;
@@ -385,8 +384,7 @@
     jni->SetObjectArrayElement(j_allocation_array, spatial_i,
                                j_array_spatial_layer);
   }
-  return Java_VideoEncoderWrapper_createBitrateAllocation(jni,
-                                                          j_allocation_array);
+  return Java_BitrateAllocation_Constructor(jni, j_allocation_array);
 }
 
 std::string VideoEncoderWrapper::GetImplementationName(JNIEnv* jni) const {