Reland of Add QP sum stats for received streams.

webrtc/modules/video_coding/test/test_util.h

 /*
  *  Copyright (c) 2012 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/modules/video_coding/include/video_coding.h"
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 
 enum { kMaxNackListSize = 250 };
 enum { kMaxPacketAgeToNack = 450 };
 
 class NullEvent : public webrtc::EventWrapper {
  public:
   virtual ~NullEvent() {}
 
-  virtual bool Set() { return true; }
+  bool Set() override { return true; }
 
-  virtual bool Reset() { return true; }
-
-  virtual webrtc::EventTypeWrapper Wait(unsigned long max_time) {  // NOLINT
+  webrtc::EventTypeWrapper Wait(unsigned long max_time) override {  // NOLINT
     return webrtc::kEventTimeout;
   }
-
-  virtual bool StartTimer(bool periodic, unsigned long time) {  // NOLINT
-    return true;
-  }
-
-  virtual bool StopTimer() { return true; }
 };
 
 class NullEventFactory : public webrtc::EventFactory {
  public:
   virtual ~NullEventFactory() {}
 
-  virtual webrtc::EventWrapper* CreateEvent() { return new NullEvent; }
+  webrtc::EventWrapper* CreateEvent() override { return new NullEvent; }
 };
 
 class FileOutputFrameReceiver : public webrtc::VCMReceiveCallback {
  public:
   FileOutputFrameReceiver(const std::string& base_out_filename, uint32_t ssrc);
   virtual ~FileOutputFrameReceiver();
 
   // VCMReceiveCallback
-  virtual int32_t FrameToRender(webrtc::VideoFrame& video_frame);  // NOLINT
+  int32_t FrameToRender(webrtc::VideoFrame& video_frame,
+                        rtc::Optional<uint8_t> qp) override;
 
  private:
   std::string out_filename_;
   FILE* out_file_;
   FILE* timing_file_;
   int width_;
   int height_;
   int count_;
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FileOutputFrameReceiver);
 };
 
 class CmdArgs {
  public:
   CmdArgs();
 
   std::string codecName;
   webrtc::VideoCodecType codecType;
   int width;
   int height;
   int rtt;
   std::string inputFile;
   std::string outputFile;
 };
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_TEST_TEST_UTIL_H_