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 c07d58faffc6210116057b02cf9d52f3a9432ea8..1d6ce09ad912df957a7a77620c001612b285cc01 100644 |
--- a/webrtc/sdk/android/src/jni/peerconnection_jni.cc |
+++ b/webrtc/sdk/android/src/jni/peerconnection_jni.cc |
@@ -1353,10 +1353,12 @@ JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnectionFactory)( |
options = ParseOptionsFromJava(jni, joptions); |
} |
+#ifdef HAVE_MEDIA |
if (video_hw_acceleration_enabled) { |
encoder_factory = new MediaCodecVideoEncoderFactory(); |
decoder_factory = new MediaCodecVideoDecoderFactory(); |
} |
+#endif |
// Do not create network_monitor_factory only if the options are |
// provided and disable_network_monitor therein is set to true. |
if (!(has_options && options.disable_network_monitor)) { |
@@ -1541,7 +1543,9 @@ JOW(void, PeerConnectionFactory_nativeSetVideoHwAccelerationOptions)( |
if (encoder_factory && |
jni->IsInstanceOf(local_egl_context, j_eglbase14_context_class)) { |
LOG(LS_INFO) << "Set EGL context for HW encoding."; |
+#ifdef HAVE_MEDIA |
encoder_factory->SetEGLContext(jni, local_egl_context); |
+#endif |
pthatcher1
2017/05/03 18:05:53
Won't the encoder and decoder factories by null so
Zhi Huang
2017/05/04 01:08:03
The idea here is trying to avoid linking the metho
|
} |
MediaCodecVideoDecoderFactory* decoder_factory = |
@@ -1549,7 +1553,9 @@ JOW(void, PeerConnectionFactory_nativeSetVideoHwAccelerationOptions)( |
(owned_factory->decoder_factory()); |
if (decoder_factory) { |
LOG(LS_INFO) << "Set EGL context for HW decoding."; |
+#ifdef HAVE_MEDIA |
decoder_factory->SetEGLContext(jni, remote_egl_context); |
+#endif |
} |
} |