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.
This commit is contained in:
Joshua Bowman 2012-10-23 12:18:38 -07:00 committed by Ralph Giles
parent 027ec51bfe
commit 3b60e81d79
4 changed files with 27 additions and 4 deletions

View file

@ -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];

View file

@ -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"

View file

@ -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 @@
<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>

View file

@ -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 @@
<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>