Skip to content
Snippets Groups Projects
Commit 3b60e81d authored by Emily Bowman's avatar Emily Bowman Committed by Ralph Giles
Browse files

Fix the MSVC build.

Updates the project files to include the new encoder source files.
Use OPUS_RESTRICT and include config.h to set the proper defines
for build under MSVC.
parent 027ec51b
No related branches found
No related tags found
No related merge requests found
...@@ -142,9 +142,9 @@ void tonality_analysis(TonalityAnalysisState *tonal, AnalysisInfo *info, CELTEnc ...@@ -142,9 +142,9 @@ void tonality_analysis(TonalityAnalysisState *tonal, AnalysisInfo *info, CELTEnc
const kiss_fft_state *kfft; const kiss_fft_state *kfft;
kiss_fft_cpx in[480], out[480]; kiss_fft_cpx in[480], out[480];
int N = 480, N2=240; int N = 480, N2=240;
float * restrict A = tonal->angle; float * OPUS_RESTRICT A = tonal->angle;
float * restrict dA = tonal->d_angle; float * OPUS_RESTRICT dA = tonal->d_angle;
float * restrict d2A = tonal->d2_angle; float * OPUS_RESTRICT d2A = tonal->d2_angle;
float tonality[240]; float tonality[240];
float noisiness[240]; float noisiness[240];
float band_tonality[NB_TBANDS]; float band_tonality[NB_TBANDS];
......
...@@ -25,6 +25,9 @@ ...@@ -25,6 +25,9 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <math.h> #include <math.h>
#include "mlp.h" #include "mlp.h"
......
...@@ -191,6 +191,9 @@ ...@@ -191,6 +191,9 @@
</CustomBuildStep> </CustomBuildStep>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="analysis.c" />
<ClCompile Include="mlp.c" />
<ClCompile Include="mlp_data.c" />
<ClCompile Include="opus.c" /> <ClCompile Include="opus.c" />
<ClCompile Include="opus_decoder.c" /> <ClCompile Include="opus_decoder.c" />
<ClCompile Include="opus_encoder.c" /> <ClCompile Include="opus_encoder.c" />
...@@ -210,9 +213,11 @@ ...@@ -210,9 +213,11 @@
<ClInclude Include="..\include\opus_types.h" /> <ClInclude Include="..\include\opus_types.h" />
<ClInclude Include="..\include\opus_multistream.h" /> <ClInclude Include="..\include\opus_multistream.h" />
<ClInclude Include="..\win32\config.h" /> <ClInclude Include="..\win32\config.h" />
<ClInclude Include="analysis.h" />
<ClInclude Include="mlp.h" />
<ClInclude Include="opus_private.h" /> <ClInclude Include="opus_private.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>
\ No newline at end of file
...@@ -30,6 +30,15 @@ ...@@ -30,6 +30,15 @@
<ClCompile Include="opus_multistream.c"> <ClCompile Include="opus_multistream.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="analysis.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mlp.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mlp_data.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\win32\config.h"> <ClInclude Include="..\win32\config.h">
...@@ -71,5 +80,11 @@ ...@@ -71,5 +80,11 @@
<ClInclude Include="..\include\opus_multistream.h"> <ClInclude Include="..\include\opus_multistream.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="analysis.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="mlp.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment