From e01857cca48f8838c3e7d11a67ca377a3e355c60 Mon Sep 17 00:00:00 2001 From: Ilya Nikolaevskiy Date: Fri, 8 Mar 2019 14:25:42 +0000 Subject: [PATCH] Revert "Reland "Tune vp9 screenshare bitrate and framerate of spatial layers"" This reverts commit 12abf671fd2028ca249e95bdf0456b15a48136f8. Reason for revert: Breaks downstream project. Original change's description: > Reland "Tune vp9 screenshare bitrate and framerate of spatial layers" > > This is a reland without any changes as it seems problems with webrtc-in-chrome importer were flakes or > caused by some issues within chrome codebase. > > Tune vp9 screenshare bitrate and framerate of spatial layers > > VP9 screenshare is not used currently, and with these values according > to local testing with screenshare_loopback, we get performance not worse than current vp8 settings for similar uplink and downlink values. > > Original Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126226 > > Bug: webrtc:10257 > Change-Id: Ie819d8bbab4f14877daac733d162e5ae7ebf2a8e > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126460 > Reviewed-by: Johannes Kron > Reviewed-by: Ilya Nikolaevskiy > Commit-Queue: Ilya Nikolaevskiy > Cr-Commit-Position: refs/heads/master@{#27036} TBR=ilnik@webrtc.org,jeroendb@webrtc.org,kron@webrtc.org Change-Id: I9ad9017b054213f931b3b39c641060d35565f17d No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:10257 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126523 Reviewed-by: Ilya Nikolaevskiy Commit-Queue: Ilya Nikolaevskiy Cr-Commit-Position: refs/heads/master@{#27037} --- modules/video_coding/codecs/vp9/svc_config.cc | 8 ++++---- modules/video_coding/codecs/vp9/svc_config_unittest.cc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/video_coding/codecs/vp9/svc_config.cc b/modules/video_coding/codecs/vp9/svc_config.cc index a3bf56d90c..138822ab92 100644 --- a/modules/video_coding/codecs/vp9/svc_config.cc +++ b/modules/video_coding/codecs/vp9/svc_config.cc @@ -23,10 +23,10 @@ namespace { const size_t kMinVp9SvcBitrateKbps = 30; const size_t kMaxNumLayersForScreenSharing = 3; -const float kMaxScreenSharingLayerFramerateFps[] = {5.0, 10.0, 30.0}; -const size_t kMinScreenSharingLayerBitrateKbps[] = {30, 200, 500}; -const size_t kTargetScreenSharingLayerBitrateKbps[] = {150, 350, 950}; -const size_t kMaxScreenSharingLayerBitrateKbps[] = {250, 500, 950}; +const float kMaxScreenSharingLayerFramerateFps[] = {5.0, 5.0, 30.0}; +const size_t kMinScreenSharingLayerBitrateKbps[] = {30, 150, 500}; +const size_t kTargetScreenSharingLayerBitrateKbps[] = {150, 350, 1000}; +const size_t kMaxScreenSharingLayerBitrateKbps[] = {200, 500, 1000}; } // namespace diff --git a/modules/video_coding/codecs/vp9/svc_config_unittest.cc b/modules/video_coding/codecs/vp9/svc_config_unittest.cc index 489f1b0cd8..05802eb5b0 100644 --- a/modules/video_coding/codecs/vp9/svc_config_unittest.cc +++ b/modules/video_coding/codecs/vp9/svc_config_unittest.cc @@ -54,7 +54,7 @@ TEST(SvcConfig, ScreenSharing) { const SpatialLayer& layer = spatial_layers[i]; EXPECT_EQ(layer.width, 1920); EXPECT_EQ(layer.height, 1080); - EXPECT_EQ(layer.maxFramerate, (i < 1) ? 5 : (i < 2 ? 10 : 30)); + EXPECT_EQ(layer.maxFramerate, (i < 2) ? 5 : 30); EXPECT_EQ(layer.numberOfTemporalLayers, 1); EXPECT_LE(layer.minBitrate, layer.maxBitrate); EXPECT_LE(layer.minBitrate, layer.targetBitrate);