From dcfa09ac6126e7bd7c3f4fae53fdd17237e61961 Mon Sep 17 00:00:00 2001 From: "frkoenig@google.com" Date: Fri, 29 Jul 2011 22:55:52 +0000 Subject: [PATCH] Correct parameters in WEBRTC_TRACE functions. Incorrect number of parameters resulted in complaints about using unitialized memory when outputing with sprintf. Review URL: http://webrtc-codereview.appspot.com/89008 git-svn-id: http://webrtc.googlecode.com/svn/trunk@277 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/video_engine/main/source/vie_codec_impl.cc | 3 ++- src/video_engine/main/source/vie_encoder.cc | 2 +- src/video_engine/main/source/vie_network_impl.cc | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/video_engine/main/source/vie_codec_impl.cc b/src/video_engine/main/source/vie_codec_impl.cc index a2f3aa9fac..a35da7314b 100644 --- a/src/video_engine/main/source/vie_codec_impl.cc +++ b/src/video_engine/main/source/vie_codec_impl.cc @@ -134,7 +134,8 @@ int ViECodecImpl::GetCodec(const unsigned char listNumber, VideoCodec& videoCodec) const { WEBRTC_TRACE(webrtc::kTraceApiCall, webrtc::kTraceVideo, ViEId(_instanceId), - "%s(listNumber: %d, codecType: %d)", __FUNCTION__, listNumber); + "%s(listNumber: %d, codecType: %d)", __FUNCTION__, + listNumber, videoCodec.codecType); if (!IsInitialized()) { SetLastError(kViENotInitialized); diff --git a/src/video_engine/main/source/vie_encoder.cc b/src/video_engine/main/source/vie_encoder.cc index 81ad3c1779..2002e983bf 100644 --- a/src/video_engine/main/source/vie_encoder.cc +++ b/src/video_engine/main/source/vie_encoder.cc @@ -312,7 +312,7 @@ WebRtc_Word32 ViEEncoder::SetEncoder(const webrtc::VideoCodec& videoCodec) { WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, ViEId(_engineId, _channelId), - "%s: CodecType: %d, width: %u, height: %u, maxPayloadLength: %u", + "%s: CodecType: %d, width: %u, height: %u", __FUNCTION__, videoCodec.codecType, videoCodec.width, videoCodec.height); diff --git a/src/video_engine/main/source/vie_network_impl.cc b/src/video_engine/main/source/vie_network_impl.cc index 97be08a6bb..fe767b18b9 100644 --- a/src/video_engine/main/source/vie_network_impl.cc +++ b/src/video_engine/main/source/vie_network_impl.cc @@ -206,10 +206,10 @@ int ViENetworkImpl::SetSendDestination(const int videoChannel, { WEBRTC_TRACE(webrtc::kTraceApiCall, webrtc::kTraceVideo, ViEId(_instanceId, videoChannel), - "%s(channel: %d, ipAddress: x, rtpPort: %u, rtcpPort: %u, " + "%s(channel: %d, ipAddress: %s, rtpPort: %u, rtcpPort: %u, " "sourceRtpPort: %u, sourceRtcpPort: %u)", - __FUNCTION__, rtpPort, rtcpPort, sourceRtpPort, - sourceRtcpPort); + __FUNCTION__, videoChannel, ipAddress, rtpPort, rtcpPort, + sourceRtpPort, sourceRtcpPort); if (!IsInitialized()) { SetLastError(kViENotInitialized);