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

Revert "Transport sequence number should be set also for retransmissions."

Browse Source 
After this CL, video_engine_test started failing flakily in different bots for different CLs.

TBR=sprang@webrtc.org

Review URL: https://codereview.webrtc.org/1393553003 .

Cr-Commit-Position: refs/heads/master@{#10188}
This commit is contained in:
Alejandro Luebs
2015-10-06 12:27:02 -07:00
parent a295320639
commit 10950692d6
2 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/modules/rtp_rtcp/source/rtp_sender.cc
View File

@ -695,7 +695,6 @@ int32_t RTPSender::ReSendPacket(uint16_t packet_id, int64_t min_resend_time) {
size_t length = IP_PACKET_SIZE;
uint8_t data_buffer[IP_PACKET_SIZE];
int64_t capture_time_ms;
if (!packet_history_.GetPacketAndSetSendTime(packet_id, min_resend_time, true,
data_buffer, &length,
&capture_time_ms)) {
@ -923,8 +922,8 @@ bool RTPSender::PrepareAndSendPacket(uint8_t* buffer,
// TODO(sprang): Potentially too much overhead in IsRegistered()?
bool using_transport_seq = rtp_header_extension_map_.IsRegistered(
kRtpExtensionTransportSequenceNumber) &&
transport_sequence_number_allocator_;
transport_sequence_number_allocator_ &&
!is_retransmit;
PacketOptions options;
if (using_transport_seq) {
options.packet_id =