From c172f57d52194ec61721bde5c1bbc8514259b2c3 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jean-marc.valin@octasic.com>
Date: Wed, 9 Feb 2011 13:34:03 -0500
Subject: [PATCH] Fixes buffering issues with CELT-only mode at 2.5 ms
---
src/opus_encoder.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/opus_encoder.c b/src/opus_encoder.c
index c911e7b57..d8dac73f6 100644
--- a/src/opus_encoder.c
+++ b/src/opus_encoder.c
@@ -211,8 +211,8 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size,
}
}
- for (i=0;i<ENCODER_DELAY_COMPENSATION*st->channels;i++)
- pcm_buf[i] = st->delay_buffer[i];
+ for (i=0;i<IMIN(frame_size, ENCODER_DELAY_COMPENSATION)*st->channels;i++)
+ pcm_buf[i] = st->delay_buffer[i];
for (;i<frame_size*st->channels;i++)
pcm_buf[i] = pcm[i-ENCODER_DELAY_COMPENSATION*st->channels];
@@ -220,8 +220,18 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size,
/* Encode high band with CELT */
ret = celt_encode_with_ec(st->celt_enc, pcm_buf, frame_size, NULL, nb_compr_bytes, &enc);
- for (i=0;i<ENCODER_DELAY_COMPENSATION*st->channels;i++)
- st->delay_buffer[i] = pcm[frame_size*st->channels-ENCODER_DELAY_COMPENSATION*st->channels+i];
+
+ if (frame_size>ENCODER_DELAY_COMPENSATION)
+ {
+ for (i=0;i<ENCODER_DELAY_COMPENSATION*st->channels;i++)
+ st->delay_buffer[i] = pcm[(frame_size-ENCODER_DELAY_COMPENSATION)*st->channels+i];
+ } else {
+ int tmp = ENCODER_DELAY_COMPENSATION-frame_size;
+ for (i=0;i<tmp*st->channels;i++)
+ st->delay_buffer[i] = st->delay_buffer[i+frame_size*st->channels];
+ for (i=0;i<frame_size*st->channels;i++)
+ st->delay_buffer[tmp*st->channels+i] = pcm[i];
+ }
} else {
ret = (ec_tell(&enc)+7)>>3;
ec_enc_done(&enc);
--
GitLab