commit b52a4d90c2ddb3ef7c7d33408ab2116d40ec6e9a
author Åsa Persson <asapersson@webrtc.org> Wed Nov 08 11:33:37 2017 +0100
committer Commit Bot <commit-bot@chromium.org> Thu Nov 09 09:37:12 2017 +0000
tree 66bbedde59dbd0df9a62e6adf82109aa0846c568
parent 7281f92e7210fb48f8b34c1bbb8f037808a73868

MediaOptimization: Remove unneeded member variable: video_target_bitrate_

Remove unimplemented function declaration CheckSuspendConditions.

Make UpdateWithEncodedData void (always returning ok).

Rename user_frame_rate_ -> max_frame_rate_


Bug: none
Change-Id: I2eb5419a670e31d417f1bec8c163839c01f8c1fa
Reviewed-on: https://webrtc-review.googlesource.com/20500
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Commit-Queue: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20612}

modules/video_coding/media_optimization.h

diff --git a/modules/video_coding/media_optimization.h b/modules/video_coding/media_optimization.h
index c72c0a5..5d5859a 100644
--- a/modules/video_coding/media_optimization.h
+++ b/modules/video_coding/media_optimization.h
@@ -11,7 +11,6 @@
 #ifndef MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_
 #define MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_
 
-#include <list>
 #include <memory>
 
 #include "modules/include/module_common_types.h"
@@ -23,7 +22,6 @@
 
 class Clock;
 class FrameDropper;
-class VCMContentMetricsProcessing;
 
 namespace media_optimization {
 
@@ -38,10 +36,10 @@
 
   // Informs media optimization of initial encoding state.
   // TODO(perkj): Deprecate SetEncodingData once its not used for stats in
-  // VieEncoder.
+  // VideoStreamEncoder.
   void SetEncodingData(int32_t max_bit_rate,
                        uint32_t bit_rate,
-                       uint32_t frame_rate);
+                       uint32_t max_frame_rate);
 
   // Sets target rates for the encoder given the channel parameters.
   // Input: |target bitrate| - the encoder target bitrate in bits/s.
@@ -52,27 +50,21 @@
 
   // Informs Media Optimization of encoded output.
   // TODO(perkj): Deprecate SetEncodingData once its not used for stats in
-  // VieEncoder.
-  int32_t UpdateWithEncodedData(const EncodedImage& encoded_image);
+  // VideoStreamEncoder.
+  void UpdateWithEncodedData(const EncodedImage& encoded_image);
 
   // InputFrameRate 0 = no frame rate estimate available.
   uint32_t InputFrameRate();
 
  private:
   enum { kFrameCountHistorySize = 90 };
-  enum { kFrameHistoryWinMs = 2000 };
 
   void UpdateIncomingFrameRate() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
   void ProcessIncomingFrameRate(int64_t now)
       RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
 
-  // Checks conditions for suspending the video. The method compares
-  // |video_target_bitrate_| with the threshold values for suspension, and
-  // changes the state of |video_suspended_| accordingly.
-  void CheckSuspendConditions() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
-
   void SetEncodingDataInternal(int32_t max_bit_rate,
-                               uint32_t frame_rate,
+                               uint32_t max_frame_rate,
                                uint32_t bit_rate)
       RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
 
@@ -81,11 +73,10 @@
   // Protect all members.
   rtc::CriticalSection crit_sect_;
 
-  Clock* clock_ RTC_GUARDED_BY(crit_sect_);
+  Clock* const clock_ RTC_GUARDED_BY(crit_sect_);
   int32_t max_bit_rate_ RTC_GUARDED_BY(crit_sect_);
-  float user_frame_rate_ RTC_GUARDED_BY(crit_sect_);
+  float max_frame_rate_ RTC_GUARDED_BY(crit_sect_);
   std::unique_ptr<FrameDropper> frame_dropper_ RTC_GUARDED_BY(crit_sect_);
-  int video_target_bitrate_ RTC_GUARDED_BY(crit_sect_);
   float incoming_frame_rate_ RTC_GUARDED_BY(crit_sect_);
   int64_t incoming_frame_times_[kFrameCountHistorySize] RTC_GUARDED_BY(
       crit_sect_);