zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename ..BitrateThresholds to ..BitrateLimits.

Browse Source 
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}
This commit is contained in:
Sergey Silkin
2019-07-03 15:09:33 +02:00
committed by Commit Bot
parent cecee9903f
commit 3d642f8442
6 changed files with 54 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sdk/android/native_unittests/codecs/wrapper_unittest.cc
View File

@ -35,7 +35,7 @@ TEST(JavaCodecsWrapperTest, JavaToNativeVideoCodecInfo) {
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 @@ TEST(JavaCodecsWrapperTest, JavaToNativeResolutionBitrateThresholds) {
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