Renaming the CELT plc.c file to celt_lpc.c to avoid MSVC conflicts with Skype's PLC.c
authorJean-Marc Valin <jmvalin@jmvalin.ca>
Tue, 4 Oct 2011 17:26:53 +0000 (13:26 -0400)
committerJean-Marc Valin <jmvalin@jmvalin.ca>
Tue, 4 Oct 2011 17:31:54 +0000 (13:31 -0400)
celt/celt.c
celt/celt.vcxproj
celt/celt.vcxproj.filters
celt/celt_lpc.c [moved from celt/plc.c with 99% similarity]
celt/celt_lpc.h [moved from celt/plc.h with 100% similarity]
celt/pitch.c
celt_headers.txt
celt_sources.mk

index 6a33298..7f812a8 100644 (file)
@@ -47,7 +47,7 @@
 #include "mathops.h"
 #include "float_cast.h"
 #include <stdarg.h>
-#include "plc.h"
+#include "celt_lpc.h"
 #include "vq.h"
 
 #ifndef OPUS_VERSION
index a597662..f5b12d3 100644 (file)
@@ -95,7 +95,7 @@
     <ClInclude Include="modes.h" />\r
     <ClInclude Include="os_support.h" />\r
     <ClInclude Include="pitch.h" />\r
-    <ClInclude Include="plc.h" />\r
+    <ClInclude Include="celt_lpc.h" />\r
     <ClInclude Include="quant_bands.h" />\r
     <ClInclude Include="rate.h" />\r
     <ClInclude Include="stack_alloc.h" />\r
     <ClCompile Include="mdct.c" />\r
     <ClCompile Include="modes.c" />\r
     <ClCompile Include="pitch.c" />\r
-    <ClCompile Include="plc.c" />\r
+    <ClCompile Include="celt_lpc.c" />\r
     <ClCompile Include="quant_bands.c" />\r
     <ClCompile Include="rate.c" />\r
     <ClCompile Include="vq.c" />\r
index 4e650b9..b88ddc9 100644 (file)
@@ -78,7 +78,7 @@
     <ClInclude Include="pitch.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="plc.h">\r
+    <ClInclude Include="celt_lpc.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="quant_bands.h">\r
     <ClCompile Include="pitch.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="plc.c">\r
+    <ClCompile Include="celt_lpc.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="quant_bands.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r
similarity index 99%
rename from celt/plc.c
rename to celt/celt_lpc.c
index 2687bf3..7842030 100644 (file)
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "plc.h"
+#include "celt_lpc.h"
 #include "stack_alloc.h"
 #include "mathops.h"
 
similarity index 100%
rename from celt/plc.h
rename to celt/celt_lpc.h
index 30c43c5..3bc1084 100644 (file)
@@ -40,6 +40,7 @@
 #include "modes.h"
 #include "stack_alloc.h"
 #include "mathops.h"
+#include "celt_lpc.h"
 
 static void find_best_pitch(opus_val32 *xcorr, opus_val16 *y, int len,
                             int max_pitch, int *best_pitch
@@ -96,7 +97,6 @@ static void find_best_pitch(opus_val32 *xcorr, opus_val16 *y, int len,
    }
 }
 
-#include "plc.h"
 void pitch_downsample(celt_sig * restrict x[], opus_val16 * restrict x_lp,
       int len, int _C)
 {
index 26b7cfa..dd9d335 100644 (file)
@@ -21,7 +21,7 @@ celt/mfrngcod.h \
 celt/modes.h \
 celt/os_support.h \
 celt/pitch.h \
-celt/plc.h \
+celt/celt_lpc.h \
 celt/quant_bands.h \
 celt/rate.h \
 celt/stack_alloc.h \
index 13c1921..6f0a90e 100644 (file)
@@ -10,7 +10,7 @@ celt/mathops.c \
 celt/mdct.c \
 celt/modes.c \
 celt/pitch.c \
-celt/plc.c \
+celt/celt_lpc.c \
 celt/quant_bands.c \
 celt/rate.c \
 celt/vq.c