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

Side by Side Diff: webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.cc

Issue 2319583005: Moved webrtc/test/channel_transport/ into webrtc/voice_engine/test/ (Closed)
Patch Set: build error on win_x64 Created 4 years, 3 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 (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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
11 #include "webrtc/test/channel_transport/udp_socket_wrapper.h" 11 #include "webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.h"
12 12
13 #include <stdlib.h> 13 #include <stdlib.h>
14 #include <string.h> 14 #include <string.h>
15 15
16 #include "webrtc/system_wrappers/include/event_wrapper.h" 16 #include "webrtc/system_wrappers/include/event_wrapper.h"
17 #include "webrtc/system_wrappers/include/trace.h" 17 #include "webrtc/system_wrappers/include/trace.h"
18 #include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h" 18 #include "webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper. h"
19 19
20 #if defined(_WIN32) 20 #if defined(_WIN32)
21 #include "webrtc/test/channel_transport/udp_socket2_win.h" 21 #include "webrtc/voice_engine/test/channel_transport/udp_socket2_win.h"
22 #else 22 #else
23 #include "webrtc/test/channel_transport/udp_socket_posix.h" 23 #include "webrtc/voice_engine/test/channel_transport/udp_socket_posix.h"
24 #endif 24 #endif
25 25
26 26
27 namespace webrtc { 27 namespace webrtc {
28 namespace test { 28 namespace test {
29 29
30 bool UdpSocketWrapper::_initiated = false; 30 bool UdpSocketWrapper::_initiated = false;
31 31
32 // Temporary Android hack. The value 1024 is taken from 32 // Temporary Android hack. The value 1024 is taken from
33 // <ndk>/build/platforms/android-1.5/arch-arm/usr/include/linux/posix_types.h 33 // <ndk>/build/platforms/android-1.5/arch-arm/usr/include/linux/posix_types.h
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 _wantsIncoming = false; 150 _wantsIncoming = false;
151 return true; 151 return true;
152 } 152 }
153 153
154 int32_t UdpSocketWrapper::SetPCP(const int32_t /*pcp*/) { return -1; } 154 int32_t UdpSocketWrapper::SetPCP(const int32_t /*pcp*/) { return -1; }
155 155
156 uint32_t UdpSocketWrapper::ReceiveBuffers() { return 0; } 156 uint32_t UdpSocketWrapper::ReceiveBuffers() { return 0; }
157 157
158 } // namespace test 158 } // namespace test
159 } // namespace webrtc 159 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698