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

Fix building errors on android

Browse Source 
TBR=Tina

BUG=
TEST=build on android
Review URL: https://webrtc-codereview.appspot.com/430001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1840 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@webrtc.org
2012-03-05 19:53:24 +00:00
parent 66487e1629
commit db2de5b49f
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/audio_coding/neteq/test/NetEqRTPplay.cc
View File

@ -22,6 +22,9 @@
#include "NETEQTEST_NetEQClass.h" #include "NETEQTEST_NetEQClass.h"
#include "NETEQTEST_CodecClass.h" #include "NETEQTEST_CodecClass.h"
#ifdef WEBRTC_ANDROID
#include <ctype.h> // isalpha
#endif
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>

3
src/modules/audio_coding/neteq/test/RTPjitter.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
* *
* Use of this source code is governed by a BSD-style license * Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source * that can be found in the LICENSE file in the root of the source
@ -21,7 +21,6 @@
#ifdef WEBRTC_LINUX #ifdef WEBRTC_LINUX
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
#include <search.h>
#include <float.h> #include <float.h>
#include "gtest/gtest.h" #include "gtest/gtest.h"

18
src/modules/video_coding/codecs/test/stats.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
* *
* Use of this source code is governed by a BSD-style license * Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source * that can be found in the LICENSE file in the root of the source
@ -79,12 +79,12 @@ void Stats::PrintSummary() {
// ENCODING // ENCODING
printf("Encoding time:\n"); printf("Encoding time:\n");
frame = min_element(stats_.begin(), frame = std::min_element(stats_.begin(),
stats_.end(), LessForEncodeTime); stats_.end(), LessForEncodeTime);
printf(" Min : %7d us (frame %d)\n", printf(" Min : %7d us (frame %d)\n",
frame->encode_time_in_us, frame->frame_number); frame->encode_time_in_us, frame->frame_number);
frame = max_element(stats_.begin(), frame = std::max_element(stats_.begin(),
stats_.end(), LessForEncodeTime); stats_.end(), LessForEncodeTime);
printf(" Max : %7d us (frame %d)\n", printf(" Max : %7d us (frame %d)\n",
frame->encode_time_in_us, frame->frame_number); frame->encode_time_in_us, frame->frame_number);
@ -106,12 +106,12 @@ void Stats::PrintSummary() {
if (decoded_frames.size() == 0) { if (decoded_frames.size() == 0) {
printf("No successfully decoded frames exist in this statistics.\n"); printf("No successfully decoded frames exist in this statistics.\n");
} else { } else {
frame = min_element(decoded_frames.begin(), frame = std::min_element(decoded_frames.begin(),
decoded_frames.end(), LessForDecodeTime); decoded_frames.end(), LessForDecodeTime);
printf(" Min : %7d us (frame %d)\n", printf(" Min : %7d us (frame %d)\n",
frame->decode_time_in_us, frame->frame_number); frame->decode_time_in_us, frame->frame_number);
frame = max_element(decoded_frames.begin(), frame = std::max_element(decoded_frames.begin(),
decoded_frames.end(), LessForDecodeTime); decoded_frames.end(), LessForDecodeTime);
printf(" Max : %7d us (frame %d)\n", printf(" Max : %7d us (frame %d)\n",
frame->decode_time_in_us, frame->frame_number); frame->decode_time_in_us, frame->frame_number);
@ -124,12 +124,12 @@ void Stats::PrintSummary() {
// SIZE // SIZE
printf("Frame sizes:\n"); printf("Frame sizes:\n");
frame = min_element(stats_.begin(), frame = std::min_element(stats_.begin(),
stats_.end(), LessForEncodedSize); stats_.end(), LessForEncodedSize);
printf(" Min : %7d bytes (frame %d)\n", printf(" Min : %7d bytes (frame %d)\n",
frame->encoded_frame_length_in_bytes, frame->frame_number); frame->encoded_frame_length_in_bytes, frame->frame_number);
frame = max_element(stats_.begin(), frame = std::max_element(stats_.begin(),
stats_.end(), LessForEncodedSize); stats_.end(), LessForEncodedSize);
printf(" Max : %7d bytes (frame %d)\n", printf(" Max : %7d bytes (frame %d)\n",
frame->encoded_frame_length_in_bytes, frame->frame_number); frame->encoded_frame_length_in_bytes, frame->frame_number);
@ -149,12 +149,12 @@ void Stats::PrintSummary() {
// BIT RATE // BIT RATE
printf("Bit rates:\n"); printf("Bit rates:\n");
frame = min_element(stats_.begin(), frame = std::min_element(stats_.begin(),
stats_.end(), LessForBitRate); stats_.end(), LessForBitRate);
printf(" Min bit rate: %7d kbps (frame %d)\n", printf(" Min bit rate: %7d kbps (frame %d)\n",
frame->bit_rate_in_kbps, frame->frame_number); frame->bit_rate_in_kbps, frame->frame_number);
frame = max_element(stats_.begin(), frame = std::max_element(stats_.begin(),
stats_.end(), LessForBitRate); stats_.end(), LessForBitRate);
printf(" Max bit rate: %7d kbps (frame %d)\n", printf(" Max bit rate: %7d kbps (frame %d)\n",
frame->bit_rate_in_kbps, frame->frame_number); frame->bit_rate_in_kbps, frame->frame_number);