From: <sb...@us...> - 2008-02-07 16:51:50
|
Revision: 1345 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1345&view=rev Author: sbalea Date: 2008-02-07 08:51:50 -0800 (Thu, 07 Feb 2008) Log Message: ----------- Remove speex-1.2beta2 patches; they're no longer needed since we require speex-1.2beta3 anyways Removed Paths: ------------- branches/team/mihai/echocan/speex-1.2beta2-loudness.patch branches/team/mihai/echocan/speex-1.2beta2-vad-probs.patch Deleted: branches/team/mihai/echocan/speex-1.2beta2-loudness.patch =================================================================== --- branches/team/mihai/echocan/speex-1.2beta2-loudness.patch 2008-02-07 16:50:56 UTC (rev 1344) +++ branches/team/mihai/echocan/speex-1.2beta2-loudness.patch 2008-02-07 16:51:50 UTC (rev 1345) @@ -1,26 +0,0 @@ -diff -urN speex-1.2beta2.orig/include/speex/speex_preprocess.h speex-1.2beta2/include/speex/speex_preprocess.h ---- speex-1.2beta2.orig/include/speex/speex_preprocess.h 2007-01-23 06:59:04.000000000 -0500 -+++ speex-1.2beta2/include/speex/speex_preprocess.h 2007-10-29 12:06:48.000000000 -0400 -@@ -178,6 +178,9 @@ - /** Get maximal gain in dB (int32) */ - #define SPEEX_PREPROCESS_GET_AGC_MAX_GAIN 31 - -+/** Get loudness */ -+#define SPEEX_PREPROCESS_GET_AGC_LOUDNESS 32 -+ - #ifdef __cplusplus - } - #endif -diff -urN speex-1.2beta2.orig/libspeex/preprocess.c speex-1.2beta2/libspeex/preprocess.c ---- speex-1.2beta2.orig/libspeex/preprocess.c 2007-05-03 05:22:04.000000000 -0400 -+++ speex-1.2beta2/libspeex/preprocess.c 2007-10-29 13:35:53.000000000 -0400 -@@ -1163,6 +1163,9 @@ - case SPEEX_PREPROCESS_GET_ECHO_STATE: - ptr = (void*)st->echo_state; - break; -+ case SPEEX_PREPROCESS_GET_AGC_LOUDNESS: -+ (*(spx_int32_t*)ptr) = pow(st->loudness, 1.0/LOUDNESS_EXP); -+ break; - - default: - speex_warning_int("Unknown speex_preprocess_ctl request: ", request); Deleted: branches/team/mihai/echocan/speex-1.2beta2-vad-probs.patch =================================================================== --- branches/team/mihai/echocan/speex-1.2beta2-vad-probs.patch 2008-02-07 16:50:56 UTC (rev 1344) +++ branches/team/mihai/echocan/speex-1.2beta2-vad-probs.patch 2008-02-07 16:51:50 UTC (rev 1345) @@ -1,24 +0,0 @@ -diff -urN speex-1.2beta2.orig/libspeex/preprocess.c speex-1.2beta2/libspeex/preprocess.c ---- speex-1.2beta2.orig/libspeex/preprocess.c 2007-05-03 05:22:04.000000000 -0400 -+++ speex-1.2beta2/libspeex/preprocess.c 2007-11-05 14:34:37.000000000 -0500 -@@ -1124,16 +1124,16 @@ - break; - - case SPEEX_PREPROCESS_SET_PROB_START: -- *(spx_int32_t*)ptr = MIN32(Q15_ONE,MAX32(0, *(spx_int32_t*)ptr)); -- st->speech_prob_start = DIV32_16(MULT16_16(32767,*(spx_int32_t*)ptr), 100); -+ *(spx_int32_t*)ptr = MIN32(100,MAX32(0, *(spx_int32_t*)ptr)); -+ st->speech_prob_start = DIV32_16(MULT16_16(Q15ONE,*(spx_int32_t*)ptr), 100); - break; - case SPEEX_PREPROCESS_GET_PROB_START: - (*(spx_int32_t*)ptr) = MULT16_16_Q15(st->speech_prob_start, 100); - break; - - case SPEEX_PREPROCESS_SET_PROB_CONTINUE: -- *(spx_int32_t*)ptr = MIN32(Q15_ONE,MAX32(0, *(spx_int32_t*)ptr)); -- st->speech_prob_continue = DIV32_16(MULT16_16(32767,*(spx_int32_t*)ptr), 100); -+ *(spx_int32_t*)ptr = MIN32(100,MAX32(0, *(spx_int32_t*)ptr)); -+ st->speech_prob_continue = DIV32_16(MULT16_16(Q15ONE,*(spx_int32_t*)ptr), 100); - break; - case SPEEX_PREPROCESS_GET_PROB_CONTINUE: - (*(spx_int32_t*)ptr) = MULT16_16_Q15(st->speech_prob_continue, 100); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |