Delete unused stats for preferred_bitrate.
Bug: webrtc:8830
Change-Id: Iaa30488255f2e09e269274136d370740cd030902
Reviewed-on: https://webrtc-review.googlesource.com/78880
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23529}diff --git a/call/video_send_stream.cc b/call/video_send_stream.cc
index ec701d0..9024e3a 100644
--- a/call/video_send_stream.cc
+++ b/call/video_send_stream.cc
@@ -48,7 +48,6 @@
ss << "encode_usage_perc: " << encode_usage_percent << ", ";
ss << "target_bps: " << target_media_bitrate_bps << ", ";
ss << "media_bps: " << media_bitrate_bps << ", ";
- ss << "preferred_media_bitrate_bps: " << preferred_media_bitrate_bps << ", ";
ss << "suspended: " << (suspended ? "true" : "false") << ", ";
ss << "bw_adapted: " << (bw_limited_resolution ? "true" : "false");
ss << '}';
diff --git a/call/video_send_stream.h b/call/video_send_stream.h
index d883285..9564245 100644
--- a/call/video_send_stream.h
+++ b/call/video_send_stream.h
@@ -74,9 +74,6 @@
int target_media_bitrate_bps = 0;
// Bitrate the encoder is actually producing.
int media_bitrate_bps = 0;
- // Media bitrate this VideoSendStream is configured to prefer if there are
- // no bandwidth limitations.
- int preferred_media_bitrate_bps = 0;
bool suspended = false;
bool bw_limited_resolution = false;
bool cpu_limited_resolution = false;
diff --git a/common_video/include/video_bitrate_allocator.h b/common_video/include/video_bitrate_allocator.h
index b8a75e8..13b01ae 100644
--- a/common_video/include/video_bitrate_allocator.h
+++ b/common_video/include/video_bitrate_allocator.h
@@ -22,7 +22,6 @@
virtual VideoBitrateAllocation GetAllocation(uint32_t total_bitrate,
uint32_t framerate) = 0;
- virtual uint32_t GetPreferredBitrateBps(uint32_t framerate) = 0;
};
class VideoBitrateAllocationObserver {
diff --git a/media/base/mediachannel.h b/media/base/mediachannel.h
index 2580c0d..a316c70 100644
--- a/media/base/mediachannel.h
+++ b/media/base/mediachannel.h
@@ -462,7 +462,6 @@
int framerate_input = 0;
int framerate_sent = 0;
int nominal_bitrate = 0;
- int preferred_bitrate = 0;
int adapt_reason = 0;
int adapt_changes = 0;
int avg_encode_ms = 0;
diff --git a/media/engine/webrtcvideoengine.cc b/media/engine/webrtcvideoengine.cc
index ea66bcb..cd125d1 100644
--- a/media/engine/webrtcvideoengine.cc
+++ b/media/engine/webrtcvideoengine.cc
@@ -2068,7 +2068,6 @@
info.qp_sum = stats.qp_sum;
info.nominal_bitrate = stats.media_bitrate_bps;
- info.preferred_bitrate = stats.preferred_media_bitrate_bps;
info.content_type = stats.content_type;
info.huge_frames_sent = stats.huge_frames_sent;
diff --git a/media/engine/webrtcvideoengine_unittest.cc b/media/engine/webrtcvideoengine_unittest.cc
index 3b23fff..8ff75e8 100644
--- a/media/engine/webrtcvideoengine_unittest.cc
+++ b/media/engine/webrtcvideoengine_unittest.cc
@@ -4578,18 +4578,6 @@
EXPECT_EQ(90, info.senders[0].send_frame_height);
}
-TEST_F(WebRtcVideoChannelTest, GetStatsReportsPreferredBitrate) {
- FakeVideoSendStream* stream = AddSendStream();
- webrtc::VideoSendStream::Stats stats;
- stats.preferred_media_bitrate_bps = 5;
- stream->SetStats(stats);
-
- cricket::VideoMediaInfo info;
- ASSERT_TRUE(channel_->GetStats(&info));
- ASSERT_EQ(1u, info.senders.size());
- EXPECT_EQ(5, info.senders[0].preferred_bitrate);
-}
-
TEST_F(WebRtcVideoChannelTest, GetStatsReportsCpuAdaptationStats) {
FakeVideoSendStream* stream = AddSendStream();
webrtc::VideoSendStream::Stats stats;
diff --git a/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc b/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc
index 5effa68..d3f135c 100644
--- a/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc
+++ b/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc
@@ -228,10 +228,6 @@
return allocation;
}
-uint32_t SimulcastRateAllocator::GetPreferredBitrateBps(uint32_t framerate) {
- return GetAllocation(codec_.maxBitrate * 1000, framerate).get_sum_bps();
-}
-
const VideoCodec& webrtc::SimulcastRateAllocator::GetCodec() const {
return codec_;
}
diff --git a/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h b/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h
index de5c389..b958781 100644
--- a/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h
+++ b/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h
@@ -31,7 +31,6 @@
VideoBitrateAllocation GetAllocation(uint32_t total_bitrate_bps,
uint32_t framerate) override;
- uint32_t GetPreferredBitrateBps(uint32_t framerate) override;
const VideoCodec& GetCodec() const;
private:
diff --git a/modules/video_coding/codecs/vp9/svc_rate_allocator.cc b/modules/video_coding/codecs/vp9/svc_rate_allocator.cc
index 87c8fb8..17d529a 100644
--- a/modules/video_coding/codecs/vp9/svc_rate_allocator.cc
+++ b/modules/video_coding/codecs/vp9/svc_rate_allocator.cc
@@ -158,10 +158,6 @@
return bitrate_allocation;
}
-uint32_t SvcRateAllocator::GetPreferredBitrateBps(uint32_t framerate) {
- return GetAllocation(codec_.maxBitrate * 1000, framerate).get_sum_bps();
-}
-
std::vector<size_t> SvcRateAllocator::SplitBitrate(
size_t num_layers,
size_t total_bitrate,
diff --git a/modules/video_coding/codecs/vp9/svc_rate_allocator.h b/modules/video_coding/codecs/vp9/svc_rate_allocator.h
index 260061a..dceaff5 100644
--- a/modules/video_coding/codecs/vp9/svc_rate_allocator.h
+++ b/modules/video_coding/codecs/vp9/svc_rate_allocator.h
@@ -29,7 +29,6 @@
VideoBitrateAllocation GetAllocation(uint32_t total_bitrate_bps,
uint32_t framerate_fps) override;
- uint32_t GetPreferredBitrateBps(uint32_t framerate_fps) override;
private:
VideoBitrateAllocation GetAllocationNormalVideo(
diff --git a/modules/video_coding/utility/default_video_bitrate_allocator.cc b/modules/video_coding/utility/default_video_bitrate_allocator.cc
index 0124ad1..a4a40dd 100644
--- a/modules/video_coding/utility/default_video_bitrate_allocator.cc
+++ b/modules/video_coding/utility/default_video_bitrate_allocator.cc
@@ -38,9 +38,4 @@
return allocation;
}
-uint32_t DefaultVideoBitrateAllocator::GetPreferredBitrateBps(
- uint32_t framerate) {
- return GetAllocation(codec_.maxBitrate * 1000, framerate).get_sum_bps();
-}
-
} // namespace webrtc
diff --git a/modules/video_coding/utility/default_video_bitrate_allocator.h b/modules/video_coding/utility/default_video_bitrate_allocator.h
index 3eddf6f..6e013bd 100644
--- a/modules/video_coding/utility/default_video_bitrate_allocator.h
+++ b/modules/video_coding/utility/default_video_bitrate_allocator.h
@@ -23,7 +23,6 @@
VideoBitrateAllocation GetAllocation(uint32_t total_bitrate,
uint32_t framerate) override;
- uint32_t GetPreferredBitrateBps(uint32_t framerate) override;
private:
const VideoCodec codec_;
diff --git a/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc b/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc
index 446fa7e..f8c83d3 100644
--- a/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc
+++ b/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc
@@ -464,42 +464,6 @@
}
}
-TEST_F(SimulcastRateAllocatorTest, GetPreferredBitrateBps) {
- MockTemporalLayers mock_layers;
- allocator_.reset(new SimulcastRateAllocator(codec_));
- EXPECT_CALL(mock_layers, OnRatesUpdated(_, _)).Times(0);
- EXPECT_EQ(codec_.maxBitrate * 1000,
- allocator_->GetPreferredBitrateBps(codec_.maxFramerate));
-}
-
-TEST_F(SimulcastRateAllocatorTest, GetPreferredBitrateSimulcast) {
- codec_.numberOfSimulcastStreams = 3;
- codec_.maxBitrate = 999999;
- codec_.simulcastStream[0].minBitrate = 10;
- codec_.simulcastStream[0].targetBitrate = 100;
- codec_.simulcastStream[0].active = true;
-
- codec_.simulcastStream[0].maxBitrate = 500;
- codec_.simulcastStream[1].minBitrate = 50;
- codec_.simulcastStream[1].targetBitrate = 500;
- codec_.simulcastStream[1].maxBitrate = 1000;
- codec_.simulcastStream[1].active = true;
-
- codec_.simulcastStream[2].minBitrate = 2000;
- codec_.simulcastStream[2].targetBitrate = 3000;
- codec_.simulcastStream[2].maxBitrate = 4000;
- codec_.simulcastStream[2].active = true;
- CreateAllocator();
-
- uint32_t preferred_bitrate_kbps;
- preferred_bitrate_kbps = codec_.simulcastStream[0].targetBitrate;
- preferred_bitrate_kbps += codec_.simulcastStream[1].targetBitrate;
- preferred_bitrate_kbps += codec_.simulcastStream[2].maxBitrate;
-
- EXPECT_EQ(preferred_bitrate_kbps * 1000,
- allocator_->GetPreferredBitrateBps(codec_.maxFramerate));
-}
-
class ScreenshareRateAllocationTest : public SimulcastRateAllocatorTest {
public:
void SetupConferenceScreenshare(bool use_simulcast, bool active = true) {
diff --git a/video/end_to_end_tests/stats_tests.cc b/video/end_to_end_tests/stats_tests.cc
index 8f993e0..8a04461 100644
--- a/video/end_to_end_tests/stats_tests.cc
+++ b/video/end_to_end_tests/stats_tests.cc
@@ -158,9 +158,6 @@
stats.encoder_implementation_name ==
test::FakeEncoder::kImplementationName;
- send_stats_filled_["EncoderPreferredBitrate"] |=
- stats.preferred_media_bitrate_bps > 0;
-
for (std::map<uint32_t, VideoSendStream::StreamStats>::const_iterator it =
stats.substreams.begin();
it != stats.substreams.end(); ++it) {
diff --git a/video/send_statistics_proxy.cc b/video/send_statistics_proxy.cc
index 6d49f48..6c86c63 100644
--- a/video/send_statistics_proxy.cc
+++ b/video/send_statistics_proxy.cc
@@ -626,10 +626,8 @@
void SendStatisticsProxy::OnEncoderReconfigured(
const VideoEncoderConfig& config,
- const std::vector<VideoStream>& streams,
- uint32_t preferred_bitrate_bps) {
+ const std::vector<VideoStream>& streams) {
rtc::CritScope lock(&crit_);
- stats_.preferred_media_bitrate_bps = preferred_bitrate_bps;
if (content_type_ != config.content_type) {
uma_container_->UpdateHistograms(rtp_config_, stats_);
diff --git a/video/send_statistics_proxy.h b/video/send_statistics_proxy.h
index 61d69bd..bef3b28 100644
--- a/video/send_statistics_proxy.h
+++ b/video/send_statistics_proxy.h
@@ -80,10 +80,9 @@
void OnInactiveSsrc(uint32_t ssrc);
// Used to indicate change in content type, which may require a change in
- // how stats are collected and set the configured preferred media bitrate.
+ // how stats are collected.
void OnEncoderReconfigured(const VideoEncoderConfig& encoder_config,
- const std::vector<VideoStream>& streams,
- uint32_t preferred_bitrate_bps);
+ const std::vector<VideoStream>& streams);
// Used to update the encoder target rate.
void OnSetEncoderTargetRate(uint32_t bitrate_bps);
diff --git a/video/send_statistics_proxy_unittest.cc b/video/send_statistics_proxy_unittest.cc
index 01cbfe8..d9e8343 100644
--- a/video/send_statistics_proxy_unittest.cc
+++ b/video/send_statistics_proxy_unittest.cc
@@ -28,7 +28,6 @@
const uint32_t kSecondRtxSsrc = 43;
const uint32_t kFlexFecSsrc = 55;
const int kFpsPeriodicIntervalMs = 2000;
-const int kPreferredBps = 50000;
const int kWidth = 640;
const int kHeight = 480;
const int kQpIdx0 = 21;
@@ -106,8 +105,6 @@
EXPECT_EQ(one.input_frame_rate, other.input_frame_rate);
EXPECT_EQ(one.encode_frame_rate, other.encode_frame_rate);
EXPECT_EQ(one.media_bitrate_bps, other.media_bitrate_bps);
- EXPECT_EQ(one.preferred_media_bitrate_bps,
- other.preferred_media_bitrate_bps);
EXPECT_EQ(one.suspended, other.suspended);
EXPECT_EQ(one.substreams.size(), other.substreams.size());
@@ -321,16 +318,6 @@
EXPECT_EQ(metrics.encode_usage_percent, stats.encode_usage_percent);
}
-TEST_F(SendStatisticsProxyTest, OnEncoderReconfiguredChangePreferredBitrate) {
- VideoSendStream::Stats stats = statistics_proxy_->GetStats();
- EXPECT_EQ(0, stats.preferred_media_bitrate_bps);
-
- VideoEncoderConfig config;
- statistics_proxy_->OnEncoderReconfigured(config, {}, kPreferredBps);
- stats = statistics_proxy_->GetStats();
- EXPECT_EQ(kPreferredBps, stats.preferred_media_bitrate_bps);
-}
-
TEST_F(SendStatisticsProxyTest, OnSendEncodedImageIncreasesFramesEncoded) {
EncodedImage encoded_image;
CodecSpecificInfo codec_info;
@@ -849,7 +836,7 @@
// Switch content type, real-time stats should be updated.
VideoEncoderConfig config;
config.content_type = VideoEncoderConfig::ContentType::kScreen;
- statistics_proxy_->OnEncoderReconfigured(config, {}, kPreferredBps);
+ statistics_proxy_->OnEncoderReconfigured(config, {});
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.AdaptChangesPerMinute.Cpu"));
EXPECT_EQ(1, metrics::NumEvents("WebRTC.Video.AdaptChangesPerMinute.Cpu", 8));
EXPECT_EQ(0,
@@ -882,12 +869,12 @@
// No switch, stats should not be updated.
VideoEncoderConfig config;
config.content_type = VideoEncoderConfig::ContentType::kRealtimeVideo;
- statistics_proxy_->OnEncoderReconfigured(config, {}, kPreferredBps);
+ statistics_proxy_->OnEncoderReconfigured(config, {});
EXPECT_EQ(0, metrics::NumSamples("WebRTC.Video.InputWidthInPixels"));
// Switch to screenshare, real-time stats should be updated.
config.content_type = VideoEncoderConfig::ContentType::kScreen;
- statistics_proxy_->OnEncoderReconfigured(config, {}, kPreferredBps);
+ statistics_proxy_->OnEncoderReconfigured(config, {});
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.InputWidthInPixels"));
}
@@ -1282,7 +1269,7 @@
VideoStream stream1;
stream1.width = kWidth;
stream1.height = kHeight;
- statistics_proxy_->OnEncoderReconfigured(config, {stream1}, kPreferredBps);
+ statistics_proxy_->OnEncoderReconfigured(config, {stream1});
const int64_t kMaxEncodedFrameWindowMs = 800;
const int kFps = 20;
@@ -1319,8 +1306,7 @@
VideoStream stream2;
stream2.width = kWidth;
stream2.height = kHeight;
- statistics_proxy_->OnEncoderReconfigured(config, {stream1, stream2},
- kPreferredBps);
+ statistics_proxy_->OnEncoderReconfigured(config, {stream1, stream2});
const int64_t kMaxEncodedFrameWindowMs = 800;
const int kFps = 20;
@@ -1363,8 +1349,7 @@
VideoStream stream2;
stream2.width = kWidth;
stream2.height = kHeight;
- statistics_proxy_->OnEncoderReconfigured(config, {stream1, stream2},
- kPreferredBps);
+ statistics_proxy_->OnEncoderReconfigured(config, {stream1, stream2});
const int64_t kMaxEncodedFrameWindowMs = 800;
const int kFps = 20;
@@ -1471,8 +1456,7 @@
VideoStream stream2;
stream2.width = kWidth;
stream2.height = kHeight;
- statistics_proxy_->OnEncoderReconfigured(config, {stream1, stream2},
- kPreferredBps);
+ statistics_proxy_->OnEncoderReconfigured(config, {stream1, stream2});
const int64_t kMaxEncodedFrameWindowMs = 800;
const int kFps = 20;
@@ -1675,7 +1659,7 @@
// Changing content type causes histograms to be reported.
VideoEncoderConfig config;
config.content_type = VideoEncoderConfig::ContentType::kScreen;
- statistics_proxy_->OnEncoderReconfigured(config, {}, kPreferredBps);
+ statistics_proxy_->OnEncoderReconfigured(config, {});
EXPECT_EQ(1,
metrics::NumSamples("WebRTC.Video.NackPacketsReceivedPerMinute"));
@@ -1839,7 +1823,7 @@
// Changing content type causes histograms to be reported.
VideoEncoderConfig config;
config.content_type = VideoEncoderConfig::ContentType::kScreen;
- statistics_proxy_->OnEncoderReconfigured(config, {}, kPreferredBps);
+ statistics_proxy_->OnEncoderReconfigured(config, {});
// Interval: 3500 bytes * 4 / 2 sec = 7000 bytes / sec = 56 kbps
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.BitrateSentInKbps"));
diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc
index 662d159..2d9762d 100644
--- a/video/video_stream_encoder.cc
+++ b/video/video_stream_encoder.cc
@@ -585,16 +585,8 @@
video_sender_.UpdateChannelParameters(rate_allocator_.get(),
bitrate_observer_);
- // Get the current actual framerate, as measured by the stats proxy. This is
- // used to get the correct bitrate layer allocation.
- int current_framerate = stats_proxy_->GetSendFrameRate();
- if (current_framerate == 0)
- current_framerate = codec.maxFramerate;
stats_proxy_->OnEncoderReconfigured(
- encoder_config_, streams,
- rate_allocator_.get()
- ? rate_allocator_->GetPreferredBitrateBps(current_framerate)
- : codec.maxBitrate);
+ encoder_config_, streams);
pending_encoder_reconfiguration_ = false;
diff --git a/video/video_stream_encoder_unittest.cc b/video/video_stream_encoder_unittest.cc
index 239470e..e295393 100644
--- a/video/video_stream_encoder_unittest.cc
+++ b/video/video_stream_encoder_unittest.cc
@@ -1406,21 +1406,6 @@
video_stream_encoder_->Stop();
}
-TEST_F(VideoStreamEncoderTest, StatsTracksPreferredBitrate) {
- video_stream_encoder_->OnBitrateUpdated(kTargetBitrateBps, 0, 0);
-
- const int kWidth = 1280;
- const int kHeight = 720;
- video_source_.IncomingCapturedFrame(CreateFrame(1, kWidth, kHeight));
- WaitForEncodedFrame(1);
-
- VideoSendStream::Stats stats = stats_proxy_->GetStats();
- EXPECT_EQ(video_encoder_config_.max_bitrate_bps,
- stats.preferred_media_bitrate_bps);
-
- video_stream_encoder_->Stop();
-}
-
TEST_F(VideoStreamEncoderTest,
ScalingUpAndDownDoesNothingWithMaintainResolution) {
const int kWidth = 1280;