neteq_rtpplay: Add one more RTP header extension and fix some stats

webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc

 /*
  *  Copyright (c) 2013 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 143 matching lines @@
               "Only use packets with this SSRC (decimal or hex, the latter "
               "starting with 0x)");
 const bool hex_ssrc_dummy =
     google::RegisterFlagValidator(&FLAGS_ssrc, &ValidateSsrcValue);
 DEFINE_int32(audio_level, 1, "Extension ID for audio level (RFC 6464)");
 const bool audio_level_dummy =
     google::RegisterFlagValidator(&FLAGS_audio_level, &ValidateExtensionId);
 DEFINE_int32(abs_send_time, 3, "Extension ID for absolute sender time");
 const bool abs_send_time_dummy =
     google::RegisterFlagValidator(&FLAGS_abs_send_time, &ValidateExtensionId);
+DEFINE_int32(transport_seq_no, 5, "Extension ID for transport sequence number");
+const bool transport_seq_no_dummy =
+    google::RegisterFlagValidator(&FLAGS_transport_seq_no,
+                                  &ValidateExtensionId);
 DEFINE_bool(matlabplot,
             false,
             "Generates a matlab script for plotting the delay profile");
 
 // Maps a codec type to a printable name string.
 std::string CodecName(NetEqDecoder codec) {
   switch (codec) {
     case NetEqDecoder::kDecoderPCMu:
       return "PCM-u";
     case NetEqDecoder::kDecoderPCMa:
@@ skipping 239 matching lines @@
           a.expand_rate += b.expand_rate / 16384.0;
           a.speech_expand_rate += b.speech_expand_rate / 16384.0;
           a.preemptive_rate += b.preemptive_rate / 16384.0;
           a.accelerate_rate += b.accelerate_rate / 16384.0;
           a.secondary_decoded_rate += b.secondary_decoded_rate / 16384.0;
           a.secondary_discarded_rate += b.secondary_discarded_rate / 16384.0;
           a.clockdrift_ppm += b.clockdrift_ppm;
           a.added_zero_samples += b.added_zero_samples;
           a.mean_waiting_time_ms += b.mean_waiting_time_ms;
           a.median_waiting_time_ms += b.median_waiting_time_ms;
-          a.min_waiting_time_ms += b.min_waiting_time_ms;
-          a.max_waiting_time_ms += b.max_waiting_time_ms;
+          a.min_waiting_time_ms =
+              std::min(a.min_waiting_time_ms,
+                       static_cast<double>(b.min_waiting_time_ms));
+          a.max_waiting_time_ms =
+              std::max(a.max_waiting_time_ms,
+                       static_cast<double>(b.max_waiting_time_ms));
           return a;
         });
 
     sum_stats.current_buffer_size_ms /= stats_.size();
     sum_stats.preferred_buffer_size_ms /= stats_.size();
     sum_stats.jitter_peaks_found /= stats_.size();
     sum_stats.packet_loss_rate /= stats_.size();
     sum_stats.expand_rate /= stats_.size();
     sum_stats.speech_expand_rate /= stats_.size();
     sum_stats.preemptive_rate /= stats_.size();
     sum_stats.accelerate_rate /= stats_.size();
     sum_stats.secondary_decoded_rate /= stats_.size();
     sum_stats.secondary_discarded_rate /= stats_.size();
     sum_stats.clockdrift_ppm /= stats_.size();
     sum_stats.added_zero_samples /= stats_.size();
     sum_stats.mean_waiting_time_ms /= stats_.size();
     sum_stats.median_waiting_time_ms /= stats_.size();
-    sum_stats.min_waiting_time_ms /= stats_.size();
-    sum_stats.max_waiting_time_ms /= stats_.size();
 
     return sum_stats;
   }
 
  private:
   NetEqGetAudioCallback* other_callback_;
   size_t counter_ = 0;
   std::vector<NetEqNetworkStatistics> stats_;
 };
 
@@ skipping 16 matching lines @@
       return 0;
     }
     // Print usage information.
     std::cout << google::ProgramUsage();
     return 0;
   }
 
   // Gather RTP header extensions in a map.
   NetEqPacketSourceInput::RtpHeaderExtensionMap rtp_ext_map = {
       {FLAGS_audio_level, kRtpExtensionAudioLevel},
-      {FLAGS_abs_send_time, kRtpExtensionAbsoluteSendTime}};
+      {FLAGS_abs_send_time, kRtpExtensionAbsoluteSendTime},
+      {FLAGS_transport_seq_no, kRtpExtensionTransportSequenceNumber}};
 
   const std::string input_file_name = argv[1];
   std::unique_ptr<NetEqInput> input;
   if (RtpFileSource::ValidRtpDump(input_file_name) ||
       RtpFileSource::ValidPcap(input_file_name)) {
     input.reset(new NetEqRtpDumpInput(input_file_name, rtp_ext_map));
   } else {
     input.reset(new NetEqEventLogInput(input_file_name, rtp_ext_map));
   }
 
@@ skipping 173 matching lines @@
   return 0;
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace webrtc
 
 int main(int argc, char* argv[]) {
   webrtc::test::RunTest(argc, argv);
 }