generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct WebRtc_Word8 in voice engine

Browse Source 
BUG=http://code.google.com/p/webrtc/issues/detail?id=311&sort=-id
TEST=build on all platforms

Review URL: https://webrtc-codereview.appspot.com/425002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1816 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@webrtc.org 2012-03-01 18:34:25 +00:00
parent 39e9659fc6
commit 813e4b0af0
6 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/voice_engine/main/source/channel.cc
View File

@ -23,7 +23,7 @@
#include "utility.h"
#include "voe_base.h"
#include "voe_external_media.h"
#include "voe_rtp_rtcp.h"
#include "voe_rtp_rtcp.h"
#if defined(_WIN32)
#include <Qos.h>
@ -349,7 +349,7 @@ Channel::SendRTCPPacket(int channel, const void *data, int len)
void
Channel::IncomingRTPPacket(const WebRtc_Word8* incomingRtpPacket,
const WebRtc_Word32 rtpPacketLength,
const WebRtc_Word8* fromIP,
const char* fromIP,
const WebRtc_UWord16 fromPort)
{
WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,_channelId),
@ -428,7 +428,7 @@ Channel::IncomingRTPPacket(const WebRtc_Word8* incomingRtpPacket,
void
Channel::IncomingRTCPPacket(const WebRtc_Word8* incomingRtcpPacket,
const WebRtc_Word32 rtcpPacketLength,
const WebRtc_Word8* fromIP,
const char* fromIP,
const WebRtc_UWord16 fromPort)
{
WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,_channelId),
@ -633,7 +633,7 @@ WebRtc_Word32
Channel::OnInitializeDecoder(
const WebRtc_Word32 id,
const WebRtc_Word8 payloadType,
const WebRtc_Word8 payloadName[RTP_PAYLOAD_NAME_SIZE],
const char payloadName[RTP_PAYLOAD_NAME_SIZE],
const int frequency,
const WebRtc_UWord8 channels,
const WebRtc_UWord32 rate)
@ -1824,8 +1824,8 @@ Channel::StopReceiving()
WebRtc_Word32
Channel::SetLocalReceiver(const WebRtc_UWord16 rtpPort,
const WebRtc_UWord16 rtcpPort,
const WebRtc_Word8 ipAddr[64],
const WebRtc_Word8 multicastIpAddr[64])
const char ipAddr[64],
const char multicastIpAddr[64])
{
WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
"Channel::SetLocalReceiver()");
@ -1910,12 +1910,10 @@ Channel::GetLocalReceiver(int& port, int& RTCPport, char ipAddr[64])
return -1;
}
WebRtc_Word8 ipAddrTmp[UdpTransport::
kIpAddressVersion6Length] = {0};
char ipAddrTmp[UdpTransport::kIpAddressVersion6Length] = {0};
WebRtc_UWord16 rtpPort(0);
WebRtc_UWord16 rtcpPort(0);
WebRtc_Word8 multicastIpAddr[UdpTransport::
kIpAddressVersion6Length] = {0};
char multicastIpAddr[UdpTransport::kIpAddressVersion6Length] = {0};
// Acquire socket information from the socket module
if (_socketTransportModule.ReceiveSocketInformation(ipAddrTmp,
@ -1943,7 +1941,7 @@ Channel::GetLocalReceiver(int& port, int& RTCPport, char ipAddr[64])
#ifndef WEBRTC_EXTERNAL_TRANSPORT
WebRtc_Word32
Channel::SetSendDestination(const WebRtc_UWord16 rtpPort,
const WebRtc_Word8 ipAddr[64],
const char ipAddr[64],
const int sourcePort,
const WebRtc_UWord16 rtcpPort)
{
@ -2102,7 +2100,7 @@ Channel::GetSendDestination(int& port,
return -1;
}
WebRtc_Word8 ipAddrTmp[UdpTransport::kIpAddressVersion6Length] = {0};
char ipAddrTmp[UdpTransport::kIpAddressVersion6Length] = {0};
WebRtc_UWord16 rtpPort(0);
WebRtc_UWord16 rtcpPort(0);
WebRtc_UWord16 rtpSourcePort(0);
@ -2837,7 +2835,7 @@ Channel::ReceivedRTPPacket(const WebRtc_Word8* data, WebRtc_Word32 length)
{
WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,_channelId),
"Channel::ReceivedRTPPacket()");
const WebRtc_Word8 dummyIP[] = "127.0.0.1";
const char dummyIP[] = "127.0.0.1";
IncomingRTPPacket(data, length, dummyIP, 0);
return 0;
}
@ -2847,7 +2845,7 @@ Channel::ReceivedRTCPPacket(const WebRtc_Word8* data, WebRtc_Word32 length)
{
WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,_channelId),
"Channel::ReceivedRTCPPacket()");
const WebRtc_Word8 dummyIP[] = "127.0.0.1";
const char dummyIP[] = "127.0.0.1";
IncomingRTCPPacket(data, length, dummyIP, 0);
return 0;
}
@ -2861,7 +2859,7 @@ Channel::GetSourceInfo(int& rtpPort, int& rtcpPort, char ipAddr[64])
WebRtc_UWord16 rtpPortModule;
WebRtc_UWord16 rtcpPortModule;
WebRtc_Word8 ipaddr[UdpTransport::kIpAddressVersion6Length] = {0};
char ipaddr[UdpTransport::kIpAddressVersion6Length] = {0};
if (_socketTransportModule.RemoteSocketInformation(ipaddr,
rtpPortModule,
@ -2937,8 +2935,7 @@ Channel::SetSourceFilter(int rtpPort, int rtcpPort, const char ipAddr[64])
lastError);
return -1;
}
const WebRtc_Word8* filterIpAddress =
static_cast<const WebRtc_Word8*> (ipAddr);
const char* filterIpAddress = ipAddr;
if (_socketTransportModule.SetFilterIP(filterIpAddress) != 0)
{
_engineStatisticsPtr->SetLastError(
@ -2966,7 +2963,7 @@ Channel::GetSourceFilter(int& rtpPort, int& rtcpPort, char ipAddr[64])
VE_SOCKET_TRANSPORT_MODULE_ERROR, kTraceWarning,
"GetSourceFilter() failed to retrieve filter ports");
}
WebRtc_Word8 ipAddrTmp[UdpTransport::kIpAddressVersion6Length] = {0};
char ipAddrTmp[UdpTransport::kIpAddressVersion6Length] = {0};
if (_socketTransportModule.FilterIP(ipAddrTmp) != 0)
{
// no filter has been configured (not seen as an error)
@ -3890,7 +3887,7 @@ int Channel::ScaleFileAsMicrophonePlayout(const float scale)
return 0;
}
int Channel::StartRecordingPlayout(const WebRtc_Word8* fileName,
int Channel::StartRecordingPlayout(const char* fileName,
const CodecInst* codecInst)
{
WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
@ -5244,7 +5241,7 @@ Channel::GetRemoteRTCP_CNAME(char cName[256])
"GetRemoteRTCP_CNAME() invalid CNAME input buffer");
return -1;
}
WebRtc_Word8 cname[RTCP_CNAME_SIZE];
char cname[RTCP_CNAME_SIZE];
const WebRtc_UWord32 remoteSSRC = _rtpRtcpModule.RemoteSSRC();
if (_rtpRtcpModule.RemoteCNAME(remoteSSRC, cname) != 0)
{

14
src/voice_engine/main/source/channel.h
View File

@ -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
@ -110,11 +110,11 @@ public:
#ifndef WEBRTC_EXTERNAL_TRANSPORT
WebRtc_Word32 SetLocalReceiver(const WebRtc_UWord16 rtpPort,
const WebRtc_UWord16 rtcpPort,
const WebRtc_Word8 ipAddr[64],
const WebRtc_Word8 multicastIpAddr[64]);
const char ipAddr[64],
const char multicastIpAddr[64]);
WebRtc_Word32 GetLocalReceiver(int& port, int& RTCPport, char ipAddr[]);
WebRtc_Word32 SetSendDestination(const WebRtc_UWord16 rtpPort,
const WebRtc_Word8 ipAddr[64],
const char ipAddr[64],
const int sourcePort,
const WebRtc_UWord16 rtcpPort);
WebRtc_Word32 GetSendDestination(int& port, char ipAddr[64],
@ -384,7 +384,7 @@ public:
WebRtc_Word32 OnInitializeDecoder(
const WebRtc_Word32 id,
const WebRtc_Word8 payloadType,
const WebRtc_Word8 payloadName[RTP_PAYLOAD_NAME_SIZE],
const char payloadName[RTP_PAYLOAD_NAME_SIZE],
const int frequency,
const WebRtc_UWord8 channels,
const WebRtc_UWord32 rate);
@ -426,12 +426,12 @@ public:
// From UdpTransportData in the Socket Transport module
void IncomingRTPPacket(const WebRtc_Word8* incomingRtpPacket,
const WebRtc_Word32 rtpPacketLength,
const WebRtc_Word8* fromIP,
const char* fromIP,
const WebRtc_UWord16 fromPort);
void IncomingRTCPPacket(const WebRtc_Word8* incomingRtcpPacket,
const WebRtc_Word32 rtcpPacketLength,
const WebRtc_Word8* fromIP,
const char* fromIP,
const WebRtc_UWord16 fromPort);
public:

4
src/voice_engine/main/source/monitor_module.cc
View File

@ -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 @@ MonitorModule::DeRegisterObserver()
}
WebRtc_Word32
MonitorModule::Version(WebRtc_Word8* version,
MonitorModule::Version(char* version,
WebRtc_UWord32& remainingBufferInBytes,
WebRtc_UWord32& position) const
{

4
src/voice_engine/main/source/monitor_module.h
View File

@ -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
@ -40,7 +40,7 @@ public:
virtual ~MonitorModule();
public: // module
WebRtc_Word32 Version(WebRtc_Word8* version,
WebRtc_Word32 Version(char* version,
WebRtc_UWord32& remainingBufferInBytes,
WebRtc_UWord32& position) const;

4
src/voice_engine/main/source/transmit_mixer.cc
View File

@ -704,7 +704,7 @@ int TransmitMixer::ScaleFileAsMicrophonePlayout(const float scale)
return 0;
}
int TransmitMixer::StartRecordingMicrophone(const WebRtc_Word8* fileName,
int TransmitMixer::StartRecordingMicrophone(const char* fileName,
const CodecInst* codecInst)
{
WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, -1),
@ -891,7 +891,7 @@ int TransmitMixer::StopRecordingMicrophone()
return 0;
}
int TransmitMixer::StartRecordingCall(const WebRtc_Word8* fileName,
int TransmitMixer::StartRecordingCall(const char* fileName,
const CodecInst* codecInst)
{
WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, -1),

8
src/voice_engine/main/source/voe_hardware_impl.cc
View File

@ -250,8 +250,8 @@ int VoEHardwareImpl::GetRecordingDeviceName(int index,
assert(strLen == kAdmMaxDeviceNameSize);
assert(strLen == kAdmMaxGuidSize);
WebRtc_Word8 name[strLen];
WebRtc_Word8 guid[strLen];
char name[strLen];
char guid[strLen];
// Get names from module
if (_audioDevicePtr->RecordingDeviceName(index, name, guid) != 0)
@ -308,8 +308,8 @@ int VoEHardwareImpl::GetPlayoutDeviceName(int index,
assert(strLen == kAdmMaxDeviceNameSize);
assert(strLen == kAdmMaxGuidSize);
WebRtc_Word8 name[strLen];
WebRtc_Word8 guid[strLen];
char name[strLen];
char guid[strLen];
// Get names from module
if (_audioDevicePtr->PlayoutDeviceName(index, name, guid) != 0)