From d703cd022f64ddb6225b08719c2e40d1e1aa997a Mon Sep 17 00:00:00 2001 From: Minyue Li Date: Tue, 21 May 2019 14:13:40 +0000 Subject: [PATCH] Revert "Avoid encrypting empty audio packet." This reverts commit b0ac94307e1787f83de2b9a2dc3b58309ea8654b. Reason for revert: failing upstream tests Original change's description: > Avoid encrypting empty audio packet. > > Bug: b/132861665 > Change-Id: I161ba8697ae88857927f27fa6d3914b7201fdeab > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/137049 > Commit-Queue: Minyue Li > Reviewed-by: Rasmus Brandt > Reviewed-by: Karl Wiberg > Cr-Commit-Position: refs/heads/master@{#28006} TBR=brandtr@webrtc.org,kwiberg@webrtc.org,minyue@webrtc.org Change-Id: I856436ad78bcc5310810283bb5547070781d0684 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: b/132861665 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/137518 Reviewed-by: Minyue Li Commit-Queue: Minyue Li Cr-Commit-Position: refs/heads/master@{#28009} --- audio/channel_send.cc | 9 --------- modules/rtp_rtcp/source/rtp_sender_audio.cc | 8 ++++++++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/audio/channel_send.cc b/audio/channel_send.cc index d4266c2bc5..e8360cb4a1 100644 --- a/audio/channel_send.cc +++ b/audio/channel_send.cc @@ -495,15 +495,6 @@ int32_t ChannelSend::SendRtpAudio(AudioFrameType frameType, uint8_t payloadType, uint32_t timeStamp, rtc::ArrayView payload) { - if (payload.empty()) { - if (frameType == AudioFrameType::kEmptyFrame) { - // we don't send empty audio RTP packets - // no error since we use it to drive DTMF when we use VAD - return 0; - } - return -1; - } - if (_includeAudioLevelIndication) { // Store current audio level in the RTP sender. // The level will be used in combination with voice-activity state diff --git a/modules/rtp_rtcp/source/rtp_sender_audio.cc b/modules/rtp_rtcp/source/rtp_sender_audio.cc index 168f2061f4..86026ffd92 100644 --- a/modules/rtp_rtcp/source/rtp_sender_audio.cc +++ b/modules/rtp_rtcp/source/rtp_sender_audio.cc @@ -221,6 +221,14 @@ bool RTPSenderAudio::SendAudio(AudioFrameType frame_type, } return true; } + if (payload_size == 0 || payload_data == NULL) { + if (frame_type == AudioFrameType::kEmptyFrame) { + // we don't send empty audio RTP packets + // no error since we use it to drive DTMF when we use VAD + return true; + } + return false; + } std::unique_ptr packet = rtp_sender_->AllocatePacket(); packet->SetMarker(MarkerBit(frame_type, payload_type));