Shrink critical-section scope in ReceiveStatisticsImpl::GetActiveStatisticians()

webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc

Index: webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
diff --git a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
index 6d64304149d662f746c78563e389a1e03deea921..ed6dea73c4def97746fa183216bfa014a10abc8d 100644
--- a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
+++ b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
@@ -422,18 +422,22 @@ void ReceiveStatisticsImpl::FecPacketReceived(const RTPHeader& header,
 }
 
 StatisticianMap ReceiveStatisticsImpl::GetActiveStatisticians() const {
-  rtc::CritScope cs(&receive_statistics_lock_);
   StatisticianMap active_statisticians;
-  for (StatisticianImplMap::const_iterator it = statisticians_.begin();
-       it != statisticians_.end(); ++it) {
-    uint32_t secs;
-    uint32_t frac;
-    it->second->LastReceiveTimeNtp(&secs, &frac);
-    if (clock_->CurrentNtpInMilliseconds() -
-        Clock::NtpToMs(secs, frac) < kStatisticsTimeoutMs) {
-      active_statisticians[it->first] = it->second;
+
+  {

[danilchap, 2017/07/25 14:05:41]

I think extra indentation make it less readable.
specially that you do not need it.

[eladalon, 2017/07/25 14:28:49]

I'm not sure I don't need this - I am not familiar enough with what operations
return-StatisticianMap would trigger if RVO is not used, and what part of this
is compiler-dependent and what is mandated by C++. But it's probably not
important enough, and given that this is already an improvement over the state
before, I'll change.

+    rtc::CritScope cs(&receive_statistics_lock_);
+    for (StatisticianImplMap::const_iterator it = statisticians_.begin();
+         it != statisticians_.end(); ++it) {
+      uint32_t secs;
+      uint32_t frac;
+      it->second->LastReceiveTimeNtp(&secs, &frac);
+      if (clock_->CurrentNtpInMilliseconds() -
+          Clock::NtpToMs(secs, frac) < kStatisticsTimeoutMs) {
+        active_statisticians[it->first] = it->second;
+      }
     }
   }
+
   return active_statisticians;
 }