diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-05-03 22:32:38 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-05-03 22:32:38 -0300 |
| commit | dd69aeceac3d1798d0869d8adfb44af883b5fb93 (patch) | |
| tree | 717e9b909ada0661940f6f3d2bd5349c6424bbf1 /drivers/opus/celt/opus_custom_demo.c | |
| parent | 567cb691ec49844101247bb9dc34bc2722f6af4f (diff) | |
| parent | b81d9e6d614a67fd58e2256e90055589205bfa30 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'drivers/opus/celt/opus_custom_demo.c')
| -rw-r--r-- | drivers/opus/celt/opus_custom_demo.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/opus/celt/opus_custom_demo.c b/drivers/opus/celt/opus_custom_demo.c index b3129de779..956bec4e45 100644 --- a/drivers/opus/celt/opus_custom_demo.c +++ b/drivers/opus/celt/opus_custom_demo.c @@ -25,10 +25,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#ifdef OPUS_ENABLED #include "opus/opus_config.h" -#endif #include "opus/opus_custom.h" #include "opus/celt/arch.h" @@ -52,7 +49,7 @@ int main(int argc, char *argv[]) int bytes_per_packet; unsigned char data[MAX_PACKET]; int complexity; -#if !(defined (OPUS_FIXED_POINT) && !defined(CUSTOM_MODES)) && defined(RESYNTH) +#if !(defined (FIXED_POINT) && !defined(CUSTOM_MODES)) && defined(RESYNTH) int i; double rmsd = 0; #endif @@ -174,7 +171,7 @@ int main(int argc, char *argv[]) for (i=0;i<ret*channels;i++) out[i] = in[i]; #endif -#if !(defined (OPUS_FIXED_POINT) && !defined(CUSTOM_MODES)) && defined(RESYNTH) +#if !(defined (FIXED_POINT) && !defined(CUSTOM_MODES)) && defined(RESYNTH) for (i=0;i<ret*channels;i++) { rmsd += (in[i]-out[i])*1.0*(in[i]-out[i]); @@ -194,7 +191,7 @@ int main(int argc, char *argv[]) opus_custom_mode_destroy(mode); free(in); free(out); -#if !(defined (OPUS_FIXED_POINT) && !defined(CUSTOM_MODES)) && defined(RESYNTH) +#if !(defined (FIXED_POINT) && !defined(CUSTOM_MODES)) && defined(RESYNTH) if (rmsd > 0) { rmsd = sqrt(rmsd/(1.0*frame_size*channels*count)); |