diff options
| author | Linfeng Zhang <linfengz@google.com> | 2017-07-20 13:00:07 -0700 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2017-07-25 02:14:38 -0400 |
| commit | 64a1608d12ec110e41588745a1384e3cc292b9e1 (patch) | |
| tree | dbd37a0a870e4343f4fd95753db605abbe3c4e57 /celt/arm | |
| parent | 047c11b5bc5a59156616a1ea861a9979b4449339 (diff) | |
| download | opus-64a1608d12ec110e41588745a1384e3cc292b9e1.tar.gz | |
Fix celt_pitch_xcorr() ARM jump table compiling error
This bug is introduced in commit 85fb8a1.
Change-Id: I3822cdfc1308ca62ce03da008260de8f4b04596c
Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>
Diffstat (limited to 'celt/arm')
| -rw-r--r-- | celt/arm/pitch_arm.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/celt/arm/pitch_arm.h b/celt/arm/pitch_arm.h index 4ee13bd0..bed8b04e 100644 --- a/celt/arm/pitch_arm.h +++ b/celt/arm/pitch_arm.h @@ -90,7 +90,9 @@ extern opus_val32 (*const CELT_PITCH_XCORR_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *, const opus_val16 *, opus_val32 *, int, int, int); # define OVERRIDE_PITCH_XCORR (1) -# define celt_pitch_xcorr (*CELT_PITCH_XCORR_IMPL[(arch)&OPUS_ARCHMASK]) +# define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \ + ((*CELT_PITCH_XCORR_IMPL[(arch)&OPUS_ARCHMASK])(_x, _y, \ + xcorr, len, max_pitch, arch)) # elif defined(OPUS_ARM_PRESUME_EDSP) || \ defined(OPUS_ARM_PRESUME_MEDIA) || \ @@ -142,7 +144,9 @@ extern void const opus_val16 *, opus_val32 *, int, int, int); # define OVERRIDE_PITCH_XCORR (1) -# define celt_pitch_xcorr (*CELT_PITCH_XCORR_IMPL[(arch)&OPUS_ARCHMASK]) +# define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \ + ((*CELT_PITCH_XCORR_IMPL[(arch)&OPUS_ARCHMASK])(_x, _y, \ + xcorr, len, max_pitch, arch)) # elif defined(OPUS_ARM_PRESUME_NEON_INTR) |