| Index: webrtc/voice_engine/channel.cc
|
| diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
|
| index b9adde7e3ec14b25098d468f124b4df08bc5be45..4b7cffddfd636bc697961f84ead85340f3ae1bd2 100644
|
| --- a/webrtc/voice_engine/channel.cc
|
| +++ b/webrtc/voice_engine/channel.cc
|
| @@ -1486,7 +1486,7 @@ int32_t Channel::DeRegisterExternalTransport() {
|
| return 0;
|
| }
|
|
|
| -int32_t Channel::ReceivedRTPPacket(const int8_t* data,
|
| +int32_t Channel::ReceivedRTPPacket(const uint8_t* received_packet,
|
| size_t length,
|
| const PacketTime& packet_time) {
|
| WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId, _channelId),
|
| @@ -1495,7 +1495,6 @@ int32_t Channel::ReceivedRTPPacket(const int8_t* data,
|
| // Store playout timestamp for the received RTP packet
|
| UpdatePlayoutTimestamp(false);
|
|
|
| - const uint8_t* received_packet = reinterpret_cast<const uint8_t*>(data);
|
| RTPHeader header;
|
| if (!rtp_header_parser_->Parse(received_packet, length, &header)) {
|
| WEBRTC_TRACE(webrtc::kTraceDebug, webrtc::kTraceVoice, _channelId,
|
| @@ -1585,14 +1584,14 @@ bool Channel::IsPacketRetransmitted(const RTPHeader& header,
|
| return !in_order && statistician->IsRetransmitOfOldPacket(header, min_rtt);
|
| }
|
|
|
| -int32_t Channel::ReceivedRTCPPacket(const int8_t* data, size_t length) {
|
| +int32_t Channel::ReceivedRTCPPacket(const uint8_t* data, size_t length) {
|
| WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId, _channelId),
|
| "Channel::ReceivedRTCPPacket()");
|
| // Store playout timestamp for the received RTCP packet
|
| UpdatePlayoutTimestamp(true);
|
|
|
| // Deliver RTCP packet to RTP/RTCP module for parsing
|
| - if (_rtpRtcpModule->IncomingRtcpPacket((const uint8_t*)data, length) == -1) {
|
| + if (_rtpRtcpModule->IncomingRtcpPacket(data, length) == -1) {
|
| _engineStatisticsPtr->SetLastError(
|
| VE_SOCKET_TRANSPORT_MODULE_ERROR, kTraceWarning,
|
| "Channel::IncomingRTPPacket() RTCP packet is invalid");
|
|
|