Index: third_party/opus/src/celt/x86/vq_sse.h |
diff --git a/third_party/opus/src/celt/celt_lpc.h b/third_party/opus/src/celt/x86/vq_sse.h |
similarity index 58% |
copy from third_party/opus/src/celt/celt_lpc.h |
copy to third_party/opus/src/celt/x86/vq_sse.h |
index 323459eb1a83156664784742ddca78e1c44e6dc0..b4efe8f249f893ed160040ec825b2a7647e192bb 100644 |
--- a/third_party/opus/src/celt/celt_lpc.h |
+++ b/third_party/opus/src/celt/x86/vq_sse.h |
@@ -1,5 +1,4 @@ |
-/* Copyright (c) 2009-2010 Xiph.Org Foundation |
- Written by Jean-Marc Valin */ |
+/* Copyright (c) 2016 Jean-Marc Valin */ |
/* |
Redistribution and use in source and binary forms, with or without |
modification, are permitted provided that the following conditions |
@@ -25,43 +24,27 @@ |
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
-#ifndef PLC_H |
-#define PLC_H |
+#ifndef VQ_SSE_H |
+#define VQ_SSE_H |
-#include "arch.h" |
-#include "cpu_support.h" |
+#if defined(OPUS_X86_MAY_HAVE_SSE2) && !defined(FIXED_POINT) |
+#define OVERRIDE_OP_PVQ_SEARCH |
-#if defined(OPUS_X86_MAY_HAVE_SSE4_1) |
-#include "x86/celt_lpc_sse.h" |
-#endif |
- |
-#define LPC_ORDER 24 |
+opus_val16 op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch); |
-void _celt_lpc(opus_val16 *_lpc, const opus_val32 *ac, int p); |
+#if defined(OPUS_X86_PRESUME_SSE2) |
+#define op_pvq_search(x, iy, K, N, arch) \ |
+ (op_pvq_search_sse2(x, iy, K, N, arch)) |
-void celt_fir_c( |
- const opus_val16 *x, |
- const opus_val16 *num, |
- opus_val16 *y, |
- int N, |
- int ord, |
- opus_val16 *mem, |
- int arch); |
+#else |
-#if !defined(OVERRIDE_CELT_FIR) |
-#define celt_fir(x, num, y, N, ord, mem, arch) \ |
- (celt_fir_c(x, num, y, N, ord, mem, arch)) |
-#endif |
+extern opus_val16 (*const OP_PVQ_SEARCH_IMPL[OPUS_ARCHMASK + 1])( |
+ celt_norm *_X, int *iy, int K, int N, int arch); |
-void celt_iir(const opus_val32 *x, |
- const opus_val16 *den, |
- opus_val32 *y, |
- int N, |
- int ord, |
- opus_val16 *mem, |
- int arch); |
+# define op_pvq_search(X, iy, K, N, arch) \ |
+ ((*OP_PVQ_SEARCH_IMPL[(arch) & OPUS_ARCHMASK])(X, iy, K, N, arch)) |
-int _celt_autocorr(const opus_val16 *x, opus_val32 *ac, |
- const opus_val16 *window, int overlap, int lag, int n, int arch); |
+#endif |
+#endif |
-#endif /* PLC_H */ |
+#endif |