Merge pull request #105 from caffeinetv/fix_adaptation

Disable frame adaptation. Split max and min bitrates.

Author: Paul Kerr

build.bat

@@ -4,7 +4,7 @@ setlocal
 set BUILD_DIR64="build64"
 set BUILD_DIR32="build32"
 set DEST_DIR="dist"
-set PACKAGE_NAME="libcaffeine-v0.7-windows"
+set PACKAGE_NAME="libcaffeine-v0.6.5-windows"
 set BIN_DIR64="%PACKAGE_NAME%\bin64"
 set LIB_DIR64="%PACKAGE_NAME%\lib64"
 set BIN_DIR32="%PACKAGE_NAME%\bin32"

src/Broadcast.cpp

@@ -158,16 +158,16 @@ namespace caff {
         this->failedCallback = failedCallback;
         transitionState(State::Offline, State::Starting);
 
-        int targetBitrate = maxBitsPerSecond;
+        int targetMaxBitrate = maxBitsPerSecond;
         int targetFps = maxFps;
         int targetFrameHeight = maxFrameHeight;
         int targetFrameWidth = maxFrameWidth;
 
         auto info = getEncoderInfo(sharedCredentials);
         if (info.has_value()) {
             if (info->setting.targetBitrate > maxBitsPerSecond) {
-                targetBitrate = info->setting.targetBitrate;
-                LOG_DEBUG("Setting target bitrate: %d", targetBitrate);
+                targetMaxBitrate = info->setting.targetBitrate;
+                LOG_DEBUG("Setting target max bitrate: %d", targetMaxBitrate);
                 // Only allow increases in framerate and frame size if bandwith cap has been raised
                 if (info->setting.framerate > maxFps) {
                     targetFps = info->setting.framerate;
@@ -183,13 +183,16 @@ namespace caff {
             }
         }
 
+        int targetMinBitrate = targetMaxBitrate * 3 / 4;
+
         broadcastThread = std::thread([=] {
             setupSubscription();
 
             LOG_DEBUG("Creating video track");
             videoCapturer = new VideoCapturer;
             videoCapturer->SetFramerateLimit(targetFps);
             videoCapturer->SetFrameSizeLimit(targetFrameWidth, targetFrameHeight);
+            videoCapturer->EnableFrameAdaption(false);
             auto videoSource = factory->CreateVideoSource(videoCapturer);
             auto videoTrack = factory->CreateVideoTrack("external_video", videoSource);
 
@@ -224,9 +227,9 @@ namespace caff {
             peerConnection->AddStream(mediaStream);
 
             webrtc::BitrateSettings bitrateOptions;
-            bitrateOptions.start_bitrate_bps = targetBitrate;
-            bitrateOptions.max_bitrate_bps = targetBitrate;
-            bitrateOptions.min_bitrate_bps = targetBitrate;
+            bitrateOptions.start_bitrate_bps = targetMaxBitrate;
+            bitrateOptions.max_bitrate_bps = targetMaxBitrate;
+            bitrateOptions.min_bitrate_bps = targetMinBitrate;
             peerConnection->SetBitrate(bitrateOptions);
 
             rtc::scoped_refptr<CreateSessionDescriptionObserver> creationObserver =
@@ -304,10 +307,9 @@ namespace caff {
                         webrtc::RtpParameters params = sender->GetParameters();
 
                         if (params.encodings.size() > 0) {
-                            params.encodings[0].max_bitrate_bps = targetBitrate;
-                            params.encodings[0].min_bitrate_bps = targetBitrate;
-                            params.encodings[0].max_framerate = targetFps;
-                            LOG_DEBUG("Setting video RTP sender min/max bitrate to target bitrate: %d", targetBitrate);
+                            params.encodings[0].max_bitrate_bps = targetMaxBitrate;
+                            params.encodings[0].min_bitrate_bps = targetMinBitrate;
+                            LOG_DEBUG("Setting video RTP sender max bitrate to target bitrate: %d", targetMaxBitrate);
                         }
 
                         webrtc::RTCError ret = sender->SetParameters(params);

src/VideoCapturer.cpp

@@ -64,9 +64,9 @@ namespace caff {
 
      VideoCapturer::VideoCapturer()
         : interFrameLimit(1'000'000us / (maxFps + 2))
-        , frameHeightMax(maxFrameHeight)
         , frameWidthMax(maxFrameWidth)
-    {}
+        , frameHeightMax(maxFrameHeight)
+     {}
 
     cricket::CaptureState VideoCapturer::Start(cricket::VideoFormat const & format) {
         SetCaptureFormat(&format);
@@ -169,7 +169,7 @@ namespace caff {
 
         webrtc::VideoFrame frame(scaledBuffer, webrtc::kVideoRotation_0, translatedCameraTime);
 
-        OnFrame(frame, adaptedWidth, adaptedHeight);
+        OnFrame(frame, width, height);
 
         return scaledBuffer;
     }
@@ -201,4 +201,7 @@ namespace caff {
         frameWidthMax = width;
     }
 
+    void VideoCapturer::EnableFrameAdaption(bool adaptFrames) {
+        set_enable_video_adapter(adaptFrames);
+    }
 } // namespace caff

src/VideoCapturer.hpp

@@ -34,6 +34,7 @@ namespace caff {
 
         void SetFramerateLimit(int32_t framerate);
         void SetFrameSizeLimit(int32_t width, int32_t height);
+        void EnableFrameAdaption(bool adaptFrames);
 
     private:
         std::chrono::microseconds lastTimestamp{ std::chrono::seconds::min() };