diff options
author | Jelena Marusic <jmarusic@webrtc.org> | 2015-05-04 14:15:32 +0200 |
---|---|---|
committer | Jelena Marusic <jmarusic@webrtc.org> | 2015-05-04 12:15:41 +0000 |
commit | 0d266054acece70259fc1e85026194154f41e5a0 (patch) | |
tree | c27985905cc4793b382f31218b3e3bf8c0a6de7b /webrtc/voice_engine/voice_engine_defines.h | |
parent | 79c143312b78a790818242bd468002b0f7a0315e (diff) | |
download | webrtc-0d266054acece70259fc1e85026194154f41e5a0.tar.gz |
VoE: apply new style guide on VoE interfaces and their implementations
Changes:
1. Ran clang-format on VoE interfaces and their implementations.
2. Replaced virtual with override in derived classes.
R=henrika@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/49239004
Cr-Commit-Position: refs/heads/master@{#9130}
Diffstat (limited to 'webrtc/voice_engine/voice_engine_defines.h')
-rw-r--r-- | webrtc/voice_engine/voice_engine_defines.h | 127 |
1 files changed, 62 insertions, 65 deletions
diff --git a/webrtc/voice_engine/voice_engine_defines.h b/webrtc/voice_engine/voice_engine_defines.h index cde9470a78..5fd8120ec3 100644 --- a/webrtc/voice_engine/voice_engine_defines.h +++ b/webrtc/voice_engine/voice_engine_defines.h @@ -44,17 +44,17 @@ const float kMinOutputVolumePanning = 0.0f; const float kMaxOutputVolumePanning = 1.0f; // DTMF -enum { kMinDtmfEventCode = 0 }; // DTMF digit "0" -enum { kMaxDtmfEventCode = 15 }; // DTMF digit "D" -enum { kMinTelephoneEventCode = 0 }; // RFC4733 (Section 2.3.1) -enum { kMaxTelephoneEventCode = 255 }; // RFC4733 (Section 2.3.1) +enum { kMinDtmfEventCode = 0 }; // DTMF digit "0" +enum { kMaxDtmfEventCode = 15 }; // DTMF digit "D" +enum { kMinTelephoneEventCode = 0 }; // RFC4733 (Section 2.3.1) +enum { kMaxTelephoneEventCode = 255 }; // RFC4733 (Section 2.3.1) enum { kMinTelephoneEventDuration = 100 }; -enum { kMaxTelephoneEventDuration = 60000 }; // Actual limit is 2^16 -enum { kMinTelephoneEventAttenuation = 0 }; // 0 dBm0 -enum { kMaxTelephoneEventAttenuation = 36 }; // -36 dBm0 -enum { kMinTelephoneEventSeparationMs = 100 }; // Min delta time between two - // telephone events -enum { kVoiceEngineMaxIpPacketSizeBytes = 1500 }; // assumes Ethernet +enum { kMaxTelephoneEventDuration = 60000 }; // Actual limit is 2^16 +enum { kMinTelephoneEventAttenuation = 0 }; // 0 dBm0 +enum { kMaxTelephoneEventAttenuation = 36 }; // -36 dBm0 +enum { kMinTelephoneEventSeparationMs = 100 }; // Min delta time between two + // telephone events +enum { kVoiceEngineMaxIpPacketSizeBytes = 1500 }; // assumes Ethernet enum { kVoiceEngineMaxModuleVersionSize = 960 }; @@ -65,15 +65,15 @@ enum { kVoiceEngineVersionMaxMessageSize = 1024 }; const NoiseSuppression::Level kDefaultNsMode = NoiseSuppression::kModerate; const GainControl::Mode kDefaultAgcMode = #if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS) - GainControl::kAdaptiveDigital; + GainControl::kAdaptiveDigital; #else - GainControl::kAdaptiveAnalog; + GainControl::kAdaptiveAnalog; #endif const bool kDefaultAgcState = #if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS) - false; + false; #else - true; + true; #endif const GainControl::Mode kDefaultRxAgcMode = GainControl::kAdaptiveDigital; @@ -131,53 +131,50 @@ enum { kVoiceEngineMaxRtpExtensionId = 14 }; // Macros // ---------------------------------------------------------------------------- -#define NOT_SUPPORTED(stat) \ - LOG_F(LS_ERROR) << "not supported"; \ - stat.SetLastError(VE_FUNC_NOT_SUPPORTED); \ +#define NOT_SUPPORTED(stat) \ + LOG_F(LS_ERROR) << "not supported"; \ + stat.SetLastError(VE_FUNC_NOT_SUPPORTED); \ return -1; #if (defined(_DEBUG) && defined(_WIN32) && (_MSC_VER >= 1400)) - #include <windows.h> - #include <stdio.h> - #define DEBUG_PRINT(...) \ - { \ - char msg[256]; \ - sprintf(msg, __VA_ARGS__); \ - OutputDebugStringA(msg); \ +#include <windows.h> +#include <stdio.h> +#define DEBUG_PRINT(...) \ + { \ + char msg[256]; \ + sprintf(msg, __VA_ARGS__); \ + OutputDebugStringA(msg); \ } #else - // special fix for visual 2003 - #define DEBUG_PRINT(exp) ((void)0) +// special fix for visual 2003 +#define DEBUG_PRINT(exp) ((void)0) #endif // defined(_DEBUG) && defined(_WIN32) -#define CHECK_CHANNEL(channel) if (CheckChannel(channel) == -1) return -1; +#define CHECK_CHANNEL(channel) \ + if (CheckChannel(channel) == -1) \ + return -1; // ---------------------------------------------------------------------------- // Inline functions // ---------------------------------------------------------------------------- -namespace webrtc -{ - -inline int VoEId(int veId, int chId) -{ - if (chId == -1) - { - const int dummyChannel(99); - return (int) ((veId << 16) + dummyChannel); - } - return (int) ((veId << 16) + chId); +namespace webrtc { + +inline int VoEId(int veId, int chId) { + if (chId == -1) { + const int dummyChannel(99); + return (int)((veId << 16) + dummyChannel); + } + return (int)((veId << 16) + chId); } -inline int VoEModuleId(int veId, int chId) -{ - return (int) ((veId << 16) + chId); +inline int VoEModuleId(int veId, int chId) { + return (int)((veId << 16) + chId); } // Convert module ID to internal VoE channel ID -inline int VoEChannelId(int moduleId) -{ - return (int) (moduleId & 0xffff); +inline int VoEChannelId(int moduleId) { + return (int)(moduleId & 0xffff); } } // namespace webrtc @@ -190,21 +187,21 @@ inline int VoEChannelId(int moduleId) #if defined(_WIN32) - #include <windows.h> +#include <windows.h> - #pragma comment( lib, "winmm.lib" ) +#pragma comment(lib, "winmm.lib") - #ifndef WEBRTC_EXTERNAL_TRANSPORT - #pragma comment( lib, "ws2_32.lib" ) - #endif +#ifndef WEBRTC_EXTERNAL_TRANSPORT +#pragma comment(lib, "ws2_32.lib") +#endif // ---------------------------------------------------------------------------- // Defines // ---------------------------------------------------------------------------- // Default device for Windows PC - #define WEBRTC_VOICE_ENGINE_DEFAULT_DEVICE \ - AudioDeviceModule::kDefaultCommunicationDevice +#define WEBRTC_VOICE_ENGINE_DEFAULT_DEVICE \ + AudioDeviceModule::kDefaultCommunicationDevice #endif // #if (defined(_WIN32) @@ -218,11 +215,11 @@ inline int VoEChannelId(int moduleId) #include <sys/socket.h> #include <sys/types.h> #ifndef QNX - #include <linux/net.h> +#include <linux/net.h> #ifndef ANDROID - #include <sys/soundcard.h> -#endif // ANDROID -#endif // QNX +#include <sys/soundcard.h> +#endif // ANDROID +#endif // QNX #include <errno.h> #include <fcntl.h> #include <sched.h> @@ -250,8 +247,8 @@ inline int VoEChannelId(int moduleId) #endif #define GetLastError() errno #define WSAGetLastError() errno -#define LPCTSTR const char* -#define LPCSTR const char* +#define LPCTSTR const char * +#define LPCSTR const char * #define wsprintf sprintf #define TEXT(a) a #define _ftprintf fprintf @@ -287,11 +284,11 @@ inline int VoEChannelId(int moduleId) #include <time.h> #include <unistd.h> #if !defined(WEBRTC_IOS) - #include <CoreServices/CoreServices.h> - #include <CoreAudio/CoreAudio.h> - #include <AudioToolbox/DefaultAudioOutput.h> - #include <AudioToolbox/AudioConverter.h> - #include <CoreAudio/HostTime.h> +#include <CoreServices/CoreServices.h> +#include <CoreAudio/CoreAudio.h> +#include <AudioToolbox/DefaultAudioOutput.h> +#include <AudioToolbox/AudioConverter.h> +#include <CoreAudio/HostTime.h> #endif #define DWORD unsigned long int @@ -306,7 +303,7 @@ inline int VoEChannelId(int moduleId) #define _stricmp strcasecmp #define GetLastError() errno #define WSAGetLastError() errno -#define LPCTSTR const char* +#define LPCTSTR const char * #define wsprintf sprintf #define TEXT(a) a #define _ftprintf fprintf @@ -314,11 +311,11 @@ inline int VoEChannelId(int moduleId) #define FAR #define __cdecl #define LPSOCKADDR struct sockaddr * -#define LPCSTR const char* +#define LPCSTR const char * #define ULONG unsigned long // Default device for Mac and iPhone #define WEBRTC_VOICE_ENGINE_DEFAULT_DEVICE 0 #endif // #ifdef WEBRTC_MAC -#endif // WEBRTC_VOICE_ENGINE_VOICE_ENGINE_DEFINES_H +#endif // WEBRTC_VOICE_ENGINE_VOICE_ENGINE_DEFINES_H |