generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Roll chromium_revision: 28d1981..d3db2ff

Browse Source 
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
This commit is contained in:
marpan@webrtc.org
2014-11-03 20:10:26 +00:00
parent f866b2d9f9
commit 4765ca55f9
12 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@@ -9,7 +9,7 @@ vars = {
# Use this googlecode_url variable only if there is an internal mirror for it. # Use this googlecode_url variable only if there is an internal mirror for it.
# If you do not know, use the full path while defining your new deps entry. # If you do not know, use the full path while defining your new deps entry.
"googlecode_url": "http://%s.googlecode.com/svn", "googlecode_url": "http://%s.googlecode.com/svn",
"chromium_revision": "28d1981264903b186f5e9275c8f71d7943ccad7d", "chromium_revision": "d3db2ff38e13cd900386404849eeb53ad884bf09",
} }
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than

1
setup_links.py
View File

@@ -86,6 +86,7 @@ if 'android' in get_target_os_list():
'third_party/libxml', 'third_party/libxml',
'third_party/modp_b64', 'third_party/modp_b64',
'tools/android', 'tools/android',
'tools/relocation_packer'
] ]
FILES = { FILES = {

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

@@ -448,7 +448,7 @@ int main(int argc, char* argv[])
{ {
printf(" Error iSAC Cannot write file %s.\n", outname); printf(" Error iSAC Cannot write file %s.\n", outname);
cout << flush; cout << flush;
getchar(); getc(stdin);
exit(1); exit(1);
} }
if(VADusage) if(VADusage)

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

@@ -383,7 +383,7 @@ valid values are 8 and 16.\n", sampFreqKHz);
// exit if returned with error // exit if returned with error
//errType=WebRtcIsac_GetErrorCode(ISAC_main_inst); //errType=WebRtcIsac_GetErrorCode(ISAC_main_inst);
fprintf(stderr,"\nError in encoder\n"); fprintf(stderr,"\nError in encoder\n");
getchar(); getc(stdin);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@@ -479,7 +479,7 @@ valid values are 8 and 16.\n", sampFreqKHz);
{ {
//errType=WebRtcIsac_GetErrorCode(ISAC_main_inst); //errType=WebRtcIsac_GetErrorCode(ISAC_main_inst);
fprintf(stderr,"\nError in decoder.\n"); fprintf(stderr,"\nError in decoder.\n");
getchar(); getc(stdin);
exit(1); exit(1);
} }

2
webrtc/modules/audio_coding/main/test/APITest.cc
View File

@@ -503,7 +503,7 @@ void APITest::RunTest(char thread) {
break; break;
default: default:
fprintf(stderr, "Wrong Test Number\n"); fprintf(stderr, "Wrong Test Number\n");
getchar(); getc(stdin);
exit(1); exit(1);
} }
} }

4
webrtc/modules/audio_device/audio_device_utility.cc
View File

@@ -82,9 +82,9 @@ void AudioDeviceUtility::WaitForKey()
// choose enter out of all available keys // choose enter out of all available keys
if (getchar() == '\n') if (getc(stdin) == '\n')
{ {
getchar(); getc(stdin);
} }
tcsetattr( STDIN_FILENO, TCSANOW, &oldt ); tcsetattr( STDIN_FILENO, TCSANOW, &oldt );

2
webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
View File

@@ -695,7 +695,7 @@ TEST_F(VideoProcessorIntegrationTest,
SetQualityMetrics(&quality_metrics, 30.0, 18.0, 0.80, 0.40); SetQualityMetrics(&quality_metrics, 30.0, 18.0, 0.80, 0.40);
// Metrics for rate control. // Metrics for rate control.
RateControlMetrics rc_metrics[3]; RateControlMetrics rc_metrics[3];
SetRateControlMetrics(rc_metrics, 0, 30, 30, 70, 15, 40, 0); SetRateControlMetrics(rc_metrics, 0, 30, 55, 70, 15, 40, 0);
SetRateControlMetrics(rc_metrics, 1, 15, 0, 50, 10, 30, 0); SetRateControlMetrics(rc_metrics, 1, 15, 0, 50, 10, 30, 0);
SetRateControlMetrics(rc_metrics, 2, 5, 0, 38, 10, 30, 0); SetRateControlMetrics(rc_metrics, 2, 5, 0, 38, 10, 30, 0);
ProcessFramesAndVerify(quality_metrics, ProcessFramesAndVerify(quality_metrics,

2
webrtc/test/run_loop.cc
View File

@@ -16,7 +16,7 @@ namespace test {
void PressEnterToContinue() { void PressEnterToContinue() {
puts(">> Press ENTER to continue..."); puts(">> Press ENTER to continue...");
while (getchar() != '\n' && !feof(stdin)); while (getc(stdin) != '\n' && !feof(stdin));
} }
} // namespace test } // namespace test
} // namespace webrtc } // namespace webrtc

6
webrtc/video_engine/test/auto_test/source/vie_autotest_loopback.cc
View File

@@ -158,7 +158,7 @@ int VideoEngineSampleCode(void* window1, void* window2)
printf("Error in scanf()\n"); printf("Error in scanf()\n");
return -1; return -1;
} }
getchar(); getc(stdin);
captureIdx = captureIdx - 1; // Compensate for idx start at 1. captureIdx = captureIdx - 1; // Compensate for idx start at 1.
#endif #endif
error = ptrViECapture->GetCaptureDevice(captureIdx, deviceName, error = ptrViECapture->GetCaptureDevice(captureIdx, deviceName,
@@ -350,7 +350,7 @@ int VideoEngineSampleCode(void* window1, void* window2)
printf("Error in scanf()\n"); printf("Error in scanf()\n");
return -1; return -1;
} }
getchar(); getc(stdin);
codecIdx = codecIdx - 1; // Compensate for idx start at 1. codecIdx = codecIdx - 1; // Compensate for idx start at 1.
#endif #endif
// VP8 over generic transport gets this special one. // VP8 over generic transport gets this special one.
@@ -624,7 +624,7 @@ int VideoEngineSampleCode(void* window1, void* window2)
// Call started // Call started
printf("\nLoopback call started\n\n"); printf("\nLoopback call started\n\n");
printf("Press enter to stop..."); printf("Press enter to stop...");
while ((getchar()) != '\n') while ((getc(stdin)) != '\n')
; ;
//******************************************************** //********************************************************

