Added the JNI interface to get and set RtpParameters and the maximum bitrate limits.

webrtc/api/java/jni/peerconnection_jni.cc

 /*
  *  Copyright 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 440 matching lines @@
   const Constraints& GetOptional() const override { return optional_; }
 
  private:
   // Helper for translating a List<Pair<String, String>> to a Constraints.
   static void PopulateConstraintsFromJavaPairList(
       JNIEnv* jni, jobject j_constraints,
       const char* field_name, Constraints* field) {
     jfieldID j_id = GetFieldID(jni,
         GetObjectClass(jni, j_constraints), field_name, "Ljava/util/List;");
     jobject j_list = GetObjectField(jni, j_constraints, j_id);
-    jmethodID j_iterator_id = GetMethodID(jni,
-        GetObjectClass(jni, j_list), "iterator", "()Ljava/util/Iterator;");
-    jobject j_iterator = jni->CallObjectMethod(j_list, j_iterator_id);
-    CHECK_EXCEPTION(jni) << "error during CallObjectMethod";
-    jmethodID j_has_next = GetMethodID(jni,
-        GetObjectClass(jni, j_iterator), "hasNext", "()Z");
-    jmethodID j_next = GetMethodID(jni,
-        GetObjectClass(jni, j_iterator), "next", "()Ljava/lang/Object;");
-    while (jni->CallBooleanMethod(j_iterator, j_has_next)) {
-      CHECK_EXCEPTION(jni) << "error during CallBooleanMethod";
-      jobject entry = jni->CallObjectMethod(j_iterator, j_next);
-      CHECK_EXCEPTION(jni) << "error during CallObjectMethod";
+    for (jobject entry : Iterable(jni, j_list)) {
       jmethodID get_key = GetMethodID(jni,
           GetObjectClass(jni, entry), "getKey", "()Ljava/lang/String;");
       jstring j_key = reinterpret_cast<jstring>(
           jni->CallObjectMethod(entry, get_key));
       CHECK_EXCEPTION(jni) << "error during CallObjectMethod";
       jmethodID get_value = GetMethodID(jni,
           GetObjectClass(jni, entry), "getValue", "()Ljava/lang/String;");
       jstring j_value = reinterpret_cast<jstring>(
           jni->CallObjectMethod(entry, get_value));
       CHECK_EXCEPTION(jni) << "error during CallObjectMethod";
       field->push_back(Constraint(JavaToStdString(jni, j_key),
                                   JavaToStdString(jni, j_value)));
     }
-    CHECK_EXCEPTION(jni) << "error during CallBooleanMethod";
   }
 
   Constraints mandatory_;
   Constraints optional_;
 };
 
 static jobject JavaSdpFromNativeSdp(
     JNIEnv* jni, const SessionDescriptionInterface* desc) {
   std::string sdp;
   RTC_CHECK(desc->ToString(&sdp)) << "got so far: " << sdp;
@@ skipping 984 matching lines @@
     return PeerConnectionInterface::GATHER_CONTINUALLY;
 
   RTC_CHECK(false) << "Unexpected ContinualGatheringPolicy enum name "
                    << enum_name;
   return PeerConnectionInterface::GATHER_ONCE;
 }
 
 static void JavaIceServersToJsepIceServers(
     JNIEnv* jni, jobject j_ice_servers,
     PeerConnectionInterface::IceServers* ice_servers) {
-  jclass list_class = GetObjectClass(jni, j_ice_servers);
-  jmethodID iterator_id = GetMethodID(
-      jni, list_class, "iterator", "()Ljava/util/Iterator;");
-  jobject iterator = jni->CallObjectMethod(j_ice_servers, iterator_id);
-  CHECK_EXCEPTION(jni) << "error during CallObjectMethod";
-  jmethodID iterator_has_next = GetMethodID(
-      jni, GetObjectClass(jni, iterator), "hasNext", "()Z");
-  jmethodID iterator_next = GetMethodID(
-      jni, GetObjectClass(jni, iterator), "next", "()Ljava/lang/Object;");
-  while (jni->CallBooleanMethod(iterator, iterator_has_next)) {
-    CHECK_EXCEPTION(jni) << "error during CallBooleanMethod";
-    jobject j_ice_server = jni->CallObjectMethod(iterator, iterator_next);
-    CHECK_EXCEPTION(jni) << "error during CallObjectMethod";
+  for (jobject j_ice_server : Iterable(jni, j_ice_servers)) {
     jclass j_ice_server_class = GetObjectClass(jni, j_ice_server);
     jfieldID j_ice_server_uri_id =
         GetFieldID(jni, j_ice_server_class, "uri", "Ljava/lang/String;");
     jfieldID j_ice_server_username_id =
         GetFieldID(jni, j_ice_server_class, "username", "Ljava/lang/String;");
     jfieldID j_ice_server_password_id =
         GetFieldID(jni, j_ice_server_class, "password", "Ljava/lang/String;");
     jstring uri = reinterpret_cast<jstring>(
         GetObjectField(jni, j_ice_server, j_ice_server_uri_id));
     jstring username = reinterpret_cast<jstring>(
         GetObjectField(jni, j_ice_server, j_ice_server_username_id));
     jstring password = reinterpret_cast<jstring>(
         GetObjectField(jni, j_ice_server, j_ice_server_password_id));
     PeerConnectionInterface::IceServer server;
     server.uri = JavaToStdString(jni, uri);
     server.username = JavaToStdString(jni, username);
     server.password = JavaToStdString(jni, password);
     ice_servers->push_back(server);
   }
-  CHECK_EXCEPTION(jni) << "error during CallBooleanMethod";
 }
 
 static void JavaRTCConfigurationToJsepRTCConfiguration(
     JNIEnv* jni,
     jobject j_rtc_config,
     PeerConnectionInterface::RTCConfiguration* rtc_config) {
   jclass j_rtc_config_class = GetObjectClass(jni, j_rtc_config);
 
   jfieldID j_ice_transports_type_id = GetFieldID(
       jni, j_rtc_config_class, "iceTransportsType",
@@ skipping 537 matching lines @@
 JOW(jlong, RtpSender_nativeGetTrack)(JNIEnv* jni,
                                   jclass,
                                   jlong j_rtp_sender_pointer,
                                   jlong j_track_pointer) {
   return jlongFromPointer(
       reinterpret_cast<RtpSenderInterface*>(j_rtp_sender_pointer)
           ->track()
           .release());
 }
 
+static bool JavaEncodingToJsepRtpEncodingParameters(
+    JNIEnv* jni,
+    jobject j_encodings,
+    std::vector<webrtc::RtpEncodingParameters>* encodings) {
+  const int kBitrateUnlimited = -1;
+  for (jobject j_encoding_parameters : Iterable(jni, j_encodings)) {
+    jclass j_encoding_parameters_class =
+        GetObjectClass(jni, j_encoding_parameters);
+    jfieldID bitrate_id = GetFieldID(jni, j_encoding_parameters_class,

[magjed_webrtc, 2016/03/22 15:15:30]

Can you move |j_encoding_parameters_class| and |bitrate_id| outside the for loop
to avoid creating them more than once?

[skvlad, 2016/03/23 00:29:27]

Done.

+                                     "maxBitrateBps", "Ljava/lang/Integer;");
+    jobject j_bitrate = GetObjectField(jni, j_encoding_parameters, bitrate_id);
+
+    webrtc::RtpEncodingParameters encoding;
+
+    if (j_bitrate) {
+      jmethodID integer_int_value_id =

[magjed_webrtc, 2016/03/22 15:15:30]

Move |integer_int_value_id| outside for loop. Strange name btw, why not just
|int_value_id|?

[skvlad, 2016/03/23 00:29:27]

Done.

+          GetMethodID(jni, GetObjectClass(jni, j_bitrate), "intValue", "()I");
+      int bitrate_value = jni->CallIntMethod(j_bitrate, integer_int_value_id);
+      CHECK_EXCEPTION(jni) << "error during CallIntMethod";
+      encoding.max_bitrate_bps = bitrate_value;
+    } else {
+      encoding.max_bitrate_bps = kBitrateUnlimited;
+    }
+
+    encodings->push_back(encoding);
+  }
+  return true;
+}
+
+JOW(jboolean, RtpSender_nativeSetParameters)
+(JNIEnv* jni, jclass, jlong j_rtp_sender_pointer, jobject j_parameters) {
+  if (!j_parameters) {
+    return false;
+  }
+
+  jclass parameters_class = FindClass(jni, "org/webrtc/RtpParameters");

[magjed_webrtc, 2016/03/22 15:15:30]

If you are not planning to store this jclass, then I prefer if you use
jni->FindClass("org/webrtc/RtpParameters") instead and remove
"org/webrtc/RtpParameters" from classreferenceholder. Same goes for
"org/webrtc/RtpParameters$Encoding" and "java/lang/Integer".

[skvlad, 2016/03/23 00:29:27]

Done. I previously assumed ClassReferenceHolder was primarily used to speed up
class lookups.

+
+  jclass encoding_class = FindClass(jni, "org/webrtc/RtpParameters$Encoding");
+  jfieldID encodings_id =
+      GetFieldID(jni, parameters_class, "encodings", "Ljava/util/LinkedList;");
+
+  jobject j_encodings = GetObjectField(jni, j_parameters, encodings_id);
+  webrtc::RtpParameters parameters;
+  JavaEncodingToJsepRtpEncodingParameters(jni, j_encodings,
+                                          &parameters.encodings);
+
+  return reinterpret_cast<RtpSenderInterface*>(j_rtp_sender_pointer)
+      ->SetParameters(parameters);
+}
+
+JOW(jobject, RtpSender_nativeGetParameters)
+(JNIEnv* jni, jclass, jlong j_rtp_sender_pointer) {
+  webrtc::RtpParameters parameters =
+      reinterpret_cast<RtpSenderInterface*>(j_rtp_sender_pointer)
+          ->GetParameters();
+
+  jclass parameters_class = FindClass(jni, "org/webrtc/RtpParameters");
+  jmethodID parameters_ctor =
+      GetMethodID(jni, parameters_class, "<init>", "()V");
+  jobject j_parameters = jni->NewObject(parameters_class, parameters_ctor);
+  CHECK_EXCEPTION(jni) << "error during NewObject";
+
+  jclass encoding_class = FindClass(jni, "org/webrtc/RtpParameters$Encoding");
+  jmethodID encoding_ctor = GetMethodID(jni, encoding_class, "<init>", "()V");
+  jfieldID encodings_id =
+      GetFieldID(jni, parameters_class, "encodings", "Ljava/util/LinkedList;");
+  jobject j_encodings = GetObjectField(jni, j_parameters, encodings_id);
+  jmethodID add = GetMethodID(jni, GetObjectClass(jni, j_encodings), "add",
+                              "(Ljava/lang/Object;)Z");
+  jfieldID bitrate_id =
+      GetFieldID(jni, encoding_class, "maxBitrateBps", "Ljava/lang/Integer;");
+
+  jclass integer_class = FindClass(jni, "java/lang/Integer");
+  jmethodID integer_ctor = GetMethodID(jni, integer_class, "<init>", "(I)V");
+
+  for (webrtc::RtpEncodingParameters encoding : parameters.encodings) {
+    jobject j_encoding_parameters =
+        jni->NewObject(encoding_class, encoding_ctor);
+    CHECK_EXCEPTION(jni) << "error during NewObject";
+    if (encoding.max_bitrate_bps > 0) {
+      jobject j_bitrate_value =
+          jni->NewObject(integer_class, integer_ctor, encoding.max_bitrate_bps);
+      CHECK_EXCEPTION(jni) << "error during NewObject";
+      jni->SetObjectField(j_encoding_parameters, bitrate_id, j_bitrate_value);
+      CHECK_EXCEPTION(jni) << "error during SetObjectField";
+    }
+
+    jboolean added =
+        jni->CallBooleanMethod(j_encodings, add, j_encoding_parameters);
+    CHECK_EXCEPTION(jni) << "error during CallBooleanMethod";
+  }
+  return j_parameters;
+}
+
 JOW(jstring, RtpSender_nativeId)(
     JNIEnv* jni, jclass, jlong j_rtp_sender_pointer) {
   return JavaStringFromStdString(
       jni, reinterpret_cast<RtpSenderInterface*>(j_rtp_sender_pointer)->id());
 }
 
 JOW(void, RtpSender_free)(JNIEnv* jni, jclass, jlong j_rtp_sender_pointer) {
   reinterpret_cast<RtpSenderInterface*>(j_rtp_sender_pointer)->Release();
 }
 
@@ skipping 12 matching lines @@
   return JavaStringFromStdString(
       jni,
       reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id());
 }
 
 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) {
   reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release();
 }
 
 }  // namespace webrtc_jni