VCMCodecTimer: Change filter from max to 95th percentile

webrtc/modules/video_coding/timing.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 155 matching lines @@
   } else {
     current_delay_ms_ = target_delay_ms;
   }
 }
 
 int32_t VCMTiming::StopDecodeTimer(uint32_t time_stamp,
                                    int32_t decode_time_ms,
                                    int64_t now_ms,
                                    int64_t render_time_ms) {
   CriticalSectionScoped cs(crit_sect_);
-  codec_timer_.MaxFilter(decode_time_ms, now_ms);
+  codec_timer_.AddTiming(decode_time_ms, now_ms);
   assert(decode_time_ms >= 0);
   last_decode_ms_ = decode_time_ms;
 
   // Update stats.
   ++num_decoded_frames_;
   if (num_decoded_frames_ == 1) {
     first_decoded_frame_ms_ = now_ms;
   }
   int time_until_rendering_ms = render_time_ms - render_delay_ms_ - now_ms;
   if (time_until_rendering_ms < 0) {
@@ skipping 22 matching lines @@
   if (estimated_complete_time_ms == -1) {
     estimated_complete_time_ms = now_ms;
   }
 
   // Make sure that we have at least the playout delay.
   uint32_t actual_delay = std::max(current_delay_ms_, min_playout_delay_ms_);
   return estimated_complete_time_ms + actual_delay;
 }
 
 // Must be called from inside a critical section.
 int32_t VCMTiming::MaxDecodeTimeMs(

[magjed_webrtc, 2016/03/04 14:19:41]

Do you want me to change this function name as well?

[philipel, 2016/03/04 15:20:13]

Yes, RequiredDecodeTimeMs should work here as well.

     FrameType frame_type /*= kVideoFrameDelta*/) const {
-  const int32_t decode_time_ms = codec_timer_.RequiredDecodeTimeMs(frame_type);
+  const int32_t decode_time_ms = codec_timer_.RequiredDecodeTimeMs();
   assert(decode_time_ms >= 0);
   return decode_time_ms;
 }
 
 uint32_t VCMTiming::MaxWaitingTime(int64_t render_time_ms,
                                    int64_t now_ms) const {
   CriticalSectionScoped cs(crit_sect_);
 
   const int64_t max_wait_time_ms =
       render_time_ms - now_ms - MaxDecodeTimeMs() - render_delay_ms_;
@@ skipping 43 matching lines @@
   *decode_ms = last_decode_ms_;
   *max_decode_ms = MaxDecodeTimeMs();
   *current_delay_ms = current_delay_ms_;
   *target_delay_ms = TargetDelayInternal();
   *jitter_buffer_ms = jitter_delay_ms_;
   *min_playout_delay_ms = min_playout_delay_ms_;
   *render_delay_ms = render_delay_ms_;
 }
 
 }  // namespace webrtc