commit 409784d0c423d920f822374da5e9d6a39c60abc1
author Markus Handell <handellm@webrtc.org> Mon May 18 21:15:21 2020
committer Commit Bot <commit-bot@chromium.org> Tue May 19 08:57:15 2020
tree f27691fa41f921c445901eaa2499a5f2280d2266
parent fde94a72d1e4f6bc38f8324bed390a9cebbc091c

FakeEncoder: remove lock recursions.

This change removes lock recursions and adds thread annotations.

Bug: webrtc:11567
Change-Id: I88561102c31156718fbb175a9a38f2cc89c6d9dc
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175642
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Markus Handell <handellm@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31316}

test/fake_encoder.cc

diff --git a/test/fake_encoder.cc b/test/fake_encoder.cc
index 64b4a4e..2959559 100644
--- a/test/fake_encoder.cc
+++ b/test/fake_encoder.cc
@@ -69,7 +69,7 @@
   RTC_DCHECK_GE(max_kbps, -1);  // max_kbps == -1 disables it.
   rtc::CritScope cs(&crit_sect_);
   max_target_bitrate_kbps_ = max_kbps;
-  SetRates(current_rate_settings_);
+  SetRatesLocked(current_rate_settings_);
 }
 
 void FakeEncoder::SetQp(int qp) {
@@ -243,6 +243,10 @@
 
 void FakeEncoder::SetRates(const RateControlParameters& parameters) {
   rtc::CritScope cs(&crit_sect_);
+  SetRatesLocked(parameters);
+}
+
+void FakeEncoder::SetRatesLocked(const RateControlParameters& parameters) {
   current_rate_settings_ = parameters;
   int allocated_bitrate_kbps = parameters.bitrate.get_sum_kbps();