From 18b91508d6cc6507163954b6ee7769334b9fa8c9 Mon Sep 17 00:00:00 2001 From: Arves100 <4847635+arves100@users.noreply.github.com> Date: Tue, 4 Jun 2024 14:28:03 +0200 Subject: [PATCH] Fix speex compilation issue with last vcpkg pkg --- Voice2/gvSpeex.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Voice2/gvSpeex.c b/Voice2/gvSpeex.c index 0b395c5e..dd56e8a7 100644 --- a/Voice2/gvSpeex.c +++ b/Voice2/gvSpeex.c @@ -24,19 +24,22 @@ GVBool gviSpeexInitialize(int quality, GVRate sampleRate) int rate; int bitsPerFrame; int samplesPerSecond; - + const SpeexMode* speexMode; + // we shouldn't already be initialized if(gviSpeexInitialized) return GVFalse; // create a new encoder state if (sampleRate == GVRate_8KHz) - gviSpeexEncoderState = speex_encoder_init(&speex_nb_mode); + speexMode = speex_lib_get_mode(SPEEX_MODEID_NB); else if (sampleRate == GVRate_16KHz) - gviSpeexEncoderState = speex_encoder_init(&speex_wb_mode); + speexMode = speex_lib_get_mode(SPEEX_MODEID_WB); else return GVFalse; + gviSpeexEncoderState = speex_encoder_init(speexMode); + if(!gviSpeexEncoderState) return GVFalse; @@ -107,15 +110,19 @@ GVBool gviSpeexNewDecoder(GVDecoderData * data) { void * decoder; int perceptualEnhancement = 1; + const SpeexMode* speexMode; // create a new decoder state + if (gviGetSampleRate() == GVRate_8KHz) - decoder = speex_decoder_init(&speex_nb_mode); + speexMode = speex_lib_get_mode(SPEEX_MODEID_NB); else if (gviGetSampleRate() == GVRate_16KHz) - decoder = speex_decoder_init(&speex_wb_mode); + speexMode = speex_lib_get_mode(SPEEX_MODEID_WB); else return GVFalse; + decoder = speex_decoder_init(speexMode); + if(!decoder) return GVFalse;