Remove redudant encoder rate calls.

webrtc/modules/video_coding/main/source/generic_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.
  */
 
 #ifndef WEBRTC_MODULES_VIDEO_CODING_GENERIC_ENCODER_H_
 #define WEBRTC_MODULES_VIDEO_CODING_GENERIC_ENCODER_H_
 
 #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
 #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h"
 
 #include <stdio.h>
 
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/scoped_ptr.h"
 
 namespace webrtc {
 class CriticalSectionWrapper;
 
 namespace media_optimization {
 class MediaOptimization;
 }  // namespace media_optimization
 
+struct EncoderParameters {
+  uint32_t target_bitrate;
+  uint8_t loss_rate;
+  int64_t rtt;
+  uint32_t input_frame_rate;
+};
+
 /*************************************/
 /* VCMEncodeFrameCallback class     */
 /***********************************/
 class VCMEncodedFrameCallback : public EncodedImageCallback
 {
 public:
     VCMEncodedFrameCallback(EncodedImageCallback* post_encode_callback);
     virtual ~VCMEncodedFrameCallback();
 
     /*
@@ skipping 56 matching lines @@
     /**
     * Encode raw image
     * inputFrame        : Frame containing raw image
     * codecSpecificInfo : Specific codec data
     * cameraFrameRate   : Request or information from the remote side
     * frameType         : The requested frame type to encode
     */
     int32_t Encode(const VideoFrame& inputFrame,
                    const CodecSpecificInfo* codecSpecificInfo,
                    const std::vector<FrameType>& frameTypes);
-    /**
-    * Set new target bitrate (bits/s) and framerate.
-    * Return Value: new bit rate if OK, otherwise <0s.
-    */
-    // TODO(tommi): We could replace BitRate and FrameRate below with a GetRates
-    // method that matches SetRates. For fetching current rates, we'd then only
-    // grab the lock once instead of twice.
-    int32_t SetRates(uint32_t target_bitrate, uint32_t frameRate);
-    /**
-    * Set a new packet loss rate and a new round-trip time in milliseconds.
-    */
-    int32_t SetChannelParameters(int32_t packetLoss, int64_t rtt);
-    int32_t CodecConfigParameters(uint8_t* buffer, int32_t size);
+
+    void SetEncoderParameters(const EncoderParameters& params);
     /**
     * Register a transport callback which will be called to deliver the encoded
     * buffers
     */
     int32_t RegisterEncodeCallback(
         VCMEncodedFrameCallback* VCMencodedFrameCallback);
+    // TODO(tommi): We could replace BitRate and FrameRate below with a GetRates

[stefan-webrtc, 2015/10/29 14:12:06]

GetEncoderParameters would make more sense then, wouldn't it? And that you have
already added it seems.

[pbos-webrtc, 2015/10/29 14:37:33]

Yep, done. Note that there's no caller who does uses both of them directly, so
this has no direct impact.

[stefan-webrtc, 2015/10/29 14:50:22]

But don't you have two methods for this now? Line 122 and line 120

[pbos-webrtc, 2015/10/29 15:26:01]

Brain fart, thanks, done. :)

+    // method that matches SetEncoderParameters. For fetching current rates,
+    // we'd then only grab the lock once instead of twice.
     /**
     * Get encoder bit rate
     */
     uint32_t BitRate() const;
      /**
     * Get encoder frame rate
     */
     uint32_t FrameRate() const;
 
+    EncoderParameters encoder_parameters() const;
+
     int32_t SetPeriodicKeyFrames(bool enable);
 
     int32_t RequestFrame(const std::vector<FrameType>& frame_types);
 
     bool InternalSource() const;
 
     void OnDroppedFrame();
 
     bool SupportsNativeHandle() const;
 
     int GetTargetFramerate();
 
 private:
     VideoEncoder* const encoder_;
     VideoEncoderRateObserver* const rate_observer_;
     VCMEncodedFrameCallback*  vcm_encoded_frame_callback_;
-    uint32_t bit_rate_;
-    uint32_t frame_rate_;
+    EncoderParameters encoder_params_ GUARDED_BY(params_lock_);
     const bool internal_source_;
-    mutable rtc::CriticalSection rates_lock_;
+    mutable rtc::CriticalSection params_lock_;
     VideoRotation rotation_;
     bool is_screenshare_;
 }; // end of VCMGenericEncoder class
 
 }  // namespace webrtc
 
 #endif // WEBRTC_MODULES_VIDEO_CODING_GENERIC_ENCODER_H_