| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2013 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 1320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1331 (owned_factory->encoder_factory()); | 1331 (owned_factory->encoder_factory()); |
| 1332 if (encoder_factory && | 1332 if (encoder_factory && |
| 1333 jni->IsInstanceOf(local_egl_context, j_eglbase14_context_class)) { | 1333 jni->IsInstanceOf(local_egl_context, j_eglbase14_context_class)) { |
| 1334 LOG(LS_INFO) << "Set EGL context for HW encoding."; | 1334 LOG(LS_INFO) << "Set EGL context for HW encoding."; |
| 1335 encoder_factory->SetEGLContext(jni, local_egl_context); | 1335 encoder_factory->SetEGLContext(jni, local_egl_context); |
| 1336 } | 1336 } |
| 1337 | 1337 |
| 1338 MediaCodecVideoDecoderFactory* decoder_factory = | 1338 MediaCodecVideoDecoderFactory* decoder_factory = |
| 1339 static_cast<MediaCodecVideoDecoderFactory*> | 1339 static_cast<MediaCodecVideoDecoderFactory*> |
| 1340 (owned_factory->decoder_factory()); | 1340 (owned_factory->decoder_factory()); |
| 1341 if (decoder_factory && | 1341 if (decoder_factory) { |
| 1342 jni->IsInstanceOf(remote_egl_context, j_eglbase14_context_class)) { | |
| 1343 LOG(LS_INFO) << "Set EGL context for HW decoding."; | 1342 LOG(LS_INFO) << "Set EGL context for HW decoding."; |
| 1344 decoder_factory->SetEGLContext(jni, remote_egl_context); | 1343 decoder_factory->SetEGLContext(jni, remote_egl_context); |
| 1345 } | 1344 } |
| 1346 } | 1345 } |
| 1347 | 1346 |
| 1348 static PeerConnectionInterface::IceTransportsType | 1347 static PeerConnectionInterface::IceTransportsType |
| 1349 JavaIceTransportsTypeToNativeType(JNIEnv* jni, jobject j_ice_transports_type) { | 1348 JavaIceTransportsTypeToNativeType(JNIEnv* jni, jobject j_ice_transports_type) { |
| 1350 std::string enum_name = GetJavaEnumName( | 1349 std::string enum_name = GetJavaEnumName( |
| 1351 jni, "org/webrtc/PeerConnection$IceTransportsType", | 1350 jni, "org/webrtc/PeerConnection$IceTransportsType", |
| 1352 j_ice_transports_type); | 1351 j_ice_transports_type); |
| (...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2139 return JavaStringFromStdString( | 2138 return JavaStringFromStdString( |
| 2140 jni, | 2139 jni, |
| 2141 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); | 2140 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); |
| 2142 } | 2141 } |
| 2143 | 2142 |
| 2144 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { | 2143 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { |
| 2145 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); | 2144 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); |
| 2146 } | 2145 } |
| 2147 | 2146 |
| 2148 } // namespace webrtc_jni | 2147 } // namespace webrtc_jni |
| OLD | NEW |