From ae19720982e2e7c72ffa814be7e0d020652b5e6f Mon Sep 17 00:00:00 2001 From: "pwestin@webrtc.org" Date: Wed, 4 Apr 2012 14:43:54 +0000 Subject: [PATCH] Fixed assert strings where string literals are used as booleans. Review URL: https://webrtc-codereview.appspot.com/473002 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1986 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../video_coding/main/source/jitter_buffer.cc | 2 +- .../source/windows/video_render_directdraw.cc | 25 ++++++++----------- .../main/test/WindowsTest/ChannelDlg.cc | 2 +- src/video_engine/vie_channel.cc | 2 +- src/video_engine/vie_file_player.cc | 2 +- src/video_engine/vie_file_recorder.cc | 6 ++--- src/video_engine/vie_frame_provider_base.cc | 2 +- src/video_engine/vie_impl.cc | 4 +-- 8 files changed, 20 insertions(+), 25 deletions(-) diff --git a/src/modules/video_coding/main/source/jitter_buffer.cc b/src/modules/video_coding/main/source/jitter_buffer.cc index b4eee604b4..ee6228c502 100644 --- a/src/modules/video_coding/main/source/jitter_buffer.cc +++ b/src/modules/video_coding/main/source/jitter_buffer.cc @@ -1621,7 +1621,7 @@ VCMJitterBuffer::InsertPacket(VCMEncodedFrame* buffer, const VCMPacket& packet) } default: { - assert(!"JitterBuffer::InsertPacket: Undefined value"); + assert(false && "JitterBuffer::InsertPacket: Undefined value"); } } return ret; diff --git a/src/modules/video_render/main/source/windows/video_render_directdraw.cc b/src/modules/video_render/main/source/windows/video_render_directdraw.cc index 42d076e109..5f512e3d21 100644 --- a/src/modules/video_render/main/source/windows/video_render_directdraw.cc +++ b/src/modules/video_render/main/source/windows/video_render_directdraw.cc @@ -1045,26 +1045,21 @@ int DirectDrawChannel::DeliverFrame(unsigned char* buffer, int bufferSize, break; } default: - assert(!"DirectDrawChannel::DeliverFrame unknown blitVideoType"); - WEBRTC_TRACE( - kTraceError, - kTraceVideo, - -1, - "DirectDrawChannel::DeliverFrame unknown blitVideoType %d", - _blitVideoType); + assert(false && + "DirectDrawChannel::DeliverFrame unknown blitVideoType"); + WEBRTC_TRACE(kTraceError, kTraceVideo, -1, + "%s unknown blitVideoType %d", + __FUNCTION__, _blitVideoType); } break; } default: - assert(!"DirectDrawChannel::DeliverFrame wrong incomming video type"); - WEBRTC_TRACE( - kTraceError, - kTraceVideo, - -1, - "DirectDrawChannel::DeliverFrame wrong incomming %d", - _incomingVideoType); + assert(false && + "DirectDrawChannel::DeliverFrame wrong incomming video type"); + WEBRTC_TRACE(kTraceError, kTraceVideo, -1, + "%s wrong incomming video type:%d", + __FUNCTION__, _incomingVideoType); } - _offScreenSurfaceUpdated = true; offScreenSurface->Unlock(NULL); return 0; diff --git a/src/video_engine/main/test/WindowsTest/ChannelDlg.cc b/src/video_engine/main/test/WindowsTest/ChannelDlg.cc index cccfa8ee21..026cab7e45 100644 --- a/src/video_engine/main/test/WindowsTest/ChannelDlg.cc +++ b/src/video_engine/main/test/WindowsTest/ChannelDlg.cc @@ -1101,7 +1101,7 @@ void CDXChannelDlg::IncomingRate(const int videoChannel, void CDXChannelDlg::RequestNewKeyFrame(int channel) { - assert(!"(RequestNewKeyFrame why is it called"); + assert(false && "(RequestNewKeyFrame why is it called"); } void CDXChannelDlg::PerformanceAlarm(unsigned int cpuLoad) { diff --git a/src/video_engine/vie_channel.cc b/src/video_engine/vie_channel.cc index 3bf3af890b..94f67498e0 100644 --- a/src/video_engine/vie_channel.cc +++ b/src/video_engine/vie_channel.cc @@ -2199,7 +2199,7 @@ WebRtc_Word32 ViEChannel::StopDecodeThread() { // Couldn't stop the thread, leak instead of crash. WEBRTC_TRACE(kTraceWarning, kTraceVideo, ViEId(engine_id_, channel_id_), "%s: could not stop decode thread", __FUNCTION__); - assert(!"could not stop decode thread"); + assert(false && "could not stop decode thread"); } decode_thread_ = NULL; return 0; diff --git a/src/video_engine/vie_file_player.cc b/src/video_engine/vie_file_player.cc index e40f3375e4..b6461fa768 100644 --- a/src/video_engine/vie_file_player.cc +++ b/src/video_engine/vie_file_player.cc @@ -241,7 +241,7 @@ int ViEFilePlayer::StopPlay() { if (decode_thread_->Stop()) { delete decode_thread_; } else { - assert(!"ViEFilePlayer::StopPlay() Failed to stop decode thread"); + assert(false && "ViEFilePlayer::StopPlay() Failed to stop decode thread"); WEBRTC_TRACE(kTraceError, kTraceVideo, ViEId(engine_id_, id_), "ViEFilePlayer::StartPlay() Failed to stop file decode " "thread."); diff --git a/src/video_engine/vie_file_recorder.cc b/src/video_engine/vie_file_recorder.cc index c2f8fa0ed6..6f377c45ba 100644 --- a/src/video_engine/vie_file_recorder.cc +++ b/src/video_engine/vie_file_recorder.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -98,7 +98,7 @@ int ViEFileRecorder::StartRecording(const char* file_nameUTF8, audio_channel, this, &engine_audio_codec_inst); break; default: - assert(!"Unknown audio_source"); + assert(false && "Unknown audio_source"); } if (error != 0) { WEBRTC_TRACE(kTraceError, kTraceVideo, instance_id_, @@ -130,7 +130,7 @@ int ViEFileRecorder::StopRecording() { case NO_AUDIO: break; default: - assert(!"Unknown audio_source"); + assert(false && "Unknown audio_source"); } if (error != 0) { WEBRTC_TRACE(kTraceError, kTraceVideo, instance_id_, diff --git a/src/video_engine/vie_frame_provider_base.cc b/src/video_engine/vie_frame_provider_base.cc index 8b7bf1f7e1..fad19464ac 100644 --- a/src/video_engine/vie_frame_provider_base.cc +++ b/src/video_engine/vie_frame_provider_base.cc @@ -141,7 +141,7 @@ int ViEFrameProviderBase::RegisterFrameCallback( WEBRTC_TRACE(kTraceWarning, kTraceVideo, ViEId(engine_id_, id_), "%s 0x%p already registered", __FUNCTION__, callback_object); - assert("!frameObserver already registered"); + assert(false && "frameObserver already registered"); return -1; } frame_callbacks_.push_back(callback_object); diff --git a/src/video_engine/vie_impl.cc b/src/video_engine/vie_impl.cc index d8a421bb9d..354b55c026 100644 --- a/src/video_engine/vie_impl.cc +++ b/src/video_engine/vie_impl.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -52,7 +52,7 @@ VideoEngine* VideoEngine::Create() { VideoEngine* self = pfn(); return self; } else { - assert(!"Failed to open test dll VideoEngineTestingDLL.dll"); + assert(false && "Failed to open test dll VideoEngineTestingDLL.dll"); return NULL; } }