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

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

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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 30 matching lines...) Expand all
41 41
42 #include <limits> 42 #include <limits>
43 #include <memory> 43 #include <memory>
44 #include <utility> 44 #include <utility>
45 45
46 #include "webrtc/api/mediaconstraintsinterface.h" 46 #include "webrtc/api/mediaconstraintsinterface.h"
47 #include "webrtc/api/peerconnectioninterface.h" 47 #include "webrtc/api/peerconnectioninterface.h"
48 #include "webrtc/api/rtpreceiverinterface.h" 48 #include "webrtc/api/rtpreceiverinterface.h"
49 #include "webrtc/api/rtpsenderinterface.h" 49 #include "webrtc/api/rtpsenderinterface.h"
50 #include "webrtc/api/videosourceproxy.h" 50 #include "webrtc/api/videosourceproxy.h"
51 #include "webrtc/base/bind.h"
52 #include "webrtc/base/checks.h"
53 #include "webrtc/base/event_tracer.h"
54 #include "webrtc/base/logging.h"
55 #include "webrtc/base/logsinks.h"
56 #include "webrtc/base/messagequeue.h"
57 #include "webrtc/base/networkmonitor.h"
58 #include "webrtc/base/rtccertificategenerator.h"
59 #include "webrtc/base/ssladapter.h"
60 #include "webrtc/base/stringutils.h"
61 #include "webrtc/media/base/mediaengine.h" 51 #include "webrtc/media/base/mediaengine.h"
62 #include "webrtc/media/base/videocapturer.h" 52 #include "webrtc/media/base/videocapturer.h"
63 #include "webrtc/modules/utility/include/jvm_android.h" 53 #include "webrtc/modules/utility/include/jvm_android.h"
64 #include "webrtc/pc/webrtcsdp.h" 54 #include "webrtc/pc/webrtcsdp.h"
55 #include "webrtc/rtc_base/bind.h"
56 #include "webrtc/rtc_base/checks.h"
57 #include "webrtc/rtc_base/event_tracer.h"
58 #include "webrtc/rtc_base/logging.h"
59 #include "webrtc/rtc_base/logsinks.h"
60 #include "webrtc/rtc_base/messagequeue.h"
61 #include "webrtc/rtc_base/networkmonitor.h"
62 #include "webrtc/rtc_base/rtccertificategenerator.h"
63 #include "webrtc/rtc_base/ssladapter.h"
64 #include "webrtc/rtc_base/stringutils.h"
65 #include "webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h" 65 #include "webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h"
66 // Adding 'nogncheck' to disable the gn include headers check. 66 // Adding 'nogncheck' to disable the gn include headers check.
67 // We don't want to always depend on audio and video related targets. 67 // We don't want to always depend on audio and video related targets.
68 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h" // nogncheck 68 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h" // nogncheck
69 #include "webrtc/sdk/android/src/jni/audio_jni.h" 69 #include "webrtc/sdk/android/src/jni/audio_jni.h"
70 #include "webrtc/sdk/android/src/jni/classreferenceholder.h" 70 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
71 #include "webrtc/sdk/android/src/jni/jni_helpers.h" 71 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
72 #include "webrtc/sdk/android/src/jni/media_jni.h" 72 #include "webrtc/sdk/android/src/jni/media_jni.h"
73 #include "webrtc/sdk/android/src/jni/ownedfactoryandthreads.h" 73 #include "webrtc/sdk/android/src/jni/ownedfactoryandthreads.h"
74 #include "webrtc/sdk/android/src/jni/rtcstatscollectorcallbackwrapper.h" 74 #include "webrtc/sdk/android/src/jni/rtcstatscollectorcallbackwrapper.h"
(...skipping 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after
1123 1123
1124 JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnectionFactory) 1124 JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnectionFactory)
1125 (JNIEnv* jni, 1125 (JNIEnv* jni,
1126 jclass, 1126 jclass,
1127 jobject joptions, 1127 jobject joptions,
1128 jobject jencoder_factory, 1128 jobject jencoder_factory,
1129 jobject jdecoder_factory) { 1129 jobject jdecoder_factory) {
1130 // talk/ assumes pretty widely that the current Thread is ThreadManager'd, but 1130 // talk/ assumes pretty widely that the current Thread is ThreadManager'd, but
1131 // ThreadManager only WrapCurrentThread()s the thread where it is first 1131 // ThreadManager only WrapCurrentThread()s the thread where it is first
1132 // created. Since the semantics around when auto-wrapping happens in 1132 // created. Since the semantics around when auto-wrapping happens in
1133 // webrtc/base/ are convoluted, we simply wrap here to avoid having to think 1133 // webrtc/rtc_base/ are convoluted, we simply wrap here to avoid having to
1134 // about ramifications of auto-wrapping there. 1134 // think about ramifications of auto-wrapping there.
1135 rtc::ThreadManager::Instance()->WrapCurrentThread(); 1135 rtc::ThreadManager::Instance()->WrapCurrentThread();
1136 webrtc::Trace::CreateTrace(); 1136 webrtc::Trace::CreateTrace();
1137 1137
1138 std::unique_ptr<Thread> network_thread = 1138 std::unique_ptr<Thread> network_thread =
1139 rtc::Thread::CreateWithSocketServer(); 1139 rtc::Thread::CreateWithSocketServer();
1140 network_thread->SetName("network_thread", nullptr); 1140 network_thread->SetName("network_thread", nullptr);
1141 RTC_CHECK(network_thread->Start()) << "Failed to start thread"; 1141 RTC_CHECK(network_thread->Start()) << "Failed to start thread";
1142 1142
1143 std::unique_ptr<Thread> worker_thread = rtc::Thread::Create(); 1143 std::unique_ptr<Thread> worker_thread = rtc::Thread::Create();
1144 worker_thread->SetName("worker_thread", nullptr); 1144 worker_thread->SetName("worker_thread", nullptr);
(...skipping 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after
2336 return reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer) 2336 return reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)
2337 ->inter_tone_gap(); 2337 ->inter_tone_gap();
2338 } 2338 }
2339 2339
2340 JOW(void, DtmfSender_free) 2340 JOW(void, DtmfSender_free)
2341 (JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) { 2341 (JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) {
2342 reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)->Release(); 2342 reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)->Release();
2343 } 2343 }
2344 2344
2345 } // namespace webrtc_jni 2345 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc ('k') | webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698