Roll chromium_revision: 28d1981..d3db2ff

Pick up the libvpx roll: https://codereview.chromium.org/674753002

Summary of changes (https://chromium.googlesource.com/chromium/src/+/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/webrtc@7598 4adac7df-926f-26a2-2b94-8c16560cd09d

10 files changed, 18 insertions, 18 deletions

diff --git a/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc b/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc
index 567ec85b..ffdcc0c1 100644
--- a/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc
+++ b/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc
@@ -448,7 +448,7 @@ int main(int argc, char* argv[])
     {
 		printf("  Error iSAC Cannot write file %s.\n", outname);
         cout << flush;
-        getchar();
+        getc(stdin);
 		exit(1);
 	}
 	if(VADusage)
diff --git a/modules/audio_coding/codecs/isac/main/test/simpleKenny.c b/modules/audio_coding/codecs/isac/main/test/simpleKenny.c
index 1e752a18..d10b4add 100644
--- a/modules/audio_coding/codecs/isac/main/test/simpleKenny.c
+++ b/modules/audio_coding/codecs/isac/main/test/simpleKenny.c
@@ -383,7 +383,7 @@ valid values are 8 and 16.\n", sampFreqKHz);
 					// exit if returned with error
 					//errType=WebRtcIsac_GetErrorCode(ISAC_main_inst);
 					fprintf(stderr,"\nError in encoder\n");
-					getchar();
+					getc(stdin);
 					exit(EXIT_FAILURE);
 				}
 
@@ -479,7 +479,7 @@ valid values are 8 and 16.\n", sampFreqKHz);
 			{
 				//errType=WebRtcIsac_GetErrorCode(ISAC_main_inst);
 				fprintf(stderr,"\nError in decoder.\n");
-				getchar();
+				getc(stdin);
 				exit(1);
 			}
 
diff --git a/modules/audio_coding/main/test/APITest.cc b/modules/audio_coding/main/test/APITest.cc
index 82940fa3..b6e47145 100644
--- a/modules/audio_coding/main/test/APITest.cc
+++ b/modules/audio_coding/main/test/APITest.cc
@@ -503,7 +503,7 @@ void APITest::RunTest(char thread) {
       break;
     default:
       fprintf(stderr, "Wrong Test Number\n");
-      getchar();
+      getc(stdin);
       exit(1);
   }
 }
diff --git a/modules/audio_device/audio_device_utility.cc b/modules/audio_device/audio_device_utility.cc
index b6c5c482..182329c4 100644
--- a/modules/audio_device/audio_device_utility.cc
+++ b/modules/audio_device/audio_device_utility.cc
@@ -82,9 +82,9 @@ void AudioDeviceUtility::WaitForKey()
 
     // choose enter out of all available keys
 
-    if (getchar() == '\n')
+    if (getc(stdin) == '\n')
     {
-        getchar();
+        getc(stdin);
     }
 
     tcsetattr( STDIN_FILENO, TCSANOW, &oldt );
diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
index 76b6ef59..3f446467 100644
--- a/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
+++ b/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
@@ -695,7 +695,7 @@ TEST_F(VideoProcessorIntegrationTest,
   SetQualityMetrics(&quality_metrics, 30.0, 18.0, 0.80, 0.40);
   // Metrics for rate control.
   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, 2, 5, 0, 38, 10, 30, 0);
   ProcessFramesAndVerify(quality_metrics,
diff --git a/test/run_loop.cc b/test/run_loop.cc
index cda1e10c..92f85dd0 100644
--- a/test/run_loop.cc
+++ b/test/run_loop.cc
@@ -16,7 +16,7 @@ namespace test {
 
 void PressEnterToContinue() {
   puts(">> Press ENTER to continue...");
-  while (getchar() != '\n' && !feof(stdin));
+  while (getc(stdin) != '\n' && !feof(stdin));
 }
 }  // namespace test
 }  // namespace webrtc
diff --git a/video_engine/test/auto_test/source/vie_autotest_loopback.cc b/video_engine/test/auto_test/source/vie_autotest_loopback.cc
index 9b8040d9..03a82b4c 100644
--- a/video_engine/test/auto_test/source/vie_autotest_loopback.cc
+++ b/video_engine/test/auto_test/source/vie_autotest_loopback.cc
@@ -158,7 +158,7 @@ int VideoEngineSampleCode(void* window1, void* window2)
         printf("Error in scanf()\n");
         return -1;
     }
