Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(613)

Unified Diff: webrtc/modules/audio_coding/codecs/opus/opus_interface.c

Issue 2158293003: Update tests and DTX check for Opus 1.1.3. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add expected result on Android arm64 to Opus bitrate test Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_coding/codecs/opus/opus_interface.c
diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_interface.c b/webrtc/modules/audio_coding/codecs/opus/opus_interface.c
index bcb05966445ba389291e40382fbc16a1a0ac2673..99057355330694df758b9249d09296304ed62bb4 100644
--- a/webrtc/modules/audio_coding/codecs/opus/opus_interface.c
+++ b/webrtc/modules/audio_coding/codecs/opus/opus_interface.c
@@ -95,7 +95,11 @@ int WebRtcOpus_Encode(OpusEncInst* inst,
encoded,
(opus_int32)length_encoded_buffer);
- if (res == 1) {
+ if (res <= 0) {
+ return -1;
+ }
+
+ if (res <= 2) {
// Indicates DTX since the packet has nothing but a header. In principle,
// there is no need to send this packet. However, we do transmit the first
// occurrence to let the decoder know that the encoder enters DTX mode.
@@ -105,12 +109,10 @@ int WebRtcOpus_Encode(OpusEncInst* inst,
inst->in_dtx_mode = 1;
return 1;
}
- } else if (res > 1) {
- inst->in_dtx_mode = 0;
- return res;
}
- return -1;
+ inst->in_dtx_mode = 0;
+ return res;
}
int16_t WebRtcOpus_SetBitRate(OpusEncInst* inst, int32_t rate) {

Powered by Google App Engine
This is Rietveld 408576698