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

Side by Side Diff: webrtc/voice_engine/voe_rtp_rtcp_impl.cc

Issue 2538093003: Prep to remove API-related #defines from voice_engine_configurations.h (Closed)
Patch Set: Created 4 years 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/voice_engine/voe_neteq_stats_impl.cc ('k') | webrtc/voice_engine/voe_video_sync_impl.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 (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/system_wrappers/include/file_wrapper.h" 11 #include "webrtc/system_wrappers/include/file_wrapper.h"
12 #include "webrtc/system_wrappers/include/trace.h" 12 #include "webrtc/system_wrappers/include/trace.h"
13 #include "webrtc/voice_engine/include/voe_errors.h" 13 #include "webrtc/voice_engine/include/voe_errors.h"
14 #include "webrtc/voice_engine/voe_rtp_rtcp_impl.h" 14 #include "webrtc/voice_engine/voe_rtp_rtcp_impl.h"
15 #include "webrtc/voice_engine/voice_engine_impl.h" 15 #include "webrtc/voice_engine/voice_engine_impl.h"
16 16
17 #include "webrtc/voice_engine/channel.h" 17 #include "webrtc/voice_engine/channel.h"
18 #include "webrtc/voice_engine/transmit_mixer.h" 18 #include "webrtc/voice_engine/transmit_mixer.h"
19 19
20 #ifndef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
21 #error "Deprecated"
22 #endif
23
20 namespace webrtc { 24 namespace webrtc {
21 25
22 VoERTP_RTCP* VoERTP_RTCP::GetInterface(VoiceEngine* voiceEngine) { 26 VoERTP_RTCP* VoERTP_RTCP::GetInterface(VoiceEngine* voiceEngine) {
23 #ifndef WEBRTC_VOICE_ENGINE_RTP_RTCP_API 27 #ifndef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
24 return NULL; 28 return NULL;
25 #else 29 #else
26 if (NULL == voiceEngine) { 30 if (NULL == voiceEngine) {
27 return NULL; 31 return NULL;
28 } 32 }
29 VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine); 33 VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine);
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 "SetNACKStatus() failed to locate channel"); 312 "SetNACKStatus() failed to locate channel");
309 return -1; 313 return -1;
310 } 314 }
311 channelPtr->SetNACKStatus(enable, maxNoPackets); 315 channelPtr->SetNACKStatus(enable, maxNoPackets);
312 return 0; 316 return 0;
313 } 317 }
314 318
315 #endif // #ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API 319 #endif // #ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
316 320
317 } // namespace webrtc 321 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/voe_neteq_stats_impl.cc ('k') | webrtc/voice_engine/voe_video_sync_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698