Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1291)

Unified Diff: webrtc/video/video_send_stream_tests.cc

Issue 2883963002: Periodically update codec bit/frame rate settings. (Closed)
Patch Set: cleanup Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/video/video_send_stream_tests.cc
diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
index 58ac2b457ce485b8b202e571468dec12fc0e2f59..115095ea7ff704afe398aba647de3ecbcb4bee34 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -931,10 +931,12 @@ void VideoSendStreamTest::TestPacketFragmentationSize(VideoFormat format,
void TriggerLossReport(const RTPHeader& header) {
// Send lossy receive reports to trigger FEC enabling.
- if (packet_count_++ % 2 != 0) {
- // Receive statistics reporting having lost 50% of the packets.
+ const int kLossPercent = 5;
+ if (packet_count_++ % (100 / kLossPercent) != 0) {
FakeReceiveStatistics lossy_receive_stats(
- kVideoSendSsrcs[0], header.sequenceNumber, packet_count_ / 2, 127);
+ kVideoSendSsrcs[0], header.sequenceNumber,
+ (packet_count_ * (100 - kLossPercent)) / 100, // Cumulative lost.
+ static_cast<uint8_t>((255 * kLossPercent) / 100)); // Loss percent.
RTCPSender rtcp_sender(false, Clock::GetRealTimeClock(),
&lossy_receive_stats, nullptr, nullptr,
transport_adapter_.get());
@@ -987,6 +989,35 @@ void VideoSendStreamTest::TestPacketFragmentationSize(VideoFormat format,
// Make sure there is at least one extension header, to make the RTP
// header larger than the base length of 12 bytes.
EXPECT_FALSE(send_config->rtp.extensions.empty());
+
+ // Setup screen content disables frame dropping which makes this easier.
stefan-webrtc 2017/05/23 17:03:20 This seems a bit unfortunate. What if we want to r
sprang_webrtc 2017/05/24 09:07:07 Then we should probably expose some API surface to
+ class VideoStreamFactory
+ : public VideoEncoderConfig::VideoStreamFactoryInterface {
+ public:
+ explicit VideoStreamFactory(size_t num_temporal_layers)
+ : num_temporal_layers_(num_temporal_layers) {
+ EXPECT_GT(num_temporal_layers, 0u);
+ }
+
+ private:
+ std::vector<VideoStream> CreateEncoderStreams(
+ int width,
+ int height,
+ const VideoEncoderConfig& encoder_config) override {
+ std::vector<VideoStream> streams =
+ test::CreateVideoStreams(width, height, encoder_config);
+ for (VideoStream& stream : streams) {
+ stream.temporal_layer_thresholds_bps.resize(num_temporal_layers_ -
+ 1);
+ }
+ return streams;
+ }
+ const size_t num_temporal_layers_;
+ };
+
+ encoder_config->video_stream_factory =
+ new rtc::RefCountedObject<VideoStreamFactory>(2);
+ encoder_config->content_type = VideoEncoderConfig::ContentType::kScreen;
}
void PerformTest() override {

Powered by Google App Engine
This is Rietveld 408576698