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

Not dropping the refresh DTX packets but substituting them by 1 byte packets.

Browse Source 
Bug: webrtc:12380
Change-Id: I27029c591ac2555d6ae61b706adcf97c9498a9fb
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/217880
Reviewed-by: Minyue Li <minyue@webrtc.org>
Commit-Queue: Jesus de Vicente Pena <devicentepena@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33983}
This commit is contained in:
Jesús de Vicente Peña
2021-05-11 13:54:42 +02:00
committed by WebRTC LUCI CQ
parent 50a0b1219e
commit d674ec77af
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
View File

@ -831,6 +831,7 @@ TEST(AudioEncoderOpusTest, OpusDtxFilteringHighEnergyRefreshPackets) {
constexpr size_t kSilenceDurationSamples = kSampleRateHz * 0.2f; constexpr size_t kSilenceDurationSamples = kSampleRateHz * 0.2f;
std::array<int16_t, kSilenceDurationSamples> silence; std::array<int16_t, kSilenceDurationSamples> silence;
uint32_t rtp_timestamp = 0; uint32_t rtp_timestamp = 0;
bool last_packet_dtx_frame = false;
bool opus_entered_dtx = false; bool opus_entered_dtx = false;
bool silence_filled = false; bool silence_filled = false;
size_t timestamp_start_silence = 0; size_t timestamp_start_silence = 0;
@ -850,10 +851,13 @@ TEST(AudioEncoderOpusTest, OpusDtxFilteringHighEnergyRefreshPackets) {
} }
rtp_timestamp += kInputBlockSizeSamples; rtp_timestamp += kInputBlockSizeSamples;
} }
if (info.encoded_bytes < 2 && !opus_entered_dtx) { EXPECT_TRUE(info.encoded_bytes > 0 || last_packet_dtx_frame);
last_packet_dtx_frame = info.encoded_bytes > 0 ? info.encoded_bytes <= 2
: last_packet_dtx_frame;
if (info.encoded_bytes <= 2 && !opus_entered_dtx) {
timestamp_start_silence = rtp_timestamp; timestamp_start_silence = rtp_timestamp;
} }
opus_entered_dtx = info.encoded_bytes < 2; opus_entered_dtx = info.encoded_bytes <= 2;
} }
EXPECT_TRUE(silence_filled); EXPECT_TRUE(silence_filled);
@ -880,6 +884,9 @@ TEST(AudioEncoderOpusTest, OpusDtxFilteringHighEnergyRefreshPackets) {
info = encoder->Encode(rtp_timestamp, silence_frame, &encoded); info = encoder->Encode(rtp_timestamp, silence_frame, &encoded);
rtp_timestamp += kInputBlockSizeSamples; rtp_timestamp += kInputBlockSizeSamples;
} }
EXPECT_TRUE(info.encoded_bytes > 0 || last_packet_dtx_frame);
last_packet_dtx_frame = info.encoded_bytes > 0 ? info.encoded_bytes <= 2
: last_packet_dtx_frame;
// Tracking the number of non empty packets. // Tracking the number of non empty packets.
if (increase_noise && info.encoded_bytes > 2) { if (increase_noise && info.encoded_bytes > 2) {
number_non_empty_packets_during_increase++; number_non_empty_packets_during_increase++;

12
modules/audio_coding/codecs/opus/opus_interface.cc
View File

@ -247,9 +247,15 @@ int WebRtcOpus_Encode(OpusEncInst* inst,
inst, rtc::MakeArrayView(audio_in, samples), inst, rtc::MakeArrayView(audio_in, samples),
rtc::MakeArrayView(encoded, res))) { rtc::MakeArrayView(encoded, res))) {
// This packet is a high energy refresh DTX packet. For avoiding an increase // This packet is a high energy refresh DTX packet. For avoiding an increase
// of the energy in the DTX region at the decoder, this packet is dropped. // of the energy in the DTX region at the decoder, this packet is
inst->in_dtx_mode = 0; // substituted by a TOC byte with one empty frame.
return 0; // The number of frames described in the TOC byte
// (https://tools.ietf.org/html/rfc6716#section-3.1) are overwritten to
// always indicate one frame (last two bits equal to 0).
encoded[0] = encoded[0] & 0b11111100;
inst->in_dtx_mode = 1;
// The payload is just the TOC byte and has 1 byte as length.
return 1;
} }
inst->in_dtx_mode = 0; inst->in_dtx_mode = 0;
return res; return res;