Prevents useless calculation of perceptually-weighted frameSpeex-1.0beta2

git-svn-id: http://svn.xiph.org/trunk/speex@4034 0101bb08-14d6-0310-b084-bc0e0c8e3800

1 files changed, 6 insertions, 4 deletions

diff --git a/libspeex/nb_celp.c b/libspeex/nb_celp.c
index a500116..284b0f7 100644
--- a/libspeex/nb_celp.c
+++ b/libspeex/nb_celp.c
@@ -299,15 +299,17 @@ void nb_encode(void *state, float *in, SpeexBits *bits)
          st->interp_lsp[i] = cos(st->interp_lsp[i]);
       lsp_to_lpc(st->interp_lsp, st->interp_lpc, st->lpcSize,stack);
 
-      bw_lpc(st->gamma1, st->interp_lpc, st->bw_lpc1, st->lpcSize);
-      bw_lpc(st->gamma2, st->interp_lpc, st->bw_lpc2, st->lpcSize);
-
-      filter_mem2(st->frame, st->bw_lpc1, st->bw_lpc2, st->sw, st->frameSize, st->lpcSize, st->mem_sw_whole);
 
       /*Open-loop pitch*/
       if (SUBMODE(lbr_pitch) != -1 || st->vbr_enabled || SUBMODE(forced_pitch_gain)) {
          int nol_pitch[4];
          float nol_pitch_coef[4];
+
+         bw_lpc(st->gamma1, st->interp_lpc, st->bw_lpc1, st->lpcSize);
+         bw_lpc(st->gamma2, st->interp_lpc, st->bw_lpc2, st->lpcSize);
+         
+         filter_mem2(st->frame, st->bw_lpc1, st->bw_lpc2, st->sw, st->frameSize, st->lpcSize, st->mem_sw_whole);
+
          open_loop_nbest_pitch(st->sw, st->min_pitch, st->max_pitch, st->frameSize, 
                                nol_pitch, nol_pitch_coef, 4, stack);
          ol_pitch=nol_pitch[0];