| 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 #include "webrtc/base/logging.h" | 62 #include "webrtc/base/logging.h" |
| 63 #include "webrtc/base/logsinks.h" | 63 #include "webrtc/base/logsinks.h" |
| 64 #include "webrtc/base/messagequeue.h" | 64 #include "webrtc/base/messagequeue.h" |
| 65 #include "webrtc/base/networkmonitor.h" | 65 #include "webrtc/base/networkmonitor.h" |
| 66 #include "webrtc/base/ssladapter.h" | 66 #include "webrtc/base/ssladapter.h" |
| 67 #include "webrtc/base/stringutils.h" | 67 #include "webrtc/base/stringutils.h" |
| 68 #include "webrtc/media/base/videocapturer.h" | 68 #include "webrtc/media/base/videocapturer.h" |
| 69 #include "webrtc/media/devices/videorendererfactory.h" | 69 #include "webrtc/media/devices/videorendererfactory.h" |
| 70 #include "webrtc/media/engine/webrtcvideodecoderfactory.h" | 70 #include "webrtc/media/engine/webrtcvideodecoderfactory.h" |
| 71 #include "webrtc/media/engine/webrtcvideoencoderfactory.h" | 71 #include "webrtc/media/engine/webrtcvideoencoderfactory.h" |
| 72 #include "webrtc/modules/video_render/video_render_internal.h" |
| 72 #include "webrtc/system_wrappers/include/field_trial_default.h" | 73 #include "webrtc/system_wrappers/include/field_trial_default.h" |
| 73 #include "webrtc/system_wrappers/include/logcat_trace_context.h" | 74 #include "webrtc/system_wrappers/include/logcat_trace_context.h" |
| 74 #include "webrtc/system_wrappers/include/trace.h" | 75 #include "webrtc/system_wrappers/include/trace.h" |
| 75 #include "webrtc/voice_engine/include/voe_base.h" | 76 #include "webrtc/voice_engine/include/voe_base.h" |
| 76 | 77 |
| 77 using cricket::WebRtcVideoDecoderFactory; | 78 using cricket::WebRtcVideoDecoderFactory; |
| 78 using cricket::WebRtcVideoEncoderFactory; | 79 using cricket::WebRtcVideoEncoderFactory; |
| 79 using rtc::Bind; | 80 using rtc::Bind; |
| 80 using rtc::Thread; | 81 using rtc::Thread; |
| 81 using rtc::ThreadManager; | 82 using rtc::ThreadManager; |
| (...skipping 2124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2206 return JavaStringFromStdString( | 2207 return JavaStringFromStdString( |
| 2207 jni, | 2208 jni, |
| 2208 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); | 2209 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); |
| 2209 } | 2210 } |
| 2210 | 2211 |
| 2211 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { | 2212 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { |
| 2212 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); | 2213 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); |
| 2213 } | 2214 } |
| 2214 | 2215 |
| 2215 } // namespace webrtc_jni | 2216 } // namespace webrtc_jni |
| OLD | NEW |