From 51907f641b1044074f0e1efed46d59291eb26598 Mon Sep 17 00:00:00 2001 From: Oskar Sundbom Date: Thu, 30 Nov 2017 15:23:00 +0100 Subject: [PATCH] Optional: Use nullopt and implicit construction in /sdk/android/src/jni/pc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes places where we explicitly construct an Optional to instead use nullopt or the requisite value type only. This CL was uploaded by git cl split. Bug: None Change-Id: Idf275495910f651ec35f641611926e62414daa9a Reviewed-on: https://webrtc-review.googlesource.com/23610 Commit-Queue: Oskar Sundbom Reviewed-by: Sami Kalliomäki Cr-Commit-Position: refs/heads/master@{#20972} --- sdk/android/src/jni/pc/java_native_conversion.cc | 2 +- sdk/android/src/jni/pc/peerconnectionfactory_jni.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/android/src/jni/pc/java_native_conversion.cc b/sdk/android/src/jni/pc/java_native_conversion.cc index 3f0e2e1e1b..db4f785ec1 100644 --- a/sdk/android/src/jni/pc/java_native_conversion.cc +++ b/sdk/android/src/jni/pc/java_native_conversion.cc @@ -505,7 +505,7 @@ void JavaToNativeRtpParameters(JNIEnv* jni, if (!IsNull(jni, j_ssrc)) { jlong ssrc_value = jni->CallLongMethod(j_ssrc, long_value_id); CHECK_EXCEPTION(jni) << "error during CallLongMethod"; - encoding.ssrc = rtc::Optional(ssrc_value); + encoding.ssrc = ssrc_value; } parameters->encodings.push_back(encoding); } diff --git a/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc b/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc index 5882243e2e..fdae2f0550 100644 --- a/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc +++ b/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc @@ -418,7 +418,7 @@ JNI_FUNCTION_DECLARATION(jlong, if (key_type != rtc::KT_DEFAULT) { rtc::scoped_refptr certificate = rtc::RTCCertificateGenerator::GenerateCertificate( - rtc::KeyParams(key_type), rtc::Optional()); + rtc::KeyParams(key_type), rtc::nullopt); if (!certificate) { RTC_LOG(LS_ERROR) << "Failed to generate certificate. KeyType: " << key_type;