From pmeerw at pmeerw.net  Tue Apr 15 09:33:50 2014
From: pmeerw at pmeerw.net (Peter Meerwald)
Date: Tue, 15 Apr 2014 18:33:50 +0200
Subject: [Speex-dev] [PATCH 3/3] Fix file permission of libspeexdsp/scal.c
In-Reply-To: <1397579630-4214-1-git-send-email-pmeerw@pmeerw.net>
References: <1397579630-4214-1-git-send-email-pmeerw@pmeerw.net>
Message-ID: <1397579630-4214-4-git-send-email-pmeerw@pmeerw.net>

Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>
---
 libspeexdsp/scal.c | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 libspeexdsp/scal.c

diff --git a/libspeexdsp/scal.c b/libspeexdsp/scal.c
old mode 100755
new mode 100644
-- 
1.9.1


From pmeerw at pmeerw.net  Tue Apr 15 09:33:48 2014
From: pmeerw at pmeerw.net (Peter Meerwald)
Date: Tue, 15 Apr 2014 18:33:48 +0200
Subject: [Speex-dev] [PATCH 1/3] Resampler buffer_size is always 160,
	drop FIXED_POINT #ifdef
In-Reply-To: <1397579630-4214-1-git-send-email-pmeerw@pmeerw.net>
References: <1397579630-4214-1-git-send-email-pmeerw@pmeerw.net>
Message-ID: <1397579630-4214-2-git-send-email-pmeerw@pmeerw.net>

Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>
---
 libspeexdsp/resample.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libspeexdsp/resample.c b/libspeexdsp/resample.c
