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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/voice_engine/voe_rtp_rtcp_impl.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« webrtc/base/event.cc ('K') | « webrtc/voice_engine/voe_neteq_stats_impl.cc ('k') | webrtc/voice_engine/voe_video_sync_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/voe_rtp_rtcp_impl.cc
diff --git a/webrtc/voice_engine/voe_rtp_rtcp_impl.cc b/webrtc/voice_engine/voe_rtp_rtcp_impl.cc
index 8cdb4f47796a83fb66d2349ae0db698568723729..b43702bb1b7dddc86fbe54022feae04feefe30e5 100644
--- a/webrtc/voice_engine/voe_rtp_rtcp_impl.cc
+++ b/webrtc/voice_engine/voe_rtp_rtcp_impl.cc
@@ -20,8 +20,8 @@
namespace webrtc {
VoERTP_RTCP* VoERTP_RTCP::GetInterface(VoiceEngine* voiceEngine) {
- if (NULL == voiceEngine) {
- return NULL;
+ if (nullptr == voiceEngine) {
+ return nullptr;
}
VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine);
s->AddRef();
@@ -47,7 +47,7 @@ int VoERTP_RTCPImpl::SetLocalSSRC(int channel, unsigned int ssrc) {
}
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,
"SetLocalSSRC() failed to locate channel");
return -1;
@@ -62,7 +62,7 @@ int VoERTP_RTCPImpl::GetLocalSSRC(int channel, unsigned int& ssrc) {
}
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,
"GetLocalSSRC() failed to locate channel");
return -1;
@@ -77,7 +77,7 @@ int VoERTP_RTCPImpl::GetRemoteSSRC(int channel, unsigned int& ssrc) {
}
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,
"GetRemoteSSRC() failed to locate channel");
return -1;
@@ -109,7 +109,7 @@ int VoERTP_RTCPImpl::SetSendAudioLevelIndicationStatus(int channel,
// Set state and id for the specified 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,
"SetSendAudioLevelIndicationStatus() failed to locate channel");
@@ -141,7 +141,7 @@ int VoERTP_RTCPImpl::SetReceiveAudioLevelIndicationStatus(int channel,
// Set state and id for the specified channel.
voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
voe::Channel* channel_ptr = ch.channel();
- if (channel_ptr == NULL) {
+ if (channel_ptr == nullptr) {
_shared->SetLastError(
VE_CHANNEL_NOT_VALID, kTraceError,
"SetReceiveAudioLevelIndicationStatus() failed to locate channel");
@@ -159,7 +159,7 @@ int VoERTP_RTCPImpl::SetRTCPStatus(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,
"SetRTCPStatus() failed to locate channel");
return -1;
@@ -175,7 +175,7 @@ int VoERTP_RTCPImpl::GetRTCPStatus(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,
"GetRTCPStatus() failed to locate channel");
return -1;
@@ -192,7 +192,7 @@ int VoERTP_RTCPImpl::SetRTCP_CNAME(int channel, const char cName[256]) {
}
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,
"SetRTCP_CNAME() failed to locate channel");
return -1;
@@ -207,7 +207,7 @@ int VoERTP_RTCPImpl::GetRemoteRTCP_CNAME(int channel, char cName[256]) {
}
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,
"GetRemoteRTCP_CNAME() failed to locate channel");
return -1;
@@ -230,7 +230,7 @@ int VoERTP_RTCPImpl::GetRemoteRTCPData(
}
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,
"GetRemoteRTCP_CNAME() failed to locate channel");
return -1;
@@ -249,7 +249,7 @@ int VoERTP_RTCPImpl::GetRTPStatistics(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,
"GetRTPStatistics() failed to locate channel");
return -1;
@@ -265,7 +265,7 @@ int VoERTP_RTCPImpl::GetRTCPStatistics(int channel, CallStatistics& stats) {
}
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,
"GetRTPStatistics() failed to locate channel");
return -1;
@@ -281,7 +281,7 @@ int VoERTP_RTCPImpl::GetRemoteRTCPReportBlocks(
}
voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
voe::Channel* channel_ptr = ch.channel();
- if (channel_ptr == NULL) {
+ if (channel_ptr == nullptr) {
_shared->SetLastError(
VE_CHANNEL_NOT_VALID, kTraceError,
"GetRemoteRTCPReportBlocks() failed to locate channel");
@@ -297,7 +297,7 @@ int VoERTP_RTCPImpl::SetNACKStatus(int channel, bool enable, int maxNoPackets) {
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,
"SetNACKStatus() failed to locate channel");
return -1;
« webrtc/base/event.cc ('K') | « 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