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

Side by Side Diff: webrtc/api/java/jni/peerconnection_jni.cc

Issue 1684163002: Rename webrtc/media/webrtc -> webrtc/media/engine (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase f396f6085f9e4f16f37471a7828e3e31308c0d52 #11590 Created 4 years, 10 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
« no previous file with comments | « webrtc/api/java/jni/androidmediaencoder_jni.h ('k') | webrtc/api/peerconnection_unittest.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 * 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 #include "webrtc/base/event_tracer.h" 61 #include "webrtc/base/event_tracer.h"
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/base/videorenderer.h" 69 #include "webrtc/media/base/videorenderer.h"
70 #include "webrtc/media/devices/videorendererfactory.h" 70 #include "webrtc/media/devices/videorendererfactory.h"
71 #include "webrtc/media/webrtc/webrtcvideodecoderfactory.h" 71 #include "webrtc/media/engine/webrtcvideodecoderfactory.h"
72 #include "webrtc/media/webrtc/webrtcvideoencoderfactory.h" 72 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
73 #include "webrtc/modules/video_render/video_render_internal.h" 73 #include "webrtc/modules/video_render/video_render_internal.h"
74 #include "webrtc/system_wrappers/include/field_trial_default.h" 74 #include "webrtc/system_wrappers/include/field_trial_default.h"
75 #include "webrtc/system_wrappers/include/logcat_trace_context.h" 75 #include "webrtc/system_wrappers/include/logcat_trace_context.h"
76 #include "webrtc/system_wrappers/include/trace.h" 76 #include "webrtc/system_wrappers/include/trace.h"
77 #include "webrtc/voice_engine/include/voe_base.h" 77 #include "webrtc/voice_engine/include/voe_base.h"
78 78
79 using cricket::WebRtcVideoDecoderFactory; 79 using cricket::WebRtcVideoDecoderFactory;
80 using cricket::WebRtcVideoEncoderFactory; 80 using cricket::WebRtcVideoEncoderFactory;
81 using rtc::Bind; 81 using rtc::Bind;
82 using rtc::Thread; 82 using rtc::Thread;
(...skipping 1949 matching lines...) Expand 10 before | Expand all | Expand 10 after
2032 return JavaStringFromStdString( 2032 return JavaStringFromStdString(
2033 jni, 2033 jni,
2034 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); 2034 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id());
2035 } 2035 }
2036 2036
2037 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { 2037 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) {
2038 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); 2038 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release();
2039 } 2039 }
2040 2040
2041 } // namespace webrtc_jni 2041 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « webrtc/api/java/jni/androidmediaencoder_jni.h ('k') | webrtc/api/peerconnection_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698