[vlc-devel] [PATCH] Update speexdsp's neon.patch to work with the latest speexdsp HEAD. Patch was broken by changes in speexdsp (410cfbc7f0e0605ad508810d9961d0b17bdf710a resample.c). This broke the iOS build script (and possibly the build of VLC itself). Eventually neon.patch should be merged upstream in speexdsp, but in the meantime this will fix the compilation of speexdsp (with neon.patch, which is enabled by default) in VLC. If neon.patch will not be merged upstream to speexdsp, please update contrib/src/speexdsp/rules.mak and point 'SPEEXDSP_HASH' to a revision that works with neon.patch, as pointing it to HEAD (as it is currently) is bound to break the application of neon.patch in the future.

[Tristan Matthews]

On Thu, Jun 26, 2014 at 6:17 PM, Marc Etcheverry
<marc at taplightsoftware.com> wrote:
> ---
>  contrib/src/speexdsp/neon.patch | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/contrib/src/speexdsp/neon.patch b/contrib/src/speexdsp/neon.patch
> index f2f4286..0665bba 100644
> --- a/contrib/src/speexdsp/neon.patch
> +++ b/contrib/src/speexdsp/neon.patch
> @@ -37,10 +37,10 @@ index 2ba0b13..9ce4f97 100644
>   [if test "$enableval" = yes; then
>     has_char16=yes;
>  diff --git a/libspeexdsp/resample.c b/libspeexdsp/resample.c
> -index 7121445..3588f7b 100644
> +index aa0d9a0..825e3c4 100644
>  --- a/libspeexdsp/resample.c
>  +++ b/libspeexdsp/resample.c
> -@@ -585,7 +585,11 @@ static void update_filter(SpeexResamplerState *st)
> +@@ -585,7 +591,11 @@ static void update_filter(SpeexResamplerState *st)
>      }
>
>      /* Choose the resampling type that requires the least amount of memory */
> @@ -175,7 +175,7 @@ index 3fb096e..0e012e9 100644
>   #define SHL(a,shift) ((spx_word32_t)(a) << (shift))
>   #define PSHR(a,shift) (SHR((a)+((EXTEND32(1)<<((shift))>>1)),shift))
>  diff --git a/libspeexdsp/resample.c b/libspeexdsp/resample.c
> -index 3588f7b..ad59b97 100644
> +index aa0d9a0..825e3c4 100644
>  --- a/libspeexdsp/resample.c
>  +++ b/libspeexdsp/resample.c
>  @@ -99,6 +99,10 @@ static void speex_free (void *ptr) {free(ptr);}
> @@ -195,7 +195,7 @@ index 3588f7b..ad59b97 100644
>   */
>  +      sum = SATURATE32PSHR(sum, 15, 32767);
>   #else
> -       sum = inner_product_single(sinc, iptr, N);
> +       sum = inner_product_single(sinct, iptr, N);
>   #endif
>
>  -      out[out_stride * out_sample++] = SATURATE32(PSHR32(sum, 15), 32767);
> --
> 1.8.5.2 (Apple Git-48)

LGTM.
Also, if you're using git send-email, you may want to use --annotate
to preface your patch with a summary rather than putting it entirely
in the e-mail subject, see
https://wiki.videolan.org/Git/#Submitting_patches_to_the_vlc-devel_or_x264-devel

Best,
Tristan