Fixed RTCRtpCodecParameters conversion when setting sender params

Author: devopvoid

webrtc-jni/src/main/cpp/src/JNI_RTCRtpSender.cpp

@@ -76,7 +76,6 @@ JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_RTCRtpSender_setParameters
 	CHECK_HANDLE(sender);
 
 	webrtc::RtpParameters rtp_parameters = jni::RTCRtpSendParameters::toNative(env, jni::JavaLocalRef<jobject>(env, jParams));
-
 	webrtc::RTCError result = sender->SetParameters(rtp_parameters);
 
 	if (!result.ok()) {

webrtc-jni/src/main/cpp/src/api/RTCRtpCodecParameters.cpp

@@ -18,6 +18,7 @@
 #include "JavaEnums.h"
 #include "JavaHashMap.h"
 #include "JavaObject.h"
+#include "JavaPrimitive.h"
 #include "JavaRef.h"
 #include "JavaString.h"
 #include "JavaUtils.h"
@@ -32,9 +33,8 @@ namespace jni
 			jint payloadType = static_cast<jint>(parameters.payload_type);
 			JavaLocalRef<jobject> mediaType = JavaEnums::toJava(env, parameters.kind);
 			JavaLocalRef<jstring> codecName = JavaString::toJava(env, parameters.name);
-			jint clockRate = static_cast<jint>(parameters.clock_rate.value_or(0));
-			jint channels = static_cast<jint>(parameters.num_channels.value_or(0));
-
+			JavaLocalRef<jobject> clockRate = nullptr;
+			JavaLocalRef<jobject> channels = nullptr;
 			JavaHashMap paramMap(env);
 
 			for (const std::pair<std::string, std::string> & param : parameters.parameters) {
@@ -44,9 +44,16 @@ namespace jni
 				paramMap.put(key, value);
 			}
 
+			if (parameters.clock_rate.has_value()) {
+				clockRate = Integer::create(env, parameters.clock_rate.value());
+			}
+			if (parameters.num_channels.has_value()) {
+				channels = Integer::create(env, parameters.num_channels.value());
+			}
+
 			const auto javaClass = JavaClasses::get<JavaRTCRtpCodecParametersClass>(env);
 
-			jobject object = env->NewObject(javaClass->cls, javaClass->ctor, payloadType, mediaType.get(), codecName.get(), clockRate, channels, ((JavaLocalRef<jobject>)paramMap).get());
+			jobject object = env->NewObject(javaClass->cls, javaClass->ctor, payloadType, mediaType.get(), codecName.get(), clockRate.get(), channels.get(), ((JavaLocalRef<jobject>)paramMap).get());
 			ExceptionCheck(env);
 
 			return JavaLocalRef<jobject>(env, object);
@@ -62,8 +69,6 @@ namespace jni
 			params.payload_type = obj.getInt<int>(javaClass->payloadType);
 			params.kind = JavaEnums::toNative<cricket::MediaType>(env, obj.getObject(javaClass->mediaType));
 			params.name = JavaString::toNative(env, obj.getString(javaClass->codecName));
-			params.clock_rate = obj.getInt<int>(javaClass->clockRate);
-			params.num_channels = obj.getInt<int>(javaClass->channels);
 
 			for (const auto & entry : JavaHashMap(env, obj.getObject(javaClass->parameters))) {
 				std::string key = JavaString::toNative(env, static_java_ref_cast<jstring>(env, entry.first));
@@ -72,20 +77,30 @@ namespace jni
 				params.parameters.emplace(key, value);
 			}
 
+			auto clockRate = obj.getObject(javaClass->clockRate);
+			auto channels = obj.getObject(javaClass->channels);
+
+			if (clockRate.get()) {
+				params.clock_rate = Integer::getValue(env, clockRate);
+			}
+			if (channels.get()) {
+				params.num_channels = Integer::getValue(env, channels);
+			}
+
 			return params;
 		}
 
 		JavaRTCRtpCodecParametersClass::JavaRTCRtpCodecParametersClass(JNIEnv * env)
 		{
 			cls = FindClass(env, PKG"RTCRtpCodecParameters");
 
-			ctor = GetMethod(env, cls, "<init>", "(IL" PKG_MEDIA "MediaType;" STRING_SIG "II" MAP_SIG ")V");
+			ctor = GetMethod(env, cls, "<init>", "(IL" PKG_MEDIA "MediaType;" STRING_SIG INTEGER_SIG INTEGER_SIG MAP_SIG ")V");
 
 			payloadType = GetFieldID(env, cls, "payloadType", "I");
 			mediaType = GetFieldID(env, cls, "mediaType", "L" PKG_MEDIA "MediaType;");
 			codecName = GetFieldID(env, cls, "codecName", STRING_SIG);
-			clockRate = GetFieldID(env, cls, "clockRate", "I");
-			channels = GetFieldID(env, cls, "channels", "I");
+			clockRate = GetFieldID(env, cls, "clockRate", INTEGER_SIG);
+			channels = GetFieldID(env, cls, "channels", INTEGER_SIG);
 			parameters = GetFieldID(env, cls, "parameters", MAP_SIG);
 		}
 	}

webrtc/src/main/java/dev/onvoid/webrtc/RTCRtpCodecParameters.java

@@ -45,12 +45,12 @@ public class RTCRtpCodecParameters {
 	/**
 	 * The codec clock rate expressed in Hertz.
 	 */
-	public final int clockRate;
+	public final Integer clockRate;
 
 	/**
 	 * When present, indicates the number of audio channels (mono=1, stereo=2).
 	 */
-	public final int channels;
+	public final Integer channels;
 
 	/**
 	 * The "format specific parameters" field from the "a=fmtp" line in the SDP
@@ -73,7 +73,7 @@ public class RTCRtpCodecParameters {
 	 * @param parameters  The "a=fmtp" parameters in the SDP.
 	 */
 	public RTCRtpCodecParameters(int payloadType, MediaType mediaType,
-			String codecName, int clockRate, int channels,
+			String codecName, Integer clockRate, Integer channels,
 			Map<String, String> parameters) {
 		this.payloadType = payloadType;
 		this.mediaType = mediaType;