-    getchar();
+    getc(stdin);
     captureIdx = captureIdx - 1; // Compensate for idx start at 1.
 #endif
     error = ptrViECapture->GetCaptureDevice(captureIdx, deviceName,
@@ -350,7 +350,7 @@ int VideoEngineSampleCode(void* window1, void* window2)
         printf("Error in scanf()\n");
         return -1;
     }
-    getchar();
+    getc(stdin);
     codecIdx = codecIdx - 1; // Compensate for idx start at 1.
 #endif
     // VP8 over generic transport gets this special one.
@@ -624,7 +624,7 @@ int VideoEngineSampleCode(void* window1, void* window2)
     // Call started
     printf("\nLoopback call started\n\n");
     printf("Press enter to stop...");
-    while ((getchar()) != '\n')
+    while ((getc(stdin)) != '\n')
         ;
 
     //********************************************************
diff --git a/video_engine/test/auto_test/source/vie_autotest_main.cc b/video_engine/test/auto_test/source/vie_autotest_main.cc
index c688e2ef..16172585 100644
--- a/video_engine/test/auto_test/source/vie_autotest_main.cc
+++ b/video_engine/test/auto_test/source/vie_autotest_main.cc
@@ -106,10 +106,10 @@ int ViEAutoTestMain::AskUserForNumber(int min_allowed, int max_allowed) {
   int result;
   if (scanf("%d", &result) <= 0) {
     ViETest::Log("\nPlease enter a number instead, then hit enter.");
-    getchar();
+    getc(stdin);
     return kInvalidChoice;
   }
-  getchar();  // Consume enter key.
+  getc(stdin);  // Consume enter key.
 
   if (result < min_allowed || result > max_allowed) {
     ViETest::Log("%d-%d are valid choices. Please try again.", min_allowed,
diff --git a/video_engine/test/auto_test/source/vie_autotest_network.cc b/video_engine/test/auto_test/source/vie_autotest_network.cc
index df5b5ef4..1ccac701 100644
--- a/video_engine/test/auto_test/source/vie_autotest_network.cc
+++ b/video_engine/test/auto_test/source/vie_autotest_network.cc
@@ -150,7 +150,7 @@ void ViEAutoTest::ViENetworkExtendedTest()
             ViETest::Log("On Win7 and late Vista, you need to right click the "
                          "exe and choose");
             ViETest::Log("\"Run as administrator\"\n");
-            getchar();
+            getc(stdin);
         }
         EXPECT_EQ(0, ViE.network->GetSendToS(
             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 "
                          "exe and choose");
             ViETest::Log("\"Run as administrator\"\n");
-            getchar();
+            getc(stdin);
         }
         EXPECT_EQ(0, ViE.network->GetSendToS(
             tbChannel.videoChannel, DSCP, useSetSockOpt));
diff --git a/video_engine/test/auto_test/source/vie_autotest_record.cc b/video_engine/test/auto_test/source/vie_autotest_record.cc
index 1fb11ad1..89575cee 100644
--- a/video_engine/test/auto_test/source/vie_autotest_record.cc
+++ b/video_engine/test/auto_test/source/vie_autotest_record.cc
@@ -216,7 +216,7 @@ int VideoEngineSampleRecordCode(void* window1, void* window2) {
     printf("Error in scanf()\n");
     return -1;
   }
-  getchar();
+  getc(stdin);
   captureIdx = captureIdx - 1;  // Compensate for idx start at 1.
 #endif
   error = ptrViECapture->GetCaptureDevice(captureIdx, deviceName,
@@ -441,14 +441,14 @@ int VideoEngineSampleRecordCode(void* window1, void* window2) {
     clock_time = webrtc::TickTime::MillisecondTimestamp();
     timing << clock_time << std::endl;
   }
-  char c = getchar();
+  char c = getc(stdin);
   fflush(stdin);
   while (c != 's') {
     if (c == '\n' && enable_labeling == 1) {
       clock_time = webrtc::TickTime::MillisecondTimestamp();
       timing << clock_time << std::endl;
     }
-    c = getchar();
+    c = getc(stdin);
   }
   if (enable_labeling == 1) {
     clock_time = webrtc::TickTime::MillisecondTimestamp();