From db5b19455f39c521998d521d9d91960ceeebacaa Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jmvalin@jmvalin.ca>
Date: Tue, 12 Nov 2013 14:20:00 -0500
Subject: [PATCH] Fixes an initialization issue in SILK prefill found by
Coverity
---
silk/fixed/encode_frame_FIX.c | 8 ++++----
silk/float/encode_frame_FLP.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/silk/fixed/encode_frame_FIX.c b/silk/fixed/encode_frame_FIX.c
index 43616369c..9c57a10a1 100644
--- a/silk/fixed/encode_frame_FIX.c
+++ b/silk/fixed/encode_frame_FIX.c
@@ -302,10 +302,6 @@ opus_int silk_encode_frame_FIX(
silk_memmove( psEnc->x_buf, &psEnc->x_buf[ psEnc->sCmn.frame_length ],
( psEnc->sCmn.ltp_mem_length + LA_SHAPE_MS * psEnc->sCmn.fs_kHz ) * sizeof( opus_int16 ) );
- /* Parameters needed for next frame */
- psEnc->sCmn.prevLag = sEncCtrl.pitchL[ psEnc->sCmn.nb_subfr - 1 ];
- psEnc->sCmn.prevSignalType = psEnc->sCmn.indices.signalType;
-
/* Exit without entropy coding */
if( psEnc->sCmn.prefillFlag ) {
/* No payload */
@@ -314,6 +310,10 @@ opus_int silk_encode_frame_FIX(
return ret;
}
+ /* Parameters needed for next frame */
+ psEnc->sCmn.prevLag = sEncCtrl.pitchL[ psEnc->sCmn.nb_subfr - 1 ];
+ psEnc->sCmn.prevSignalType = psEnc->sCmn.indices.signalType;
+
/****************************************/
/* Finalize payload */
/****************************************/
diff --git a/silk/float/encode_frame_FLP.c b/silk/float/encode_frame_FLP.c
index 29bdc542a..df75db91d 100644
--- a/silk/float/encode_frame_FLP.c
+++ b/silk/float/encode_frame_FLP.c
@@ -294,10 +294,6 @@ opus_int silk_encode_frame_FLP(
silk_memmove( psEnc->x_buf, &psEnc->x_buf[ psEnc->sCmn.frame_length ],
( psEnc->sCmn.ltp_mem_length + LA_SHAPE_MS * psEnc->sCmn.fs_kHz ) * sizeof( silk_float ) );
- /* Parameters needed for next frame */
- psEnc->sCmn.prevLag = sEncCtrl.pitchL[ psEnc->sCmn.nb_subfr - 1 ];
- psEnc->sCmn.prevSignalType = psEnc->sCmn.indices.signalType;
-
/* Exit without entropy coding */
if( psEnc->sCmn.prefillFlag ) {
/* No payload */
@@ -305,6 +301,10 @@ opus_int silk_encode_frame_FLP(
return ret;
}
+ /* Parameters needed for next frame */
+ psEnc->sCmn.prevLag = sEncCtrl.pitchL[ psEnc->sCmn.nb_subfr - 1 ];
+ psEnc->sCmn.prevSignalType = psEnc->sCmn.indices.signalType;
+
/****************************************/
/* Finalize payload */
/****************************************/
--
GitLab