diff --git a/src/modules/rtp_rtcp/source/rtcp_receiver_help.cc b/src/modules/rtp_rtcp/source/rtcp_receiver_help.cc index 5b224e60b5..0058acabb6 100644 --- a/src/modules/rtp_rtcp/source/rtcp_receiver_help.cc +++ b/src/modules/rtp_rtcp/source/rtcp_receiver_help.cc @@ -17,24 +17,25 @@ namespace webrtc { using namespace RTCPHelp; -RTCPPacketInformation::RTCPPacketInformation() : - rtcpPacketTypeFlags(0), - nackSequenceNumbers(0), - nackSequenceNumbersLength(0), - applicationSubType(0), - applicationName(0), - applicationData(), - applicationLength(0), - reportBlock(false), - fractionLost(0), - roundTripTime(0), - lastReceivedExtendedHighSeqNum(0), - jitter(0), - interArrivalJitter(0), - sliPictureId(0), - rpsiPictureId(0), - VoIPMetric(NULL) -{ +RTCPPacketInformation::RTCPPacketInformation() + : rtcpPacketTypeFlags(0), + remoteSSRC(0), + nackSequenceNumbers(0), + nackSequenceNumbersLength(0), + applicationSubType(0), + applicationName(0), + applicationData(), + applicationLength(0), + reportBlock(false), + fractionLost(0), + roundTripTime(0), + lastReceivedExtendedHighSeqNum(0), + jitter(0), + interArrivalJitter(0), + sliPictureId(0), + rpsiPictureId(0), + receiverEstimatedMaxBitrate(0), + VoIPMetric(NULL) { } RTCPPacketInformation::~RTCPPacketInformation() diff --git a/src/modules/rtp_rtcp/source/rtcp_utility.cc b/src/modules/rtp_rtcp/source/rtcp_utility.cc index aa9c90773b..0cba9a8a01 100644 --- a/src/modules/rtp_rtcp/source/rtcp_utility.cc +++ b/src/modules/rtp_rtcp/source/rtcp_utility.cc @@ -29,27 +29,22 @@ RTCPUtility::RTCPCnameInformation::~RTCPCnameInformation() /////////// // RTCPParserV2 : currently read only -RTCPUtility::RTCPParserV2::RTCPParserV2( const WebRtc_UWord8* rtcpData, +RTCPUtility::RTCPParserV2::RTCPParserV2(const WebRtc_UWord8* rtcpData, size_t rtcpDataLength, bool rtcpReducedSizeEnable) - : - _ptrRTCPDataBegin(rtcpData), - _RTCPReducedSizeEnable(rtcpReducedSizeEnable), - _ptrRTCPDataEnd(rtcpData + rtcpDataLength), - - _validPacket(false), - _ptrRTCPData(rtcpData), - - _state(State_TopLevel), - _numberOfBlocks(0), - - _packetType(kRtcpNotValidCode) -{ - Validate(); + : _ptrRTCPDataBegin(rtcpData), + _RTCPReducedSizeEnable(rtcpReducedSizeEnable), + _ptrRTCPDataEnd(rtcpData + rtcpDataLength), + _validPacket(false), + _ptrRTCPData(rtcpData), + _ptrRTCPBlockEnd(NULL), + _state(State_TopLevel), + _numberOfBlocks(0), + _packetType(kRtcpNotValidCode) { + Validate(); } -RTCPUtility::RTCPParserV2::~RTCPParserV2() -{ +RTCPUtility::RTCPParserV2::~RTCPParserV2() { } ptrdiff_t @@ -1475,17 +1470,15 @@ RTCPUtility::RTCPParserV2::ParseAPPItem() return true; } -RTCPUtility::RTCPPacketIterator::RTCPPacketIterator( - WebRtc_UWord8* rtcpData, - size_t rtcpDataLength) - : - _ptrBegin(rtcpData), - _ptrEnd(rtcpData + rtcpDataLength) -{ +RTCPUtility::RTCPPacketIterator::RTCPPacketIterator(WebRtc_UWord8* rtcpData, + size_t rtcpDataLength) + : _ptrBegin(rtcpData), + _ptrEnd(rtcpData + rtcpDataLength), + _ptrBlock(NULL) { + memset(&_header, 0, sizeof(_header)); } -RTCPUtility::RTCPPacketIterator::~RTCPPacketIterator() -{ +RTCPUtility::RTCPPacketIterator::~RTCPPacketIterator() { } const RTCPUtility::RTCPCommonHeader* diff --git a/src/modules/rtp_rtcp/source/rtp_sender_audio.cc b/src/modules/rtp_rtcp/source/rtp_sender_audio.cc index e941c5a2c0..ca1a91d51d 100644 --- a/src/modules/rtp_rtcp/source/rtp_sender_audio.cc +++ b/src/modules/rtp_rtcp/source/rtp_sender_audio.cc @@ -40,8 +40,8 @@ RTPSenderAudio::RTPSenderAudio(const WebRtc_Word32 id, RtpRtcpClock* clock, _cngSWBPayloadType(-1), _lastPayloadType(-1), _includeAudioLevelIndication(false), // @TODO - reset at Init()? - _audioLevelIndicationID(0) -{ + _audioLevelIndicationID(0), + _audioLevel_dBov(0) { }; RTPSenderAudio::~RTPSenderAudio()