From 306b60887ab1dc01548429b1326f5e5ef9165319 Mon Sep 17 00:00:00 2001
From: acgist <289547414@qq.com>
Date: Wed, 10 Apr 2024 17:02:59 +0800
Subject: [PATCH] =?UTF-8?q?[*]=20=E7=A0=81=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taoyao/media/src/main/cpp/webrtc/Room.cpp            | 9 +++++++--
 .../main/java/com/acgist/taoyao/media/client/Room.java   | 1 -
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/taoyao-client-android/taoyao/media/src/main/cpp/webrtc/Room.cpp b/taoyao-client-android/taoyao/media/src/main/cpp/webrtc/Room.cpp
index 973ac5a..dd71358 100644
--- a/taoyao-client-android/taoyao/media/src/main/cpp/webrtc/Room.cpp
+++ b/taoyao-client-android/taoyao/media/src/main/cpp/webrtc/Room.cpp
@@ -342,6 +342,8 @@ namespace acgist {
         }
         this->factory          = factory;
         this->rtcConfiguration = new webrtc::PeerConnectionInterface::RTCConfiguration(rtcConfiguration);
+//      this->rtcConfiguration->set_cpu_adaptation(false);
+//      this->rtcConfiguration->set_experiment_cpu_load_estimator(false);
         mediasoupclient::PeerConnection::Options options;
         options.config      = rtcConfiguration;
         options.factory     = factory;
@@ -418,7 +420,7 @@ namespace acgist {
         nlohmann::json codecOptions =
             {
                 // x-google-start-bitrate
-                { "videoGoogleStartBitrate", 400  },
+                { "videoGoogleStartBitrate", 1200 },
                 // x-google-min-bitrate
                 { "videoGoogleMinBitrate",   800  },
                 // x-google-max-bitrate
@@ -581,7 +583,7 @@ namespace acgist {
             ++iterator
         ) {
             if(maxFramerate > 0) {
-                LOG_I("当前最大帧率：%d - %d - %f", maxFramerate, iterator->max_framerate, iterator->scale_resolution_down_by);
+                LOG_I("当前最大帧率：%d - %d", maxFramerate, iterator->max_framerate);
                 iterator->max_framerate = maxFramerate;
             }
             if(minBitrate > 0) {
@@ -592,6 +594,9 @@ namespace acgist {
                 LOG_I("当前最大码率：%d - %d", maxBitrate, iterator->max_bitrate_bps);
                 iterator->max_bitrate_bps = maxBitrate;
             }
+//            iterator->bitrate_priority = 4.0;
+//            iterator->network_priority = webrtc::Priority::kHigh;
+//            iterator->scale_resolution_down_by = 2;
         }
         rtpSender->SetParameters(rtpParameters);
     }
diff --git a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/client/Room.java b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/client/Room.java
index 6379003..459840b 100644
--- a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/client/Room.java
+++ b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/client/Room.java
@@ -208,7 +208,6 @@ public class Room extends CloseableClient implements RouterCallback {
             }
             this.rtcConfiguration = new PeerConnection.RTCConfiguration(iceServers);
 //          this.rtcConfiguration.enableCpuOveruseDetection = true;
-
             // 开始协商
             return this.taoyao.requestFuture(
                 this.taoyao.buildMessage("media::router::rtp::capabilities", "roomId", this.roomId),