zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix WebRtc ninja x86 build using Visual Studio 2015 (set GYP_MSVS_VERSION=2015).

Browse Source 
Visual Studio 2015 balks at the implicit truncation of values. Easily fixed with an explicit cast.

Fixed redefinition of CLOCKS_PER_SEC when using Visual Studio 2015 and the Windows 10 SDK. CLOCKS_PER_SEC is also defined in "<WIN10 SDK DIR>\include\10.0.10240.0\ucrt\time.h" and also has the value of 1000

Hiding snprintf definition if building with Visual Studio 2015

Fixed C4573 compiler complaint in audio_processing_impl_locking_unittest.cc.

BUG=webrtc:5183

Review URL: https://codereview.webrtc.org/1412653006

Cr-Commit-Position: refs/heads/master@{#11434}
This commit is contained in:
conceptgenesis
2016-01-30 14:40:44 -08:00
committed by Commit bot
parent c97c886e3a
commit 3f70562bbb
6 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc
View File

@ -33,8 +33,10 @@
//#define FS 16000 /* sampling frequency (Hz) */
#ifdef WIN32
#ifndef CLOCKS_PER_SEC
#define CLOCKS_PER_SEC 1000 /* Runtime statistics */
#endif
#endif
using namespace std;

4
webrtc/modules/audio_coding/codecs/isac/main/test/simpleKenny.c
View File

@ -17,8 +17,10 @@
#ifdef WIN32
#include "windows.h"
#ifndef CLOCKS_PER_SEC
#define CLOCKS_PER_SEC 1000
#endif
#endif
#include <ctype.h>
#include <math.h>
@ -218,7 +220,7 @@ int main(int argc, char* argv[]) {
_makepath(bitrateFileName, outDrive, outPath, "bitrate", ".txt");
bitrateFile = fopen(bitrateFileName, "a");
fprintf(bitrateFile, "% %%s \n", inname);
fprintf(bitrateFile, "%% %s \n", inname);
#endif
printf("\n");