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

Side by Side Diff: webrtc/voice_engine/test/android/android_test/jni/android_test.cc

Issue 1369263002: Unify Transport and newapi::Transport interfaces. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 2 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) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 133
134 // my_transportation is used when useExtTrans is enabled 134 // my_transportation is used when useExtTrans is enabled
135 class my_transportation : public Transport 135 class my_transportation : public Transport
136 { 136 {
137 public: 137 public:
138 my_transportation(VoENetwork * network) : 138 my_transportation(VoENetwork * network) :
139 netw(network) { 139 netw(network) {
140 } 140 }
141 141
142 int SendPacket(int channel, const void* data, size_t len) override; 142 int SendPacket(int channel, const void* data, size_t len) override;
143 int SendRTCPPacket(int channel, const void* data, size_t len) override; 143 int SendRtcp(int channel, const void* data, size_t len) override;
144 144
145 private: 145 private:
146 VoENetwork * netw; 146 VoENetwork * netw;
147 }; 147 };
148 148
149 int my_transportation::SendPacket(int channel, const void *data, size_t len) 149 int my_transportation::SendPacket(int channel, const void *data, size_t len)
150 { 150 {
151 netw->ReceivedRTPPacket(channel, data, len); 151 netw->ReceivedRTPPacket(channel, data, len);
152 return len; 152 return len;
153 } 153 }
154 154
155 int my_transportation::SendRTCPPacket(int channel, const void *data, size_t len) 155 int my_transportation::SendRtcp(int channel, const void *data, size_t len)
156 { 156 {
157 netw->ReceivedRTCPPacket(channel, data, len); 157 netw->ReceivedRTCPPacket(channel, data, len);
158 return len; 158 return len;
159 } 159 }
160 160
161 //Global variables visible in this file 161 //Global variables visible in this file
162 static VoiceEngineData veData1; 162 static VoiceEngineData veData1;
163 static VoiceEngineData veData2; 163 static VoiceEngineData veData2;
164 164
165 // "Local" functions (i.e. not Java accessible) 165 // "Local" functions (i.e. not Java accessible)
(...skipping 1156 matching lines...) Expand 10 before | Expand all | Expand 10 after
1322 releaseOK = false; 1322 releaseOK = false;
1323 } 1323 }
1324 else 1324 else
1325 { 1325 {
1326 veData.rtp_rtcp = NULL; 1326 veData.rtp_rtcp = NULL;
1327 } 1327 }
1328 } 1328 }
1329 1329
1330 return releaseOK; 1330 return releaseOK;
1331 } 1331 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698