[config] use 60 fps streaming by default

src/config_center/config_center.h

@@ -72,7 +72,7 @@ class ConfigCenter {
 
   LANGUAGE language_ = LANGUAGE::CHINESE;
   VIDEO_QUALITY video_quality_ = VIDEO_QUALITY::MEDIUM;
-  VIDEO_FRAME_RATE video_frame_rate_ = VIDEO_FRAME_RATE::FPS_30;
+  VIDEO_FRAME_RATE video_frame_rate_ = VIDEO_FRAME_RATE::FPS_60;
   VIDEO_ENCODE_FORMAT video_encode_format_ = VIDEO_ENCODE_FORMAT::H264;
   bool hardware_video_codec_ = false;
   bool enable_turn_ = false;

src/gui/render.cpp

@@ -566,6 +566,14 @@ void Render::UpdateInteractions() {
     screen_capturer_is_started_ = false;
   }
 
+  if (start_speaker_capturer_ && !speaker_capturer_is_started_) {
+    StartSpeakerCapturer();
+    speaker_capturer_is_started_ = true;
+  } else if (!start_speaker_capturer_ && speaker_capturer_is_started_) {
+    StopSpeakerCapturer();
+    speaker_capturer_is_started_ = false;
+  }
+
   if (start_mouse_controller_ && !mouse_controller_is_started_) {
     StartMouseController();
     mouse_controller_is_started_ = true;
@@ -1055,9 +1063,9 @@ void Render::MainLoop() {
       remote_action.i.host_name[host_name.size()] = '\0';
       remote_action.i.host_name_size = host_name.size();
 
-      std::vector<char> serialized = SerializeRemoteAction(remote_action);
-      int ret = SendDataFrame(peer_, serialized.data(), serialized.size(),
-                              data_label_.c_str());
+      std::string msg = remote_action.to_json();
+      int ret =
+          SendDataFrame(peer_, msg.data(), msg.size(), data_label_.c_str());
       FreeRemoteAction(remote_action);
       if (0 == ret) {
         need_to_send_host_info_ = false;

src/gui/render.h

@@ -49,10 +49,10 @@ class Render {
     bool connection_established_ = false;
     bool rejoin_ = false;
     bool net_traffic_stats_button_pressed_ = false;
-    bool mouse_control_button_pressed_ = false;
+    bool mouse_control_button_pressed_ = true;
     bool mouse_controller_is_started_ = false;
-    bool audio_capture_button_pressed_ = false;
-    bool control_mouse_ = false;
+    bool audio_capture_button_pressed_ = true;
+    bool control_mouse_ = true;
     bool streaming_ = false;
     bool is_control_bar_in_left_ = true;
     bool control_bar_hovered_ = false;
@@ -311,7 +311,9 @@ class Render {
   bool mouse_controller_is_started_ = false;
   bool start_screen_capturer_ = false;
   bool screen_capturer_is_started_ = false;
-  bool start_keyboard_capturer_ = false;
+  bool start_speaker_capturer_ = false;
+  bool speaker_capturer_is_started_ = false;
+  bool start_keyboard_capturer_ = true;
   bool keyboard_capturer_is_started_ = false;
   bool foucs_on_main_window_ = false;
   bool foucs_on_stream_window_ = false;
@@ -436,7 +438,7 @@ class Render {
   char password_saved_[7] = "";
   int language_button_value_ = 0;
   int video_quality_button_value_ = 0;
-  int video_frame_rate_button_value_ = 0;
+  int video_frame_rate_button_value_ = 1;
   int video_encode_format_button_value_ = 0;
   bool enable_hardware_video_codec_ = false;
   bool enable_turn_ = false;
@@ -470,6 +472,9 @@ class Render {
       client_properties_;
   void CloseTab(decltype(client_properties_)::iterator& it);
   /* ------ stream window property end ------ */
+
+  /* ------ server mode ------ */
+  std::unordered_map<std::string, ConnectionStatus> connection_status_;
 };
 }  // namespace crossdesk
 #endif

src/gui/render_callback.cpp

@@ -28,8 +28,7 @@ int Render::SendKeyCommand(int key_code, bool is_down) {
         client_properties_.end()) {
       auto props = client_properties_[controlled_remote_id_];
       if (props->connection_status_ == ConnectionStatus::Connected) {
-        json j = remote_action.to_json();
-        std::string msg = j.dump();
+        std::string msg = remote_action.to_json();
         SendDataFrame(props->peer_, msg.c_str(), msg.size(),
                       props->data_label_.c_str());
       }
@@ -97,8 +96,7 @@ int Render::ProcessMouseEvent(const SDL_Event& event) {
         remote_action.m.flag = MouseFlag::move;
       }
 
-      json j = remote_action.to_json();
-      std::string msg = j.dump();
+      std::string msg = remote_action.to_json();
       SendDataFrame(props->peer_, msg.c_str(), msg.size(),
                     props->data_label_.c_str());
     } else if (SDL_EVENT_MOUSE_WHEEL == event.type &&
@@ -132,8 +130,7 @@ int Render::ProcessMouseEvent(const SDL_Event& event) {
           (float)(event.button.y - props->stream_render_rect_.y) /
           render_height;
 
-      json j = remote_action.to_json();
-      std::string msg = j.dump();
+      std::string msg = remote_action.to_json();
       SendDataFrame(props->peer_, msg.c_str(), msg.size(),
                     props->data_label_.c_str());
     }
@@ -321,9 +318,9 @@ void Render::OnReceiveDataBufferCb(const char* data, size_t size,
       render->mouse_controller_->SendMouseCommand(remote_action,
                                                   render->selected_display_);
     } else if (remote_action.type == ControlType::audio_capture) {
-      if (remote_action.a)
+      if (remote_action.a && !render->start_speaker_capturer_)
         render->StartSpeakerCapturer();
-      else
+      else if (!remote_action.a && render->start_speaker_capturer_)
         render->StopSpeakerCapturer();
     } else if (remote_action.type == ControlType::keyboard &&
                render->keyboard_capturer_) {
@@ -406,7 +403,7 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
     props->connection_status_ = status;
 
     switch (status) {
-      case ConnectionStatus::Connected:
+      case ConnectionStatus::Connected: {
         if (!render->need_to_create_stream_window_ &&
             !render->client_properties_.empty()) {
           render->need_to_create_stream_window_ = true;
@@ -417,14 +414,10 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
             (int)render->stream_window_width_,
             (int)(render->stream_window_height_ - render->title_bar_height_)};
         break;
+      }
       case ConnectionStatus::Disconnected:
       case ConnectionStatus::Failed:
-      case ConnectionStatus::Closed:
-        render->password_validating_time_ = 0;
-        render->start_screen_capturer_ = false;
-        render->start_mouse_controller_ = false;
-        render->start_keyboard_capturer_ = false;
-        render->control_mouse_ = false;
+      case ConnectionStatus::Closed: {
         props->connection_established_ = false;
         props->mouse_control_button_pressed_ = false;
         if (props->dst_buffer_) {
@@ -433,8 +426,10 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
                             props->texture_width_);
         }
         render->CleanSubStreamWindowProperties(props);
+
         break;
-      case ConnectionStatus::IncorrectPassword:
+      }
+      case ConnectionStatus::IncorrectPassword: {
         render->password_validating_ = false;
         render->password_validating_time_++;
         if (render->connect_button_pressed_) {
@@ -444,37 +439,53 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
               localization::connect[render->localization_language_index_];
         }
         break;
-      case ConnectionStatus::NoSuchTransmissionId:
+      }
+      case ConnectionStatus::NoSuchTransmissionId: {
         if (render->connect_button_pressed_) {
           props->connection_established_ = false;
           render->connect_button_label_ =
               localization::connect[render->localization_language_index_];
         }
         break;
+      }
       default:
         break;
     }
   } else {
     render->is_client_mode_ = false;
     render->show_connection_status_window_ = true;
+    render->connection_status_[remote_id] = status;
 
     switch (status) {
-      case ConnectionStatus::Connected:
+      case ConnectionStatus::Connected: {
         render->need_to_send_host_info_ = true;
         render->start_screen_capturer_ = true;
+        render->start_speaker_capturer_ = true;
         render->start_mouse_controller_ = true;
         break;
-      case ConnectionStatus::Closed:
-        render->start_screen_capturer_ = false;
-        render->start_mouse_controller_ = false;
-        render->start_keyboard_capturer_ = false;
-        render->need_to_send_host_info_ = false;
-        if (props) props->connection_established_ = false;
-        if (render->audio_capture_) {
-          render->StopSpeakerCapturer();
-          render->audio_capture_ = false;
+      }
+      case ConnectionStatus::Closed: {
+        if (std::all_of(render->connection_status_.begin(),
+                        render->connection_status_.end(), [](const auto& kv) {
+                          return kv.second == ConnectionStatus::Closed ||
+                                 kv.second == ConnectionStatus::Failed ||
+                                 kv.second == ConnectionStatus::Disconnected;
+                        })) {
+          render->start_screen_capturer_ = false;
+          render->start_speaker_capturer_ = false;
+          render->start_mouse_controller_ = false;
+          render->start_keyboard_capturer_ = false;
+          render->need_to_send_host_info_ = false;
+          if (props) props->connection_established_ = false;
+          if (render->audio_capture_) {
+            render->StopSpeakerCapturer();
+            render->audio_capture_ = false;
+          }
+
+          render->connection_status_.erase(remote_id);
         }
         break;
+      }
       default:
         break;
     }

src/gui/toolbars/control_bar.cpp

@@ -68,8 +68,9 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
           remote_action.type = ControlType::display_id;
           remote_action.d = i;
           if (props->connection_status_ == ConnectionStatus::Connected) {
-            SendDataFrame(props->peer_, (const char*)&remote_action,
-                          sizeof(remote_action), props->data_label_.c_str());
+            std::string msg = remote_action.to_json();
+            SendDataFrame(props->peer_, msg.c_str(), msg.size(),
+                          props->data_label_.c_str());
           }
         }
         props->display_selectable_hovered_ = ImGui::IsWindowHovered();
@@ -142,8 +143,9 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
         RemoteAction remote_action;
         remote_action.type = ControlType::audio_capture;
         remote_action.a = props->audio_capture_button_pressed_;
-        SendDataFrame(props->peer_, (const char*)&remote_action,
-                      sizeof(remote_action), props->data_label_.c_str());
+        std::string msg = remote_action.to_json();
+        SendDataFrame(props->peer_, msg.c_str(), msg.size(),
+                      props->data_label_.c_str());
       }
     }
     if (!props->audio_capture_button_pressed_) {