OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 #include <algorithm> // max | 10 #include <algorithm> // max |
(...skipping 19 matching lines...) Expand all Loading... |
30 #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h" | 30 #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h" |
31 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" | 31 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" |
32 #include "webrtc/system_wrappers/include/sleep.h" | 32 #include "webrtc/system_wrappers/include/sleep.h" |
33 #include "webrtc/test/call_test.h" | 33 #include "webrtc/test/call_test.h" |
34 #include "webrtc/test/configurable_frame_size_encoder.h" | 34 #include "webrtc/test/configurable_frame_size_encoder.h" |
35 #include "webrtc/test/fake_texture_frame.h" | 35 #include "webrtc/test/fake_texture_frame.h" |
36 #include "webrtc/test/frame_generator.h" | 36 #include "webrtc/test/frame_generator.h" |
37 #include "webrtc/test/frame_utils.h" | 37 #include "webrtc/test/frame_utils.h" |
38 #include "webrtc/test/null_transport.h" | 38 #include "webrtc/test/null_transport.h" |
39 #include "webrtc/test/testsupport/perf_test.h" | 39 #include "webrtc/test/testsupport/perf_test.h" |
40 | |
41 #include "webrtc/video/send_statistics_proxy.h" | 40 #include "webrtc/video/send_statistics_proxy.h" |
42 #include "webrtc/video_frame.h" | 41 #include "webrtc/video_frame.h" |
43 #include "webrtc/video_send_stream.h" | 42 #include "webrtc/video_send_stream.h" |
44 | 43 |
45 namespace webrtc { | 44 namespace webrtc { |
46 | 45 |
47 enum VideoFormat { kGeneric, kVP8, }; | 46 enum VideoFormat { kGeneric, kVP8, }; |
48 | 47 |
49 void ExpectEqualFramesVector(const std::vector<VideoFrame>& frames1, | 48 void ExpectEqualFramesVector(const std::vector<VideoFrame>& frames1, |
50 const std::vector<VideoFrame>& frames2); | 49 const std::vector<VideoFrame>& frames2); |
(...skipping 851 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
902 void OnVideoStreamsCreated( | 901 void OnVideoStreamsCreated( |
903 VideoSendStream* send_stream, | 902 VideoSendStream* send_stream, |
904 const std::vector<VideoReceiveStream*>& receive_streams) override { | 903 const std::vector<VideoReceiveStream*>& receive_streams) override { |
905 stream_ = send_stream; | 904 stream_ = send_stream; |
906 } | 905 } |
907 | 906 |
908 void ModifyVideoConfigs( | 907 void ModifyVideoConfigs( |
909 VideoSendStream::Config* send_config, | 908 VideoSendStream::Config* send_config, |
910 std::vector<VideoReceiveStream::Config>* receive_configs, | 909 std::vector<VideoReceiveStream::Config>* receive_configs, |
911 VideoEncoderConfig* encoder_config) override { | 910 VideoEncoderConfig* encoder_config) override { |
912 RTC_DCHECK_EQ(1u, encoder_config->number_of_streams); | |
913 transport_adapter_.reset( | 911 transport_adapter_.reset( |
914 new internal::TransportAdapter(send_config->send_transport)); | 912 new internal::TransportAdapter(send_config->send_transport)); |
915 transport_adapter_->Enable(); | 913 transport_adapter_->Enable(); |
916 send_config->rtp.nack.rtp_history_ms = kNackRtpHistoryMs; | 914 send_config->rtp.nack.rtp_history_ms = kNackRtpHistoryMs; |
917 send_config->pre_encode_callback = this; | 915 send_config->pre_encode_callback = this; |
918 send_config->suspend_below_min_bitrate = true; | 916 send_config->suspend_below_min_bitrate = true; |
919 int min_bitrate_bps = | 917 int min_bitrate_bps = encoder_config->streams[0].min_bitrate_bps; |
920 test::DefaultVideoStreamFactory::kDefaultMinBitratePerStream[0]; | |
921 set_low_remb_bps(min_bitrate_bps - 10000); | 918 set_low_remb_bps(min_bitrate_bps - 10000); |
922 int threshold_window = std::max(min_bitrate_bps / 10, 20000); | 919 int threshold_window = std::max(min_bitrate_bps / 10, 20000); |
923 ASSERT_GT(encoder_config->max_bitrate_bps, | 920 ASSERT_GT(encoder_config->streams[0].max_bitrate_bps, |
924 min_bitrate_bps + threshold_window + 5000); | 921 min_bitrate_bps + threshold_window + 5000); |
925 set_high_remb_bps(min_bitrate_bps + threshold_window + 5000); | 922 set_high_remb_bps(min_bitrate_bps + threshold_window + 5000); |
926 } | 923 } |
927 | 924 |
928 void PerformTest() override { | 925 void PerformTest() override { |
929 EXPECT_TRUE(Wait()) << "Timed out during suspend-below-min-bitrate test."; | 926 EXPECT_TRUE(Wait()) << "Timed out during suspend-below-min-bitrate test."; |
930 } | 927 } |
931 | 928 |
932 enum TestState { | 929 enum TestState { |
933 kBeforeSuspend, | 930 kBeforeSuspend, |
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1202 void OnVideoStreamsCreated( | 1199 void OnVideoStreamsCreated( |
1203 VideoSendStream* send_stream, | 1200 VideoSendStream* send_stream, |
1204 const std::vector<VideoReceiveStream*>& receive_streams) override { | 1201 const std::vector<VideoReceiveStream*>& receive_streams) override { |
1205 send_stream_ = send_stream; | 1202 send_stream_ = send_stream; |
1206 } | 1203 } |
1207 | 1204 |
1208 void ModifyVideoConfigs( | 1205 void ModifyVideoConfigs( |
1209 VideoSendStream::Config* send_config, | 1206 VideoSendStream::Config* send_config, |
1210 std::vector<VideoReceiveStream::Config>* receive_configs, | 1207 std::vector<VideoReceiveStream::Config>* receive_configs, |
1211 VideoEncoderConfig* encoder_config) override { | 1208 VideoEncoderConfig* encoder_config) override { |
1212 RTC_DCHECK_EQ(1u, encoder_config->number_of_streams); | 1209 RTC_DCHECK_EQ(1u, encoder_config->streams.size()); |
1213 if (running_without_padding_) { | 1210 if (running_without_padding_) { |
1214 encoder_config->min_transmit_bitrate_bps = 0; | 1211 encoder_config->min_transmit_bitrate_bps = 0; |
1215 encoder_config->content_type = | 1212 encoder_config->content_type = |
1216 VideoEncoderConfig::ContentType::kRealtimeVideo; | 1213 VideoEncoderConfig::ContentType::kRealtimeVideo; |
1217 } else { | 1214 } else { |
1218 encoder_config->min_transmit_bitrate_bps = kMinTransmitBitrateBps; | 1215 encoder_config->min_transmit_bitrate_bps = kMinTransmitBitrateBps; |
1219 encoder_config->content_type = VideoEncoderConfig::ContentType::kScreen; | 1216 encoder_config->content_type = VideoEncoderConfig::ContentType::kScreen; |
1220 } | 1217 } |
1221 encoder_config_ = encoder_config->Copy(); | 1218 encoder_config_ = encoder_config->Copy(); |
1222 } | 1219 } |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1270 TEST_F(VideoSendStreamTest, RespectsMinTransmitBitrate) { | 1267 TEST_F(VideoSendStreamTest, RespectsMinTransmitBitrate) { |
1271 MaxPaddingSetTest test(false); | 1268 MaxPaddingSetTest test(false); |
1272 RunBaseTest(&test); | 1269 RunBaseTest(&test); |
1273 } | 1270 } |
1274 | 1271 |
1275 TEST_F(VideoSendStreamTest, RespectsMinTransmitBitrateAfterContentSwitch) { | 1272 TEST_F(VideoSendStreamTest, RespectsMinTransmitBitrateAfterContentSwitch) { |
1276 MaxPaddingSetTest test(true); | 1273 MaxPaddingSetTest test(true); |
1277 RunBaseTest(&test); | 1274 RunBaseTest(&test); |
1278 } | 1275 } |
1279 | 1276 |
1280 // This test verifies that new frame sizes reconfigures encoders even though not | |
1281 // (yet) sending. The purpose of this is to permit encoding as quickly as | |
1282 // possible once we start sending. Likely the frames being input are from the | |
1283 // same source that will be sent later, which just means that we're ready | |
1284 // earlier. | |
1285 TEST_F(VideoSendStreamTest, | |
1286 EncoderReconfigureOnResolutionChangeWhenNotSending) { | |
1287 class EncoderObserver : public test::FakeEncoder { | |
1288 public: | |
1289 EncoderObserver() | |
1290 : FakeEncoder(Clock::GetRealTimeClock()), | |
1291 init_encode_called_(false, false), | |
1292 number_of_initializations_(0), | |
1293 last_initialized_frame_width_(0), | |
1294 last_initialized_frame_height_(0) {} | |
1295 | |
1296 void WaitForResolution(int width, int height) { | |
1297 { | |
1298 rtc::CritScope lock(&crit_); | |
1299 if (last_initialized_frame_width_ == width && | |
1300 last_initialized_frame_height_ == height) { | |
1301 return; | |
1302 } | |
1303 } | |
1304 init_encode_called_.Wait(VideoSendStreamTest::kDefaultTimeoutMs); | |
1305 { | |
1306 rtc::CritScope lock(&crit_); | |
1307 EXPECT_EQ(width, last_initialized_frame_width_); | |
1308 EXPECT_EQ(height, last_initialized_frame_height_); | |
1309 } | |
1310 } | |
1311 | |
1312 private: | |
1313 int32_t InitEncode(const VideoCodec* config, | |
1314 int32_t number_of_cores, | |
1315 size_t max_payload_size) override { | |
1316 rtc::CritScope lock(&crit_); | |
1317 last_initialized_frame_width_ = config->width; | |
1318 last_initialized_frame_height_ = config->height; | |
1319 ++number_of_initializations_; | |
1320 // First time InitEncode is called, the frame size is unknown. | |
1321 if (number_of_initializations_ > 1) | |
1322 init_encode_called_.Set(); | |
1323 return FakeEncoder::InitEncode(config, number_of_cores, max_payload_size); | |
1324 } | |
1325 | |
1326 int32_t Encode(const VideoFrame& input_image, | |
1327 const CodecSpecificInfo* codec_specific_info, | |
1328 const std::vector<FrameType>* frame_types) override { | |
1329 ADD_FAILURE() | |
1330 << "Unexpected Encode call since the send stream is not started"; | |
1331 return 0; | |
1332 } | |
1333 | |
1334 rtc::CriticalSection crit_; | |
1335 rtc::Event init_encode_called_; | |
1336 size_t number_of_initializations_ GUARDED_BY(&crit_); | |
1337 int last_initialized_frame_width_ GUARDED_BY(&crit_); | |
1338 int last_initialized_frame_height_ GUARDED_BY(&crit_); | |
1339 }; | |
1340 | |
1341 CreateSenderCall(Call::Config()); | |
1342 test::NullTransport transport; | |
1343 CreateSendConfig(1, 0, &transport); | |
1344 EncoderObserver encoder; | |
1345 video_send_config_.encoder_settings.encoder = &encoder; | |
1346 CreateVideoStreams(); | |
1347 CreateFrameGeneratorCapturer(kDefaultFramerate, kDefaultWidth, | |
1348 kDefaultHeight); | |
1349 frame_generator_capturer_->Start(); | |
1350 | |
1351 encoder.WaitForResolution(kDefaultWidth, kDefaultHeight); | |
1352 frame_generator_capturer_->ChangeResolution(kDefaultWidth * 2, | |
1353 kDefaultHeight * 2); | |
1354 encoder.WaitForResolution(kDefaultWidth * 2, kDefaultHeight * 2); | |
1355 DestroyStreams(); | |
1356 } | |
1357 | |
1358 TEST_F(VideoSendStreamTest, CanReconfigureToUseStartBitrateAbovePreviousMax) { | 1277 TEST_F(VideoSendStreamTest, CanReconfigureToUseStartBitrateAbovePreviousMax) { |
1359 class StartBitrateObserver : public test::FakeEncoder { | 1278 class StartBitrateObserver : public test::FakeEncoder { |
1360 public: | 1279 public: |
1361 StartBitrateObserver() | 1280 StartBitrateObserver() |
1362 : FakeEncoder(Clock::GetRealTimeClock()), | 1281 : FakeEncoder(Clock::GetRealTimeClock()), |
1363 start_bitrate_changed_(false, false), | 1282 start_bitrate_changed_(false, false), |
1364 start_bitrate_kbps_(0) {} | 1283 start_bitrate_kbps_(0) {} |
1365 int32_t InitEncode(const VideoCodec* config, | 1284 int32_t InitEncode(const VideoCodec* config, |
1366 int32_t number_of_cores, | 1285 int32_t number_of_cores, |
1367 size_t max_payload_size) override { | 1286 size_t max_payload_size) override { |
(...skipping 25 matching lines...) Expand all Loading... |
1393 rtc::Event start_bitrate_changed_; | 1312 rtc::Event start_bitrate_changed_; |
1394 int start_bitrate_kbps_ GUARDED_BY(crit_); | 1313 int start_bitrate_kbps_ GUARDED_BY(crit_); |
1395 }; | 1314 }; |
1396 | 1315 |
1397 CreateSenderCall(Call::Config()); | 1316 CreateSenderCall(Call::Config()); |
1398 | 1317 |
1399 test::NullTransport transport; | 1318 test::NullTransport transport; |
1400 CreateSendConfig(1, 0, &transport); | 1319 CreateSendConfig(1, 0, &transport); |
1401 | 1320 |
1402 Call::Config::BitrateConfig bitrate_config; | 1321 Call::Config::BitrateConfig bitrate_config; |
1403 bitrate_config.start_bitrate_bps = 2 * video_encoder_config_.max_bitrate_bps; | 1322 bitrate_config.start_bitrate_bps = |
| 1323 2 * video_encoder_config_.streams[0].max_bitrate_bps; |
1404 sender_call_->SetBitrateConfig(bitrate_config); | 1324 sender_call_->SetBitrateConfig(bitrate_config); |
1405 | 1325 |
1406 StartBitrateObserver encoder; | 1326 StartBitrateObserver encoder; |
1407 video_send_config_.encoder_settings.encoder = &encoder; | 1327 video_send_config_.encoder_settings.encoder = &encoder; |
1408 // Since this test does not use a capturer, set |internal_source| = true. | |
1409 // Encoder configuration is otherwise updated on the next video frame. | |
1410 video_send_config_.encoder_settings.internal_source = true; | |
1411 | 1328 |
1412 CreateVideoStreams(); | 1329 CreateVideoStreams(); |
1413 | 1330 |
1414 EXPECT_TRUE(encoder.WaitForStartBitrate()); | 1331 EXPECT_TRUE(encoder.WaitForStartBitrate()); |
1415 EXPECT_EQ(video_encoder_config_.max_bitrate_bps / 1000, | 1332 EXPECT_EQ(video_encoder_config_.streams[0].max_bitrate_bps / 1000, |
1416 encoder.GetStartBitrateKbps()); | 1333 encoder.GetStartBitrateKbps()); |
1417 | 1334 |
1418 video_encoder_config_.max_bitrate_bps = 2 * bitrate_config.start_bitrate_bps; | 1335 video_encoder_config_.streams[0].max_bitrate_bps = |
| 1336 2 * bitrate_config.start_bitrate_bps; |
1419 video_send_stream_->ReconfigureVideoEncoder(video_encoder_config_.Copy()); | 1337 video_send_stream_->ReconfigureVideoEncoder(video_encoder_config_.Copy()); |
1420 | 1338 |
1421 // New bitrate should be reconfigured above the previous max. As there's no | 1339 // New bitrate should be reconfigured above the previous max. As there's no |
1422 // network connection this shouldn't be flaky, as no bitrate should've been | 1340 // network connection this shouldn't be flaky, as no bitrate should've been |
1423 // reported in between. | 1341 // reported in between. |
1424 EXPECT_TRUE(encoder.WaitForStartBitrate()); | 1342 EXPECT_TRUE(encoder.WaitForStartBitrate()); |
1425 EXPECT_EQ(bitrate_config.start_bitrate_bps / 1000, | 1343 EXPECT_EQ(bitrate_config.start_bitrate_bps / 1000, |
1426 encoder.GetStartBitrateKbps()); | 1344 encoder.GetStartBitrateKbps()); |
1427 | 1345 |
1428 DestroyStreams(); | 1346 DestroyStreams(); |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1534 | 1452 |
1535 test::NullTransport transport; | 1453 test::NullTransport transport; |
1536 CreateSendConfig(1, 0, &transport); | 1454 CreateSendConfig(1, 0, &transport); |
1537 FrameObserver observer; | 1455 FrameObserver observer; |
1538 video_send_config_.pre_encode_callback = &observer; | 1456 video_send_config_.pre_encode_callback = &observer; |
1539 CreateVideoStreams(); | 1457 CreateVideoStreams(); |
1540 | 1458 |
1541 // Prepare five input frames. Send ordinary VideoFrame and texture frames | 1459 // Prepare five input frames. Send ordinary VideoFrame and texture frames |
1542 // alternatively. | 1460 // alternatively. |
1543 std::vector<VideoFrame> input_frames; | 1461 std::vector<VideoFrame> input_frames; |
1544 int width = 168; | 1462 int width = static_cast<int>(video_encoder_config_.streams[0].width); |
1545 int height = 132; | 1463 int height = static_cast<int>(video_encoder_config_.streams[0].height); |
1546 | |
1547 test::FakeNativeHandle* handle1 = new test::FakeNativeHandle(); | 1464 test::FakeNativeHandle* handle1 = new test::FakeNativeHandle(); |
1548 test::FakeNativeHandle* handle2 = new test::FakeNativeHandle(); | 1465 test::FakeNativeHandle* handle2 = new test::FakeNativeHandle(); |
1549 test::FakeNativeHandle* handle3 = new test::FakeNativeHandle(); | 1466 test::FakeNativeHandle* handle3 = new test::FakeNativeHandle(); |
1550 input_frames.push_back(test::FakeNativeHandle::CreateFrame( | 1467 input_frames.push_back(test::FakeNativeHandle::CreateFrame( |
1551 handle1, width, height, 1, 1, kVideoRotation_0)); | 1468 handle1, width, height, 1, 1, kVideoRotation_0)); |
1552 input_frames.push_back(test::FakeNativeHandle::CreateFrame( | 1469 input_frames.push_back(test::FakeNativeHandle::CreateFrame( |
1553 handle2, width, height, 2, 2, kVideoRotation_0)); | 1470 handle2, width, height, 2, 2, kVideoRotation_0)); |
1554 input_frames.push_back(CreateVideoFrame(width, height, 3)); | 1471 input_frames.push_back(CreateVideoFrame(width, height, 3)); |
1555 input_frames.push_back(CreateVideoFrame(width, height, 4)); | 1472 input_frames.push_back(CreateVideoFrame(width, height, 4)); |
1556 input_frames.push_back(test::FakeNativeHandle::CreateFrame( | 1473 input_frames.push_back(test::FakeNativeHandle::CreateFrame( |
1557 handle3, width, height, 5, 5, kVideoRotation_0)); | 1474 handle3, width, height, 5, 5, kVideoRotation_0)); |
1558 | 1475 |
1559 video_send_stream_->Start(); | 1476 video_send_stream_->Start(); |
1560 test::FrameForwarder forwarder; | 1477 test::FrameForwarder forwarder; |
1561 video_send_stream_->SetSource(&forwarder); | 1478 video_send_stream_->SetSource(&forwarder); |
1562 for (size_t i = 0; i < input_frames.size(); i++) { | 1479 for (size_t i = 0; i < input_frames.size(); i++) { |
1563 forwarder.IncomingCapturedFrame(input_frames[i]); | 1480 forwarder.IncomingCapturedFrame(input_frames[i]); |
| 1481 // Do not send the next frame too fast, so the frame dropper won't drop it. |
| 1482 if (i < input_frames.size() - 1) |
| 1483 SleepMs(1000 / video_encoder_config_.streams[0].max_framerate); |
1564 // Wait until the output frame is received before sending the next input | 1484 // Wait until the output frame is received before sending the next input |
1565 // frame. Or the previous input frame may be replaced without delivering. | 1485 // frame. Or the previous input frame may be replaced without delivering. |
1566 observer.WaitOutputFrame(); | 1486 observer.WaitOutputFrame(); |
1567 } | 1487 } |
1568 video_send_stream_->Stop(); | 1488 video_send_stream_->Stop(); |
1569 video_send_stream_->SetSource(nullptr); | 1489 video_send_stream_->SetSource(nullptr); |
1570 | 1490 |
1571 // Test if the input and output frames are the same. render_time_ms and | 1491 // Test if the input and output frames are the same. render_time_ms and |
1572 // timestamp are not compared because capturer sets those values. | 1492 // timestamp are not compared because capturer sets those values. |
1573 ExpectEqualFramesVector(input_frames, observer.output_frames()); | 1493 ExpectEqualFramesVector(input_frames, observer.output_frames()); |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1680 void ModifyVideoConfigs( | 1600 void ModifyVideoConfigs( |
1681 VideoSendStream::Config* send_config, | 1601 VideoSendStream::Config* send_config, |
1682 std::vector<VideoReceiveStream::Config>* receive_configs, | 1602 std::vector<VideoReceiveStream::Config>* receive_configs, |
1683 VideoEncoderConfig* encoder_config) override { | 1603 VideoEncoderConfig* encoder_config) override { |
1684 send_config->encoder_settings.encoder = this; | 1604 send_config->encoder_settings.encoder = this; |
1685 encoder_config_ = encoder_config->Copy(); | 1605 encoder_config_ = encoder_config->Copy(); |
1686 } | 1606 } |
1687 | 1607 |
1688 void PerformTest() override { | 1608 void PerformTest() override { |
1689 EXPECT_TRUE(Wait()) << "Timed out while waiting for Encode."; | 1609 EXPECT_TRUE(Wait()) << "Timed out while waiting for Encode."; |
1690 // Expect |num_releases| == 1 since the encoder has been reconfigured | 1610 EXPECT_EQ(0u, num_releases()); |
1691 // once when the first frame is encoded. Not until at that point is the | |
1692 // frame size known and the encoder can be properly initialized. | |
1693 EXPECT_EQ(1u, num_releases()); | |
1694 stream_->ReconfigureVideoEncoder(std::move(encoder_config_)); | 1611 stream_->ReconfigureVideoEncoder(std::move(encoder_config_)); |
1695 EXPECT_EQ(1u, num_releases()); | 1612 EXPECT_EQ(0u, num_releases()); |
1696 stream_->Stop(); | 1613 stream_->Stop(); |
1697 // Encoder should not be released before destroying the VideoSendStream. | 1614 // Encoder should not be released before destroying the VideoSendStream. |
1698 EXPECT_FALSE(IsReleased()); | 1615 EXPECT_FALSE(IsReleased()); |
1699 EXPECT_TRUE(IsReadyForEncode()); | 1616 EXPECT_TRUE(IsReadyForEncode()); |
1700 stream_->Start(); | 1617 stream_->Start(); |
1701 // Sanity check, make sure we still encode frames with this encoder. | 1618 // Sanity check, make sure we still encode frames with this encoder. |
1702 EXPECT_TRUE(Wait()) << "Timed out while waiting for Encode."; | 1619 EXPECT_TRUE(Wait()) << "Timed out while waiting for Encode."; |
1703 } | 1620 } |
1704 | 1621 |
1705 rtc::CriticalSection crit_; | 1622 rtc::CriticalSection crit_; |
1706 VideoSendStream* stream_; | 1623 VideoSendStream* stream_; |
1707 bool initialized_ GUARDED_BY(crit_); | 1624 bool initialized_ GUARDED_BY(crit_); |
1708 bool callback_registered_ GUARDED_BY(crit_); | 1625 bool callback_registered_ GUARDED_BY(crit_); |
1709 size_t num_releases_ GUARDED_BY(crit_); | 1626 size_t num_releases_ GUARDED_BY(crit_); |
1710 bool released_ GUARDED_BY(crit_); | 1627 bool released_ GUARDED_BY(crit_); |
1711 VideoEncoderConfig encoder_config_; | 1628 VideoEncoderConfig encoder_config_; |
1712 } test_encoder; | 1629 } test_encoder; |
1713 | 1630 |
1714 RunBaseTest(&test_encoder); | 1631 RunBaseTest(&test_encoder); |
1715 | 1632 |
1716 EXPECT_TRUE(test_encoder.IsReleased()); | 1633 EXPECT_TRUE(test_encoder.IsReleased()); |
1717 EXPECT_EQ(2u, test_encoder.num_releases()); | 1634 EXPECT_EQ(1u, test_encoder.num_releases()); |
1718 } | 1635 } |
1719 | 1636 |
1720 TEST_F(VideoSendStreamTest, EncoderSetupPropagatesCommonEncoderConfigValues) { | 1637 TEST_F(VideoSendStreamTest, EncoderSetupPropagatesCommonEncoderConfigValues) { |
1721 class VideoCodecConfigObserver : public test::SendTest, | 1638 class VideoCodecConfigObserver : public test::SendTest, |
1722 public test::FakeEncoder { | 1639 public test::FakeEncoder { |
1723 public: | 1640 public: |
1724 VideoCodecConfigObserver() | 1641 VideoCodecConfigObserver() |
1725 : SendTest(kDefaultTimeoutMs), | 1642 : SendTest(kDefaultTimeoutMs), |
1726 FakeEncoder(Clock::GetRealTimeClock()), | 1643 FakeEncoder(Clock::GetRealTimeClock()), |
1727 init_encode_event_(false, false), | 1644 init_encode_event_(false, false), |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1790 FakeEncoder(Clock::GetRealTimeClock()), | 1707 FakeEncoder(Clock::GetRealTimeClock()), |
1791 video_codec_type_(video_codec_type), | 1708 video_codec_type_(video_codec_type), |
1792 codec_name_(codec_name), | 1709 codec_name_(codec_name), |
1793 init_encode_event_(false, false), | 1710 init_encode_event_(false, false), |
1794 num_initializations_(0), | 1711 num_initializations_(0), |
1795 stream_(nullptr) { | 1712 stream_(nullptr) { |
1796 memset(&encoder_settings_, 0, sizeof(encoder_settings_)); | 1713 memset(&encoder_settings_, 0, sizeof(encoder_settings_)); |
1797 } | 1714 } |
1798 | 1715 |
1799 private: | 1716 private: |
1800 class VideoStreamFactory | |
1801 : public VideoEncoderConfig::VideoStreamFactoryInterface { | |
1802 public: | |
1803 VideoStreamFactory() {} | |
1804 | |
1805 private: | |
1806 std::vector<VideoStream> CreateEncoderStreams( | |
1807 int width, | |
1808 int height, | |
1809 const VideoEncoderConfig& encoder_config) override { | |
1810 std::vector<VideoStream> streams = | |
1811 test::CreateVideoStreams(width, height, encoder_config); | |
1812 for (size_t i = 0; i < streams.size(); ++i) { | |
1813 streams[i].temporal_layer_thresholds_bps.resize( | |
1814 kVideoCodecConfigObserverNumberOfTemporalLayers - 1); | |
1815 } | |
1816 return streams; | |
1817 } | |
1818 }; | |
1819 | |
1820 void ModifyVideoConfigs( | 1717 void ModifyVideoConfigs( |
1821 VideoSendStream::Config* send_config, | 1718 VideoSendStream::Config* send_config, |
1822 std::vector<VideoReceiveStream::Config>* receive_configs, | 1719 std::vector<VideoReceiveStream::Config>* receive_configs, |
1823 VideoEncoderConfig* encoder_config) override { | 1720 VideoEncoderConfig* encoder_config) override { |
1824 send_config->encoder_settings.encoder = this; | 1721 send_config->encoder_settings.encoder = this; |
1825 send_config->encoder_settings.payload_name = codec_name_; | 1722 send_config->encoder_settings.payload_name = codec_name_; |
1826 | 1723 |
| 1724 for (size_t i = 0; i < encoder_config->streams.size(); ++i) { |
| 1725 encoder_config->streams[i].temporal_layer_thresholds_bps.resize( |
| 1726 kVideoCodecConfigObserverNumberOfTemporalLayers - 1); |
| 1727 } |
| 1728 |
1827 encoder_config->encoder_specific_settings = GetEncoderSpecificSettings(); | 1729 encoder_config->encoder_specific_settings = GetEncoderSpecificSettings(); |
1828 encoder_config->video_stream_factory = | |
1829 new rtc::RefCountedObject<VideoStreamFactory>(); | |
1830 encoder_config_ = encoder_config->Copy(); | 1730 encoder_config_ = encoder_config->Copy(); |
1831 } | 1731 } |
1832 | 1732 |
1833 void OnVideoStreamsCreated( | 1733 void OnVideoStreamsCreated( |
1834 VideoSendStream* send_stream, | 1734 VideoSendStream* send_stream, |
1835 const std::vector<VideoReceiveStream*>& receive_streams) override { | 1735 const std::vector<VideoReceiveStream*>& receive_streams) override { |
1836 stream_ = send_stream; | 1736 stream_ = send_stream; |
1837 } | 1737 } |
1838 | 1738 |
1839 int32_t InitEncode(const VideoCodec* config, | 1739 int32_t InitEncode(const VideoCodec* config, |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2015 rtc::CriticalSection crit_; | 1915 rtc::CriticalSection crit_; |
2016 size_t rtp_packets_sent_ GUARDED_BY(&crit_); | 1916 size_t rtp_packets_sent_ GUARDED_BY(&crit_); |
2017 size_t media_bytes_sent_ GUARDED_BY(&crit_); | 1917 size_t media_bytes_sent_ GUARDED_BY(&crit_); |
2018 } test; | 1918 } test; |
2019 | 1919 |
2020 RunBaseTest(&test); | 1920 RunBaseTest(&test); |
2021 } | 1921 } |
2022 | 1922 |
2023 TEST_F(VideoSendStreamTest, TranslatesTwoLayerScreencastToTargetBitrate) { | 1923 TEST_F(VideoSendStreamTest, TranslatesTwoLayerScreencastToTargetBitrate) { |
2024 static const int kScreencastTargetBitrateKbps = 200; | 1924 static const int kScreencastTargetBitrateKbps = 200; |
2025 | |
2026 class VideoStreamFactory | |
2027 : public VideoEncoderConfig::VideoStreamFactoryInterface { | |
2028 public: | |
2029 VideoStreamFactory() {} | |
2030 | |
2031 private: | |
2032 std::vector<VideoStream> CreateEncoderStreams( | |
2033 int width, | |
2034 int height, | |
2035 const VideoEncoderConfig& encoder_config) override { | |
2036 std::vector<VideoStream> streams = | |
2037 test::CreateVideoStreams(width, height, encoder_config); | |
2038 EXPECT_TRUE(streams[0].temporal_layer_thresholds_bps.empty()); | |
2039 streams[0].temporal_layer_thresholds_bps.push_back( | |
2040 kScreencastTargetBitrateKbps * 1000); | |
2041 return streams; | |
2042 } | |
2043 }; | |
2044 | |
2045 class ScreencastTargetBitrateTest : public test::SendTest, | 1925 class ScreencastTargetBitrateTest : public test::SendTest, |
2046 public test::FakeEncoder { | 1926 public test::FakeEncoder { |
2047 public: | 1927 public: |
2048 ScreencastTargetBitrateTest() | 1928 ScreencastTargetBitrateTest() |
2049 : SendTest(kDefaultTimeoutMs), | 1929 : SendTest(kDefaultTimeoutMs), |
2050 test::FakeEncoder(Clock::GetRealTimeClock()) {} | 1930 test::FakeEncoder(Clock::GetRealTimeClock()) {} |
2051 | 1931 |
2052 private: | 1932 private: |
2053 int32_t InitEncode(const VideoCodec* config, | 1933 int32_t InitEncode(const VideoCodec* config, |
2054 int32_t number_of_cores, | 1934 int32_t number_of_cores, |
2055 size_t max_payload_size) override { | 1935 size_t max_payload_size) override { |
2056 EXPECT_EQ(static_cast<unsigned int>(kScreencastTargetBitrateKbps), | 1936 EXPECT_EQ(static_cast<unsigned int>(kScreencastTargetBitrateKbps), |
2057 config->targetBitrate); | 1937 config->targetBitrate); |
2058 observation_complete_.Set(); | 1938 observation_complete_.Set(); |
2059 return test::FakeEncoder::InitEncode( | 1939 return test::FakeEncoder::InitEncode( |
2060 config, number_of_cores, max_payload_size); | 1940 config, number_of_cores, max_payload_size); |
2061 } | 1941 } |
2062 void ModifyVideoConfigs( | 1942 void ModifyVideoConfigs( |
2063 VideoSendStream::Config* send_config, | 1943 VideoSendStream::Config* send_config, |
2064 std::vector<VideoReceiveStream::Config>* receive_configs, | 1944 std::vector<VideoReceiveStream::Config>* receive_configs, |
2065 VideoEncoderConfig* encoder_config) override { | 1945 VideoEncoderConfig* encoder_config) override { |
2066 send_config->encoder_settings.encoder = this; | 1946 send_config->encoder_settings.encoder = this; |
2067 EXPECT_EQ(1u, encoder_config->number_of_streams); | 1947 EXPECT_EQ(1u, encoder_config->streams.size()); |
2068 encoder_config->video_stream_factory = | 1948 EXPECT_TRUE( |
2069 new rtc::RefCountedObject<VideoStreamFactory>(); | 1949 encoder_config->streams[0].temporal_layer_thresholds_bps.empty()); |
| 1950 encoder_config->streams[0].temporal_layer_thresholds_bps.push_back( |
| 1951 kScreencastTargetBitrateKbps * 1000); |
2070 encoder_config->content_type = VideoEncoderConfig::ContentType::kScreen; | 1952 encoder_config->content_type = VideoEncoderConfig::ContentType::kScreen; |
2071 } | 1953 } |
2072 | 1954 |
2073 void PerformTest() override { | 1955 void PerformTest() override { |
2074 EXPECT_TRUE(Wait()) | 1956 EXPECT_TRUE(Wait()) |
2075 << "Timed out while waiting for the encoder to be initialized."; | 1957 << "Timed out while waiting for the encoder to be initialized."; |
2076 } | 1958 } |
2077 } test; | 1959 } test; |
2078 | 1960 |
2079 RunBaseTest(&test); | 1961 RunBaseTest(&test); |
(...skipping 20 matching lines...) Expand all Loading... |
2100 num_initializations_(0), | 1982 num_initializations_(0), |
2101 call_(nullptr), | 1983 call_(nullptr), |
2102 send_stream_(nullptr) {} | 1984 send_stream_(nullptr) {} |
2103 | 1985 |
2104 private: | 1986 private: |
2105 int32_t InitEncode(const VideoCodec* codecSettings, | 1987 int32_t InitEncode(const VideoCodec* codecSettings, |
2106 int32_t numberOfCores, | 1988 int32_t numberOfCores, |
2107 size_t maxPayloadSize) override { | 1989 size_t maxPayloadSize) override { |
2108 EXPECT_GE(codecSettings->startBitrate, codecSettings->minBitrate); | 1990 EXPECT_GE(codecSettings->startBitrate, codecSettings->minBitrate); |
2109 EXPECT_LE(codecSettings->startBitrate, codecSettings->maxBitrate); | 1991 EXPECT_LE(codecSettings->startBitrate, codecSettings->maxBitrate); |
2110 // First reinitialization happens due to that the frame size is updated. | 1992 if (num_initializations_ == 0) { |
2111 if (num_initializations_ == 0 || num_initializations_ == 1) { | |
2112 EXPECT_EQ(static_cast<unsigned int>(kMinBitrateKbps), | 1993 EXPECT_EQ(static_cast<unsigned int>(kMinBitrateKbps), |
2113 codecSettings->minBitrate); | 1994 codecSettings->minBitrate); |
2114 EXPECT_EQ(static_cast<unsigned int>(kStartBitrateKbps), | 1995 EXPECT_EQ(static_cast<unsigned int>(kStartBitrateKbps), |
2115 codecSettings->startBitrate); | 1996 codecSettings->startBitrate); |
2116 EXPECT_EQ(static_cast<unsigned int>(kMaxBitrateKbps), | 1997 EXPECT_EQ(static_cast<unsigned int>(kMaxBitrateKbps), |
2117 codecSettings->maxBitrate); | 1998 codecSettings->maxBitrate); |
2118 observation_complete_.Set(); | 1999 observation_complete_.Set(); |
2119 } else if (num_initializations_ == 2) { | 2000 } else if (num_initializations_ == 1) { |
2120 EXPECT_EQ(static_cast<unsigned int>(kLowerMaxBitrateKbps), | 2001 EXPECT_EQ(static_cast<unsigned int>(kLowerMaxBitrateKbps), |
2121 codecSettings->maxBitrate); | 2002 codecSettings->maxBitrate); |
2122 // The start bitrate should be kept (-1) and capped to the max bitrate. | 2003 // The start bitrate should be kept (-1) and capped to the max bitrate. |
2123 // Since this is not an end-to-end call no receiver should have been | 2004 // Since this is not an end-to-end call no receiver should have been |
2124 // returning a REMB that could lower this estimate. | 2005 // returning a REMB that could lower this estimate. |
2125 EXPECT_EQ(codecSettings->startBitrate, codecSettings->maxBitrate); | 2006 EXPECT_EQ(codecSettings->startBitrate, codecSettings->maxBitrate); |
2126 } else if (num_initializations_ == 3) { | 2007 } else if (num_initializations_ == 2) { |
2127 EXPECT_EQ(static_cast<unsigned int>(kIncreasedMaxBitrateKbps), | 2008 EXPECT_EQ(static_cast<unsigned int>(kIncreasedMaxBitrateKbps), |
2128 codecSettings->maxBitrate); | 2009 codecSettings->maxBitrate); |
2129 // The start bitrate will be whatever the rate BitRateController | 2010 // The start bitrate will be whatever the rate BitRateController |
2130 // has currently configured but in the span of the set max and min | 2011 // has currently configured but in the span of the set max and min |
2131 // bitrate. | 2012 // bitrate. |
2132 } | 2013 } |
2133 ++num_initializations_; | 2014 ++num_initializations_; |
2134 if (num_initializations_ > 1) { | 2015 init_encode_event_.Set(); |
2135 init_encode_event_.Set(); | |
2136 } | |
2137 return FakeEncoder::InitEncode(codecSettings, numberOfCores, | 2016 return FakeEncoder::InitEncode(codecSettings, numberOfCores, |
2138 maxPayloadSize); | 2017 maxPayloadSize); |
2139 } | 2018 } |
2140 | 2019 |
2141 int32_t SetRates(uint32_t newBitRate, uint32_t frameRate) override { | 2020 int32_t SetRates(uint32_t newBitRate, uint32_t frameRate) override { |
2142 { | 2021 { |
2143 rtc::CritScope lock(&crit_); | 2022 rtc::CritScope lock(&crit_); |
2144 if (target_bitrate_ == newBitRate) { | |
2145 return FakeEncoder::SetRates(newBitRate, frameRate); | |
2146 } | |
2147 target_bitrate_ = newBitRate; | 2023 target_bitrate_ = newBitRate; |
2148 } | 2024 } |
2149 bitrate_changed_event_.Set(); | 2025 bitrate_changed_event_.Set(); |
2150 return FakeEncoder::SetRates(newBitRate, frameRate); | 2026 return FakeEncoder::SetRates(newBitRate, frameRate); |
2151 } | 2027 } |
2152 | 2028 |
2153 void WaitForSetRates(uint32_t expected_bitrate) { | 2029 void WaitForSetRates(uint32_t expected_bitrate) { |
2154 EXPECT_TRUE( | 2030 EXPECT_TRUE( |
2155 bitrate_changed_event_.Wait(VideoSendStreamTest::kDefaultTimeoutMs)) | 2031 bitrate_changed_event_.Wait(VideoSendStreamTest::kDefaultTimeoutMs)) |
2156 << "Timed out while waiting encoder rate to be set."; | 2032 << "Timed out while waiting encoder rate to be set."; |
2157 rtc::CritScope lock(&crit_); | 2033 rtc::CritScope lock(&crit_); |
2158 EXPECT_EQ(expected_bitrate, target_bitrate_); | 2034 EXPECT_EQ(expected_bitrate, target_bitrate_); |
2159 } | 2035 } |
2160 | 2036 |
2161 Call::Config GetSenderCallConfig() override { | 2037 Call::Config GetSenderCallConfig() override { |
2162 Call::Config config; | 2038 Call::Config config; |
2163 config.bitrate_config.min_bitrate_bps = kMinBitrateKbps * 1000; | 2039 config.bitrate_config.min_bitrate_bps = kMinBitrateKbps * 1000; |
2164 config.bitrate_config.start_bitrate_bps = kStartBitrateKbps * 1000; | 2040 config.bitrate_config.start_bitrate_bps = kStartBitrateKbps * 1000; |
2165 config.bitrate_config.max_bitrate_bps = kMaxBitrateKbps * 1000; | 2041 config.bitrate_config.max_bitrate_bps = kMaxBitrateKbps * 1000; |
2166 return config; | 2042 return config; |
2167 } | 2043 } |
2168 | 2044 |
2169 class VideoStreamFactory | |
2170 : public VideoEncoderConfig::VideoStreamFactoryInterface { | |
2171 public: | |
2172 explicit VideoStreamFactory(int min_bitrate_bps) | |
2173 : min_bitrate_bps_(min_bitrate_bps) {} | |
2174 | |
2175 private: | |
2176 std::vector<VideoStream> CreateEncoderStreams( | |
2177 int width, | |
2178 int height, | |
2179 const VideoEncoderConfig& encoder_config) override { | |
2180 std::vector<VideoStream> streams = | |
2181 test::CreateVideoStreams(width, height, encoder_config); | |
2182 streams[0].min_bitrate_bps = min_bitrate_bps_; | |
2183 return streams; | |
2184 } | |
2185 | |
2186 const int min_bitrate_bps_; | |
2187 }; | |
2188 | |
2189 void ModifyVideoConfigs( | 2045 void ModifyVideoConfigs( |
2190 VideoSendStream::Config* send_config, | 2046 VideoSendStream::Config* send_config, |
2191 std::vector<VideoReceiveStream::Config>* receive_configs, | 2047 std::vector<VideoReceiveStream::Config>* receive_configs, |
2192 VideoEncoderConfig* encoder_config) override { | 2048 VideoEncoderConfig* encoder_config) override { |
2193 send_config->encoder_settings.encoder = this; | 2049 send_config->encoder_settings.encoder = this; |
2194 // Set bitrates lower/higher than min/max to make sure they are properly | 2050 // Set bitrates lower/higher than min/max to make sure they are properly |
2195 // capped. | 2051 // capped. |
2196 encoder_config->max_bitrate_bps = kMaxBitrateKbps * 1000; | 2052 encoder_config->streams.front().min_bitrate_bps = kMinBitrateKbps * 1000; |
2197 // Create a new StreamFactory to be able to set | 2053 encoder_config->streams.front().max_bitrate_bps = kMaxBitrateKbps * 1000; |
2198 // |VideoStream.min_bitrate_bps|. | |
2199 encoder_config->video_stream_factory = | |
2200 new rtc::RefCountedObject<VideoStreamFactory>(kMinBitrateKbps * 1000); | |
2201 encoder_config_ = encoder_config->Copy(); | 2054 encoder_config_ = encoder_config->Copy(); |
2202 } | 2055 } |
2203 | 2056 |
2204 void OnCallsCreated(Call* sender_call, Call* receiver_call) override { | 2057 void OnCallsCreated(Call* sender_call, Call* receiver_call) override { |
2205 call_ = sender_call; | 2058 call_ = sender_call; |
2206 } | 2059 } |
2207 | 2060 |
2208 void OnVideoStreamsCreated( | 2061 void OnVideoStreamsCreated( |
2209 VideoSendStream* send_stream, | 2062 VideoSendStream* send_stream, |
2210 const std::vector<VideoReceiveStream*>& receive_streams) override { | 2063 const std::vector<VideoReceiveStream*>& receive_streams) override { |
2211 send_stream_ = send_stream; | 2064 send_stream_ = send_stream; |
2212 } | 2065 } |
2213 | 2066 |
2214 void PerformTest() override { | 2067 void PerformTest() override { |
2215 ASSERT_TRUE( | 2068 ASSERT_TRUE( |
2216 init_encode_event_.Wait(VideoSendStreamTest::kDefaultTimeoutMs)) | 2069 init_encode_event_.Wait(VideoSendStreamTest::kDefaultTimeoutMs)) |
2217 << "Timed out while waiting for encoder to be configured."; | 2070 << "Timed out while waiting for encoder to be configured."; |
2218 WaitForSetRates(kStartBitrateKbps); | 2071 WaitForSetRates(kStartBitrateKbps); |
2219 Call::Config::BitrateConfig bitrate_config; | 2072 Call::Config::BitrateConfig bitrate_config; |
2220 bitrate_config.start_bitrate_bps = kIncreasedStartBitrateKbps * 1000; | 2073 bitrate_config.start_bitrate_bps = kIncreasedStartBitrateKbps * 1000; |
2221 bitrate_config.max_bitrate_bps = kIncreasedMaxBitrateKbps * 1000; | 2074 bitrate_config.max_bitrate_bps = kIncreasedMaxBitrateKbps * 1000; |
2222 call_->SetBitrateConfig(bitrate_config); | 2075 call_->SetBitrateConfig(bitrate_config); |
2223 // Encoder rate is capped by EncoderConfig max_bitrate_bps. | 2076 // Encoder rate is capped by EncoderConfig max_bitrate_bps. |
2224 WaitForSetRates(kMaxBitrateKbps); | 2077 WaitForSetRates(kMaxBitrateKbps); |
2225 encoder_config_.max_bitrate_bps = kLowerMaxBitrateKbps * 1000; | 2078 |
| 2079 encoder_config_.streams[0].min_bitrate_bps = 0; |
| 2080 encoder_config_.streams[0].max_bitrate_bps = kLowerMaxBitrateKbps * 1000; |
| 2081 send_stream_->ReconfigureVideoEncoder(encoder_config_.Copy()); |
| 2082 ASSERT_TRUE( |
| 2083 init_encode_event_.Wait(VideoSendStreamTest::kDefaultTimeoutMs)); |
| 2084 EXPECT_EQ(2, num_initializations_) |
| 2085 << "Encoder should have been reconfigured with the new value."; |
| 2086 WaitForSetRates(kLowerMaxBitrateKbps); |
| 2087 |
| 2088 encoder_config_.streams[0].target_bitrate_bps = |
| 2089 encoder_config_.streams[0].min_bitrate_bps; |
| 2090 encoder_config_.streams[0].max_bitrate_bps = |
| 2091 kIncreasedMaxBitrateKbps * 1000; |
2226 send_stream_->ReconfigureVideoEncoder(encoder_config_.Copy()); | 2092 send_stream_->ReconfigureVideoEncoder(encoder_config_.Copy()); |
2227 ASSERT_TRUE( | 2093 ASSERT_TRUE( |
2228 init_encode_event_.Wait(VideoSendStreamTest::kDefaultTimeoutMs)); | 2094 init_encode_event_.Wait(VideoSendStreamTest::kDefaultTimeoutMs)); |
2229 EXPECT_EQ(3, num_initializations_) | 2095 EXPECT_EQ(3, num_initializations_) |
2230 << "Encoder should have been reconfigured with the new value."; | 2096 << "Encoder should have been reconfigured with the new value."; |
2231 WaitForSetRates(kLowerMaxBitrateKbps); | |
2232 | |
2233 encoder_config_.max_bitrate_bps = kIncreasedMaxBitrateKbps * 1000; | |
2234 send_stream_->ReconfigureVideoEncoder(encoder_config_.Copy()); | |
2235 ASSERT_TRUE( | |
2236 init_encode_event_.Wait(VideoSendStreamTest::kDefaultTimeoutMs)); | |
2237 EXPECT_EQ(4, num_initializations_) | |
2238 << "Encoder should have been reconfigured with the new value."; | |
2239 // Expected target bitrate is the start bitrate set in the call to | 2097 // Expected target bitrate is the start bitrate set in the call to |
2240 // call_->SetBitrateConfig. | 2098 // call_->SetBitrateConfig. |
2241 WaitForSetRates(kIncreasedStartBitrateKbps); | 2099 WaitForSetRates(kIncreasedStartBitrateKbps); |
2242 } | 2100 } |
2243 | 2101 |
2244 rtc::Event init_encode_event_; | 2102 rtc::Event init_encode_event_; |
2245 rtc::Event bitrate_changed_event_; | 2103 rtc::Event bitrate_changed_event_; |
2246 rtc::CriticalSection crit_; | 2104 rtc::CriticalSection crit_; |
2247 uint32_t target_bitrate_ GUARDED_BY(&crit_); | 2105 uint32_t target_bitrate_ GUARDED_BY(&crit_); |
2248 | |
2249 int num_initializations_; | 2106 int num_initializations_; |
2250 webrtc::Call* call_; | 2107 webrtc::Call* call_; |
2251 webrtc::VideoSendStream* send_stream_; | 2108 webrtc::VideoSendStream* send_stream_; |
2252 webrtc::VideoEncoderConfig encoder_config_; | 2109 webrtc::VideoEncoderConfig encoder_config_; |
2253 } test; | 2110 } test; |
2254 | 2111 |
2255 RunBaseTest(&test); | 2112 RunBaseTest(&test); |
2256 } | 2113 } |
2257 | 2114 |
2258 TEST_F(VideoSendStreamTest, ReportsSentResolution) { | 2115 TEST_F(VideoSendStreamTest, ReportsSentResolution) { |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2294 } | 2151 } |
2295 | 2152 |
2296 observation_complete_.Set(); | 2153 observation_complete_.Set(); |
2297 return 0; | 2154 return 0; |
2298 } | 2155 } |
2299 void ModifyVideoConfigs( | 2156 void ModifyVideoConfigs( |
2300 VideoSendStream::Config* send_config, | 2157 VideoSendStream::Config* send_config, |
2301 std::vector<VideoReceiveStream::Config>* receive_configs, | 2158 std::vector<VideoReceiveStream::Config>* receive_configs, |
2302 VideoEncoderConfig* encoder_config) override { | 2159 VideoEncoderConfig* encoder_config) override { |
2303 send_config->encoder_settings.encoder = this; | 2160 send_config->encoder_settings.encoder = this; |
2304 EXPECT_EQ(kNumStreams, encoder_config->number_of_streams); | 2161 EXPECT_EQ(kNumStreams, encoder_config->streams.size()); |
2305 } | 2162 } |
2306 | 2163 |
2307 size_t GetNumVideoStreams() const override { return kNumStreams; } | 2164 size_t GetNumVideoStreams() const override { return kNumStreams; } |
2308 | 2165 |
2309 void PerformTest() override { | 2166 void PerformTest() override { |
2310 EXPECT_TRUE(Wait()) | 2167 EXPECT_TRUE(Wait()) |
2311 << "Timed out while waiting for the encoder to send one frame."; | 2168 << "Timed out while waiting for the encoder to send one frame."; |
2312 VideoSendStream::Stats stats = send_stream_->GetStats(); | 2169 VideoSendStream::Stats stats = send_stream_->GetStats(); |
2313 | 2170 |
2314 for (size_t i = 0; i < kNumStreams; ++i) { | 2171 for (size_t i = 0; i < kNumStreams; ++i) { |
(...skipping 21 matching lines...) Expand all Loading... |
2336 } | 2193 } |
2337 | 2194 |
2338 #if !defined(RTC_DISABLE_VP9) | 2195 #if !defined(RTC_DISABLE_VP9) |
2339 class Vp9HeaderObserver : public test::SendTest { | 2196 class Vp9HeaderObserver : public test::SendTest { |
2340 public: | 2197 public: |
2341 Vp9HeaderObserver() | 2198 Vp9HeaderObserver() |
2342 : SendTest(VideoSendStreamTest::kLongTimeoutMs), | 2199 : SendTest(VideoSendStreamTest::kLongTimeoutMs), |
2343 vp9_encoder_(VP9Encoder::Create()), | 2200 vp9_encoder_(VP9Encoder::Create()), |
2344 vp9_settings_(VideoEncoder::GetDefaultVp9Settings()), | 2201 vp9_settings_(VideoEncoder::GetDefaultVp9Settings()), |
2345 packets_sent_(0), | 2202 packets_sent_(0), |
2346 frames_sent_(0), | 2203 frames_sent_(0) {} |
2347 expected_width_(0), | |
2348 expected_height_(0) {} | |
2349 | 2204 |
2350 virtual void ModifyVideoConfigsHook( | 2205 virtual void ModifyVideoConfigsHook( |
2351 VideoSendStream::Config* send_config, | 2206 VideoSendStream::Config* send_config, |
2352 std::vector<VideoReceiveStream::Config>* receive_configs, | 2207 std::vector<VideoReceiveStream::Config>* receive_configs, |
2353 VideoEncoderConfig* encoder_config) {} | 2208 VideoEncoderConfig* encoder_config) {} |
2354 | 2209 |
2355 virtual void InspectHeader(const RTPVideoHeaderVP9& vp9) = 0; | 2210 virtual void InspectHeader(const RTPVideoHeaderVP9& vp9) = 0; |
2356 | 2211 |
2357 private: | 2212 private: |
2358 const int kVp9PayloadType = 105; | 2213 const int kVp9PayloadType = 105; |
2359 | 2214 |
2360 class VideoStreamFactory | |
2361 : public VideoEncoderConfig::VideoStreamFactoryInterface { | |
2362 public: | |
2363 explicit VideoStreamFactory(size_t number_of_temporal_layers) | |
2364 : number_of_temporal_layers_(number_of_temporal_layers) {} | |
2365 | |
2366 private: | |
2367 std::vector<VideoStream> CreateEncoderStreams( | |
2368 int width, | |
2369 int height, | |
2370 const VideoEncoderConfig& encoder_config) override { | |
2371 std::vector<VideoStream> streams = | |
2372 test::CreateVideoStreams(width, height, encoder_config); | |
2373 streams[0].temporal_layer_thresholds_bps.resize( | |
2374 number_of_temporal_layers_ - 1); | |
2375 return streams; | |
2376 } | |
2377 | |
2378 const size_t number_of_temporal_layers_; | |
2379 }; | |
2380 | |
2381 void ModifyVideoConfigs( | 2215 void ModifyVideoConfigs( |
2382 VideoSendStream::Config* send_config, | 2216 VideoSendStream::Config* send_config, |
2383 std::vector<VideoReceiveStream::Config>* receive_configs, | 2217 std::vector<VideoReceiveStream::Config>* receive_configs, |
2384 VideoEncoderConfig* encoder_config) override { | 2218 VideoEncoderConfig* encoder_config) override { |
2385 send_config->encoder_settings.encoder = vp9_encoder_.get(); | 2219 send_config->encoder_settings.encoder = vp9_encoder_.get(); |
2386 send_config->encoder_settings.payload_name = "VP9"; | 2220 send_config->encoder_settings.payload_name = "VP9"; |
2387 send_config->encoder_settings.payload_type = kVp9PayloadType; | 2221 send_config->encoder_settings.payload_type = kVp9PayloadType; |
2388 ModifyVideoConfigsHook(send_config, receive_configs, encoder_config); | 2222 ModifyVideoConfigsHook(send_config, receive_configs, encoder_config); |
2389 encoder_config->encoder_specific_settings = new rtc::RefCountedObject< | 2223 encoder_config->encoder_specific_settings = new rtc::RefCountedObject< |
2390 VideoEncoderConfig::Vp9EncoderSpecificSettings>(vp9_settings_); | 2224 VideoEncoderConfig::Vp9EncoderSpecificSettings>(vp9_settings_); |
2391 EXPECT_EQ(1u, encoder_config->number_of_streams); | 2225 EXPECT_EQ(1u, encoder_config->streams.size()); |
2392 encoder_config->video_stream_factory = | 2226 encoder_config->streams[0].temporal_layer_thresholds_bps.resize( |
2393 new rtc::RefCountedObject<VideoStreamFactory>( | 2227 vp9_settings_.numberOfTemporalLayers - 1); |
2394 vp9_settings_.numberOfTemporalLayers); | |
2395 encoder_config_ = encoder_config->Copy(); | 2228 encoder_config_ = encoder_config->Copy(); |
2396 } | 2229 } |
2397 | 2230 |
2398 void ModifyVideoCaptureStartResolution(int* width, | |
2399 int* height, | |
2400 int* frame_rate) override { | |
2401 expected_width_ = *width; | |
2402 expected_height_ = *height; | |
2403 } | |
2404 | |
2405 void PerformTest() override { | 2231 void PerformTest() override { |
2406 EXPECT_TRUE(Wait()) << "Test timed out waiting for VP9 packet, num frames " | 2232 EXPECT_TRUE(Wait()) << "Test timed out waiting for VP9 packet, num frames " |
2407 << frames_sent_; | 2233 << frames_sent_; |
2408 } | 2234 } |
2409 | 2235 |
2410 Action OnSendRtp(const uint8_t* packet, size_t length) override { | 2236 Action OnSendRtp(const uint8_t* packet, size_t length) override { |
2411 RTPHeader header; | 2237 RTPHeader header; |
2412 EXPECT_TRUE(parser_->Parse(packet, length, &header)); | 2238 EXPECT_TRUE(parser_->Parse(packet, length, &header)); |
2413 | 2239 |
2414 EXPECT_EQ(kVp9PayloadType, header.payloadType); | 2240 EXPECT_EQ(kVp9PayloadType, header.payloadType); |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2584 // +-+-+-+-+-+-+-+-+ | 2410 // +-+-+-+-+-+-+-+-+ |
2585 // N_G: | T |U| R |-|-| N_G times | 2411 // N_G: | T |U| R |-|-| N_G times |
2586 // +-+-+-+-+-+-+-+-+ | 2412 // +-+-+-+-+-+-+-+-+ |
2587 // | P_DIFF | R times | 2413 // | P_DIFF | R times |
2588 // +-+-+-+-+-+-+-+-+ | 2414 // +-+-+-+-+-+-+-+-+ |
2589 void VerifySsData(const RTPVideoHeaderVP9& vp9) const { | 2415 void VerifySsData(const RTPVideoHeaderVP9& vp9) const { |
2590 EXPECT_TRUE(vp9.ss_data_available); // V | 2416 EXPECT_TRUE(vp9.ss_data_available); // V |
2591 EXPECT_EQ(vp9_settings_.numberOfSpatialLayers, // N_S + 1 | 2417 EXPECT_EQ(vp9_settings_.numberOfSpatialLayers, // N_S + 1 |
2592 vp9.num_spatial_layers); | 2418 vp9.num_spatial_layers); |
2593 EXPECT_TRUE(vp9.spatial_layer_resolution_present); // Y:1 | 2419 EXPECT_TRUE(vp9.spatial_layer_resolution_present); // Y:1 |
2594 int expected_width = expected_width_; | 2420 size_t expected_width = encoder_config_.streams[0].width; |
2595 int expected_height = expected_height_; | 2421 size_t expected_height = encoder_config_.streams[0].height; |
2596 for (int i = static_cast<int>(vp9.num_spatial_layers) - 1; i >= 0; --i) { | 2422 for (int i = static_cast<int>(vp9.num_spatial_layers) - 1; i >= 0; --i) { |
2597 EXPECT_EQ(expected_width, vp9.width[i]); // WIDTH | 2423 EXPECT_EQ(expected_width, vp9.width[i]); // WIDTH |
2598 EXPECT_EQ(expected_height, vp9.height[i]); // HEIGHT | 2424 EXPECT_EQ(expected_height, vp9.height[i]); // HEIGHT |
2599 expected_width /= 2; | 2425 expected_width /= 2; |
2600 expected_height /= 2; | 2426 expected_height /= 2; |
2601 } | 2427 } |
2602 } | 2428 } |
2603 | 2429 |
2604 void CompareConsecutiveFrames(const RTPHeader& header, | 2430 void CompareConsecutiveFrames(const RTPHeader& header, |
2605 const RTPVideoHeader& video) const { | 2431 const RTPVideoHeader& video) const { |
(...skipping 23 matching lines...) Expand all Loading... |
2629 VerifyTl0Idx(vp9); | 2455 VerifyTl0Idx(vp9); |
2630 } | 2456 } |
2631 | 2457 |
2632 std::unique_ptr<VP9Encoder> vp9_encoder_; | 2458 std::unique_ptr<VP9Encoder> vp9_encoder_; |
2633 VideoCodecVP9 vp9_settings_; | 2459 VideoCodecVP9 vp9_settings_; |
2634 webrtc::VideoEncoderConfig encoder_config_; | 2460 webrtc::VideoEncoderConfig encoder_config_; |
2635 RTPHeader last_header_; | 2461 RTPHeader last_header_; |
2636 RTPVideoHeaderVP9 last_vp9_; | 2462 RTPVideoHeaderVP9 last_vp9_; |
2637 size_t packets_sent_; | 2463 size_t packets_sent_; |
2638 size_t frames_sent_; | 2464 size_t frames_sent_; |
2639 int expected_width_; | |
2640 int expected_height_; | |
2641 }; | 2465 }; |
2642 | 2466 |
2643 TEST_F(VideoSendStreamTest, Vp9NonFlexMode_1Tl1SLayers) { | 2467 TEST_F(VideoSendStreamTest, Vp9NonFlexMode_1Tl1SLayers) { |
2644 const uint8_t kNumTemporalLayers = 1; | 2468 const uint8_t kNumTemporalLayers = 1; |
2645 const uint8_t kNumSpatialLayers = 1; | 2469 const uint8_t kNumSpatialLayers = 1; |
2646 TestVp9NonFlexMode(kNumTemporalLayers, kNumSpatialLayers); | 2470 TestVp9NonFlexMode(kNumTemporalLayers, kNumSpatialLayers); |
2647 } | 2471 } |
2648 | 2472 |
2649 TEST_F(VideoSendStreamTest, Vp9NonFlexMode_2Tl1SLayers) { | 2473 TEST_F(VideoSendStreamTest, Vp9NonFlexMode_2Tl1SLayers) { |
2650 const uint8_t kNumTemporalLayers = 2; | 2474 const uint8_t kNumTemporalLayers = 2; |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2732 static const int kHeight = 4; | 2556 static const int kHeight = 4; |
2733 class NonFlexibleModeResolution : public Vp9HeaderObserver { | 2557 class NonFlexibleModeResolution : public Vp9HeaderObserver { |
2734 void ModifyVideoConfigsHook( | 2558 void ModifyVideoConfigsHook( |
2735 VideoSendStream::Config* send_config, | 2559 VideoSendStream::Config* send_config, |
2736 std::vector<VideoReceiveStream::Config>* receive_configs, | 2560 std::vector<VideoReceiveStream::Config>* receive_configs, |
2737 VideoEncoderConfig* encoder_config) override { | 2561 VideoEncoderConfig* encoder_config) override { |
2738 vp9_settings_.flexibleMode = false; | 2562 vp9_settings_.flexibleMode = false; |
2739 vp9_settings_.numberOfTemporalLayers = 1; | 2563 vp9_settings_.numberOfTemporalLayers = 1; |
2740 vp9_settings_.numberOfSpatialLayers = 1; | 2564 vp9_settings_.numberOfSpatialLayers = 1; |
2741 | 2565 |
2742 EXPECT_EQ(1u, encoder_config->number_of_streams); | 2566 EXPECT_EQ(1u, encoder_config->streams.size()); |
| 2567 encoder_config->streams[0].width = kWidth; |
| 2568 encoder_config->streams[0].height = kHeight; |
2743 } | 2569 } |
2744 | 2570 |
2745 void InspectHeader(const RTPVideoHeaderVP9& vp9_header) override { | 2571 void InspectHeader(const RTPVideoHeaderVP9& vp9_header) override { |
2746 if (frames_sent_ > kNumFramesToSend) | 2572 if (frames_sent_ > kNumFramesToSend) |
2747 observation_complete_.Set(); | 2573 observation_complete_.Set(); |
2748 } | 2574 } |
2749 | |
2750 void ModifyVideoCaptureStartResolution(int* width, | |
2751 int* height, | |
2752 int* frame_rate) override { | |
2753 expected_width_ = kWidth; | |
2754 expected_height_ = kHeight; | |
2755 *width = kWidth; | |
2756 *height = kHeight; | |
2757 } | |
2758 } test; | 2575 } test; |
2759 | 2576 |
2760 RunBaseTest(&test); | 2577 RunBaseTest(&test); |
2761 } | 2578 } |
2762 | 2579 |
2763 TEST_F(VideoSendStreamTest, Vp9FlexModeRefCount) { | 2580 TEST_F(VideoSendStreamTest, Vp9FlexModeRefCount) { |
2764 class FlexibleMode : public Vp9HeaderObserver { | 2581 class FlexibleMode : public Vp9HeaderObserver { |
2765 void ModifyVideoConfigsHook( | 2582 void ModifyVideoConfigsHook( |
2766 VideoSendStream::Config* send_config, | 2583 VideoSendStream::Config* send_config, |
2767 std::vector<VideoReceiveStream::Config>* receive_configs, | 2584 std::vector<VideoReceiveStream::Config>* receive_configs, |
(...skipping 12 matching lines...) Expand all Loading... |
2780 observation_complete_.Set(); | 2597 observation_complete_.Set(); |
2781 } | 2598 } |
2782 } | 2599 } |
2783 } test; | 2600 } test; |
2784 | 2601 |
2785 RunBaseTest(&test); | 2602 RunBaseTest(&test); |
2786 } | 2603 } |
2787 #endif // !defined(RTC_DISABLE_VP9) | 2604 #endif // !defined(RTC_DISABLE_VP9) |
2788 | 2605 |
2789 } // namespace webrtc | 2606 } // namespace webrtc |
OLD | NEW |