fix: Revert changes of SetRates method (#186)

* revert changes of SetRates method

* fixed bug

* [skip ci] Update plugins

Author: karasusan

Plugin~/WebRTCPlugin/Codec/NvCodec/NvEncoder.cpp

@@ -90,7 +90,8 @@ namespace webrtc
         nvEncConfig.profileGUID = NV_ENC_H264_PROFILE_BASELINE_GUID;
         nvEncConfig.gopLength = nvEncInitializeParams.frameRateNum;
         nvEncConfig.rcParams.rateControlMode = NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ;
-        nvEncConfig.rcParams.averageBitRate = (static_cast<unsigned int>(5.0f *
+        nvEncConfig.rcParams.averageBitRate =
+            (static_cast<unsigned int>(5.0f *
             nvEncInitializeParams.encodeWidth *
             nvEncInitializeParams.encodeHeight) / (m_width * m_height)) * 100000;
         nvEncConfig.encodeCodecConfig.h264Config.idrPeriod = nvEncConfig.gopLength;
@@ -107,19 +108,18 @@ namespace webrtc
         capsParam.capsToQuery = NV_ENC_CAPS_ASYNC_ENCODE_SUPPORT;
         int32 asyncMode = 0;
         errorCode = pNvEncodeAPI->nvEncGetEncodeCaps(pEncoderInterface, nvEncInitializeParams.encodeGUID, &capsParam, &asyncMode);
-        checkf(NV_RESULT(errorCode), StringFormat("Failded to get NVEncoder capability params %d", errorCode).c_str());
+        checkf(NV_RESULT(errorCode), StringFormat("Failed to get NVEncoder capability params %d", errorCode).c_str());
         nvEncInitializeParams.enableEncodeAsync = 0;
 #pragma endregion
 #pragma region initialize hardware encoder session
         errorCode = pNvEncodeAPI->nvEncInitializeEncoder(pEncoderInterface, &nvEncInitializeParams);
         result = NV_RESULT(errorCode);
         checkf(result, StringFormat("Failed to initialize NVEncoder %d", errorCode).c_str());
 #pragma endregion
-
         InitEncoderResources();
         m_isNvEncoderSupported = true;
-
     }
+
     NvEncoder::~NvEncoder()
     {
         ReleaseEncoderResources();
@@ -205,7 +205,7 @@ namespace webrtc
     {
         if (s_hModule)
         {
-#if _WIN32
+#if defined(_WIN32)
             FreeLibrary((HMODULE)s_hModule);
 #else
             dlclose(s_hModule);
@@ -242,10 +242,6 @@ namespace webrtc
         }
     }
 
-    constexpr double kLowRateFactor = 1.0;
-    constexpr double kHighRateFactor = 2.0;
-
-
     void NvEncoder::SetRates(uint32_t bitRate, int64_t frameRate)
     {
         m_frameRate = frameRate;
@@ -269,14 +265,6 @@ namespace webrtc
         UpdateSettings();
         uint32 bufferIndexToWrite = frameCount % bufferedFrameNum;
         Frame& frame = bufferedFrames[bufferIndexToWrite];
-#pragma region set frame params
-        //no free buffer, skip this frame
-        if (frame.isEncoding)
-        {
-            return false;
-        }
-        frame.isEncoding = true;
-#pragma endregion
 #pragma region configure per-frame encode parameters
         NV_ENC_PIC_PARAMS picParams = { 0 };
         picParams.version = NV_ENC_PIC_PARAMS_VER;
@@ -305,12 +293,6 @@ namespace webrtc
     //get encoded frame
     void NvEncoder::ProcessEncodedFrame(Frame& frame)
     {
-        //The frame hasn't been encoded, something wrong
-        if (!frame.isEncoding)
-        {
-            return;
-        }
-        frame.isEncoding = false;
 #pragma region retrieve encoded frame from output buffer
         NV_ENC_LOCK_BITSTREAM lockBitStream = { 0 };
         lockBitStream.version = NV_ENC_LOCK_BITSTREAM_VER;
@@ -325,14 +307,15 @@ namespace webrtc
         }
         errorCode = pNvEncodeAPI->nvEncUnlockBitstream(pEncoderInterface, frame.outputFrame);
         checkf(NV_RESULT(errorCode), StringFormat("Failed to unlock bit stream, error is %d", errorCode).c_str());
-        frame.isIdrFrame = lockBitStream.pictureType == NV_ENC_PIC_TYPE_IDR;
 #pragma endregion
-        rtc::scoped_refptr<FrameBuffer> buffer = new rtc::RefCountedObject<FrameBuffer>(m_width, m_height, frame.encodedFrame, m_encoderId);
-
+        const rtc::scoped_refptr<FrameBuffer> buffer =
+            new rtc::RefCountedObject<FrameBuffer>(
+                m_width, m_height, frame.encodedFrame, m_encoderId);
         const int64_t timestamp_us = m_clock->TimeInMicroseconds();
         const int64_t now_us = rtc::TimeMicros();
         const int64_t translated_camera_time_us =
-            timestamp_aligner_.TranslateTimestamp(timestamp_us,
+            timestamp_aligner_.TranslateTimestamp(
+                timestamp_us,
                 now_us);
 
         webrtc::VideoFrame::Builder builder =

Plugin~/WebRTCPlugin/Codec/NvCodec/NvEncoder.h

@@ -1,7 +1,6 @@
 #pragma once
 #include <vector>
 #include <thread>
-#include <atomic>
 #include <rtc_base/timestamp_aligner.h>
 
 #include "nvEncodeAPI.h"
@@ -30,8 +29,6 @@ namespace webrtc
             InputFrame inputFrame = {nullptr, nullptr, NV_ENC_BUFFER_FORMAT_UNDEFINED };
             OutputFrame outputFrame = nullptr;
             std::vector<uint8> encodedFrame = {};
-            bool isIdrFrame = false;
-            std::atomic<bool> isEncoding = { false };
         };
     public:
         NvEncoder(

Plugin~/WebRTCPlugin/DummyVideoEncoder.cpp

@@ -1,5 +1,6 @@
 #include "pch.h"
 #include "DummyVideoEncoder.h"
+#include "modules/video_coding/utility/simulcast_rate_allocator.h"
 
 namespace unity
 {
@@ -34,7 +35,13 @@ namespace webrtc
         {
             return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
         }
-        m_codec = codec_settings;
+
+        m_codec = *codec_settings;
+        webrtc::SimulcastRateAllocator init_allocator(m_codec);
+        webrtc::VideoBitrateAllocation allocation =
+            init_allocator.Allocate(webrtc::VideoBitrateAllocationParameters(
+                webrtc::DataRate::KilobitsPerSec(m_codec.startBitrate), m_codec.maxFramerate));
+        SetRates(RateControlParameters(allocation, m_codec.maxFramerate));
 
         return WEBRTC_VIDEO_CODEC_OK;
     }
@@ -125,33 +132,10 @@ namespace webrtc
 
     void DummyVideoEncoder::SetRates(const RateControlParameters& parameters)
     {
+        int64_t frameRate = parameters.framerate_fps;
 
-        //
-        // "parameters.framerate_fps" which the parameter of the argument of
-        // "SetRates" method, in many cases this parameter is higher than
-        // the frequency of the encoding.
-        // Need to determine the right framerate to set to the hardware encoder,
-        // so collect timestamp of encoding and get stats.
-        // 
-        int64_t now_ms = m_clock->TimeInMilliseconds();
-        absl::optional<int64_t> encodeFrameRate = m_encode_fps.Rate(now_ms);
-        int64_t frameRate = encodeFrameRate.value_or(30);
-
-        //
-        // The bitrate adjuster is using for avoiding overshoot the bitrate.
-        // But, when a frame rate is low, estimation of bitrate may be low
-        // so it can not recover video quality.
-        // If it determine the low frame rate (defined as 15fps),
-        // use original bps to avoid bitrate undershoot.
-        // 
         m_bitrateAdjuster->SetTargetBitrateBps(parameters.bitrate.get_sum_bps());
         uint32_t bitRate = m_bitrateAdjuster->GetAdjustedBitrateBps();
-        const uint32_t kLowFrameRate = 15;
-        if (frameRate < kLowFrameRate)
-        {
-            bitRate = parameters.bitrate.get_sum_bps();
-        }
-
 
         m_setRates(m_encoderId, bitRate, frameRate);
     }

Plugin~/WebRTCPlugin/DummyVideoEncoder.h

@@ -37,7 +37,7 @@ namespace webrtc
         webrtc::EncodedImage m_encodedImage;
         webrtc::RTPFragmentationHeader m_fragHeader;
         webrtc::H264BitstreamParser m_h264BitstreamParser;
-        const webrtc::VideoCodec* m_codec;
+        webrtc::VideoCodec m_codec;
 
         webrtc::RateStatistics m_encode_fps;
         webrtc::Clock* m_clock;