opus - Jul 2017 - [PATCH] Fix celt_pitch_xcorr ARM jump table compiling error

Hi,

Attached is a fix related to ARM optimization jump table compiling error.

Thanks,
Linfeng Zhang
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.xiph.org/pipermail/opus/attachments/20170720/661d96b5/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Fix-celt_pitch_xcorr-ARM-jump-table-compiling-error.patch
Type: text/x-patch
Size: 1538 bytes
Desc: not available
URL:
<http://lists.xiph.org/pipermail/opus/attachments/20170720/661d96b5/attachment.bin>

Hi Linfeng,

Just curious, can you explain why the code before the patch doesn't work?

Cheers,

	Jean-Marc


On 20/07/17 09:17 PM, Linfeng Zhang wrote:
> Hi,
> 
> Attached is a fix related to ARM optimization jump table compiling error.
> 
> Thanks,
> Linfeng Zhang
> 
> 
> 
> _______________________________________________
> opus mailing list
> opus at xiph.org
> http://lists.xiph.org/mailman/listinfo/opus
>

On Thu, Jul 20, 2017 at 7:01 PM, Jean-Marc Valin <jmvalin at jmvalin.ca>
wrote:
> Hi Linfeng,
>
> Just curious, can you explain why the code before the patch doesn't
work?
>
external/libopus/celt/arm/arm_celt_map.c:64:17: error: use of
undeclared identifier 'arch'
  MAY_HAVE_NEON(celt_pitch_xcorr)   /* NEON */
                ^
external/libopus/celt/arm/pitch_arm.h:93:54: note: expanded from macro
'celt_pitch_xcorr'
#   define celt_pitch_xcorr (*CELT_PITCH_XCORR_IMPL[(arch)&OPUS_ARCHMASK])
                                                     ^
external/libopus/celt/arm/arm_celt_map.c:64:3: error: pasting formed
')_media', an invalid preprocessing token
  MAY_HAVE_NEON(celt_pitch_xcorr)   /* NEON */
  ^
external/libopus/celt/arm/armcpu.h:46:31: note: expanded from macro
'MAY_HAVE_NEON'
#  define MAY_HAVE_NEON(name) MAY_HAVE_MEDIA(name)
                              ^
external/libopus/celt/arm/armcpu.h:38:37: note: expanded from macro
'MAY_HAVE_MEDIA'
#  define MAY_HAVE_MEDIA(name) name ## _media
                                    ^
2 errors generated.
> Cheers,
>
>         Jean-Marc
>
>
> On 20/07/17 09:17 PM, Linfeng Zhang wrote:
>> Hi,
>>
>> Attached is a fix related to ARM optimization jump table compiling
error.
>>
>> Thanks,
>> Linfeng Zhang
>>
>>
>>
>> _______________________________________________
>> opus mailing list
>> opus at xiph.org
>> http://lists.xiph.org/mailman/listinfo/opus
>>
> _______________________________________________
> opus mailing list
> opus at xiph.org
> http://lists.xiph.org/mailman/listinfo/opus