ref: 2e5c52e98735a1722d858300835097dc7e9dd47c
parent: bfbfafa5cb3c42aa2eb201a5db3656a5232554ff
author: Paul Brossier <piem@piem.org>
date: Wed Oct 4 09:08:48 EDT 2017
src/spectral/dct_ipp.c: add ipp dct
--- /dev/null
+++ b/src/spectral/dct_ipp.c
@@ -1,0 +1,158 @@
+/*
+ Copyright (C) 2017 Paul Brossier <piem@aubio.org>
+
+ This file is part of aubio.
+
+ aubio is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ aubio is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with aubio. If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "aubio_priv.h"
+#include "fvec.h"
+#include "cvec.h"
+#include "spectral/dct.h"
+
+#if defined(HAVE_INTEL_IPP)
+
+#if !HAVE_AUBIO_DOUBLE
+#define aubio_IppFloat Ipp32f
+#define aubio_ippsDCTFwdSpec IppsDCTFwdSpec_32f
+#define aubio_ippsDCTInvSpec IppsDCTInvSpec_32f
+#define aubio_ippsDCTFwdGetSize ippsDCTFwdGetSize_32f
+#define aubio_ippsDCTInvGetSize ippsDCTInvGetSize_32f
+#define aubio_ippsDCTFwdInit ippsDCTFwdInit_32f
+#define aubio_ippsDCTInvInit ippsDCTInvInit_32f
+#define aubio_ippsDCTFwd ippsDCTFwd_32f
+#define aubio_ippsDCTInv ippsDCTInv_32f
+#else /* HAVE_AUBIO_DOUBLE */
+#define aubio_IppFloat Ipp64f
+#define aubio_ippsDCTFwdSpec IppsDCTFwdSpec_64f
+#define aubio_ippsDCTInvSpec IppsDCTInvSpec_64f
+#define aubio_ippsDCTFwdGetSize ippsDCTFwdGetSize_64f
+#define aubio_ippsDCTInvGetSize ippsDCTInvGetSize_64f
+#define aubio_ippsDCTFwdInit ippsDCTFwdInit_64f
+#define aubio_ippsDCTInvInit ippsDCTInvInit_64f
+#define aubio_ippsDCTFwd ippsDCTFwd_64f
+#define aubio_ippsDCTInv ippsDCTInv_64f
+#endif
+
+struct _aubio_dct_t {+ uint_t size;
+ Ipp8u* pSpec;
+ Ipp8u* pSpecBuffer;
+ Ipp8u* pBuffer;
+ Ipp8u* pSpecInv;
+ Ipp8u* pSpecBufferInv;
+ Ipp8u* pBufferInv;
+ aubio_ippsDCTFwdSpec* pFwdDCTSpec;
+ aubio_ippsDCTInvSpec* pInvDCTSpec;
+};
+
+aubio_dct_t * new_aubio_dct (uint_t size) {+ aubio_dct_t * s = AUBIO_NEW(aubio_dct_t);
+
+ const IppHintAlgorithm qualityHint = ippAlgHintAccurate; // ippAlgHintFast;
+ int pSpecSize, pSpecBufferSize, pBufferSize;
+ IppStatus status;
+
+ if ((sint_t)size <= 1) {+ AUBIO_ERR("dct: can only create with sizes greater than 1, requested %d\n",+ size);
+ goto beach;
+ }
+
+ status = aubio_ippsDCTFwdGetSize(size, qualityHint, &pSpecSize,
+ &pSpecBufferSize, &pBufferSize);
+ if (status != ippStsNoErr) {+ AUBIO_ERR("dct: failed to initialize dct. IPP error: %d\n", status);+ goto beach;
+ }
+
+ //AUBIO_INF("dct: fwd initialized with %d %d %d\n", pSpecSize, pSpecBufferSize,+ // pBufferSize);
+
+ s->pSpec = ippsMalloc_8u(pSpecSize);
+ if (pSpecSize > 0) {+ s->pSpecBuffer = ippsMalloc_8u(pSpecBufferSize);
+ } else {+ s->pSpecBuffer = NULL;
+ }
+ s->pBuffer = ippsMalloc_8u(pBufferSize);
+
+ status = aubio_ippsDCTInvGetSize(size, qualityHint, &pSpecSize,
+ &pSpecBufferSize, &pBufferSize);
+ if (status != ippStsNoErr) {+ AUBIO_ERR("dct: failed to initialize dct. IPP error: %d\n", status);+ goto beach;
+ }
+
+ //AUBIO_INF("dct: inv initialized with %d %d %d\n", pSpecSize, pSpecBufferSize,+ // pBufferSize);
+
+ s->pSpecInv = ippsMalloc_8u(pSpecSize);
+ if (pSpecSize > 0) {+ s->pSpecBufferInv = ippsMalloc_8u(pSpecBufferSize);
+ } else {+ s->pSpecBufferInv = NULL;
+ }
+ s->pBufferInv = ippsMalloc_8u(pBufferSize);
+
+ status = aubio_ippsDCTFwdInit(&(s->pFwdDCTSpec), size, qualityHint, s->pSpec,
+ s->pSpecBuffer);
+ if (status != ippStsNoErr) {+ AUBIO_ERR("dct: failed to initialize fwd dct. IPP error: %d\n", status);+ goto beach;
+ }
+
+ status = aubio_ippsDCTInvInit(&(s->pInvDCTSpec), size, qualityHint,
+ s->pSpecInv, s->pSpecBufferInv);
+ if (status != ippStsNoErr) {+ AUBIO_ERR("dct: failed to initialize inv dct. IPP error: %d\n", status);+ goto beach;
+ }
+
+ s->size = size;
+
+ return s;
+
+beach:
+ del_aubio_dct(s);
+ return NULL;
+}
+
+void del_aubio_dct(aubio_dct_t *s) {+ ippFree(s->pSpec);
+ ippFree(s->pSpecBuffer);
+ ippFree(s->pBuffer);
+ ippFree(s->pSpecInv);
+ ippFree(s->pSpecBufferInv);
+ ippFree(s->pBufferInv);
+ AUBIO_FREE(s);
+}
+
+void aubio_dct_do(aubio_dct_t *s, const fvec_t *input, fvec_t *output) {+
+ aubio_ippsDCTFwd((const aubio_IppFloat*)input->data,
+ (aubio_IppFloat*)output->data, s->pFwdDCTSpec, s->pBuffer);
+
+}
+
+void aubio_dct_rdo(aubio_dct_t *s, const fvec_t *input, fvec_t *output) {+
+ aubio_ippsDCTInv((const aubio_IppFloat*)input->data,
+ (aubio_IppFloat*)output->data, s->pInvDCTSpec, s->pBuffer);
+
+}
+
+#endif //defined(HAVE_INTEL_IPP)
--- a/src/spectral/dct_ooura.c
+++ b/src/spectral/dct_ooura.c
@@ -23,7 +23,7 @@
#include "cvec.h"
#include "spectral/dct.h"
-#if !defined(HAVE_ACCELERATE) && !defined(HAVE_FFTW3)
+#if !defined(HAVE_ACCELERATE) && !defined(HAVE_FFTW3) && !defined(HAVE_INTEL_IPP)
extern void aubio_ooura_ddct(int, int, smpl_t *, int *, smpl_t *);