| Index: webrtc/voice_engine/voe_codec_impl.cc
|
| diff --git a/webrtc/voice_engine/voe_codec_impl.cc b/webrtc/voice_engine/voe_codec_impl.cc
|
| index 2022024536c164b13b9d77825940a7e579b279d1..ba8085d611d01b138f6fad5cdafa87ad16b69786 100644
|
| --- a/webrtc/voice_engine/voe_codec_impl.cc
|
| +++ b/webrtc/voice_engine/voe_codec_impl.cc
|
| @@ -20,8 +20,8 @@
|
| namespace webrtc {
|
|
|
| VoECodec* VoECodec::GetInterface(VoiceEngine* voiceEngine) {
|
| - if (NULL == voiceEngine) {
|
| - return NULL;
|
| + if (nullptr == voiceEngine) {
|
| + return nullptr;
|
| }
|
| VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine);
|
| s->AddRef();
|
| @@ -85,7 +85,7 @@ int VoECodecImpl::SetSendCodec(int channel, const CodecInst& codec) {
|
| }
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
|
| "GetSendCodec() failed to locate channel");
|
| return -1;
|
| @@ -111,7 +111,7 @@ int VoECodecImpl::GetSendCodec(int channel, CodecInst& codec) {
|
| }
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
|
| "GetSendCodec() failed to locate channel");
|
| return -1;
|
| @@ -144,7 +144,7 @@ int VoECodecImpl::GetRecCodec(int channel, CodecInst& codec) {
|
| }
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
|
| "GetRecCodec() failed to locate channel");
|
| return -1;
|
| @@ -166,7 +166,7 @@ int VoECodecImpl::SetRecPayloadType(int channel, const CodecInst& codec) {
|
| }
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
|
| "GetRecPayloadType() failed to locate channel");
|
| return -1;
|
| @@ -181,7 +181,7 @@ int VoECodecImpl::GetRecPayloadType(int channel, CodecInst& codec) {
|
| }
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
|
| "GetRecPayloadType() failed to locate channel");
|
| return -1;
|
| @@ -215,7 +215,7 @@ int VoECodecImpl::SetSendCNPayloadType(int channel,
|
| }
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
|
| "SetSendCNPayloadType() failed to locate channel");
|
| return -1;
|
| @@ -232,7 +232,7 @@ int VoECodecImpl::SetFECStatus(int channel, bool enable) {
|
| }
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
|
| "SetCodecFECStatus() failed to locate channel");
|
| return -1;
|
| @@ -247,7 +247,7 @@ int VoECodecImpl::GetFECStatus(int channel, bool& enabled) {
|
| }
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
|
| "GetFECStatus() failed to locate channel");
|
| return -1;
|
| @@ -270,7 +270,7 @@ int VoECodecImpl::SetVADStatus(int channel,
|
| }
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
|
| "SetVADStatus failed to locate channel");
|
| return -1;
|
| @@ -304,7 +304,7 @@ int VoECodecImpl::GetVADStatus(int channel,
|
| }
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
|
| "GetVADStatus failed to locate channel");
|
| return -1;
|
| @@ -346,7 +346,7 @@ int VoECodecImpl::SetOpusMaxPlaybackRate(int channel, int frequency_hz) {
|
| }
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
|
| "SetOpusMaxPlaybackRate failed to locate channel");
|
| return -1;
|
| @@ -363,7 +363,7 @@ int VoECodecImpl::SetOpusDtx(int channel, bool enable_dtx) {
|
| }
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
|
| "SetOpusDtx failed to locate channel");
|
| return -1;
|
| @@ -380,7 +380,7 @@ int VoECodecImpl::GetOpusDtxStatus(int channel, bool* enabled) {
|
| }
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
|
| "GetOpusDtx failed to locate channel");
|
| return -1;
|
|
|