| Index: webrtc/voice_engine/voe_video_sync_impl.cc
|
| diff --git a/webrtc/voice_engine/voe_video_sync_impl.cc b/webrtc/voice_engine/voe_video_sync_impl.cc
|
| index e82cbb3b5eacd1c76890f4422e0a5dc834cecd9a..c8781055ee4e991928a8fc6c42e8fb857f8a1225 100644
|
| --- a/webrtc/voice_engine/voe_video_sync_impl.cc
|
| +++ b/webrtc/voice_engine/voe_video_sync_impl.cc
|
| @@ -18,8 +18,8 @@
|
| namespace webrtc {
|
|
|
| VoEVideoSync* VoEVideoSync::GetInterface(VoiceEngine* voiceEngine) {
|
| - if (NULL == voiceEngine) {
|
| - return NULL;
|
| + if (nullptr == voiceEngine) {
|
| + return nullptr;
|
| }
|
| VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine);
|
| s->AddRef();
|
| @@ -44,7 +44,7 @@ int VoEVideoSyncImpl::GetPlayoutTimestamp(int 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,
|
| "GetPlayoutTimestamp() failed to locate channel");
|
| return -1;
|
| @@ -63,7 +63,7 @@ int VoEVideoSyncImpl::SetInitTimestamp(int channel, unsigned int timestamp) {
|
| }
|
| 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,
|
| "SetInitTimestamp() failed to locate channel");
|
| return -1;
|
| @@ -82,7 +82,7 @@ int VoEVideoSyncImpl::SetInitSequenceNumber(int channel, short sequenceNumber) {
|
| }
|
| 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,
|
| "SetInitSequenceNumber() failed to locate channel");
|
| return -1;
|
| @@ -101,7 +101,7 @@ int VoEVideoSyncImpl::SetMinimumPlayoutDelay(int channel, int delayMs) {
|
| }
|
| 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,
|
| "SetMinimumPlayoutDelay() failed to locate channel");
|
| return -1;
|
| @@ -118,7 +118,7 @@ int VoEVideoSyncImpl::GetDelayEstimate(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,
|
| "GetDelayEstimate() failed to locate channel");
|
| return -1;
|
| @@ -155,7 +155,7 @@ int VoEVideoSyncImpl::GetRtpRtcp(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,
|
| "GetPlayoutTimestamp() failed to locate channel");
|
| return -1;
|
| @@ -170,7 +170,7 @@ int VoEVideoSyncImpl::GetLeastRequiredDelayMs(int channel) const {
|
| }
|
| 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,
|
| "GetLeastRequiredDelayMs() failed to locate channel");
|
| return -1;
|
|
|