Pick up the libvpx roll: https://codereview.chromium.org/674753002
Summary of changes (28d1981..d3db2ff/DEPS):
* third_party/android_tools 36bf7ac..ea50ccc
* third_party/boringssl 7ea8481..751e889
* third_party/icu 8ac906f..d8b2a9d
* third_party/libvpx efe9712..2e5ced5
* third_party/usrsctp/usrsctplib
* tools/gyp 1990:1991
* tools/swarming_client a57d7db..bcb3bc3
Clang is not updated in this roll.
Made the change getchar() --> getc(stdin) as seems like getchar() isn't supported on android anymore.
(getchar() was causing the error: undefined reference to '__srget')
Update rate control parameter in vp9 test.
R=andrew@webrtc.org
TBR=ajm@google.com
Review URL: https://webrtc-codereview.appspot.com/23229004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7598 4adac7df-926f-26a2-2b94-8c16560cd09d
113 lines
2.6 KiB
C++
113 lines
2.6 KiB
C++
/*
|
|
* 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
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include <assert.h>
|
|
|
|
#include "webrtc/modules/audio_device/audio_device_utility.h"
|
|
|
|
#if defined(_WIN32)
|
|
|
|
// ============================================================================
|
|
// Windows
|
|
// ============================================================================
|
|
|
|
#include <windows.h>
|
|
#include <conio.h>
|
|
#include <ctype.h>
|
|
#include <stdio.h>
|
|
#include <mmsystem.h>
|
|
|
|
namespace webrtc
|
|
{
|
|
|
|
void AudioDeviceUtility::WaitForKey()
|
|
{
|
|
_getch();
|
|
}
|
|
|
|
uint32_t AudioDeviceUtility::GetTimeInMS()
|
|
{
|
|
return timeGetTime();
|
|
}
|
|
|
|
bool AudioDeviceUtility::StringCompare(
|
|
const char* str1 , const char* str2,
|
|
const uint32_t length)
|
|
{
|
|
return ((_strnicmp(str1, str2, length) == 0) ? true : false);
|
|
}
|
|
|
|
} // namespace webrtc
|
|
|
|
#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
|
|
|
|
// ============================================================================
|
|
// Linux & Mac
|
|
// ============================================================================
|
|
|
|
#include <stdio.h> // getchar
|
|
#include <string.h> // strncasecmp
|
|
#include <sys/time.h> // gettimeofday
|
|
#include <termios.h> // tcgetattr
|
|
#include <time.h> // gettimeofday
|
|
|
|
#include <unistd.h>
|
|
|
|
namespace webrtc
|
|
{
|
|
|
|
void AudioDeviceUtility::WaitForKey()
|
|
{
|
|
|
|
struct termios oldt, newt;
|
|
|
|
tcgetattr( STDIN_FILENO, &oldt );
|
|
|
|
// we don't want getchar to echo!
|
|
|
|
newt = oldt;
|
|
newt.c_lflag &= ~( ICANON | ECHO );
|
|
tcsetattr( STDIN_FILENO, TCSANOW, &newt );
|
|
|
|
// catch any newline that's hanging around...
|
|
|
|
// you'll have to hit enter twice if you
|
|
|
|
// choose enter out of all available keys
|
|
|
|
if (getc(stdin) == '\n')
|
|
{
|
|
getc(stdin);
|
|
}
|
|
|
|
tcsetattr( STDIN_FILENO, TCSANOW, &oldt );
|
|
}
|
|
|
|
uint32_t AudioDeviceUtility::GetTimeInMS()
|
|
{
|
|
struct timeval tv;
|
|
struct timezone tz;
|
|
uint32_t val;
|
|
|
|
gettimeofday(&tv, &tz);
|
|
val = (uint32_t)(tv.tv_sec*1000 + tv.tv_usec/1000);
|
|
return val;
|
|
}
|
|
|
|
bool AudioDeviceUtility::StringCompare(
|
|
const char* str1 , const char* str2, const uint32_t length)
|
|
{
|
|
return (strncasecmp(str1, str2, length) == 0)?true: false;
|
|
}
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
|