| OLD | NEW |
| 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 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 enum { kVoiceEngineMaxMinPlayoutDelayMs = 10000 }; | 57 enum { kVoiceEngineMaxMinPlayoutDelayMs = 10000 }; |
| 58 | 58 |
| 59 // RTP/RTCP | 59 // RTP/RTCP |
| 60 // Min 4-bit ID for RTP extension (see section 4.2 in RFC 5285) | 60 // Min 4-bit ID for RTP extension (see section 4.2 in RFC 5285) |
| 61 enum { kVoiceEngineMinRtpExtensionId = 1 }; | 61 enum { kVoiceEngineMinRtpExtensionId = 1 }; |
| 62 // Max 4-bit ID for RTP extension | 62 // Max 4-bit ID for RTP extension |
| 63 enum { kVoiceEngineMaxRtpExtensionId = 14 }; | 63 enum { kVoiceEngineMaxRtpExtensionId = 14 }; |
| 64 | 64 |
| 65 } // namespace webrtc | 65 } // namespace webrtc |
| 66 | 66 |
| 67 #define NOT_SUPPORTED(stat) \ | |
| 68 LOG_F(LS_ERROR) << "not supported"; \ | |
| 69 stat.SetLastError(VE_FUNC_NOT_SUPPORTED); \ | |
| 70 return -1; | |
| 71 | |
| 72 namespace webrtc { | 67 namespace webrtc { |
| 73 | 68 |
| 74 inline int VoEId(int veId, int chId) { | 69 inline int VoEId(int veId, int chId) { |
| 75 if (chId == -1) { | 70 if (chId == -1) { |
| 76 const int dummyChannel(99); | 71 const int dummyChannel(99); |
| 77 return (int)((veId << 16) + dummyChannel); | 72 return (int)((veId << 16) + dummyChannel); |
| 78 } | 73 } |
| 79 return (int)((veId << 16) + chId); | 74 return (int)((veId << 16) + chId); |
| 80 } | 75 } |
| 81 | 76 |
| 82 inline int VoEModuleId(int veId, int chId) { | 77 inline int VoEModuleId(int veId, int chId) { |
| 83 return (int)((veId << 16) + chId); | 78 return (int)((veId << 16) + chId); |
| 84 } | 79 } |
| 85 | 80 |
| 86 // Convert module ID to internal VoE channel ID | 81 // Convert module ID to internal VoE channel ID |
| 87 inline int VoEChannelId(int moduleId) { | 82 inline int VoEChannelId(int moduleId) { |
| 88 return (int)(moduleId & 0xffff); | 83 return (int)(moduleId & 0xffff); |
| 89 } | 84 } |
| 90 | 85 |
| 91 } // namespace webrtc | 86 } // namespace webrtc |
| 92 | 87 |
| 93 #if defined(_WIN32) | 88 #if defined(_WIN32) |
| 94 #define WEBRTC_VOICE_ENGINE_DEFAULT_DEVICE \ | 89 #define WEBRTC_VOICE_ENGINE_DEFAULT_DEVICE \ |
| 95 AudioDeviceModule::kDefaultCommunicationDevice | 90 AudioDeviceModule::kDefaultCommunicationDevice |
| 96 #else | 91 #else |
| 97 #define WEBRTC_VOICE_ENGINE_DEFAULT_DEVICE 0 | 92 #define WEBRTC_VOICE_ENGINE_DEFAULT_DEVICE 0 |
| 98 #endif // #if (defined(_WIN32) | 93 #endif // #if (defined(_WIN32) |
| 99 | 94 |
| 100 #endif // VOICE_ENGINE_VOICE_ENGINE_DEFINES_H_ | 95 #endif // VOICE_ENGINE_VOICE_ENGINE_DEFINES_H_ |
| OLD | NEW |