index 7121445..e32ca45 100644
--- a/libspeexdsp/resample.c
+++ b/libspeexdsp/resample.c
@@ -755,11 +755,7 @@ EXPORT SpeexResamplerState *speex_resampler_init_frac(spx_uint32_t nb_channels,
    st->in_stride = 1;
    st->out_stride = 1;
    
-#ifdef FIXED_POINT
-   st->buffer_size = 160;
-#else
    st->buffer_size = 160;
-#endif
    
    /* Per channel data */
    st->last_sample = (spx_int32_t*)speex_alloc(nb_channels*sizeof(spx_int32_t));
-- 
1.9.1


From pmeerw at pmeerw.net  Tue Apr 15 09:33:49 2014
From: pmeerw at pmeerw.net (Peter Meerwald)
Date: Tue, 15 Apr 2014 18:33:49 +0200
Subject: [Speex-dev] [PATCH 2/3] Use fabsf() instead of fabs() since we have
	floats, not double
In-Reply-To: <1397579630-4214-1-git-send-email-pmeerw@pmeerw.net>
References: <1397579630-4214-1-git-send-email-pmeerw@pmeerw.net>
Message-ID: <1397579630-4214-3-git-send-email-pmeerw@pmeerw.net>

Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>
---
 libspeexdsp/resample.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libspeexdsp/resample.c b/libspeexdsp/resample.c
index e32ca45..a19b997 100644
--- a/libspeexdsp/resample.c
+++ b/libspeexdsp/resample.c
@@ -85,7 +85,7 @@ static void speex_free (void *ptr) {free(ptr);}
 #ifdef FIXED_POINT
 #define WORD2INT(x) ((x) < -32767 ? -32768 : ((x) > 32766 ? 32767 : (x)))  
 #else
-#define WORD2INT(x) ((x) < -32767.5f ? -32768 : ((x) > 32766.5f ? 32767 : floor(.5+(x))))  
+#define WORD2INT(x) ((x) < -32767.5f ? -32768 : ((x) > 32766.5f ? 32767 : floorf(.5+(x))))
 #endif
                
 #define IMAX(a,b) ((a) > (b) ? (a) : (b))
@@ -273,12 +273,12 @@ static spx_word16_t sinc(float cutoff, float x, int N, struct FuncDef *window_fu
 {
    /*fprintf (stderr, "%f ", x);*/
    float xx = x * cutoff;
-   if (fabs(x)<1e-6f)
+   if (fabsf(x)<1e-6f)
       return WORD2INT(32768.*cutoff);
-   else if (fabs(x) > .5f*N)
+   else if (fabsf(x) > .5f*N)
       return 0;
    /*FIXME: Can it really be any slower than this? */
-   return WORD2INT(32768.*cutoff*sin(M_PI*xx)/(M_PI*xx) * compute_func(fabs(2.*x/N), window_func));
+   return WORD2INT(32768.*cutoff*sin(M_PI*xx)/(M_PI*xx) * compute_func(fabsf(2.*x/N), window_func));
 }
 #else
 /* The slow way of computing a sinc for the table. Should improve that some day */
@@ -286,12 +286,12 @@ static spx_word16_t sinc(float cutoff, float x, int N, struct FuncDef *window_fu
 {
    /*fprintf (stderr, "%f ", x);*/
    float xx = x * cutoff;
-   if (fabs(x)<1e-6)
+   if (fabsf(x)<1e-6f)
       return cutoff;
-   else if (fabs(x) > .5*N)
+   else if (fabsf(x) > .5f*N)
       return 0;
    /*FIXME: Can it really be any slower than this? */
-   return cutoff*sin(M_PI*xx)/(M_PI*xx) * compute_func(fabs(2.*x/N), window_func);
+   return cutoff*sin(M_PI*xx)/(M_PI*xx) * compute_func(fabsf(2.*x/N), window_func);
 }
 #endif
 
-- 
1.9.1


From pmeerw at pmeerw.net  Tue Apr 15 09:33:47 2014
From: pmeerw at pmeerw.net (Peter Meerwald)
Date: Tue, 15 Apr 2014 18:33:47 +0200
Subject: [Speex-dev] [PATCH 0/3] misc. cleanup
Message-ID: <1397579630-4214-1-git-send-email-pmeerw@pmeerw.net>

Hello,

some misc. cleanup patches for speexdsp, nothing big

I'm not sure about how to submit patches, so this is a test balloon :)

ultimately, I'd like to fix the FIXED_POINT issue, see
http://lists.xiph.org/pipermail/speex-dev/2013-December/008465.html

currently, I think the only way to find out how speexdsp has been compiled is
to resample some bytes and observe the output; which is awkard

I plan to post some patches in this direction shortly...

thanks, regards, p.

Peter Meerwald (3):
  Resampler buffer_size is always 160, drop FIXED_POINT #ifdef
  Use fabsf() instead of fabs() since we have floats, not double
  Fix file permission of libspeexdsp/scal.c

 libspeexdsp/resample.c | 18 +++++++-----------
 libspeexdsp/scal.c     |  0
 2 files changed, 7 insertions(+), 11 deletions(-)
 mode change 100755 => 100644 libspeexdsp/scal.c

-- 
1.9.1


From le.businessman at gmail.com  Tue Apr 15 12:42:43 2014
From: le.businessman at gmail.com (Tristan Matthews)
Date: Tue, 15 Apr 2014 15:42:43 -0400
Subject: [Speex-dev] [PATCH 1/3] Resampler buffer_size is always 160,
	drop FIXED_POINT #ifdef
In-Reply-To: <1397579630-4214-2-git-send-email-pmeerw@pmeerw.net>
References: <1397579630-4214-1-git-send-email-pmeerw@pmeerw.net>
	<1397579630-4214-2-git-send-email-pmeerw@pmeerw.net>
Message-ID: <CAN8HRDk=C0r0NtMTwRxi_O-3zT_i1e4we1OaGkoH6fKSXvJScg@mail.gmail.com>

On Tue, Apr 15, 2014 at 12:33 PM, Peter Meerwald <pmeerw at pmeerw.net> wrote:

> Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>
> ---
>  libspeexdsp/resample.c | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/libspeexdsp/resample.c b/libspeexdsp/resample.c
> index 7121445..e32ca45 100644
> --- a/libspeexdsp/resample.c
> +++ b/libspeexdsp/resample.c
> @@ -755,11 +755,7 @@ EXPORT SpeexResamplerState
> *speex_resampler_init_frac(spx_uint32_t nb_channels,
>     st->in_stride = 1;
>     st->out_stride = 1;
>
> -#ifdef FIXED_POINT
> -   st->buffer_size = 160;
> -#else
>     st->buffer_size = 160;
> -#endif
>

LGTM.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.xiph.org/pipermail/speex-dev/attachments/20140415/7ccc4acf/attachment.htm 

From le.businessman at gmail.com  Tue Apr 15 12:44:11 2014
From: le.businessman at gmail.com (Tristan Matthews)
Date: Tue, 15 Apr 2014 15:44:11 -0400
Subject: [Speex-dev] [PATCH 3/3] Fix file permission of
	libspeexdsp/scal.c
In-Reply-To: <1397579630-4214-4-git-send-email-pmeerw@pmeerw.net>
References: <1397579630-4214-1-git-send-email-pmeerw@pmeerw.net>
	<1397579630-4214-4-git-send-email-pmeerw@pmeerw.net>
Message-ID: <CAN8HRDkgw6GH=tR4XZ5PQ-ZVkYajWwM1JW3oCK8Pt4mhD0Kd3g@mail.gmail.com>

On Tue, Apr 15, 2014 at 12:33 PM, Peter Meerwald <pmeerw at pmeerw.net> wrote:

> Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>
> ---
>  libspeexdsp/scal.c | 0
>  1 file changed, 0 insertions(+), 0 deletions(-)
>  mode change 100755 => 100644 libspeexdsp/scal.c
>
> diff --git a/libspeexdsp/scal.c b/libspeexdsp/scal.c
> old mode 100755
> new mode 100644
>

Looks good.

-t
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.xiph.org/pipermail/speex-dev/attachments/20140415/b807e733/attachment.htm 

From le.businessman at gmail.com  Tue Apr 15 12:45:43 2014
From: le.businessman at gmail.com (Tristan Matthews)
Date: Tue, 15 Apr 2014 15:45:43 -0400
Subject: [Speex-dev] [PATCH 2/3] Use fabsf() instead of fabs() since we
 have floats, not double
In-Reply-To: <1397579630-4214-3-git-send-email-pmeerw@pmeerw.net>
References: <1397579630-4214-1-git-send-email-pmeerw@pmeerw.net>
	<1397579630-4214-3-git-send-email-pmeerw@pmeerw.net>
Message-ID: <CAN8HRDk+7NnmWhHQSDipo__da9FqxyhkjDwqm0gk2-sKmcZ9Nw@mail.gmail.com>

On Tue, Apr 15, 2014 at 12:33 PM, Peter Meerwald <pmeerw at pmeerw.net> wrote:

> Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>
> ---
>  libspeexdsp/resample.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/libspeexdsp/resample.c b/libspeexdsp/resample.c
> index e32ca45..a19b997 100644
> --- a/libspeexdsp/resample.c
> +++ b/libspeexdsp/resample.c
> @@ -85,7 +85,7 @@ static void speex_free (void *ptr) {free(ptr);}
>  #ifdef FIXED_POINT
>  #define WORD2INT(x) ((x) < -32767 ? -32768 : ((x) > 32766 ? 32767 : (x)))
>  #else
> -#define WORD2INT(x) ((x) < -32767.5f ? -32768 : ((x) > 32766.5f ? 32767 :
> floor(.5+(x))))
> +#define WORD2INT(x) ((x) < -32767.5f ? -32768 : ((x) > 32766.5f ? 32767 :
> floorf(.5+(x))))
>  #endif
>
>  #define IMAX(a,b) ((a) > (b) ? (a) : (b))
> @@ -273,12 +273,12 @@ static spx_word16_t sinc(float cutoff, float x, int
> N, struct FuncDef *window_fu
>  {
>     /*fprintf (stderr, "%f ", x);*/
>     float xx = x * cutoff;
> -   if (fabs(x)<1e-6f)
> +   if (fabsf(x)<1e-6f)
>        return WORD2INT(32768.*cutoff);
> -   else if (fabs(x) > .5f*N)
> +   else if (fabsf(x) > .5f*N)
>        return 0;
>     /*FIXME: Can it really be any slower than this? */
> -   return WORD2INT(32768.*cutoff*sin(M_PI*xx)/(M_PI*xx) *
> compute_func(fabs(2.*x/N), window_func));
> +   return WORD2INT(32768.*cutoff*sin(M_PI*xx)/(M_PI*xx) *
> compute_func(fabsf(2.*x/N), window_func));
>  }
>  #else
>  /* The slow way of computing a sinc for the table. Should improve that
> some day */
> @@ -286,12 +286,12 @@ static spx_word16_t sinc(float cutoff, float x, int
> N, struct FuncDef *window_fu
>  {
>     /*fprintf (stderr, "%f ", x);*/
>     float xx = x * cutoff;
> -   if (fabs(x)<1e-6)
> +   if (fabsf(x)<1e-6f)
>        return cutoff;
> -   else if (fabs(x) > .5*N)
> +   else if (fabsf(x) > .5f*N)
>        return 0;
>     /*FIXME: Can it really be any slower than this? */
> -   return cutoff*sin(M_PI*xx)/(M_PI*xx) * compute_func(fabs(2.*x/N),
> window_func);
> +   return cutoff*sin(M_PI*xx)/(M_PI*xx) * compute_func(fabsf(2.*x/N),
> window_func);
>  }
>  #endif
>

Seems fine, fabsf is supported everywhere fabs is?

Best,
Tristan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.xiph.org/pipermail/speex-dev/attachments/20140415/14518979/attachment.htm 

From jmvalin at jmvalin.ca  Tue Apr 15 13:49:51 2014
From: jmvalin at jmvalin.ca (Jean-Marc Valin)
Date: Tue, 15 Apr 2014 16:49:51 -0400
Subject: [Speex-dev] [PATCH 2/3] Use fabsf() instead of fabs() since we
 have floats, not double
In-Reply-To: <CAN8HRDk+7NnmWhHQSDipo__da9FqxyhkjDwqm0gk2-sKmcZ9Nw@mail.gmail.com>
References: <1397579630-4214-1-git-send-email-pmeerw@pmeerw.net>	<1397579630-4214-3-git-send-email-pmeerw@pmeerw.net>
	<CAN8HRDk+7NnmWhHQSDipo__da9FqxyhkjDwqm0gk2-sKmcZ9Nw@mail.gmail.com>
Message-ID: <534D9B6F.5030008@jmvalin.ca>

On 15/04/14 03:45 PM, Tristan Matthews wrote:
> Seems fine, fabsf is supported everywhere fabs is?

No. AFAIK, fabsf() is C99-only, which would be a problem.

	Jean-Marc

From pmeerw at pmeerw.net  Tue Apr 15 14:36:45 2014
From: pmeerw at pmeerw.net (Peter Meerwald)
Date: Tue, 15 Apr 2014 23:36:45 +0200 (CEST)
Subject: [Speex-dev] [PATCH 2/3] Use fabsf() instead of fabs() since we
 have floats, not double
In-Reply-To: <534D9B6F.5030008@jmvalin.ca>
References: <1397579630-4214-1-git-send-email-pmeerw@pmeerw.net>
	<1397579630-4214-3-git-send-email-pmeerw@pmeerw.net>
	<CAN8HRDk+7NnmWhHQSDipo__da9FqxyhkjDwqm0gk2-sKmcZ9Nw@mail.gmail.com>
	<534D9B6F.5030008@jmvalin.ca>
Message-ID: <alpine.DEB.2.01.1404152317270.829@pmeerw.net>


> > Seems fine, fabsf is supported everywhere fabs is?
> 
> No. AFAIK, fabsf() is C99-only, which would be a problem.

right, fabsf() is C99, fabs() is C89 (according to fabs(3) man)

I wasn't aware of this constraint; it might be a good idea to enforce/test 
C89 compliance with "gcc -std=c89" then

p.

-- 

Peter Meerwald
+43-664-2444418 (mobile)