Update video adaptation stats to support degradations in both resolution and framerate.

webrtc/video/vie_encoder.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 44 matching lines @@
  public:
   // Interface for receiving encoded video frames and notifications about
   // configuration changes.
   class EncoderSink : public EncodedImageCallback {
    public:
     virtual void OnEncoderConfigurationChanged(
         std::vector<VideoStream> streams,
         int min_transmit_bitrate_bps) = 0;
   };
 
+  struct AdaptCounts {
+    int resolution = 0;
+    int fps = 0;
+  };

[sprang_webrtc, 2017/05/10 09:34:23]

Maybe this can be declared together with the counter class down below?

[åsapersson, 2017/05/10 09:54:53]

The struct is public.

+
   // Downscale resolution at most 2 times for CPU reasons.
   static const int kMaxCpuResolutionDowngrades = 2;
   // Downscale framerate at most 4 times.
   static const int kMaxCpuFramerateDowngrades = 4;
 
   ViEEncoder(uint32_t number_of_cores,
              SendStatisticsProxy* stats_proxy,
              const VideoSendStream::Config::EncoderSettings& settings,
              rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback,
              EncodedFrameObserver* encoder_timing);
@@ skipping 93 matching lines @@
       const EncodedImage& encoded_image,
       const CodecSpecificInfo* codec_specific_info,
       const RTPFragmentationHeader* fragmentation) override;
 
   void OnDroppedFrame() override;
 
   bool EncoderPaused() const;
   void TraceFrameDropStart();
   void TraceFrameDropEnd();
 
-  const std::vector<int>& GetScaleCounters()
+  // Class holding adaptation information.
+  class AdaptCounter {
+   public:
+    AdaptCounter();
+    ~AdaptCounter();

[sprang_webrtc, 2017/05/10 09:34:24]

nit: virtual destructor or final class

[åsapersson, 2017/05/10 09:54:53]

Done.

+
+    // Get number of adaptation downscales for |reason|.
+    AdaptCounts Counts(int reason) const;
+
+    std::string ToString() const;
+
+    void IncrementFramerate(int reason, int delta);
+    void IncrementResolution(int reason, int delta);
+
+    // Gets the total number of downgrades (for all adapt reasons).
+    int FramerateCount() const;
+    int ResolutionCount() const;
+    int TotalCount() const;
+
+    // Gets the total number of downgrades for |reason|.
+    int FramerateCount(int reason) const;
+    int ResolutionCount(int reason) const;
+    int TotalCount(int reason) const;
+
+   private:
+    std::string ToString(const std::vector<int>& counters) const;
+    int Count(const std::vector<int>& counters) const;
+
+    // Degradation counters holding number of framerate/resolution reductions
+    // per adapt reason.
+    std::vector<int> fps_counters_;
+    std::vector<int> resolution_counters_;
+  };
+
+  const AdaptCounter& GetAdaptCounter()
       EXCLUSIVE_LOCKS_REQUIRED(&encoder_queue_);
-  void IncrementScaleCounter(int reason, int delta)
+  void IncrementFramerateCounter(AdaptReason reason, int delta)
+      EXCLUSIVE_LOCKS_REQUIRED(&encoder_queue_);

[kthelgason, 2017/05/09 11:50:15]

I've been using the RUN_ON macro for asserting that something runs on a specific
queue. They do the same thing but I find RUN_ON to be more readable, since we're
dealing with a queue, not a lock.

[åsapersson, 2017/05/10 08:24:45]

Done.

+  void IncrementResolutionCounter(AdaptReason reason, int delta)
+      EXCLUSIVE_LOCKS_REQUIRED(&encoder_queue_);
+  void UpdateAdaptationStats(AdaptReason reason)
+      EXCLUSIVE_LOCKS_REQUIRED(&encoder_queue_);
+  ViEEncoder::AdaptCounts GetActiveCounts(AdaptReason reason)
       EXCLUSIVE_LOCKS_REQUIRED(&encoder_queue_);
 
   rtc::Event shutdown_event_;
 
   const uint32_t number_of_cores_;
   // Counts how many frames we've dropped in the initial rampup phase.
   int initial_rampup_;
 
   const std::unique_ptr<VideoSourceProxy> source_proxy_;
   EncoderSink* sink_;
@@ skipping 19 matching lines @@
   // Set when ConfigureEncoder has been called in order to lazy reconfigure the
   // encoder on the next frame.
   bool pending_encoder_reconfiguration_ ACCESS_ON(&encoder_queue_);
   rtc::Optional<VideoFrameInfo> last_frame_info_ ACCESS_ON(&encoder_queue_);
   uint32_t encoder_start_bitrate_bps_ ACCESS_ON(&encoder_queue_);
   size_t max_data_payload_length_ ACCESS_ON(&encoder_queue_);
   bool nack_enabled_ ACCESS_ON(&encoder_queue_);
   uint32_t last_observed_bitrate_bps_ ACCESS_ON(&encoder_queue_);
   bool encoder_paused_and_dropped_frame_ ACCESS_ON(&encoder_queue_);
   Clock* const clock_;
-  // Counters used for deciding if the video resolution is currently
-  // restricted, and if so, why, on a per degradation preference basis.
+  // Counters used for deciding if the video resolution or framerate is
+  // currently restricted, and if so, why, on a per degradation preference
+  // basis.
   // TODO(sprang): Replace this with a state holding a relative overuse measure
   // instead, that can be translated into suitable down-scale or fps limit.
-  std::map<const VideoSendStream::DegradationPreference, std::vector<int>>
-      scale_counters_ ACCESS_ON(&encoder_queue_);
-  // Set depending on degradation preferences
+  std::map<const VideoSendStream::DegradationPreference, AdaptCounter>
+      adapt_counters_ ACCESS_ON(&encoder_queue_);
+  // Set depending on degradation preferences.
   VideoSendStream::DegradationPreference degradation_preference_
       ACCESS_ON(&encoder_queue_);
 
   struct AdaptationRequest {
     // The pixel count produced by the source at the time of the adaptation.
     int input_pixel_count_;
     // Framerate received from the source at the time of the adaptation.
     int framerate_fps_;
     // Indicates if request was to adapt up or down.
     enum class Mode { kAdaptUp, kAdaptDown } mode_;
@@ skipping 21 matching lines @@
   // All public methods are proxied to |encoder_queue_|. It must must be
   // destroyed first to make sure no tasks are run that use other members.
   rtc::TaskQueue encoder_queue_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(ViEEncoder);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIE_ENCODER_H_