| OLD | NEW |
| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 // return to the Java frame that called code in this file, at which point it's | 52 // return to the Java frame that called code in this file, at which point it's |
| 53 // impossible to tell which JNI call broke). | 53 // impossible to tell which JNI call broke). |
| 54 | 54 |
| 55 #include <jni.h> | 55 #include <jni.h> |
| 56 #undef JNIEXPORT | 56 #undef JNIEXPORT |
| 57 #define JNIEXPORT __attribute__((visibility("default"))) | 57 #define JNIEXPORT __attribute__((visibility("default"))) |
| 58 | 58 |
| 59 #include <limits> | 59 #include <limits> |
| 60 #include <utility> | 60 #include <utility> |
| 61 | 61 |
| 62 #include "talk/app/webrtc/androidvideocapturer.h" | 62 #include "webrtc/api/androidvideocapturer.h" |
| 63 #include "talk/app/webrtc/dtlsidentitystore.h" | 63 #include "webrtc/api/dtlsidentitystore.h" |
| 64 #include "talk/app/webrtc/java/jni/androidmediadecoder_jni.h" | 64 #include "webrtc/api/java/jni/androidmediadecoder_jni.h" |
| 65 #include "talk/app/webrtc/java/jni/androidmediaencoder_jni.h" | 65 #include "webrtc/api/java/jni/androidmediaencoder_jni.h" |
| 66 #include "talk/app/webrtc/java/jni/androidvideocapturer_jni.h" | 66 #include "webrtc/api/java/jni/androidnetworkmonitor_jni.h" |
| 67 #include "talk/app/webrtc/java/jni/androidnetworkmonitor_jni.h" | 67 #include "webrtc/api/java/jni/androidvideocapturer_jni.h" |
| 68 #include "talk/app/webrtc/java/jni/classreferenceholder.h" | 68 #include "webrtc/api/java/jni/classreferenceholder.h" |
| 69 #include "talk/app/webrtc/java/jni/jni_helpers.h" | 69 #include "webrtc/api/java/jni/jni_helpers.h" |
| 70 #include "talk/app/webrtc/java/jni/native_handle_impl.h" | 70 #include "webrtc/api/java/jni/native_handle_impl.h" |
| 71 #include "talk/app/webrtc/mediaconstraintsinterface.h" | 71 #include "webrtc/api/mediaconstraintsinterface.h" |
| 72 #include "talk/app/webrtc/peerconnectioninterface.h" | 72 #include "webrtc/api/peerconnectioninterface.h" |
| 73 #include "talk/app/webrtc/rtpreceiverinterface.h" | 73 #include "webrtc/api/rtpreceiverinterface.h" |
| 74 #include "talk/app/webrtc/rtpsenderinterface.h" | 74 #include "webrtc/api/rtpsenderinterface.h" |
| 75 #include "talk/app/webrtc/videosourceinterface.h" | 75 #include "webrtc/api/videosourceinterface.h" |
| 76 #include "webrtc/base/bind.h" | 76 #include "webrtc/base/bind.h" |
| 77 #include "webrtc/base/checks.h" | 77 #include "webrtc/base/checks.h" |
| 78 #include "webrtc/base/event_tracer.h" | 78 #include "webrtc/base/event_tracer.h" |
| 79 #include "webrtc/base/logging.h" | 79 #include "webrtc/base/logging.h" |
| 80 #include "webrtc/base/logsinks.h" | 80 #include "webrtc/base/logsinks.h" |
| 81 #include "webrtc/base/messagequeue.h" | 81 #include "webrtc/base/messagequeue.h" |
| 82 #include "webrtc/base/networkmonitor.h" | 82 #include "webrtc/base/networkmonitor.h" |
| 83 #include "webrtc/base/ssladapter.h" | 83 #include "webrtc/base/ssladapter.h" |
| 84 #include "webrtc/base/stringutils.h" | 84 #include "webrtc/base/stringutils.h" |
| 85 #include "webrtc/media/base/videocapturer.h" | 85 #include "webrtc/media/base/videocapturer.h" |
| 86 #include "webrtc/media/base/videorenderer.h" | 86 #include "webrtc/media/base/videorenderer.h" |
| 87 #include "webrtc/media/devices/videorendererfactory.h" | 87 #include "webrtc/media/devices/videorendererfactory.h" |
| 88 #include "webrtc/media/webrtc/webrtcvideodecoderfactory.h" | 88 #include "webrtc/media/webrtc/webrtcvideodecoderfactory.h" |
| 89 #include "webrtc/media/webrtc/webrtcvideoencoderfactory.h" | 89 #include "webrtc/media/webrtc/webrtcvideoencoderfactory.h" |
| 90 #include "webrtc/modules/video_render/video_render_internal.h" |
| 90 #include "webrtc/system_wrappers/include/field_trial_default.h" | 91 #include "webrtc/system_wrappers/include/field_trial_default.h" |
| 91 #include "webrtc/system_wrappers/include/logcat_trace_context.h" | 92 #include "webrtc/system_wrappers/include/logcat_trace_context.h" |
| 92 #include "webrtc/system_wrappers/include/trace.h" | 93 #include "webrtc/system_wrappers/include/trace.h" |
| 93 #include "webrtc/voice_engine/include/voe_base.h" | 94 #include "webrtc/voice_engine/include/voe_base.h" |
| 94 | 95 |
| 95 using cricket::WebRtcVideoDecoderFactory; | 96 using cricket::WebRtcVideoDecoderFactory; |
| 96 using cricket::WebRtcVideoEncoderFactory; | 97 using cricket::WebRtcVideoEncoderFactory; |
| 97 using rtc::Bind; | 98 using rtc::Bind; |
| 98 using rtc::Thread; | 99 using rtc::Thread; |
| 99 using rtc::ThreadManager; | 100 using rtc::ThreadManager; |
| (...skipping 1948 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2048 return JavaStringFromStdString( | 2049 return JavaStringFromStdString( |
| 2049 jni, | 2050 jni, |
| 2050 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); | 2051 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); |
| 2051 } | 2052 } |
| 2052 | 2053 |
| 2053 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { | 2054 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { |
| 2054 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); | 2055 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); |
| 2055 } | 2056 } |
| 2056 | 2057 |
| 2057 } // namespace webrtc_jni | 2058 } // namespace webrtc_jni |
| OLD | NEW |