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

Side by Side Diff: webrtc/sdk/android/src/jni/peerconnection_jni.cc

Issue 2854123003: Build WebRTC with data channel only. (Closed)
Patch Set: Replace the rtc_ prefix with webrtc_ to avoid naming conflict. Created 3 years, 6 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
OLDNEW
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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #include "webrtc/base/checks.h" 54 #include "webrtc/base/checks.h"
55 #include "webrtc/base/event_tracer.h" 55 #include "webrtc/base/event_tracer.h"
56 #include "webrtc/base/logging.h" 56 #include "webrtc/base/logging.h"
57 #include "webrtc/base/logsinks.h" 57 #include "webrtc/base/logsinks.h"
58 #include "webrtc/base/messagequeue.h" 58 #include "webrtc/base/messagequeue.h"
59 #include "webrtc/base/networkmonitor.h" 59 #include "webrtc/base/networkmonitor.h"
60 #include "webrtc/base/rtccertificategenerator.h" 60 #include "webrtc/base/rtccertificategenerator.h"
61 #include "webrtc/base/ssladapter.h" 61 #include "webrtc/base/ssladapter.h"
62 #include "webrtc/base/stringutils.h" 62 #include "webrtc/base/stringutils.h"
63 #include "webrtc/media/base/videocapturer.h" 63 #include "webrtc/media/base/videocapturer.h"
64 #include "webrtc/media/engine/webrtcvideodecoderfactory.h"
65 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
66 #include "webrtc/modules/utility/include/jvm_android.h" 64 #include "webrtc/modules/utility/include/jvm_android.h"
67 #include "webrtc/system_wrappers/include/field_trial.h"
68 #include "webrtc/pc/webrtcsdp.h" 65 #include "webrtc/pc/webrtcsdp.h"
69 #include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h"
70 #include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h"
71 #include "webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h" 66 #include "webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h"
72 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h" 67 // Adding 'nogncheck' to disable the gn include headers check.
68 // We don't want to always depend on audio and video related targets.
69 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h" // nogncheck
73 #include "webrtc/sdk/android/src/jni/classreferenceholder.h" 70 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
74 #include "webrtc/sdk/android/src/jni/jni_helpers.h" 71 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
75 #include "webrtc/sdk/android/src/jni/native_handle_impl.h" 72 #include "webrtc/sdk/android/src/jni/ownedfactoryandthreads.h"
76 #include "webrtc/sdk/android/src/jni/rtcstatscollectorcallbackwrapper.h" 73 #include "webrtc/sdk/android/src/jni/rtcstatscollectorcallbackwrapper.h"
74 #include "webrtc/system_wrappers/include/field_trial.h"
77 // Adding 'nogncheck' to disable the gn include headers check. 75 // Adding 'nogncheck' to disable the gn include headers check.
78 // We don't want to depend on 'system_wrappers:field_trial_default' because 76 // We don't want to depend on 'system_wrappers:field_trial_default' because
79 // clients should be able to provide their own implementation. 77 // clients should be able to provide their own implementation.
80 #include "webrtc/system_wrappers/include/field_trial_default.h" // nogncheck 78 #include "webrtc/system_wrappers/include/field_trial_default.h" // nogncheck
81 #include "webrtc/system_wrappers/include/logcat_trace_context.h" 79 #include "webrtc/system_wrappers/include/logcat_trace_context.h"
82 #include "webrtc/system_wrappers/include/trace.h" 80 #include "webrtc/system_wrappers/include/trace.h"
83 #include "webrtc/voice_engine/include/voe_base.h" 81 #include "webrtc/voice_engine/include/voe_base.h" // nogncheck
84 82
85 using cricket::WebRtcVideoDecoderFactory; 83 using cricket::WebRtcVideoDecoderFactory;
86 using cricket::WebRtcVideoEncoderFactory; 84 using cricket::WebRtcVideoEncoderFactory;
87 using rtc::Bind; 85 using rtc::Bind;
88 using rtc::Thread; 86 using rtc::Thread;
89 using rtc::ThreadManager; 87 using rtc::ThreadManager;
90 using webrtc::AudioSourceInterface; 88 using webrtc::AudioSourceInterface;
91 using webrtc::AudioTrackInterface; 89 using webrtc::AudioTrackInterface;
92 using webrtc::AudioTrackVector; 90 using webrtc::AudioTrackVector;
93 using webrtc::CreateSessionDescriptionObserver; 91 using webrtc::CreateSessionDescriptionObserver;
(...skipping 12 matching lines...) Expand all
106 using webrtc::PeerConnectionInterface; 104 using webrtc::PeerConnectionInterface;
107 using webrtc::PeerConnectionObserver; 105 using webrtc::PeerConnectionObserver;
108 using webrtc::RtpReceiverInterface; 106 using webrtc::RtpReceiverInterface;
109 using webrtc::RtpReceiverObserverInterface; 107 using webrtc::RtpReceiverObserverInterface;
110 using webrtc::RtpSenderInterface; 108 using webrtc::RtpSenderInterface;
111 using webrtc::SessionDescriptionInterface; 109 using webrtc::SessionDescriptionInterface;
112 using webrtc::SetSessionDescriptionObserver; 110 using webrtc::SetSessionDescriptionObserver;
113 using webrtc::StatsObserver; 111 using webrtc::StatsObserver;
114 using webrtc::StatsReport; 112 using webrtc::StatsReport;
115 using webrtc::StatsReports; 113 using webrtc::StatsReports;
116 using webrtc::VideoTrackSourceInterface;
117 using webrtc::VideoTrackInterface; 114 using webrtc::VideoTrackInterface;
118 using webrtc::VideoTrackVector;
119 using webrtc::kVideoCodecVP8;
120 115
121 namespace webrtc_jni { 116 namespace webrtc_jni {
122 117
118 WebRtcVideoEncoderFactory* CreateVideoEncoderFactory();
119
120 WebRtcVideoDecoderFactory* CreateVideoDecoderFactory();
121
122 jobject GetJavaSurfaceTextureHelper(
123 rtc::scoped_refptr<SurfaceTextureHelper> surface_texture_helper);
124
123 // Field trials initialization string 125 // Field trials initialization string
124 static char *field_trials_init_string = NULL; 126 static char *field_trials_init_string = NULL;
125 127
126 // Set in PeerConnectionFactory_initializeAndroidGlobals(). 128 // Set in PeerConnectionFactory_initializeAndroidGlobals().
127 static bool factory_static_initialized = false; 129 static bool factory_static_initialized = false;
128 static bool video_hw_acceleration_enabled = true; 130 static bool video_hw_acceleration_enabled = true;
129 static jobject j_application_context = nullptr; 131 static jobject j_application_context = nullptr;
130 132
131 // Return the (singleton) Java Enum object corresponding to |index|; 133 // Return the (singleton) Java Enum object corresponding to |index|;
132 // |state_class_fragment| is something like "MediaSource$State". 134 // |state_class_fragment| is something like "MediaSource$State".
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 } 842 }
841 843
842 const ScopedGlobalRef<jobject> j_observer_global_; 844 const ScopedGlobalRef<jobject> j_observer_global_;
843 const ScopedGlobalRef<jclass> j_observer_class_; 845 const ScopedGlobalRef<jclass> j_observer_class_;
844 const ScopedGlobalRef<jclass> j_stats_report_class_; 846 const ScopedGlobalRef<jclass> j_stats_report_class_;
845 const jmethodID j_stats_report_ctor_; 847 const jmethodID j_stats_report_ctor_;
846 const ScopedGlobalRef<jclass> j_value_class_; 848 const ScopedGlobalRef<jclass> j_value_class_;
847 const jmethodID j_value_ctor_; 849 const jmethodID j_value_ctor_;
848 }; 850 };
849 851
850 // Wrapper dispatching rtc::VideoSinkInterface to a Java VideoRenderer
851 // instance.
852 class JavaVideoRendererWrapper
853 : public rtc::VideoSinkInterface<webrtc::VideoFrame> {
854 public:
855 JavaVideoRendererWrapper(JNIEnv* jni, jobject j_callbacks)
856 : j_callbacks_(jni, j_callbacks),
857 j_render_frame_id_(GetMethodID(
858 jni, GetObjectClass(jni, j_callbacks), "renderFrame",
859 "(Lorg/webrtc/VideoRenderer$I420Frame;)V")),
860 j_frame_class_(jni,
861 FindClass(jni, "org/webrtc/VideoRenderer$I420Frame")),
862 j_i420_frame_ctor_id_(GetMethodID(
863 jni, *j_frame_class_, "<init>", "(III[I[Ljava/nio/ByteBuffer;J)V")),
864 j_texture_frame_ctor_id_(GetMethodID(
865 jni, *j_frame_class_, "<init>",
866 "(IIII[FJ)V")),
867 j_byte_buffer_class_(jni, FindClass(jni, "java/nio/ByteBuffer")) {
868 CHECK_EXCEPTION(jni);
869 }
870
871 virtual ~JavaVideoRendererWrapper() {}
872
873 void OnFrame(const webrtc::VideoFrame& video_frame) override {
874 ScopedLocalRefFrame local_ref_frame(jni());
875 jobject j_frame =
876 (video_frame.video_frame_buffer()->native_handle() != nullptr)
877 ? CricketToJavaTextureFrame(&video_frame)
878 : CricketToJavaI420Frame(&video_frame);
879 // |j_callbacks_| is responsible for releasing |j_frame| with
880 // VideoRenderer.renderFrameDone().
881 jni()->CallVoidMethod(*j_callbacks_, j_render_frame_id_, j_frame);
882 CHECK_EXCEPTION(jni());
883 }
884
885 private:
886 // Make a shallow copy of |frame| to be used with Java. The callee has
887 // ownership of the frame, and the frame should be released with
888 // VideoRenderer.releaseNativeFrame().
889 static jlong javaShallowCopy(const webrtc::VideoFrame* frame) {
890 return jlongFromPointer(new webrtc::VideoFrame(*frame));
891 }
892
893 // Return a VideoRenderer.I420Frame referring to the data in |frame|.
894 jobject CricketToJavaI420Frame(const webrtc::VideoFrame* frame) {
895 jintArray strides = jni()->NewIntArray(3);
896 jint* strides_array = jni()->GetIntArrayElements(strides, NULL);
897 strides_array[0] = frame->video_frame_buffer()->StrideY();
898 strides_array[1] = frame->video_frame_buffer()->StrideU();
899 strides_array[2] = frame->video_frame_buffer()->StrideV();
900 jni()->ReleaseIntArrayElements(strides, strides_array, 0);
901 jobjectArray planes = jni()->NewObjectArray(3, *j_byte_buffer_class_, NULL);
902 jobject y_buffer = jni()->NewDirectByteBuffer(
903 const_cast<uint8_t*>(frame->video_frame_buffer()->DataY()),
904 frame->video_frame_buffer()->StrideY() *
905 frame->video_frame_buffer()->height());
906 size_t chroma_height = (frame->height() + 1) / 2;
907 jobject u_buffer = jni()->NewDirectByteBuffer(
908 const_cast<uint8_t*>(frame->video_frame_buffer()->DataU()),
909 frame->video_frame_buffer()->StrideU() * chroma_height);
910 jobject v_buffer = jni()->NewDirectByteBuffer(
911 const_cast<uint8_t*>(frame->video_frame_buffer()->DataV()),
912 frame->video_frame_buffer()->StrideV() * chroma_height);
913
914 jni()->SetObjectArrayElement(planes, 0, y_buffer);
915 jni()->SetObjectArrayElement(planes, 1, u_buffer);
916 jni()->SetObjectArrayElement(planes, 2, v_buffer);
917 return jni()->NewObject(
918 *j_frame_class_, j_i420_frame_ctor_id_,
919 frame->width(), frame->height(),
920 static_cast<int>(frame->rotation()),
921 strides, planes, javaShallowCopy(frame));
922 }
923
924 // Return a VideoRenderer.I420Frame referring texture object in |frame|.
925 jobject CricketToJavaTextureFrame(const webrtc::VideoFrame* frame) {
926 NativeHandleImpl* handle = reinterpret_cast<NativeHandleImpl*>(
927 frame->video_frame_buffer()->native_handle());
928 jfloatArray sampling_matrix = handle->sampling_matrix.ToJava(jni());
929
930 return jni()->NewObject(
931 *j_frame_class_, j_texture_frame_ctor_id_,
932 frame->width(), frame->height(),
933 static_cast<int>(frame->rotation()),
934 handle->oes_texture_id, sampling_matrix, javaShallowCopy(frame));
935 }
936
937 JNIEnv* jni() {
938 return AttachCurrentThreadIfNeeded();
939 }
940
941 ScopedGlobalRef<jobject> j_callbacks_;
942 jmethodID j_render_frame_id_;
943 ScopedGlobalRef<jclass> j_frame_class_;
944 jmethodID j_i420_frame_ctor_id_;
945 jmethodID j_texture_frame_ctor_id_;
946 ScopedGlobalRef<jclass> j_byte_buffer_class_;
947 };
948
949 // Adapter between the C++ RtpReceiverObserverInterface and the Java 852 // Adapter between the C++ RtpReceiverObserverInterface and the Java
950 // RtpReceiver.Observer interface. Wraps an instance of the Java interface and 853 // RtpReceiver.Observer interface. Wraps an instance of the Java interface and
951 // dispatches C++ callbacks to Java. 854 // dispatches C++ callbacks to Java.
952 class RtpReceiverObserver : public RtpReceiverObserverInterface { 855 class RtpReceiverObserver : public RtpReceiverObserverInterface {
953 public: 856 public:
954 RtpReceiverObserver(JNIEnv* jni, jobject j_observer) 857 RtpReceiverObserver(JNIEnv* jni, jobject j_observer)
955 : j_observer_global_(jni, j_observer) {} 858 : j_observer_global_(jni, j_observer) {}
956 859
957 ~RtpReceiverObserver() override {} 860 ~RtpReceiverObserver() override {}
958 861
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
1081 984
1082 JOW(void, PeerConnection_freeObserver)(JNIEnv*, jclass, jlong j_p) { 985 JOW(void, PeerConnection_freeObserver)(JNIEnv*, jclass, jlong j_p) {
1083 PCOJava* p = reinterpret_cast<PCOJava*>(j_p); 986 PCOJava* p = reinterpret_cast<PCOJava*>(j_p);
1084 delete p; 987 delete p;
1085 } 988 }
1086 989
1087 JOW(void, MediaSource_free)(JNIEnv*, jclass, jlong j_p) { 990 JOW(void, MediaSource_free)(JNIEnv*, jclass, jlong j_p) {
1088 reinterpret_cast<rtc::RefCountInterface*>(j_p)->Release(); 991 reinterpret_cast<rtc::RefCountInterface*>(j_p)->Release();
1089 } 992 }
1090 993
1091 JOW(void, VideoRenderer_freeWrappedVideoRenderer)(JNIEnv*, jclass, jlong j_p) {
1092 delete reinterpret_cast<JavaVideoRendererWrapper*>(j_p);
1093 }
1094
1095 JOW(void, VideoRenderer_releaseNativeFrame)(
1096 JNIEnv* jni, jclass, jlong j_frame_ptr) {
1097 delete reinterpret_cast<const webrtc::VideoFrame*>(j_frame_ptr);
1098 }
1099
1100 JOW(void, MediaStreamTrack_free)(JNIEnv*, jclass, jlong j_p) { 994 JOW(void, MediaStreamTrack_free)(JNIEnv*, jclass, jlong j_p) {
1101 reinterpret_cast<MediaStreamTrackInterface*>(j_p)->Release(); 995 reinterpret_cast<MediaStreamTrackInterface*>(j_p)->Release();
1102 } 996 }
1103 997
1104 JOW(jboolean, MediaStream_nativeAddAudioTrack)( 998 JOW(jboolean, MediaStream_nativeAddAudioTrack)(
1105 JNIEnv* jni, jclass, jlong pointer, jlong j_audio_track_pointer) { 999 JNIEnv* jni, jclass, jlong pointer, jlong j_audio_track_pointer) {
1106 return reinterpret_cast<MediaStreamInterface*>(pointer)->AddTrack( 1000 return reinterpret_cast<MediaStreamInterface*>(pointer)->AddTrack(
1107 reinterpret_cast<AudioTrackInterface*>(j_audio_track_pointer)); 1001 reinterpret_cast<AudioTrackInterface*>(j_audio_track_pointer));
1108 } 1002 }
1109 1003
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
1201 rtc::tracing::ShutdownInternalTracer(); 1095 rtc::tracing::ShutdownInternalTracer();
1202 } 1096 }
1203 1097
1204 JOW(void, AudioTrack_nativeSetVolume) 1098 JOW(void, AudioTrack_nativeSetVolume)
1205 (JNIEnv*, jclass, jlong j_p, jdouble volume) { 1099 (JNIEnv*, jclass, jlong j_p, jdouble volume) {
1206 rtc::scoped_refptr<AudioSourceInterface> source( 1100 rtc::scoped_refptr<AudioSourceInterface> source(
1207 reinterpret_cast<AudioTrackInterface*>(j_p)->GetSource()); 1101 reinterpret_cast<AudioTrackInterface*>(j_p)->GetSource());
1208 source->SetVolume(volume); 1102 source->SetVolume(volume);
1209 } 1103 }
1210 1104
1211 // Helper struct for working around the fact that CreatePeerConnectionFactory()
1212 // comes in two flavors: either entirely automagical (constructing its own
1213 // threads and deleting them on teardown, but no external codec factory support)
1214 // or entirely manual (requires caller to delete threads after factory
1215 // teardown). This struct takes ownership of its ctor's arguments to present a
1216 // single thing for Java to hold and eventually free.
1217 class OwnedFactoryAndThreads {
1218 public:
1219 OwnedFactoryAndThreads(std::unique_ptr<Thread> network_thread,
1220 std::unique_ptr<Thread> worker_thread,
1221 std::unique_ptr<Thread> signaling_thread,
1222 WebRtcVideoEncoderFactory* encoder_factory,
1223 WebRtcVideoDecoderFactory* decoder_factory,
1224 rtc::NetworkMonitorFactory* network_monitor_factory,
1225 PeerConnectionFactoryInterface* factory)
1226 : network_thread_(std::move(network_thread)),
1227 worker_thread_(std::move(worker_thread)),
1228 signaling_thread_(std::move(signaling_thread)),
1229 encoder_factory_(encoder_factory),
1230 decoder_factory_(decoder_factory),
1231 network_monitor_factory_(network_monitor_factory),
1232 factory_(factory) {}
1233
1234 ~OwnedFactoryAndThreads() {
1235 CHECK_RELEASE(factory_);
1236 if (network_monitor_factory_ != nullptr) {
1237 rtc::NetworkMonitorFactory::ReleaseFactory(network_monitor_factory_);
1238 }
1239 }
1240
1241 PeerConnectionFactoryInterface* factory() { return factory_; }
1242 Thread* signaling_thread() { return signaling_thread_.get(); }
1243 Thread* worker_thread() { return worker_thread_.get(); }
1244 WebRtcVideoEncoderFactory* encoder_factory() { return encoder_factory_; }
1245 WebRtcVideoDecoderFactory* decoder_factory() { return decoder_factory_; }
1246 rtc::NetworkMonitorFactory* network_monitor_factory() {
1247 return network_monitor_factory_;
1248 }
1249 void clear_network_monitor_factory() { network_monitor_factory_ = nullptr; }
1250 void InvokeJavaCallbacksOnFactoryThreads();
1251
1252 private:
1253 void JavaCallbackOnFactoryThreads();
1254
1255 const std::unique_ptr<Thread> network_thread_;
1256 const std::unique_ptr<Thread> worker_thread_;
1257 const std::unique_ptr<Thread> signaling_thread_;
1258 WebRtcVideoEncoderFactory* encoder_factory_;
1259 WebRtcVideoDecoderFactory* decoder_factory_;
1260 rtc::NetworkMonitorFactory* network_monitor_factory_;
1261 PeerConnectionFactoryInterface* factory_; // Const after ctor except dtor.
1262 };
1263
1264 void OwnedFactoryAndThreads::JavaCallbackOnFactoryThreads() {
1265 JNIEnv* jni = AttachCurrentThreadIfNeeded();
1266 ScopedLocalRefFrame local_ref_frame(jni);
1267 jclass j_factory_class = FindClass(jni, "org/webrtc/PeerConnectionFactory");
1268 jmethodID m = nullptr;
1269 if (network_thread_->IsCurrent()) {
1270 LOG(LS_INFO) << "Network thread JavaCallback";
1271 m = GetStaticMethodID(jni, j_factory_class, "onNetworkThreadReady", "()V");
1272 }
1273 if (worker_thread_->IsCurrent()) {
1274 LOG(LS_INFO) << "Worker thread JavaCallback";
1275 m = GetStaticMethodID(jni, j_factory_class, "onWorkerThreadReady", "()V");
1276 }
1277 if (signaling_thread_->IsCurrent()) {
1278 LOG(LS_INFO) << "Signaling thread JavaCallback";
1279 m = GetStaticMethodID(
1280 jni, j_factory_class, "onSignalingThreadReady", "()V");
1281 }
1282 if (m != nullptr) {
1283 jni->CallStaticVoidMethod(j_factory_class, m);
1284 CHECK_EXCEPTION(jni) << "error during JavaCallback::CallStaticVoidMethod";
1285 }
1286 }
1287
1288 void OwnedFactoryAndThreads::InvokeJavaCallbacksOnFactoryThreads() {
1289 LOG(LS_INFO) << "InvokeJavaCallbacksOnFactoryThreads.";
1290 network_thread_->Invoke<void>(RTC_FROM_HERE,
1291 [this] { JavaCallbackOnFactoryThreads(); });
1292 worker_thread_->Invoke<void>(RTC_FROM_HERE,
1293 [this] { JavaCallbackOnFactoryThreads(); });
1294 signaling_thread_->Invoke<void>(RTC_FROM_HERE,
1295 [this] { JavaCallbackOnFactoryThreads(); });
1296 }
1297
1298 PeerConnectionFactoryInterface::Options ParseOptionsFromJava(JNIEnv* jni, 1105 PeerConnectionFactoryInterface::Options ParseOptionsFromJava(JNIEnv* jni,
1299 jobject options) { 1106 jobject options) {
1300 jclass options_class = jni->GetObjectClass(options); 1107 jclass options_class = jni->GetObjectClass(options);
1301 jfieldID network_ignore_mask_field = 1108 jfieldID network_ignore_mask_field =
1302 jni->GetFieldID(options_class, "networkIgnoreMask", "I"); 1109 jni->GetFieldID(options_class, "networkIgnoreMask", "I");
1303 int network_ignore_mask = 1110 int network_ignore_mask =
1304 jni->GetIntField(options, network_ignore_mask_field); 1111 jni->GetIntField(options, network_ignore_mask_field);
1305 1112
1306 jfieldID disable_encryption_field = 1113 jfieldID disable_encryption_field =
1307 jni->GetFieldID(options_class, "disableEncryption", "Z"); 1114 jni->GetFieldID(options_class, "disableEncryption", "Z");
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
1350 WebRtcVideoDecoderFactory* decoder_factory = nullptr; 1157 WebRtcVideoDecoderFactory* decoder_factory = nullptr;
1351 rtc::NetworkMonitorFactory* network_monitor_factory = nullptr; 1158 rtc::NetworkMonitorFactory* network_monitor_factory = nullptr;
1352 1159
1353 PeerConnectionFactoryInterface::Options options; 1160 PeerConnectionFactoryInterface::Options options;
1354 bool has_options = joptions != NULL; 1161 bool has_options = joptions != NULL;
1355 if (has_options) { 1162 if (has_options) {
1356 options = ParseOptionsFromJava(jni, joptions); 1163 options = ParseOptionsFromJava(jni, joptions);
1357 } 1164 }
1358 1165
1359 if (video_hw_acceleration_enabled) { 1166 if (video_hw_acceleration_enabled) {
1360 encoder_factory = new MediaCodecVideoEncoderFactory(); 1167 encoder_factory = CreateVideoEncoderFactory();
1361 decoder_factory = new MediaCodecVideoDecoderFactory(); 1168 decoder_factory = CreateVideoDecoderFactory();
1362 } 1169 }
1363 // Do not create network_monitor_factory only if the options are 1170 // Do not create network_monitor_factory only if the options are
1364 // provided and disable_network_monitor therein is set to true. 1171 // provided and disable_network_monitor therein is set to true.
1365 if (!(has_options && options.disable_network_monitor)) { 1172 if (!(has_options && options.disable_network_monitor)) {
1366 network_monitor_factory = new AndroidNetworkMonitorFactory(); 1173 network_monitor_factory = new AndroidNetworkMonitorFactory();
1367 rtc::NetworkMonitorFactory::SetFactory(network_monitor_factory); 1174 rtc::NetworkMonitorFactory::SetFactory(network_monitor_factory);
1368 } 1175 }
1369 1176
1370 rtc::scoped_refptr<PeerConnectionFactoryInterface> factory( 1177 rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
1371 webrtc::CreatePeerConnectionFactory( 1178 webrtc::CreatePeerConnectionFactory(
(...skipping 17 matching lines...) Expand all
1389 JOW(void, PeerConnectionFactory_nativeFreeFactory)(JNIEnv*, jclass, jlong j_p) { 1196 JOW(void, PeerConnectionFactory_nativeFreeFactory)(JNIEnv*, jclass, jlong j_p) {
1390 delete reinterpret_cast<OwnedFactoryAndThreads*>(j_p); 1197 delete reinterpret_cast<OwnedFactoryAndThreads*>(j_p);
1391 if (field_trials_init_string) { 1198 if (field_trials_init_string) {
1392 webrtc::field_trial::InitFieldTrialsFromString(NULL); 1199 webrtc::field_trial::InitFieldTrialsFromString(NULL);
1393 delete field_trials_init_string; 1200 delete field_trials_init_string;
1394 field_trials_init_string = NULL; 1201 field_trials_init_string = NULL;
1395 } 1202 }
1396 webrtc::Trace::ReturnTrace(); 1203 webrtc::Trace::ReturnTrace();
1397 } 1204 }
1398 1205
1399 static PeerConnectionFactoryInterface* factoryFromJava(jlong j_p) {
1400 return reinterpret_cast<OwnedFactoryAndThreads*>(j_p)->factory();
1401 }
1402
1403 JOW(void, PeerConnectionFactory_nativeThreadsCallbacks)( 1206 JOW(void, PeerConnectionFactory_nativeThreadsCallbacks)(
1404 JNIEnv*, jclass, jlong j_p) { 1207 JNIEnv*, jclass, jlong j_p) {
1405 OwnedFactoryAndThreads *factory = 1208 OwnedFactoryAndThreads *factory =
1406 reinterpret_cast<OwnedFactoryAndThreads*>(j_p); 1209 reinterpret_cast<OwnedFactoryAndThreads*>(j_p);
1407 factory->InvokeJavaCallbacksOnFactoryThreads(); 1210 factory->InvokeJavaCallbacksOnFactoryThreads();
1408 } 1211 }
1409 1212
1410 JOW(jlong, PeerConnectionFactory_nativeCreateLocalMediaStream)( 1213 JOW(jlong, PeerConnectionFactory_nativeCreateLocalMediaStream)(
1411 JNIEnv* jni, jclass, jlong native_factory, jstring label) { 1214 JNIEnv* jni, jclass, jlong native_factory, jstring label) {
1412 rtc::scoped_refptr<PeerConnectionFactoryInterface> factory( 1215 rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
1413 factoryFromJava(native_factory)); 1216 factoryFromJava(native_factory));
1414 rtc::scoped_refptr<MediaStreamInterface> stream( 1217 rtc::scoped_refptr<MediaStreamInterface> stream(
1415 factory->CreateLocalMediaStream(JavaToStdString(jni, label))); 1218 factory->CreateLocalMediaStream(JavaToStdString(jni, label)));
1416 return (jlong)stream.release(); 1219 return (jlong)stream.release();
1417 } 1220 }
1418 1221
1419 JOW(jlong, PeerConnectionFactory_nativeCreateVideoSource)
1420 (JNIEnv* jni, jclass, jlong native_factory, jobject j_egl_context,
1421 jboolean is_screencast) {
1422 OwnedFactoryAndThreads* factory =
1423 reinterpret_cast<OwnedFactoryAndThreads*>(native_factory);
1424
1425 rtc::scoped_refptr<webrtc::AndroidVideoTrackSource> source(
1426 new rtc::RefCountedObject<webrtc::AndroidVideoTrackSource>(
1427 factory->signaling_thread(), jni, j_egl_context, is_screencast));
1428 rtc::scoped_refptr<webrtc::VideoTrackSourceProxy> proxy_source =
1429 webrtc::VideoTrackSourceProxy::Create(factory->signaling_thread(),
1430 factory->worker_thread(), source);
1431
1432 return (jlong)proxy_source.release();
1433 }
1434
1435 JOW(void, PeerConnectionFactory_nativeInitializeVideoCapturer) 1222 JOW(void, PeerConnectionFactory_nativeInitializeVideoCapturer)
1436 (JNIEnv* jni, 1223 (JNIEnv* jni,
1437 jclass, 1224 jclass,
1438 jlong native_factory, 1225 jlong native_factory,
1439 jobject j_video_capturer, 1226 jobject j_video_capturer,
1440 jlong native_source, 1227 jlong native_source,
1441 jobject j_frame_observer) { 1228 jobject j_frame_observer) {
1442 LOG(LS_INFO) << "PeerConnectionFactory_nativeInitializeVideoCapturer"; 1229 LOG(LS_INFO) << "PeerConnectionFactory_nativeInitializeVideoCapturer";
1443 rtc::scoped_refptr<PeerConnectionFactoryInterface> factory( 1230 rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
1444 factoryFromJava(native_factory)); 1231 factoryFromJava(native_factory));
1232 if (!native_source) {
1233 return;
1234 }
1445 auto proxy_source = 1235 auto proxy_source =
1446 reinterpret_cast<webrtc::VideoTrackSourceProxy*>(native_source); 1236 reinterpret_cast<webrtc::VideoTrackSourceProxy*>(native_source);
1447 auto source = reinterpret_cast<webrtc::AndroidVideoTrackSource*>( 1237 auto source = reinterpret_cast<webrtc::AndroidVideoTrackSource*>(
1448 proxy_source->internal()); 1238 proxy_source->internal());
1449 rtc::scoped_refptr<SurfaceTextureHelper> surface_texture_helper = 1239 rtc::scoped_refptr<SurfaceTextureHelper> surface_texture_helper =
1450 source->surface_texture_helper(); 1240 source->surface_texture_helper();
1451 jni->CallVoidMethod( 1241 jni->CallVoidMethod(
1452 j_video_capturer, 1242 j_video_capturer,
1453 GetMethodID(jni, FindClass(jni, "org/webrtc/VideoCapturer"), "initialize", 1243 GetMethodID(jni, FindClass(jni, "org/webrtc/VideoCapturer"), "initialize",
1454 "(Lorg/webrtc/SurfaceTextureHelper;Landroid/content/" 1244 "(Lorg/webrtc/SurfaceTextureHelper;Landroid/content/"
1455 "Context;Lorg/webrtc/VideoCapturer$CapturerObserver;)V"), 1245 "Context;Lorg/webrtc/VideoCapturer$CapturerObserver;)V"),
1456 surface_texture_helper 1246 GetJavaSurfaceTextureHelper(surface_texture_helper),
1457 ? surface_texture_helper->GetJavaSurfaceTextureHelper()
1458 : nullptr,
1459 j_application_context, j_frame_observer); 1247 j_application_context, j_frame_observer);
1460 CHECK_EXCEPTION(jni) << "error during VideoCapturer.initialize()"; 1248 CHECK_EXCEPTION(jni) << "error during VideoCapturer.initialize()";
1461 } 1249 }
1462 1250
1463 JOW(jlong, PeerConnectionFactory_nativeCreateVideoTrack)(
1464 JNIEnv* jni, jclass, jlong native_factory, jstring id,
1465 jlong native_source) {
1466 rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
1467 factoryFromJava(native_factory));
1468 rtc::scoped_refptr<VideoTrackInterface> track(factory->CreateVideoTrack(
1469 JavaToStdString(jni, id),
1470 reinterpret_cast<VideoTrackSourceInterface*>(native_source)));
1471 return (jlong)track.release();
1472 }
1473
1474 JOW(jlong, PeerConnectionFactory_nativeCreateAudioSource)( 1251 JOW(jlong, PeerConnectionFactory_nativeCreateAudioSource)(
1475 JNIEnv* jni, jclass, jlong native_factory, jobject j_constraints) { 1252 JNIEnv* jni, jclass, jlong native_factory, jobject j_constraints) {
1476 std::unique_ptr<ConstraintsWrapper> constraints( 1253 std::unique_ptr<ConstraintsWrapper> constraints(
1477 new ConstraintsWrapper(jni, j_constraints)); 1254 new ConstraintsWrapper(jni, j_constraints));
1478 rtc::scoped_refptr<PeerConnectionFactoryInterface> factory( 1255 rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
1479 factoryFromJava(native_factory)); 1256 factoryFromJava(native_factory));
1480 cricket::AudioOptions options; 1257 cricket::AudioOptions options;
1481 CopyConstraintsIntoAudioOptions(constraints.get(), &options); 1258 CopyConstraintsIntoAudioOptions(constraints.get(), &options);
1482 rtc::scoped_refptr<AudioSourceInterface> source( 1259 rtc::scoped_refptr<AudioSourceInterface> source(
1483 factory->CreateAudioSource(options)); 1260 factory->CreateAudioSource(options));
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
1522 OwnedFactoryAndThreads* owner = 1299 OwnedFactoryAndThreads* owner =
1523 reinterpret_cast<OwnedFactoryAndThreads*>(native_factory); 1300 reinterpret_cast<OwnedFactoryAndThreads*>(native_factory);
1524 if (owner->network_monitor_factory()) { 1301 if (owner->network_monitor_factory()) {
1525 rtc::NetworkMonitorFactory::ReleaseFactory( 1302 rtc::NetworkMonitorFactory::ReleaseFactory(
1526 owner->network_monitor_factory()); 1303 owner->network_monitor_factory());
1527 owner->clear_network_monitor_factory(); 1304 owner->clear_network_monitor_factory();
1528 } 1305 }
1529 } 1306 }
1530 } 1307 }
1531 1308
1532 JOW(void, PeerConnectionFactory_nativeSetVideoHwAccelerationOptions)(
1533 JNIEnv* jni, jclass, jlong native_factory, jobject local_egl_context,
1534 jobject remote_egl_context) {
1535 OwnedFactoryAndThreads* owned_factory =
1536 reinterpret_cast<OwnedFactoryAndThreads*>(native_factory);
1537
1538 jclass j_eglbase14_context_class =
1539 FindClass(jni, "org/webrtc/EglBase14$Context");
1540
1541 MediaCodecVideoEncoderFactory* encoder_factory =
1542 static_cast<MediaCodecVideoEncoderFactory*>
1543 (owned_factory->encoder_factory());
1544 if (encoder_factory &&
1545 jni->IsInstanceOf(local_egl_context, j_eglbase14_context_class)) {
1546 LOG(LS_INFO) << "Set EGL context for HW encoding.";
1547 encoder_factory->SetEGLContext(jni, local_egl_context);
1548 }
1549
1550 MediaCodecVideoDecoderFactory* decoder_factory =
1551 static_cast<MediaCodecVideoDecoderFactory*>
1552 (owned_factory->decoder_factory());
1553 if (decoder_factory) {
1554 LOG(LS_INFO) << "Set EGL context for HW decoding.";
1555 decoder_factory->SetEGLContext(jni, remote_egl_context);
1556 }
1557 }
1558
1559 static PeerConnectionInterface::IceTransportsType 1309 static PeerConnectionInterface::IceTransportsType
1560 JavaIceTransportsTypeToNativeType(JNIEnv* jni, jobject j_ice_transports_type) { 1310 JavaIceTransportsTypeToNativeType(JNIEnv* jni, jobject j_ice_transports_type) {
1561 std::string enum_name = GetJavaEnumName( 1311 std::string enum_name = GetJavaEnumName(
1562 jni, "org/webrtc/PeerConnection$IceTransportsType", 1312 jni, "org/webrtc/PeerConnection$IceTransportsType",
1563 j_ice_transports_type); 1313 j_ice_transports_type);
1564 1314
1565 if (enum_name == "ALL") 1315 if (enum_name == "ALL")
1566 return PeerConnectionInterface::kAll; 1316 return PeerConnectionInterface::kAll;
1567 1317
1568 if (enum_name == "RELAY") 1318 if (enum_name == "RELAY")
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after
2180 ExtractNativePC(jni, j_pc)->Close(); 1930 ExtractNativePC(jni, j_pc)->Close();
2181 return; 1931 return;
2182 } 1932 }
2183 1933
2184 JOW(jobject, MediaSource_nativeState)(JNIEnv* jni, jclass, jlong j_p) { 1934 JOW(jobject, MediaSource_nativeState)(JNIEnv* jni, jclass, jlong j_p) {
2185 rtc::scoped_refptr<MediaSourceInterface> p( 1935 rtc::scoped_refptr<MediaSourceInterface> p(
2186 reinterpret_cast<MediaSourceInterface*>(j_p)); 1936 reinterpret_cast<MediaSourceInterface*>(j_p));
2187 return JavaEnumFromIndex(jni, "MediaSource$State", p->state()); 1937 return JavaEnumFromIndex(jni, "MediaSource$State", p->state());
2188 } 1938 }
2189 1939
2190 JOW(jlong, VideoRenderer_nativeWrapVideoRenderer)(
2191 JNIEnv* jni, jclass, jobject j_callbacks) {
2192 std::unique_ptr<JavaVideoRendererWrapper> renderer(
2193 new JavaVideoRendererWrapper(jni, j_callbacks));
2194 return (jlong)renderer.release();
2195 }
2196
2197 JOW(void, VideoRenderer_nativeCopyPlane)(
2198 JNIEnv *jni, jclass, jobject j_src_buffer, jint width, jint height,
2199 jint src_stride, jobject j_dst_buffer, jint dst_stride) {
2200 size_t src_size = jni->GetDirectBufferCapacity(j_src_buffer);
2201 size_t dst_size = jni->GetDirectBufferCapacity(j_dst_buffer);
2202 RTC_CHECK(src_stride >= width) << "Wrong source stride " << src_stride;
2203 RTC_CHECK(dst_stride >= width) << "Wrong destination stride " << dst_stride;
2204 RTC_CHECK(src_size >= src_stride * height)
2205 << "Insufficient source buffer capacity " << src_size;
2206 RTC_CHECK(dst_size >= dst_stride * height)
2207 << "Insufficient destination buffer capacity " << dst_size;
2208 uint8_t *src =
2209 reinterpret_cast<uint8_t*>(jni->GetDirectBufferAddress(j_src_buffer));
2210 uint8_t *dst =
2211 reinterpret_cast<uint8_t*>(jni->GetDirectBufferAddress(j_dst_buffer));
2212 if (src_stride == dst_stride) {
2213 memcpy(dst, src, src_stride * height);
2214 } else {
2215 for (int i = 0; i < height; i++) {
2216 memcpy(dst, src, width);
2217 src += src_stride;
2218 dst += dst_stride;
2219 }
2220 }
2221 }
2222
2223 JOW(void, FileVideoCapturer_nativeI420ToNV21)( 1940 JOW(void, FileVideoCapturer_nativeI420ToNV21)(
2224 JNIEnv *jni, jclass, jbyteArray j_src_buffer, jint width, jint height, 1941 JNIEnv *jni, jclass, jbyteArray j_src_buffer, jint width, jint height,
2225 jbyteArray j_dst_buffer) { 1942 jbyteArray j_dst_buffer) {
2226 size_t src_size = jni->GetArrayLength(j_src_buffer); 1943 size_t src_size = jni->GetArrayLength(j_src_buffer);
2227 size_t dst_size = jni->GetArrayLength(j_dst_buffer); 1944 size_t dst_size = jni->GetArrayLength(j_dst_buffer);
2228 int src_stride = width; 1945 int src_stride = width;
2229 int dst_stride = width; 1946 int dst_stride = width;
2230 RTC_CHECK_GE(src_size, src_stride * height * 3 / 2); 1947 RTC_CHECK_GE(src_size, src_stride * height * 3 / 2);
2231 RTC_CHECK_GE(dst_size, dst_stride * height * 3 / 2); 1948 RTC_CHECK_GE(dst_size, dst_stride * height * 3 / 2);
2232 1949
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
2744 return reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer) 2461 return reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)
2745 ->inter_tone_gap(); 2462 ->inter_tone_gap();
2746 } 2463 }
2747 2464
2748 JOW(void, DtmfSender_free) 2465 JOW(void, DtmfSender_free)
2749 (JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) { 2466 (JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) {
2750 reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)->Release(); 2467 reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)->Release();
2751 } 2468 }
2752 2469
2753 } // namespace webrtc_jni 2470 } // namespace webrtc_jni
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698