Index: webrtc/sdk/android/src/jni/peerconnection_jni.cc |
diff --git a/webrtc/sdk/android/src/jni/peerconnection_jni.cc b/webrtc/sdk/android/src/jni/peerconnection_jni.cc |
index d3f23445d615e708049db976c0e6c8b9b50f3790..36aeb50c41e6d624ef39f76194f98dc2deea05e3 100644 |
--- a/webrtc/sdk/android/src/jni/peerconnection_jni.cc |
+++ b/webrtc/sdk/android/src/jni/peerconnection_jni.cc |
@@ -116,7 +116,7 @@ using webrtc::kVideoCodecVP8; |
namespace webrtc_jni { |
// Field trials initialization string |
-static char *field_trials_init_string = NULL; |
+static char* field_trials_init_string = nullptr; |
// Set in PeerConnectionFactory_initializeAndroidGlobals(). |
static bool factory_static_initialized = false; |
@@ -489,7 +489,7 @@ class PCOJava : public PeerConnectionObserver { |
const std::vector<cricket::Candidate>& candidates) { |
jclass candidate_class = FindClass(jni, "org/webrtc/IceCandidate"); |
jobjectArray java_candidates = |
- jni->NewObjectArray(candidates.size(), candidate_class, NULL); |
+ jni->NewObjectArray(candidates.size(), candidate_class, nullptr); |
int i = 0; |
for (const cricket::Candidate& candidate : candidates) { |
jobject j_candidate = ToJavaCandidate(jni, &candidate_class, candidate); |
@@ -794,8 +794,8 @@ class StatsObserverWrapper : public StatsObserver { |
private: |
jobjectArray ReportsToJava( |
JNIEnv* jni, const StatsReports& reports) { |
- jobjectArray reports_array = jni->NewObjectArray( |
- reports.size(), *j_stats_report_class_, NULL); |
+ jobjectArray reports_array = |
+ jni->NewObjectArray(reports.size(), *j_stats_report_class_, nullptr); |
int i = 0; |
for (const auto* report : reports) { |
ScopedLocalRefFrame local_ref_frame(jni); |
@@ -814,8 +814,8 @@ class StatsObserverWrapper : public StatsObserver { |
} |
jobjectArray ValuesToJava(JNIEnv* jni, const StatsReport::Values& values) { |
- jobjectArray j_values = jni->NewObjectArray( |
- values.size(), *j_value_class_, NULL); |
+ jobjectArray j_values = |
+ jni->NewObjectArray(values.size(), *j_value_class_, nullptr); |
int i = 0; |
for (const auto& it : values) { |
ScopedLocalRefFrame local_ref_frame(jni); |
@@ -888,12 +888,13 @@ class JavaVideoRendererWrapper |
// Return a VideoRenderer.I420Frame referring to the data in |frame|. |
jobject CricketToJavaI420Frame(const webrtc::VideoFrame* frame) { |
jintArray strides = jni()->NewIntArray(3); |
- jint* strides_array = jni()->GetIntArrayElements(strides, NULL); |
+ jint* strides_array = jni()->GetIntArrayElements(strides, nullptr); |
strides_array[0] = frame->video_frame_buffer()->StrideY(); |
strides_array[1] = frame->video_frame_buffer()->StrideU(); |
strides_array[2] = frame->video_frame_buffer()->StrideV(); |
jni()->ReleaseIntArrayElements(strides, strides_array, 0); |
- jobjectArray planes = jni()->NewObjectArray(3, *j_byte_buffer_class_, NULL); |
+ jobjectArray planes = |
+ jni()->NewObjectArray(3, *j_byte_buffer_class_, nullptr); |
jobject y_buffer = jni()->NewDirectByteBuffer( |
const_cast<uint8_t*>(frame->video_frame_buffer()->DataY()), |
frame->video_frame_buffer()->StrideY() * |
@@ -1019,7 +1020,7 @@ JOW(void, DataChannel_close)(JNIEnv* jni, jobject j_dc) { |
JOW(jboolean, DataChannel_sendNative)(JNIEnv* jni, jobject j_dc, |
jbyteArray data, jboolean binary) { |
- jbyte* bytes = jni->GetByteArrayElements(data, NULL); |
+ jbyte* bytes = jni->GetByteArrayElements(data, nullptr); |
bool ret = ExtractNativeDC(jni, j_dc)->Send(DataBuffer( |
rtc::CopyOnWriteBuffer(bytes, jni->GetArrayLength(data)), |
binary)); |
@@ -1157,10 +1158,10 @@ JOW(jboolean, PeerConnectionFactory_initializeAndroidGlobals) |
JOW(void, PeerConnectionFactory_initializeFieldTrials)( |
JNIEnv* jni, jclass, jstring j_trials_init_string) { |
- field_trials_init_string = NULL; |
- if (j_trials_init_string != NULL) { |
+ field_trials_init_string = nullptr; |
+ if (j_trials_init_string != nullptr) { |
const char* init_string = |
- jni->GetStringUTFChars(j_trials_init_string, NULL); |
+ jni->GetStringUTFChars(j_trials_init_string, nullptr); |
int init_string_length = jni->GetStringUTFLength(j_trials_init_string); |
field_trials_init_string = new char[init_string_length + 1]; |
rtc::strcpyn(field_trials_init_string, init_string_length + 1, init_string); |
@@ -1186,7 +1187,7 @@ JOW(jboolean, PeerConnectionFactory_startInternalTracingCapture)( |
return false; |
const char* init_string = |
- jni->GetStringUTFChars(j_event_tracing_filename, NULL); |
+ jni->GetStringUTFChars(j_event_tracing_filename, nullptr); |
LOG(LS_INFO) << "Starting internal tracing to: " << init_string; |
bool ret = rtc::tracing::StartInternalCapture(init_string); |
jni->ReleaseStringUTFChars(j_event_tracing_filename, init_string); |
@@ -1337,7 +1338,7 @@ JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnectionFactory)( |
RTC_CHECK(worker_thread->Start()) << "Failed to start thread"; |
std::unique_ptr<Thread> signaling_thread = rtc::Thread::Create(); |
- signaling_thread->SetName("signaling_thread", NULL); |
+ signaling_thread->SetName("signaling_thread", nullptr); |
RTC_CHECK(signaling_thread->Start()) << "Failed to start thread"; |
WebRtcVideoEncoderFactory* encoder_factory = nullptr; |
@@ -1345,7 +1346,7 @@ JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnectionFactory)( |
rtc::NetworkMonitorFactory* network_monitor_factory = nullptr; |
PeerConnectionFactoryInterface::Options options; |
- bool has_options = joptions != NULL; |
+ bool has_options = joptions != nullptr; |
if (has_options) { |
options = ParseOptionsFromJava(jni, joptions); |
} |
@@ -1383,9 +1384,9 @@ JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnectionFactory)( |
JOW(void, PeerConnectionFactory_nativeFreeFactory)(JNIEnv*, jclass, jlong j_p) { |
delete reinterpret_cast<OwnedFactoryAndThreads*>(j_p); |
if (field_trials_init_string) { |
- webrtc::field_trial::InitFieldTrialsFromString(NULL); |
+ webrtc::field_trial::InitFieldTrialsFromString(nullptr); |
delete field_trials_init_string; |
- field_trials_init_string = NULL; |
+ field_trials_init_string = nullptr; |
} |
webrtc::Trace::ReturnTrace(); |
} |
@@ -1879,13 +1880,13 @@ static rtc::scoped_refptr<PeerConnectionInterface> ExtractNativePC( |
JOW(jobject, PeerConnection_getLocalDescription)(JNIEnv* jni, jobject j_pc) { |
const SessionDescriptionInterface* sdp = |
ExtractNativePC(jni, j_pc)->local_description(); |
- return sdp ? JavaSdpFromNativeSdp(jni, sdp) : NULL; |
+ return sdp ? JavaSdpFromNativeSdp(jni, sdp) : nullptr; |
} |
JOW(jobject, PeerConnection_getRemoteDescription)(JNIEnv* jni, jobject j_pc) { |
const SessionDescriptionInterface* sdp = |
ExtractNativePC(jni, j_pc)->remote_description(); |
- return sdp ? JavaSdpFromNativeSdp(jni, sdp) : NULL; |
+ return sdp ? JavaSdpFromNativeSdp(jni, sdp) : nullptr; |
} |
JOW(jobject, PeerConnection_createDataChannel)( |
@@ -1954,16 +1955,15 @@ static SessionDescriptionInterface* JavaSdpToNativeSdp( |
jstring j_description = (jstring)GetObjectField(jni, j_sdp, j_description_id); |
std::string std_description = JavaToStdString(jni, j_description); |
- return webrtc::CreateSessionDescription( |
- std_type, std_description, NULL); |
+ return webrtc::CreateSessionDescription(std_type, std_description, nullptr); |
} |
JOW(void, PeerConnection_setLocalDescription)( |
JNIEnv* jni, jobject j_pc, |
jobject j_observer, jobject j_sdp) { |
rtc::scoped_refptr<SetSdpObserverWrapper> observer( |
- new rtc::RefCountedObject<SetSdpObserverWrapper>( |
- jni, j_observer, reinterpret_cast<ConstraintsWrapper*>(NULL))); |
+ new rtc::RefCountedObject<SetSdpObserverWrapper>(jni, j_observer, |
+ nullptr)); |
ExtractNativePC(jni, j_pc)->SetLocalDescription( |
observer, JavaSdpToNativeSdp(jni, j_sdp)); |
} |
@@ -1972,8 +1972,8 @@ JOW(void, PeerConnection_setRemoteDescription)( |
JNIEnv* jni, jobject j_pc, |
jobject j_observer, jobject j_sdp) { |
rtc::scoped_refptr<SetSdpObserverWrapper> observer( |
- new rtc::RefCountedObject<SetSdpObserverWrapper>( |
- jni, j_observer, reinterpret_cast<ConstraintsWrapper*>(NULL))); |
+ new rtc::RefCountedObject<SetSdpObserverWrapper>(jni, j_observer, |
+ nullptr)); |
ExtractNativePC(jni, j_pc)->SetRemoteDescription( |
observer, JavaSdpToNativeSdp(jni, j_sdp)); |
} |
@@ -1996,7 +1996,7 @@ JOW(jboolean, PeerConnection_nativeAddIceCandidate)( |
std::string sdp_mid = JavaToStdString(jni, j_sdp_mid); |
std::string sdp = JavaToStdString(jni, j_candidate_sdp); |
std::unique_ptr<IceCandidateInterface> candidate( |
- webrtc::CreateIceCandidate(sdp_mid, j_sdp_mline_index, sdp, NULL)); |
+ webrtc::CreateIceCandidate(sdp_mid, j_sdp_mline_index, sdp, nullptr)); |
return ExtractNativePC(jni, j_pc)->AddIceCandidate(candidate.get()); |
} |
@@ -2012,7 +2012,7 @@ static cricket::Candidate GetCandidateFromJava(JNIEnv* jni, |
std::string sdp = |
JavaToStdString(jni, GetStringField(jni, j_candidate, j_sdp_id)); |
cricket::Candidate candidate; |
- if (!webrtc::SdpDeserializeCandidate(sdp_mid, sdp, &candidate, NULL)) { |
+ if (!webrtc::SdpDeserializeCandidate(sdp_mid, sdp, &candidate, nullptr)) { |
LOG(LS_ERROR) << "SdpDescrializeCandidate failed with sdp " << sdp; |
} |
return candidate; |