Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1494)

Side by Side Diff: talk/app/webrtc/java/jni/peerconnection_jni.cc

Issue 1587373002: Fix a test bot failure caused by an earlier CL Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2013 Google Inc. 3 * Copyright 2013 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 1334 matching lines...) Expand 10 before | Expand all | Expand 10 after
1345 #endif 1345 #endif
1346 } 1346 }
1347 1347
1348 JOW(void, PeerConnectionFactory_nativeSetOptions)( 1348 JOW(void, PeerConnectionFactory_nativeSetOptions)(
1349 JNIEnv* jni, jclass, jlong native_factory, jobject options) { 1349 JNIEnv* jni, jclass, jlong native_factory, jobject options) {
1350 rtc::scoped_refptr<PeerConnectionFactoryInterface> factory( 1350 rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
1351 factoryFromJava(native_factory)); 1351 factoryFromJava(native_factory));
1352 PeerConnectionFactoryInterface::Options options_to_set = 1352 PeerConnectionFactoryInterface::Options options_to_set =
1353 ParseOptionsFromJava(jni, options); 1353 ParseOptionsFromJava(jni, options);
1354 factory->SetOptions(options_to_set); 1354 factory->SetOptions(options_to_set);
1355
1356 if (options_to_set.disable_network_monitor) {
1357 OwnedFactoryAndThreads* owner =
1358 reinterpret_cast<OwnedFactoryAndThreads*>(native_factory);
1359 if (owner->network_monitor_factory()) {
1360 rtc::NetworkMonitorFactory::ReleaseFactory(
1361 owner->network_monitor_factory());
1362 owner->clear_network_monitor_factory();
1363 }
1364 }
1355 } 1365 }
1356 1366
1357 JOW(void, PeerConnectionFactory_nativeSetVideoHwAccelerationOptions)( 1367 JOW(void, PeerConnectionFactory_nativeSetVideoHwAccelerationOptions)(
1358 JNIEnv* jni, jclass, jlong native_factory, jobject local_egl_context, 1368 JNIEnv* jni, jclass, jlong native_factory, jobject local_egl_context,
1359 jobject remote_egl_context) { 1369 jobject remote_egl_context) {
1360 #if defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD) 1370 #if defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD)
1361 OwnedFactoryAndThreads* owned_factory = 1371 OwnedFactoryAndThreads* owned_factory =
1362 reinterpret_cast<OwnedFactoryAndThreads*>(native_factory); 1372 reinterpret_cast<OwnedFactoryAndThreads*>(native_factory);
1363 1373
1364 jclass j_eglbase14_context_class = 1374 jclass j_eglbase14_context_class =
(...skipping 793 matching lines...) Expand 10 before | Expand all | Expand 10 after
2158 return JavaStringFromStdString( 2168 return JavaStringFromStdString(
2159 jni, 2169 jni,
2160 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); 2170 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id());
2161 } 2171 }
2162 2172
2163 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { 2173 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) {
2164 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); 2174 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release();
2165 } 2175 }
2166 2176
2167 } // namespace webrtc_jni 2177 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698