[Pkg-voip-commits] r852 - speex/trunk/debian/patches
Maitland Bottoms
bottoms at costa.debian.org
Sat Oct 15 20:18:33 UTC 2005
Author: bottoms
Date: 2005-10-15 20:18:33 +0000 (Sat, 15 Oct 2005)
New Revision: 852
Added:
speex/trunk/debian/patches/02_configurable-VAD.dpatch
Removed:
speex/trunk/debian/patches/02a_configurable-VAD.dpatch
speex/trunk/debian/patches/02b_configurable-VAD.dpatch
Modified:
speex/trunk/debian/patches/00list
Log:
Select upstream approved patch
Modified: speex/trunk/debian/patches/00list
===================================================================
--- speex/trunk/debian/patches/00list 2005-10-15 19:07:28 UTC (rev 851)
+++ speex/trunk/debian/patches/00list 2005-10-15 20:18:33 UTC (rev 852)
@@ -1 +1,2 @@
01_default-quality-manpage.dpatch
+02_configurable-VAD.dpatch
Copied: speex/trunk/debian/patches/02_configurable-VAD.dpatch (from rev 851, speex/trunk/debian/patches/02b_configurable-VAD.dpatch)
Deleted: speex/trunk/debian/patches/02a_configurable-VAD.dpatch
===================================================================
--- speex/trunk/debian/patches/02a_configurable-VAD.dpatch 2005-10-15 19:07:28 UTC (rev 851)
+++ speex/trunk/debian/patches/02a_configurable-VAD.dpatch 2005-10-15 20:18:33 UTC (rev 852)
@@ -1,94 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02a_configurable-VAD.dpatch by A. Maitland Bottoms <bottoms at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: with float arguments as used in iaxclient
-
- at DPATCH@
-diff -urNad speex-1.1.10~/include/speex/speex_preprocess.h speex-1.1.10/include/speex/speex_preprocess.h
---- speex-1.1.10~/include/speex/speex_preprocess.h 2005-05-07 20:08:03.000000000 -0400
-+++ speex-1.1.10/include/speex/speex_preprocess.h 2005-10-13 22:51:10.445800957 -0400
-@@ -55,6 +55,8 @@
- int dereverb_enabled;
- float reverb_decay;
- float reverb_level;
-+ float speech_prob_start;
-+ float speech_prob_continue;
-
- float *frame; /**< Processing frame (2*ps_size) */
- float *ps; /**< Current power spectrum */
-@@ -140,6 +142,12 @@
- #define SPEEX_PREPROCESS_SET_DEREVERB_DECAY 12
- #define SPEEX_PREPROCESS_GET_DEREVERB_DECAY 13
-
-+#define SPEEX_PREPROCESS_SET_PROB_START 14
-+#define SPEEX_PREPROCESS_GET_PROB_START 15
-+
-+#define SPEEX_PREPROCESS_SET_PROB_CONTINUE 16
-+#define SPEEX_PREPROCESS_GET_PROB_CONTINUE 17
-+
- #ifdef __cplusplus
- }
- #endif
-diff -urNad speex-1.1.10~/libspeex/preprocess.c speex-1.1.10/libspeex/preprocess.c
---- speex-1.1.10~/libspeex/preprocess.c 2005-05-07 20:07:21.000000000 -0400
-+++ speex-1.1.10/libspeex/preprocess.c 2005-10-13 00:00:35.851280475 -0400
-@@ -52,6 +52,9 @@
-
- #define NB_BANDS 8
-
-+#define SPEEX_PROB_START_DEFAULT 0.35f
-+#define SPEEX_PROB_CONTINUE_DEFAULT 0.20f
-+
- #define ZMIN .1
- #define ZMAX .316
- #define ZMIN_1 10
-@@ -153,6 +156,9 @@
- st->reverb_decay = .5;
- st->reverb_level = .2;
-
-+ st->speech_prob_start = SPEEX_PROB_START_DEFAULT;
-+ st->speech_prob_continue = SPEEX_PROB_CONTINUE_DEFAULT;
-+
- st->frame = (float*)speex_alloc(2*N*sizeof(float));
- st->ps = (float*)speex_alloc(N*sizeof(float));
- st->gain2 = (float*)speex_alloc(N*sizeof(float));
-@@ -447,7 +453,8 @@
- st->speech_prob = p0/(1e-25f+p1+p0);
- /*fprintf (stderr, "%f %f %f ", tot_loudness, st->loudness2, st->speech_prob);*/
-
-- if (st->speech_prob>.35 || (st->last_speech < 20 && st->speech_prob>.1))
-+ if (st->speech_prob > st->speech_prob_start
-+ || (st->last_speech < 20 && st->speech_prob > st->speech_prob_continue))
- {
- is_speech = 1;
- st->last_speech = 0;
-@@ -1037,6 +1044,28 @@
- (*(float*)ptr) = st->reverb_decay;
- break;
-
-+ case SPEEX_PREPROCESS_SET_PROB_START:
-+ st->speech_prob_start = (*(float*)ptr);
-+ if ( st->speech_prob_start > 1 )
-+ st->speech_prob_start = st->speech_prob_start / 100;
-+ if ( st->speech_prob_start > 1 || st->speech_prob_start < 0 )
-+ st->speech_prob_start = SPEEX_PROB_START_DEFAULT;
-+ break;
-+ case SPEEX_PREPROCESS_GET_PROB_START:
-+ (*(float*)ptr) = st->speech_prob_start ;
-+ break;
-+
-+ case SPEEX_PREPROCESS_SET_PROB_CONTINUE:
-+ st->speech_prob_continue = (*(float*)ptr);
-+ if ( st->speech_prob_continue > 1 )
-+ st->speech_prob_continue = st->speech_prob_continue / 100;
-+ if ( st->speech_prob_continue > 1 || st->speech_prob_continue < 0 )
-+ st->speech_prob_continue = SPEEX_PROB_CONTINUE_DEFAULT;
-+ break;
-+ case SPEEX_PREPROCESS_GET_PROB_CONTINUE:
-+ (*(float*)ptr) = st->speech_prob_continue;
-+ break;
-+
- default:
- speex_warning_int("Unknown speex_preprocess_ctl request: ", request);
- return -1;
Deleted: speex/trunk/debian/patches/02b_configurable-VAD.dpatch
===================================================================
--- speex/trunk/debian/patches/02b_configurable-VAD.dpatch 2005-10-15 19:07:28 UTC (rev 851)
+++ speex/trunk/debian/patches/02b_configurable-VAD.dpatch 2005-10-15 20:18:33 UTC (rev 852)
@@ -1,90 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_configurable-VAD.dpatch by A. Maitland Bottoms <bottoms at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: integer arguments as percentages
-
- at DPATCH@
-diff -urNad speex-1.1.10~/include/speex/speex_preprocess.h speex-1.1.10/include/speex/speex_preprocess.h
---- speex-1.1.10~/include/speex/speex_preprocess.h 2005-05-07 20:08:03.000000000 -0400
-+++ speex-1.1.10/include/speex/speex_preprocess.h 2005-10-13 22:51:10.445800957 -0400
-@@ -55,6 +55,8 @@
- int dereverb_enabled;
- float reverb_decay;
- float reverb_level;
-+ float speech_prob_start;
-+ float speech_prob_continue;
-
- float *frame; /**< Processing frame (2*ps_size) */
- float *ps; /**< Current power spectrum */
-@@ -140,6 +142,12 @@
- #define SPEEX_PREPROCESS_SET_DEREVERB_DECAY 12
- #define SPEEX_PREPROCESS_GET_DEREVERB_DECAY 13
-
-+#define SPEEX_PREPROCESS_SET_PROB_START 14
-+#define SPEEX_PREPROCESS_GET_PROB_START 15
-+
-+#define SPEEX_PREPROCESS_SET_PROB_CONTINUE 16
-+#define SPEEX_PREPROCESS_GET_PROB_CONTINUE 17
-+
- #ifdef __cplusplus
- }
- #endif
-diff -urNad speex-1.1.10~/libspeex/preprocess.c speex-1.1.10/libspeex/preprocess.c
---- speex-1.1.10~/libspeex/preprocess.c 2005-05-07 20:07:21.000000000 -0400
-+++ speex-1.1.10/libspeex/preprocess.c 2005-10-14 08:30:09.466914112 -0400
-@@ -52,6 +52,9 @@
-
- #define NB_BANDS 8
-
-+#define SPEEX_PROB_START_DEFAULT 0.35f
-+#define SPEEX_PROB_CONTINUE_DEFAULT 0.20f
-+
- #define ZMIN .1
- #define ZMAX .316
- #define ZMIN_1 10
-@@ -153,6 +156,9 @@
- st->reverb_decay = .5;
- st->reverb_level = .2;
-
-+ st->speech_prob_start = SPEEX_PROB_START_DEFAULT;
-+ st->speech_prob_continue = SPEEX_PROB_CONTINUE_DEFAULT;
-+
- st->frame = (float*)speex_alloc(2*N*sizeof(float));
- st->ps = (float*)speex_alloc(N*sizeof(float));
- st->gain2 = (float*)speex_alloc(N*sizeof(float));
-@@ -447,7 +453,8 @@
- st->speech_prob = p0/(1e-25f+p1+p0);
- /*fprintf (stderr, "%f %f %f ", tot_loudness, st->loudness2, st->speech_prob);*/
-
-- if (st->speech_prob>.35 || (st->last_speech < 20 && st->speech_prob>.1))
-+ if (st->speech_prob > st->speech_prob_start
-+ || (st->last_speech < 20 && st->speech_prob > st->speech_prob_continue))
- {
- is_speech = 1;
- st->last_speech = 0;
-@@ -1037,6 +1044,24 @@
- (*(float*)ptr) = st->reverb_decay;
- break;
-
-+ case SPEEX_PREPROCESS_SET_PROB_START:
-+ st->speech_prob_start = (*(int*)ptr) / 100.0;
-+ if ( st->speech_prob_start > 1 || st->speech_prob_start < 0 )
-+ st->speech_prob_start = SPEEX_PROB_START_DEFAULT;
-+ break;
-+ case SPEEX_PREPROCESS_GET_PROB_START:
-+ (*(int*)ptr) = st->speech_prob_start * 100;
-+ break;
-+
-+ case SPEEX_PREPROCESS_SET_PROB_CONTINUE:
-+ st->speech_prob_continue = (*(int*)ptr) / 100.0;
-+ if ( st->speech_prob_continue > 1 || st->speech_prob_continue < 0 )
-+ st->speech_prob_continue = SPEEX_PROB_CONTINUE_DEFAULT;
-+ break;
-+ case SPEEX_PREPROCESS_GET_PROB_CONTINUE:
-+ (*(int*)ptr) = st->speech_prob_continue * 100;
-+ break;
-+
- default:
- speex_warning_int("Unknown speex_preprocess_ctl request: ", request);
- return -1;
More information about the Pkg-voip-commits
mailing list