Merge min_ms and max_ms accessors in PlayoutDelayOracle

webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h

Index: webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h
diff --git a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h
index 90677e786f5ef66150ca147c1509f623ed42ec9e..f4cbe52bf2cdb4ccd361d9a805249ce27e433e58 100644
--- a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h
+++ b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h
@@ -42,16 +42,10 @@ class PlayoutDelayOracle {
     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
@@ -75,10 +69,8 @@ class PlayoutDelayOracle {
   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);
 };