From 545727ecce444320328b825d65b287e844dca7cb Mon Sep 17 00:00:00 2001 From: pbos Date: Wed, 1 Jul 2015 06:31:06 -0700 Subject: [PATCH] Move early-return in TimeToSendPadding. Prevents taking send_critsect_ for checking sending status when not actually intending to send padding. BUG= R=stefan@webrtc.org Review URL: https://codereview.webrtc.org/1218093002 Cr-Commit-Position: refs/heads/master@{#9526} --- webrtc/modules/rtp_rtcp/source/rtp_sender.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc index 8923135169..29b2897b34 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc @@ -958,12 +958,12 @@ bool RTPSender::IsFecPacket(const uint8_t* buffer, } size_t RTPSender::TimeToSendPadding(size_t bytes) { + if (bytes == 0) + return 0; { CriticalSectionScoped cs(send_critsect_.get()); if (!sending_media_) return 0; } - if (bytes == 0) - return 0; size_t bytes_sent = TrySendRedundantPayloads(bytes); if (bytes_sent < bytes) bytes_sent += TrySendPadData(bytes - bytes_sent);