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

rtp_encode: Fixing bug related to DTX

Browse Source 
Bug: webrtc:2692
Change-Id: I7b884b22cab21b9dce77e5599f43431bbc899f5d
Reviewed-on: https://webrtc-review.googlesource.com/26027
Commit-Queue: Henrik Lundin <henrik.lundin@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20909}
This commit is contained in:
Henrik Lundin
2017-11-28 13:05:35 +01:00
committed by Commit Bot
parent eb5554c8d2
commit 32f64d2ef9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/audio_coding/neteq/tools/rtp_encode.cc
View File

@ -110,7 +110,9 @@ class Packetizer : public AudioPacketizationCallback {
size_t payload_len_bytes,
const RTPFragmentationHeader* fragmentation) override {
RTC_CHECK(!fragmentation);
RTC_DCHECK_GT(payload_len_bytes, 0);
if (payload_len_bytes == 0) {
return 0;
}
constexpr size_t kRtpHeaderLength = 12;
constexpr size_t kRtpDumpHeaderLength = 8;
@ -302,7 +304,7 @@ int RunRtpEncode(int argc, char* argv[]) {
CreateEncoder(codec_it->second.type, payload_type);
// Create an external VAD/CNG encoder if needed.
if (FLAG_dtx && codec_it->second.internal_dtx) {
if (FLAG_dtx && !codec_it->second.internal_dtx) {
AudioEncoderCng::Config cng_config = GetCngConfig(codec->SampleRateHz());
RTC_DCHECK(codec);
cng_config.speech_encoder = std::move(codec);