commit f9e701ad2411b44c8689171ceb4091871574376c
author Jean-Marc Valin <jmvalin@jmvalin.ca> Wed Aug 31 17:47:48 2011 -0400
committer Jean-Marc Valin <jmvalin@jmvalin.ca> Wed Aug 31 17:52:10 2011 -0400
tree 36c8dbf8ed18ab1cb843a1dee01251246e9ade8c
parent 875f8dbd56e303985a69ab9b4e0c7cf840741afa

Sharing more macros between the Opus code and the CELT low-level code

libcelt/modes.c

diff --git a/libcelt/modes.c b/libcelt/modes.c
index df183fb..247e1c2 100644
--- a/libcelt/modes.c
+++ b/libcelt/modes.c
@@ -246,7 +246,7 @@
                (frame_size<<j) == static_mode_list[i]->shortMdctSize*static_mode_list[i]->nbShortMdcts)
          {
             if (error)
-               *error = CELT_OK;
+               *error = OPUS_OK;
             return (CELTMode*)static_mode_list[i];
          }
       }
@@ -255,7 +255,7 @@
 
 #ifndef CUSTOM_MODES
    if (error)
-      *error = CELT_BAD_ARG;
+      *error = OPUS_BAD_ARG;
    return NULL;
 #else
 
@@ -264,20 +264,20 @@
    if (Fs < 8000 || Fs > 96000)
    {
       if (error)
-         *error = CELT_BAD_ARG;
+         *error = OPUS_BAD_ARG;
       return NULL;
    }
    if (frame_size < 40 || frame_size > 1024 || frame_size%2!=0)
    {
       if (error)
-         *error = CELT_BAD_ARG;
+         *error = OPUS_BAD_ARG;
       return NULL;
    }
    /* Frames of less than 1ms are not supported. */
    if ((opus_int32)frame_size*1000 < Fs)
    {
       if (error)
-         *error = CELT_BAD_ARG;
+         *error = OPUS_BAD_ARG;
       return NULL;
    }
 
@@ -299,7 +299,7 @@
    if ((opus_int32)(frame_size>>LM)*300 > Fs)
    {
       if (error)
-         *error = CELT_BAD_ARG;
+         *error = OPUS_BAD_ARG;
       return NULL;
    }
 
@@ -385,12 +385,12 @@
       goto failure;
 
    if (error)
-      *error = CELT_OK;
+      *error = OPUS_OK;
 
    return mode;
 failure:
    if (error)
-      *error = CELT_ALLOC_FAIL;
+      *error = OPUS_ALLOC_FAIL;
    if (mode!=NULL)
       celt_mode_destroy(mode);
    return NULL;