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

Unified Diff: webrtc/sdk/android/api/org/webrtc/PeerConnectionFactory.java

Issue 2625903005: Reland of Android: Add field trial for Intel HW Vp8 encoder (Closed)
Patch Set: Ignore field trials when jingle_peerconnection_so is not available Created 3 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/sdk/android/api/org/webrtc/PeerConnectionFactory.java
diff --git a/webrtc/sdk/android/api/org/webrtc/PeerConnectionFactory.java b/webrtc/sdk/android/api/org/webrtc/PeerConnectionFactory.java
index 75d3be9e8b89ce2aba6f86cce7248733db392d99..4a7bca61c0c80da2dce3b1868d5498bdd1755f4b 100644
--- a/webrtc/sdk/android/api/org/webrtc/PeerConnectionFactory.java
+++ b/webrtc/sdk/android/api/org/webrtc/PeerConnectionFactory.java
@@ -17,8 +17,15 @@ import java.util.List;
* the PeerConnection API for clients.
*/
public class PeerConnectionFactory {
+ private static volatile boolean nativeLibLoaded;
+
static {
- System.loadLibrary("jingle_peerconnection_so");
+ try {
+ System.loadLibrary("jingle_peerconnection_so");
+ nativeLibLoaded = true;
+ } catch (UnsatisfiedLinkError t) {
+ nativeLibLoaded = false;
+ }
}
private static final String TAG = "PeerConnectionFactory";
@@ -64,7 +71,10 @@ public class PeerConnectionFactory {
// } else {
// method2();
// }
- public static native String fieldTrialsFindFullName(String name);
+ public static String fieldTrialsFindFullName(String name) {
+ return nativeLibLoaded ? nativeFieldTrialsFindFullName(name) : "";
+ }
+ private static native String nativeFieldTrialsFindFullName(String name);
// Internal tracing initialization. Must be called before PeerConnectionFactory is created to
// prevent racing with tracing code.
public static native void initializeInternalTracer();
« no previous file with comments | « webrtc/sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java ('k') | webrtc/sdk/android/src/jni/peerconnection_jni.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698