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

Support 2 byte payload size DTX packets in NetEq simulation.

Browse Source 
Bug: none
Change-Id: I785f13555c650171e94e400cf15123e8cc17de22
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/154350
Reviewed-by: Minyue Li <minyue@webrtc.org>
Commit-Queue: Jakob Ivarsson <jakobi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29286}
This commit is contained in:
Jakob Ivarsson
2019-09-24 16:42:47 +02:00
committed by Commit Bot
parent 9d281028c7
commit 74344d2aa6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/audio_coding/neteq/tools/fake_decode_from_file.cc
View File

@ -100,7 +100,7 @@ int FakeDecodeFromFile::DecodeInternal(const uint8_t* encoded,
uint32_t original_payload_size_bytes = uint32_t original_payload_size_bytes =
ByteReader<uint32_t>::ReadLittleEndian(&encoded[8]); ByteReader<uint32_t>::ReadLittleEndian(&encoded[8]);
if (original_payload_size_bytes == 1) { if (original_payload_size_bytes <= 2) {
// This is a comfort noise payload. // This is a comfort noise payload.
RTC_DCHECK_GT(total_samples_to_decode, 0); RTC_DCHECK_GT(total_samples_to_decode, 0);
std::fill_n(decoded, total_samples_to_decode, 0); std::fill_n(decoded, total_samples_to_decode, 0);
@ -135,7 +135,7 @@ int FakeDecodeFromFile::PacketDuration(const uint8_t* encoded,
if ( // Decoder is asked to produce codec-internal comfort noise if ( // Decoder is asked to produce codec-internal comfort noise
encoded_len == 0 || encoded_len == 0 ||
// Comfort noise payload // Comfort noise payload
original_payload_size_bytes == 1 || samples_to_decode == 0 || original_payload_size_bytes <= 2 || samples_to_decode == 0 ||
// Erroneous duration since it is not a multiple of 10ms // Erroneous duration since it is not a multiple of 10ms
samples_to_decode % rtc::CheckedDivExact(SampleRateHz(), 100) != 0) { samples_to_decode % rtc::CheckedDivExact(SampleRateHz(), 100) != 0) {
if (last_decoded_length_ > 0) { if (last_decoded_length_ > 0) {