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

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

Issue 1415173005: Prevent Opus DTX from generating intermittent noise during silence (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 2 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 2ac53736650907ca4d54cfb1e1ccc42646f1116a..6c51f940f5e2df45e82d5e80fe752771896eebc2 100644
--- a/webrtc/modules/audio_coding/codecs/opus/opus_interface.c
+++ b/webrtc/modules/audio_coding/codecs/opus/opus_interface.c
@@ -29,48 +29,74 @@ enum {
/* Default frame size, 20 ms @ 48 kHz, in samples (for one channel). */
kWebRtcOpusDefaultFrameSize = 960,
+
+ // Maximum number of consecutive zeros, beyond or equal to which DTX can fail.
+ kZeroBreakCount = 158,
};
int16_t WebRtcOpus_EncoderCreate(OpusEncInst** inst,
int32_t channels,
int32_t application) {
- OpusEncInst* state;
- if (inst != NULL) {
- state = (OpusEncInst*) calloc(1, sizeof(OpusEncInst));
- if (state) {
- int opus_app;
- switch (application) {
- case 0: {
- opus_app = OPUS_APPLICATION_VOIP;
- break;
- }
- case 1: {
- opus_app = OPUS_APPLICATION_AUDIO;
- break;
- }
- default: {
- free(state);
- return -1;
- }
- }
+ if (inst == NULL)
+ return -1;
- int error;
- state->encoder = opus_encoder_create(48000, channels, opus_app,
- &error);
- state->in_dtx_mode = 0;
- if (error == OPUS_OK && state->encoder != NULL) {
- *inst = state;
- return 0;
- }
- free(state);
+ OpusEncInst* state = (OpusEncInst*)calloc(1, sizeof(OpusEncInst));
+ if (!state)
+ return -1;
+
+ // Allocate buffer for input signal.
+ state->buffer =
+ (int16_t*)calloc(channels * 48 * kWebRtcOpusMaxEncodeFrameSizeMs,
+ sizeof(int16_t));
+ if (!state->buffer) {
+ free(state);
+ return -1;
+ }
+
+ // Allocate buffer for zero counters.
+ state->zero_counts = (size_t*)calloc(channels, sizeof(size_t));
+ if (!state->zero_counts) {
+ free(state->buffer);
+ free(state);
+ return -1;
+ }
+
+ int opus_app;
+ switch (application) {
+ case 0: {
+ opus_app = OPUS_APPLICATION_VOIP;
+ break;
+ }
+ case 1: {
+ opus_app = OPUS_APPLICATION_AUDIO;
+ break;
+ }
+ default: {
+ WebRtcOpus_EncoderFree(state);
+ return -1;
}
}
- return -1;
+
+ int error;
+ state->encoder = opus_encoder_create(48000, channels, opus_app,
+ &error);
+ if (error != OPUS_OK || state->encoder == NULL) {
+ WebRtcOpus_EncoderFree(state);
+ return -1;
+ }
+
+ state->in_dtx_mode = 0;
+ state->channels = channels;
+
+ *inst = state;
+ return 0;
}
int16_t WebRtcOpus_EncoderFree(OpusEncInst* inst) {
if (inst) {
opus_encoder_destroy(inst->encoder);
+ free(inst->zero_counts);
+ free(inst->buffer);
free(inst);
return 0;
} else {
@@ -89,8 +115,29 @@ int WebRtcOpus_Encode(OpusEncInst* inst,
return -1;
}
+ const int channels = inst->channels;
+ int16_t* pointer = inst->buffer;
+ // Break long consecutive zeros by forcing a "1" every |kZeroBreakCount|
+ // samples.
+ memcpy(pointer, audio_in, samples * channels * sizeof(int16_t));
+ if (inst->in_dtx_mode) {
+ for (size_t i = 0; i < samples; ++i) {
+ for (int c = 0; c < channels; ++c, ++pointer) {
+ if (*pointer == 0) {
+ ++inst->zero_counts[c];
+ if (inst->zero_counts[c] == kZeroBreakCount) {
+ *pointer = 1;
+ inst->zero_counts[c] = 0;
+ }
+ } else {
+ inst->zero_counts[c] = 0;
+ }
+ }
+ }
+ }
tlegrand-webrtc 2015/10/27 13:51:22 I think there is a much simpler way of doing this,
minyue-webrtc 2015/10/27 18:29:01 There is a problem with checking if whole frame ar
tlegrand-webrtc 2015/10/28 13:20:37 Ah, I see now why you need to check for shorter pe
+
res = opus_encode(inst->encoder,
- (const opus_int16*)audio_in,
+ inst->buffer,
(int)samples,
encoded,
(opus_int32)length_encoded_buffer);
« no previous file with comments | « webrtc/modules/audio_coding/codecs/opus/opus_inst.h ('k') | webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698