Chromium Code Reviews| Index: webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc |
| diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc |
| index 2aa4961cdc77d98490c607ed23945617228bf760..27ad420c8a549dfdc3c8f6bcd139bf6f47d90f07 100644 |
| --- a/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc |
| +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc |
| @@ -12,6 +12,7 @@ |
| #include <string.h> |
| +#include "webrtc/base/logging.h" |
| #include "webrtc/base/trace_event.h" |
| #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" |
| #include "webrtc/modules/rtp_rtcp/source/byte_io.h" |
| @@ -45,7 +46,8 @@ RTPSenderAudio::RTPSenderAudio(Clock* clock, |
| _cngSWBPayloadType(-1), |
| _cngFBPayloadType(-1), |
| _lastPayloadType(-1), |
| - _audioLevel_dBov(0) {} |
| + _audioLevel_dBov(0), |
| + _firstPacketSent(false) {} |
| RTPSenderAudio::~RTPSenderAudio() {} |
| @@ -342,9 +344,15 @@ int32_t RTPSenderAudio::SendAudio(FrameType frameType, |
| memcpy(dataBuffer + rtpHeaderLength, payloadData, payloadSize); |
| } |
| } |
| + |
| + bool firstPacket; |
| { |
| CriticalSectionScoped cs(_sendAudioCritsect.get()); |
| _lastPayloadType = payloadType; |
| + firstPacket = !_firstPacketSent; |
| + if (firstPacket) { |
| + _firstPacketSent = true; |
| + } |
|
pthatcher1
2016/03/05 01:17:05
Nit: This might be more clear as:
bool firstPacke
skvlad
2016/03/07 19:36:53
Done.
|
| } |
| // Update audio level extension, if included. |
| size_t packetSize = payloadSize + rtpHeaderLength; |
| @@ -357,10 +365,15 @@ int32_t RTPSenderAudio::SendAudio(FrameType frameType, |
| TRACE_EVENT_ASYNC_END2("webrtc", "Audio", captureTimeStamp, "timestamp", |
| _rtpSender->Timestamp(), "seqnum", |
| _rtpSender->SequenceNumber()); |
| - return _rtpSender->SendToNetwork(dataBuffer, payloadSize, rtpHeaderLength, |
| + int32_t sendResult = _rtpSender->SendToNetwork(dataBuffer, payloadSize, |
|
danilchap
2016/03/07 09:29:11
SendToNetwork doesn't send packet immediately. It
pthatcher1
2016/03/07 17:28:33
That's a good point.
Actually, we might want to
skvlad
2016/03/07 19:36:53
Changed the log line to say the packet hasn't gone
|
| + rtpHeaderLength, |
| TickTime::MillisecondTimestamp(), |
| kAllowRetransmission, |
| RtpPacketSender::kHighPriority); |
| + if (firstPacket) { |
| + LOG(LS_INFO) << "First audio RTP packet sent"; |
| + } |
| + return sendResult; |
| } |
| // Audio level magnitude and voice activity flag are set for each RTP packet |