commit 3d642f8442abc2e53ce80e1e82619277aa70898f
author Sergey Silkin <ssilkin@webrtc.org> Wed Jul 03 15:09:33 2019 +0200
committer Commit Bot <commit-bot@chromium.org> Wed Jul 03 14:50:46 2019 +0000
tree a30753789d0e444442ef7d7ea9d6bf45c3154530
parent cecee9903f6d544d6cedb8c3ce0c5e5c2b3da089

Rename ..BitrateThresholds to ..BitrateLimits.

Bug: webrtc:10798
Change-Id: I1975206323a520b557652760d1d54c01c26a7405
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144540
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28473}

sdk/android/native_unittests/codecs/wrapper_unittest.cc

diff --git a/sdk/android/native_unittests/codecs/wrapper_unittest.cc b/sdk/android/native_unittests/codecs/wrapper_unittest.cc
index d5a29d1..c858095 100644
--- a/sdk/android/native_unittests/codecs/wrapper_unittest.cc
+++ b/sdk/android/native_unittests/codecs/wrapper_unittest.cc
@@ -35,7 +35,7 @@
   EXPECT_EQ(cricket::kH264ProfileLevelConstrainedBaseline, it->second);
 }
 
-TEST(JavaCodecsWrapperTest, JavaToNativeResolutionBitrateThresholds) {
+TEST(JavaCodecsWrapperTest, JavaToNativeResolutionBitrateLimits) {
   JNIEnv* env = AttachCurrentThreadIfNeeded();
   ScopedJavaLocalRef<jobject> j_fake_encoder =
       jni::Java_CodecsWrapperTestHelper_createFakeVideoEncoder(env);
@@ -43,15 +43,14 @@
   auto encoder = jni::JavaToNativeVideoEncoder(env, j_fake_encoder);
   ASSERT_TRUE(encoder);
 
-  // Check that the resolution bitrate thresholds are correctly passed from Java
-  // to native.
-  const std::vector<VideoEncoder::ResolutionBitrateThresholds> thresholds =
-      encoder->GetEncoderInfo().resolution_bitrate_thresholds;
-  ASSERT_EQ(thresholds.size(), 1u);
-  EXPECT_EQ(thresholds[0].frame_size_pixels, 640 * 360);
-  EXPECT_EQ(thresholds[0].min_start_bitrate_bps, 300000);
-  EXPECT_EQ(thresholds[0].min_bitrate_bps, 200000);
-  EXPECT_EQ(thresholds[0].max_bitrate_bps, 1000000);
+  // Check that the bitrate limits correctly passed from Java to native.
+  const std::vector<VideoEncoder::ResolutionBitrateLimits> bitrate_limits =
+      encoder->GetEncoderInfo().resolution_bitrate_limits;
+  ASSERT_EQ(bitrate_limits.size(), 1u);
+  EXPECT_EQ(bitrate_limits[0].frame_size_pixels, 640 * 360);
+  EXPECT_EQ(bitrate_limits[0].min_start_bitrate_bps, 300000);
+  EXPECT_EQ(bitrate_limits[0].min_bitrate_bps, 200000);
+  EXPECT_EQ(bitrate_limits[0].max_bitrate_bps, 1000000);
 }
 }  // namespace
 }  // namespace test

sdk/android/native_unittests/org/webrtc/FakeVideoEncoder.java

diff --git a/sdk/android/native_unittests/org/webrtc/FakeVideoEncoder.java b/sdk/android/native_unittests/org/webrtc/FakeVideoEncoder.java
index 32a3ae4..8359b49 100644
--- a/sdk/android/native_unittests/org/webrtc/FakeVideoEncoder.java
+++ b/sdk/android/native_unittests/org/webrtc/FakeVideoEncoder.java
@@ -41,14 +41,14 @@
   }
 
   @Override
-  public ResolutionBitrateThresholds[] getResolutionBitrateThresholds() {
-    ResolutionBitrateThresholds resolution_bitrate_thresholds[] = {
-        new ResolutionBitrateThresholds(/* frameSizePixels = */ 640 * 360,
+  public ResolutionBitrateLimits[] getResolutionBitrateLimits() {
+    ResolutionBitrateLimits resolution_bitrate_limits[] = {
+        new ResolutionBitrateLimits(/* frameSizePixels = */ 640 * 360,
             /* minStartBitrateBps = */ 300000,
             /* minBitrateBps = */ 200000,
             /* maxBitrateBps = */ 1000000)};
 
-    return resolution_bitrate_thresholds;
+    return resolution_bitrate_limits;
   }
 
   @Override