Merge min_ms and max_ms accessors in PlayoutDelayOracle

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.
  */
 
@@ skipping 24 matching lines @@
   PlayoutDelayOracle();
   ~PlayoutDelayOracle();
 
   // 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 {
+  // Returns current playout delay.
+  PlayoutDelay playout_delay() const {
     rtc::CritScope lock(&crit_sect_);
-    return min_playout_delay_ms_;
-  }
-
-  // Returns current maximum playout delay in milliseconds.
-  int max_playout_delay_ms() const {
-    rtc::CritScope lock(&crit_sect_);
-    return max_playout_delay_ms_;
+    return playout_delay_;
   }
 
   // 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(s).
   // The sequence number feedback is updated from the worker thread.
   // 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_);
   // Sequence number unwrapper.
   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(crit_sect_);
-  // Max playout delay value on the next frame if |send_playout_delay_| is set.
-  int max_playout_delay_ms_ GUARDED_BY(crit_sect_);
+  // Playout delay values on the next frame if |send_playout_delay_| is set.
+  PlayoutDelay playout_delay_ GUARDED_BY(crit_sect_);
 
   RTC_DISALLOW_COPY_AND_ASSIGN(PlayoutDelayOracle);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_