Fixed several places for compiler warnings.
To reproduce, use compiler arm-linux-androideabi-gcc (GCC) 4.6.x-google 20120106 (prerelease). Review URL: https://webrtc-codereview.appspot.com/762011 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2712 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
0b3ee391f7
commit
3c1f96f279
@ -124,10 +124,10 @@ int main(int argc, char* argv[])
|
||||
char version_number[20];
|
||||
char tmpBit[5] = ".bit";
|
||||
|
||||
double kbps;
|
||||
int totalbits =0;
|
||||
int totalsmpls =0;
|
||||
#ifdef _DEBUG
|
||||
double kbps;
|
||||
FILE *fy;
|
||||
#endif
|
||||
WebRtc_Word16 testNum, testCE;
|
||||
@ -793,8 +793,6 @@ int main(int argc, char* argv[])
|
||||
|
||||
totalsmpls += declen;
|
||||
totalbits += 8 * stream_len;
|
||||
kbps = ((double) FS) / ((double) cur_framesmpls) * 8.0 *
|
||||
stream_len / 1000.0;// kbits/s
|
||||
|
||||
/* Error test number 10, garbage data */
|
||||
if (testNum == 10) {
|
||||
@ -809,6 +807,8 @@ int main(int argc, char* argv[])
|
||||
|
||||
#ifdef _DEBUG
|
||||
|
||||
kbps = ((double) FS) / ((double) cur_framesmpls) * 8.0 *
|
||||
stream_len / 1000.0;// kbits/s
|
||||
fy = fopen("bit_rate.dat", "a");
|
||||
fprintf(fy, "Frame %i = %0.14f\n", framecnt, kbps);
|
||||
fclose(fy);
|
||||
|
@ -248,7 +248,7 @@ bool VideoRenderAndroid::JavaRenderThreadProcess()
|
||||
WEBRTC_TRACE(kTraceInfo, kTraceVideoRenderer, _id,
|
||||
"%s: Java thread detached", __FUNCTION__);
|
||||
}
|
||||
_javaRenderJniEnv = false;
|
||||
_javaRenderJniEnv = NULL;
|
||||
_javaShutDownFlag = false;
|
||||
_javaShutdownEvent.Set();
|
||||
return false; // Do not run this thread again.
|
||||
|
@ -45,10 +45,10 @@ ConditionVariablePosix::ConditionVariablePosix()
|
||||
|
||||
int ConditionVariablePosix::Construct()
|
||||
{
|
||||
int result = 0;
|
||||
#ifdef WEBRTC_CLOCK_TYPE_REALTIME
|
||||
result = pthread_cond_init(&_cond, NULL);
|
||||
pthread_cond_init(&_cond, NULL);
|
||||
#else
|
||||
int result = 0;
|
||||
pthread_condattr_t condAttr;
|
||||
result = pthread_condattr_init(&condAttr);
|
||||
if (result != 0)
|
||||
|
Loading…
x
Reference in New Issue
Block a user