Modified the rtp_receiver_unittests.

webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 193 matching lines @@
     }
   }
   return true;
 }
 
 TelephoneEventHandler* RtpReceiverImpl::GetTelephoneEventHandler() {
   return rtp_media_receiver_->GetTelephoneEventHandler();
 }
 
 std::vector<RtpSource> RtpReceiverImpl::GetSources() const {
-  int64_t now_ms = clock_->TimeInMilliseconds();
-  std::vector<RtpSource> sources;
+    rtc::CritScope lock(&critical_section_rtp_receiver_);
 
-  {
-    rtc::CritScope lock(&critical_section_rtp_receiver_);
+    int64_t now_ms = clock_->TimeInMilliseconds();
+    std::vector<RtpSource> sources;
 
     RTC_DCHECK(std::is_sorted(ssrc_sources_.begin(), ssrc_sources_.end(),
                               [](const RtpSource& lhs, const RtpSource& rhs) {
                                 return lhs.timestamp_ms() < rhs.timestamp_ms();
                               }));
     RTC_DCHECK(std::is_sorted(csrc_sources_.begin(), csrc_sources_.end(),
                               [](const RtpSource& lhs, const RtpSource& rhs) {
                                 return lhs.timestamp_ms() < rhs.timestamp_ms();
                               }));
 
     std::set<uint32_t> selected_ssrcs;
     for (auto rit = ssrc_sources_.rbegin(); rit != ssrc_sources_.rend();
          ++rit) {
       if ((now_ms - rit->timestamp_ms()) > kGetSourcesTimeoutMs) {
         break;
       }
       if (selected_ssrcs.insert(rit->source_id()).second) {
         sources.push_back(*rit);
       }
     }
 
     for (auto rit = csrc_sources_.rbegin(); rit != csrc_sources_.rend();
          ++rit) {
       if ((now_ms - rit->timestamp_ms()) > kGetSourcesTimeoutMs) {
         break;
       }
       sources.push_back(*rit);
     }

[Taylor Brandstetter, 2017/04/10 22:35:14]

Can remove a level of indentation now.

-  }  // End critsect.
-
   return sources;
 }
 
 bool RtpReceiverImpl::Timestamp(uint32_t* timestamp) const {
   rtc::CritScope lock(&critical_section_rtp_receiver_);
   if (!HaveReceivedFrame())
     return false;
   *timestamp = last_received_timestamp_;
   return true;
 }
@@ skipping 292 matching lines @@
   for (vec_it = ssrc_sources_.begin(); vec_it != ssrc_sources_.end();
        ++vec_it) {
     if ((now_ms - vec_it->timestamp_ms()) <= kGetSourcesTimeoutMs) {
       break;
     }
   }
   ssrc_sources_.erase(ssrc_sources_.begin(), vec_it);
 }
 
 }  // namespace webrtc