From db2de5b49f2d10f0eae15595506653f51e7fa44b Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Mon, 5 Mar 2012 19:53:24 +0000 Subject: [PATCH] Fix building errors on android 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 --- .../audio_coding/neteq/test/NetEqRTPplay.cc | 3 +++ .../audio_coding/neteq/test/RTPjitter.cc | 3 +-- src/modules/video_coding/codecs/test/stats.cc | 18 +++++++++--------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/modules/audio_coding/neteq/test/NetEqRTPplay.cc b/src/modules/audio_coding/neteq/test/NetEqRTPplay.cc index d3f7eb511..09b0791d8 100644 --- a/src/modules/audio_coding/neteq/test/NetEqRTPplay.cc +++ b/src/modules/audio_coding/neteq/test/NetEqRTPplay.cc @@ -22,6 +22,9 @@ #include "NETEQTEST_NetEQClass.h" #include "NETEQTEST_CodecClass.h" +#ifdef WEBRTC_ANDROID +#include // isalpha +#endif #include #include #include diff --git a/src/modules/audio_coding/neteq/test/RTPjitter.cc b/src/modules/audio_coding/neteq/test/RTPjitter.cc index 795111f0f..ef390911e 100644 --- a/src/modules/audio_coding/neteq/test/RTPjitter.cc +++ b/src/modules/audio_coding/neteq/test/RTPjitter.cc @@ -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 * that can be found in the LICENSE file in the root of the source @@ -21,7 +21,6 @@ #ifdef WEBRTC_LINUX #include #endif -#include #include #include "gtest/gtest.h" diff --git a/src/modules/video_coding/codecs/test/stats.cc b/src/modules/video_coding/codecs/test/stats.cc index 5cdf36412..e9c943873 100644 --- a/src/modules/video_coding/codecs/test/stats.cc +++ b/src/modules/video_coding/codecs/test/stats.cc @@ -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 * that can be found in the LICENSE file in the root of the source @@ -79,12 +79,12 @@ void Stats::PrintSummary() { // ENCODING printf("Encoding time:\n"); - frame = min_element(stats_.begin(), + frame = std::min_element(stats_.begin(), stats_.end(), LessForEncodeTime); printf(" Min : %7d us (frame %d)\n", frame->encode_time_in_us, frame->frame_number); - frame = max_element(stats_.begin(), + frame = std::max_element(stats_.begin(), stats_.end(), LessForEncodeTime); printf(" Max : %7d us (frame %d)\n", frame->encode_time_in_us, frame->frame_number); @@ -106,12 +106,12 @@ void Stats::PrintSummary() { if (decoded_frames.size() == 0) { printf("No successfully decoded frames exist in this statistics.\n"); } else { - frame = min_element(decoded_frames.begin(), + frame = std::min_element(decoded_frames.begin(), decoded_frames.end(), LessForDecodeTime); printf(" Min : %7d us (frame %d)\n", 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); printf(" Max : %7d us (frame %d)\n", frame->decode_time_in_us, frame->frame_number); @@ -124,12 +124,12 @@ void Stats::PrintSummary() { // SIZE printf("Frame sizes:\n"); - frame = min_element(stats_.begin(), + frame = std::min_element(stats_.begin(), stats_.end(), LessForEncodedSize); printf(" Min : %7d bytes (frame %d)\n", frame->encoded_frame_length_in_bytes, frame->frame_number); - frame = max_element(stats_.begin(), + frame = std::max_element(stats_.begin(), stats_.end(), LessForEncodedSize); printf(" Max : %7d bytes (frame %d)\n", frame->encoded_frame_length_in_bytes, frame->frame_number); @@ -149,12 +149,12 @@ void Stats::PrintSummary() { // BIT RATE printf("Bit rates:\n"); - frame = min_element(stats_.begin(), + frame = std::min_element(stats_.begin(), stats_.end(), LessForBitRate); printf(" Min bit rate: %7d kbps (frame %d)\n", frame->bit_rate_in_kbps, frame->frame_number); - frame = max_element(stats_.begin(), + frame = std::max_element(stats_.begin(), stats_.end(), LessForBitRate); printf(" Max bit rate: %7d kbps (frame %d)\n", frame->bit_rate_in_kbps, frame->frame_number);