zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up incomplete revert in r4357

Browse Source 
Also revert r4319, will follow up with pbos

Reason for recent series of reverts: video freezes when testing with packet loss

R=mikhal@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4359 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tnakamura@webrtc.org
2013-07-16 21:52:59 +00:00
parent aa4d96a134
commit 64e2cbf184
3 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc
View File

@ -283,7 +283,6 @@ class RTPPayloadAudioStrategy : public RTPPayloadStrategy {
ModuleRTPUtility::Payload* payload = new ModuleRTPUtility::Payload; ModuleRTPUtility::Payload* payload = new ModuleRTPUtility::Payload;
payload->name[RTP_PAYLOAD_NAME_SIZE - 1] = 0; payload->name[RTP_PAYLOAD_NAME_SIZE - 1] = 0;
strncpy(payload->name, payloadName, RTP_PAYLOAD_NAME_SIZE - 1); strncpy(payload->name, payloadName, RTP_PAYLOAD_NAME_SIZE - 1);
assert(frequency >= 1000);
payload->typeSpecific.Audio.frequency = frequency; payload->typeSpecific.Audio.frequency = frequency;
payload->typeSpecific.Audio.channels = channels; payload->typeSpecific.Audio.channels = channels;
payload->typeSpecific.Audio.rate = rate; payload->typeSpecific.Audio.rate = rate;

1
webrtc/modules/rtp_rtcp/test/testAPI/test_api_video.cc
View File

@ -15,7 +15,6 @@
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/common_types.h" #include "webrtc/common_types.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_payload_registry.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h" #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h"

11
webrtc/voice_engine/channel.cc
View File

@ -2151,17 +2151,6 @@ int32_t Channel::ReceivedRTPPacket(const int8_t* data, int32_t length) {
"IncomingPacket invalid RTP header"); "IncomingPacket invalid RTP header");
return -1; return -1;
} }
header.payload_type_frequency =
rtp_payload_registry_->GetPayloadTypeFrequency(header.payloadType);
bool retransmitted = IsPacketRetransmitted(header);
bool in_order = rtp_receiver_->InOrderPacket(header.sequenceNumber);
rtp_receive_statistics_->IncomingPacket(header, static_cast<uint16_t>(length),
retransmitted, in_order);
PayloadUnion payload_specific;
if (!rtp_payload_registry_->GetPayloadSpecifics(header.payloadType,
&payload_specific)) {
return -1;
}
// Deliver RTP packet to RTP/RTCP module for parsing // Deliver RTP packet to RTP/RTCP module for parsing
// The packet will be pushed back to the channel thru the // The packet will be pushed back to the channel thru the
// OnReceivedPayloadData callback so we don't push it to the ACM here // OnReceivedPayloadData callback so we don't push it to the ACM here