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

Side by Side Diff: talk/app/webrtc/java/jni/peerconnection_jni.cc

Issue 1413333002: system_wrappers: rename interface -> include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased again! Created 5 years, 1 month 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
« no previous file with comments | « talk/app/webrtc/java/jni/androidmediaencoder_jni.cc ('k') | talk/app/webrtc/peerconnection.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 #include "talk/media/webrtc/webrtcvideodecoderfactory.h" 73 #include "talk/media/webrtc/webrtcvideodecoderfactory.h"
74 #include "talk/media/webrtc/webrtcvideoencoderfactory.h" 74 #include "talk/media/webrtc/webrtcvideoencoderfactory.h"
75 #include "webrtc/base/bind.h" 75 #include "webrtc/base/bind.h"
76 #include "webrtc/base/checks.h" 76 #include "webrtc/base/checks.h"
77 #include "webrtc/base/logging.h" 77 #include "webrtc/base/logging.h"
78 #include "webrtc/base/logsinks.h" 78 #include "webrtc/base/logsinks.h"
79 #include "webrtc/base/networkmonitor.h" 79 #include "webrtc/base/networkmonitor.h"
80 #include "webrtc/base/messagequeue.h" 80 #include "webrtc/base/messagequeue.h"
81 #include "webrtc/base/ssladapter.h" 81 #include "webrtc/base/ssladapter.h"
82 #include "webrtc/base/stringutils.h" 82 #include "webrtc/base/stringutils.h"
83 #include "webrtc/system_wrappers/interface/field_trial_default.h" 83 #include "webrtc/system_wrappers/include/field_trial_default.h"
84 #include "webrtc/system_wrappers/interface/trace.h" 84 #include "webrtc/system_wrappers/include/trace.h"
85 #include "webrtc/voice_engine/include/voe_base.h" 85 #include "webrtc/voice_engine/include/voe_base.h"
86 86
87 #if defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD) 87 #if defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD)
88 #include "talk/app/webrtc/androidvideocapturer.h" 88 #include "talk/app/webrtc/androidvideocapturer.h"
89 #include "talk/app/webrtc/java/jni/androidmediadecoder_jni.h" 89 #include "talk/app/webrtc/java/jni/androidmediadecoder_jni.h"
90 #include "talk/app/webrtc/java/jni/androidmediaencoder_jni.h" 90 #include "talk/app/webrtc/java/jni/androidmediaencoder_jni.h"
91 #include "talk/app/webrtc/java/jni/androidvideocapturer_jni.h" 91 #include "talk/app/webrtc/java/jni/androidvideocapturer_jni.h"
92 #include "talk/app/webrtc/java/jni/androidnetworkmonitor_jni.h" 92 #include "talk/app/webrtc/java/jni/androidnetworkmonitor_jni.h"
93 #include "webrtc/modules/video_render/video_render_internal.h" 93 #include "webrtc/modules/video_render/video_render_internal.h"
94 #include "webrtc/system_wrappers/interface/logcat_trace_context.h" 94 #include "webrtc/system_wrappers/include/logcat_trace_context.h"
95 using webrtc::LogcatTraceContext; 95 using webrtc::LogcatTraceContext;
96 #endif 96 #endif
97 97
98 using cricket::WebRtcVideoDecoderFactory; 98 using cricket::WebRtcVideoDecoderFactory;
99 using cricket::WebRtcVideoEncoderFactory; 99 using cricket::WebRtcVideoEncoderFactory;
100 using rtc::Bind; 100 using rtc::Bind;
101 using rtc::Thread; 101 using rtc::Thread;
102 using rtc::ThreadManager; 102 using rtc::ThreadManager;
103 using rtc::scoped_ptr; 103 using rtc::scoped_ptr;
104 using webrtc::AudioSourceInterface; 104 using webrtc::AudioSourceInterface;
(...skipping 1941 matching lines...) Expand 10 before | Expand all | Expand 10 after
2046 return JavaStringFromStdString( 2046 return JavaStringFromStdString(
2047 jni, 2047 jni,
2048 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); 2048 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id());
2049 } 2049 }
2050 2050
2051 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { 2051 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) {
2052 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); 2052 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release();
2053 } 2053 }
2054 2054
2055 } // namespace webrtc_jni 2055 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « talk/app/webrtc/java/jni/androidmediaencoder_jni.cc ('k') | talk/app/webrtc/peerconnection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698