Remove thread_checker in playout_delay_oracle

webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h

 /*
  *  Copyright (c) 2016 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.
  */
 
 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_
 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_
 
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/criticalsection.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 
 namespace webrtc {
 
 // This class tracks the application requests to limit minimum and maximum
 // playout delay and makes a decision on whether the current RTP frame
 // should include the playout out delay extension header.
 //
@@ skipping 11 matching lines @@
 
   // Returns true if the current frame should include the playout delay
   // extension
   bool send_playout_delay() const {
     rtc::CritScope lock(&crit_sect_);
     return send_playout_delay_;
   }
 
   // Returns current minimum playout delay in milliseconds.
   int min_playout_delay_ms() const {
-    RTC_DCHECK_RUN_ON(&thread_checker_);
+    rtc::CritScope lock(&crit_sect_);
     return min_playout_delay_ms_;
   }
 
   // Returns current maximum playout delay in milliseconds.
   int max_playout_delay_ms() const {
-    RTC_DCHECK_RUN_ON(&thread_checker_);
+    rtc::CritScope lock(&crit_sect_);
     return max_playout_delay_ms_;
   }
 
   // Updates the application requested playout delay, current ssrc
   // and the current sequence number.
   void UpdateRequest(uint32_t ssrc,
                      PlayoutDelay playout_delay,
                      uint16_t seq_num);
 
   void OnReceivedRtcpReportBlocks(const ReportBlockList& report_blocks);
 
  private:
-  // The playout delay information is updated from the encoder thread or
-  // a thread controlled by application in case of external encoder.
+  // The playout delay information is updated from the encoder thread(s).
   // The sequence number feedback is updated from the worker thread.
-  // Guards access to data across the two threads.
+  // Guards access to data across multiple threads.
   rtc::CriticalSection crit_sect_;
   // The current highest sequence number on which playout delay has been sent.
   int64_t high_sequence_number_ GUARDED_BY(crit_sect_);
   // Indicates whether the playout delay should go on the next frame.
   bool send_playout_delay_ GUARDED_BY(crit_sect_);
   // Sender ssrc.
   uint32_t ssrc_ GUARDED_BY(crit_sect_);
-
-  // Data in this section is accessed on the sending/encoder thread alone.
-  rtc::ThreadChecker thread_checker_;
   // Sequence number unwrapper.
-  SequenceNumberUnwrapper unwrapper_ GUARDED_BY(thread_checker_);
+  SequenceNumberUnwrapper unwrapper_ GUARDED_BY(crit_sect_);
   // Min playout delay value on the next frame if |send_playout_delay_| is set.
-  int min_playout_delay_ms_ GUARDED_BY(thread_checker_);
+  int min_playout_delay_ms_ GUARDED_BY(crit_sect_);
   // Max playout delay value on the next frame if |send_playout_delay_| is set.
-  int max_playout_delay_ms_ GUARDED_BY(thread_checker_);
+  int max_playout_delay_ms_ GUARDED_BY(crit_sect_);
 
   RTC_DISALLOW_COPY_AND_ASSIGN(PlayoutDelayOracle);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_