Revert of VCMCodecTimer: Change filter from max to 95th percentile

webrtc/modules/video_coding/timing_unittest.cc

 /*
  *  Copyright (c) 2011 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 11 matching lines @@
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
 namespace webrtc {
 
 TEST(ReceiverTiming, Tests) {
   SimulatedClock clock(0);
   VCMTiming timing(&clock);
   uint32_t waitTime = 0;
   uint32_t jitterDelayMs = 0;
-  uint32_t requiredDecodeTimeMs = 0;
+  uint32_t maxDecodeTimeMs = 0;
   uint32_t timeStamp = 0;
 
   timing.Reset();
 
   timing.UpdateCurrentDelay(timeStamp);
 
   timing.Reset();
 
   timing.IncomingTimestamp(timeStamp, clock.TimeInMilliseconds());
   jitterDelayMs = 20;
@@ skipping 44 matching lines @@
     int64_t startTimeMs = clock.TimeInMilliseconds();
     clock.AdvanceTimeMilliseconds(10);
     timing.StopDecodeTimer(
         timeStamp, clock.TimeInMilliseconds() - startTimeMs,
         clock.TimeInMilliseconds(),
         timing.RenderTimeMs(timeStamp, clock.TimeInMilliseconds()));
     timeStamp += 90000 / 25;
     clock.AdvanceTimeMilliseconds(1000 / 25 - 10);
     timing.IncomingTimestamp(timeStamp, clock.TimeInMilliseconds());
   }
-  requiredDecodeTimeMs = 10;
+  maxDecodeTimeMs = 10;
   timing.SetJitterDelay(jitterDelayMs);
   clock.AdvanceTimeMilliseconds(1000);
   timeStamp += 90000;
   timing.UpdateCurrentDelay(timeStamp);
   waitTime = timing.MaxWaitingTime(
       timing.RenderTimeMs(timeStamp, clock.TimeInMilliseconds()),
       clock.TimeInMilliseconds());
   EXPECT_EQ(waitTime, jitterDelayMs);
 
   uint32_t minTotalDelayMs = 200;
   timing.set_min_playout_delay(minTotalDelayMs);
   clock.AdvanceTimeMilliseconds(5000);
   timeStamp += 5 * 90000;
   timing.UpdateCurrentDelay(timeStamp);
   const int kRenderDelayMs = 10;
   timing.set_render_delay(kRenderDelayMs);
   waitTime = timing.MaxWaitingTime(
       timing.RenderTimeMs(timeStamp, clock.TimeInMilliseconds()),
       clock.TimeInMilliseconds());
   // We should at least have minTotalDelayMs - decodeTime (10) - renderTime
   // (10) to wait.
-  EXPECT_EQ(waitTime, minTotalDelayMs - requiredDecodeTimeMs - kRenderDelayMs);
+  EXPECT_EQ(waitTime, minTotalDelayMs - maxDecodeTimeMs - kRenderDelayMs);
   // The total video delay should be equal to the min total delay.
   EXPECT_EQ(minTotalDelayMs, timing.TargetVideoDelay());
 
   // Reset playout delay.
   timing.set_min_playout_delay(0);
   clock.AdvanceTimeMilliseconds(5000);
   timeStamp += 5 * 90000;
   timing.UpdateCurrentDelay(timeStamp);
 }
 
@@ skipping 10 matching lines @@
     int64_t render_time =
         timing.RenderTimeMs(0xFFFFFFFFu, clock.TimeInMilliseconds());
     EXPECT_EQ(3 * 1000 / kFramerate, render_time);
     render_time = timing.RenderTimeMs(89u,  // One second later in 90 kHz.
                                       clock.TimeInMilliseconds());
     EXPECT_EQ(3 * 1000 / kFramerate + 1, render_time);
   }
 }
 
 }  // namespace webrtc