4
webrtc/video_engine/test/auto_test/source/vie_autotest_main.cc
View File

@@ -106,10 +106,10 @@ int ViEAutoTestMain::AskUserForNumber(int min_allowed, int max_allowed) {
int result; int result;
if (scanf("%d", &result) <= 0) { if (scanf("%d", &result) <= 0) {
ViETest::Log("\nPlease enter a number instead, then hit enter."); ViETest::Log("\nPlease enter a number instead, then hit enter.");
getchar(); getc(stdin);
return kInvalidChoice; return kInvalidChoice;
} }
getchar(); // Consume enter key. getc(stdin); // Consume enter key.
if (result < min_allowed || result > max_allowed) { if (result < min_allowed || result > max_allowed) {
ViETest::Log("%d-%d are valid choices. Please try again.", min_allowed, ViETest::Log("%d-%d are valid choices. Please try again.", min_allowed,

4
webrtc/video_engine/test/auto_test/source/vie_autotest_network.cc
View File

@@ -150,7 +150,7 @@ void ViEAutoTest::ViENetworkExtendedTest()
ViETest::Log("On Win7 and late Vista, you need to right click the " ViETest::Log("On Win7 and late Vista, you need to right click the "
"exe and choose"); "exe and choose");
ViETest::Log("\"Run as administrator\"\n"); ViETest::Log("\"Run as administrator\"\n");
getchar(); getc(stdin);
} }
EXPECT_EQ(0, ViE.network->GetSendToS( EXPECT_EQ(0, ViE.network->GetSendToS(
tbChannel.videoChannel, DSCP, useSetSockOpt)); // No ToS set tbChannel.videoChannel, DSCP, useSetSockOpt)); // No ToS set
@@ -390,7 +390,7 @@ void ViEAutoTest::ViENetworkAPITest()
ViETest::Log("On Win7 and late Vista, you need to right click the " ViETest::Log("On Win7 and late Vista, you need to right click the "
"exe and choose"); "exe and choose");
ViETest::Log("\"Run as administrator\"\n"); ViETest::Log("\"Run as administrator\"\n");
getchar(); getc(stdin);
} }
EXPECT_EQ(0, ViE.network->GetSendToS( EXPECT_EQ(0, ViE.network->GetSendToS(
tbChannel.videoChannel, DSCP, useSetSockOpt)); tbChannel.videoChannel, DSCP, useSetSockOpt));

6
webrtc/video_engine/test/auto_test/source/vie_autotest_record.cc
View File

@@ -216,7 +216,7 @@ int VideoEngineSampleRecordCode(void* window1, void* window2) {
printf("Error in scanf()\n"); printf("Error in scanf()\n");
return -1; return -1;
} }
getchar(); getc(stdin);
captureIdx = captureIdx - 1; // Compensate for idx start at 1. captureIdx = captureIdx - 1; // Compensate for idx start at 1.
#endif #endif
error = ptrViECapture->GetCaptureDevice(captureIdx, deviceName, error = ptrViECapture->GetCaptureDevice(captureIdx, deviceName,
@@ -441,14 +441,14 @@ int VideoEngineSampleRecordCode(void* window1, void* window2) {
clock_time = webrtc::TickTime::MillisecondTimestamp(); clock_time = webrtc::TickTime::MillisecondTimestamp();
timing << clock_time << std::endl; timing << clock_time << std::endl;
} }
char c = getchar(); char c = getc(stdin);
fflush(stdin); fflush(stdin);
while (c != 's') { while (c != 's') {
if (c == '\n' && enable_labeling == 1) { if (c == '\n' && enable_labeling == 1) {
clock_time = webrtc::TickTime::MillisecondTimestamp(); clock_time = webrtc::TickTime::MillisecondTimestamp();
timing << clock_time << std::endl; timing << clock_time << std::endl;
} }
c = getchar(); c = getc(stdin);
} }
if (enable_labeling == 1) { if (enable_labeling == 1) {
clock_time = webrtc::TickTime::MillisecondTimestamp(); clock_time = webrtc::TickTime::MillisecondTimestamp();