mirror of
https://github.com/kunkundi/crossdesk.git
synced 2025-12-19 13:59:10 +08:00
Compare commits
7 Commits
28062f5574
...
v1.0.4-bet
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
99ef55be8f | ||
|
|
6947f7e1c3 | ||
|
|
b1df10c0de | ||
|
|
3817b222fd | ||
|
|
910cc9b587 | ||
|
|
2ee3e93afe | ||
|
|
8875c6a6a1 |
@@ -1191,6 +1191,10 @@ void Render::CleanupPeers() {
|
|||||||
LOG_INFO("[{}] Leave connection [{}]", client_id_, client_id_);
|
LOG_INFO("[{}] Leave connection [{}]", client_id_, client_id_);
|
||||||
LeaveConnection(peer_, client_id_);
|
LeaveConnection(peer_, client_id_);
|
||||||
is_client_mode_ = false;
|
is_client_mode_ = false;
|
||||||
|
StopScreenCapturer();
|
||||||
|
StopSpeakerCapturer();
|
||||||
|
StopMouseController();
|
||||||
|
StopKeyboardCapturer();
|
||||||
LOG_INFO("Destroy peer [{}]", client_id_);
|
LOG_INFO("Destroy peer [{}]", client_id_);
|
||||||
DestroyPeer(&peer_);
|
DestroyPeer(&peer_);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -450,6 +450,7 @@ class Render {
|
|||||||
bool enable_self_hosted_ = false;
|
bool enable_self_hosted_ = false;
|
||||||
int language_button_value_last_ = 0;
|
int language_button_value_last_ = 0;
|
||||||
int video_quality_button_value_last_ = 0;
|
int video_quality_button_value_last_ = 0;
|
||||||
|
int video_frame_rate_button_value_last_ = 0;
|
||||||
int video_encode_format_button_value_last_ = 0;
|
int video_encode_format_button_value_last_ = 0;
|
||||||
bool enable_hardware_video_codec_last_ = false;
|
bool enable_hardware_video_codec_last_ = false;
|
||||||
bool enable_turn_last_ = false;
|
bool enable_turn_last_ = false;
|
||||||
|
|||||||
@@ -6,11 +6,6 @@
|
|||||||
|
|
||||||
#define NV12_BUFFER_SIZE 1280 * 720 * 3 / 2
|
#define NV12_BUFFER_SIZE 1280 * 720 * 3 / 2
|
||||||
|
|
||||||
#ifdef CROSSDESK_DEBUG
|
|
||||||
#else
|
|
||||||
#define MOUSE_CONTROL 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace crossdesk {
|
namespace crossdesk {
|
||||||
|
|
||||||
int Render::SendKeyCommand(int key_code, bool is_down) {
|
int Render::SendKeyCommand(int key_code, bool is_down) {
|
||||||
@@ -461,7 +456,12 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
|
|||||||
render->need_to_send_host_info_ = true;
|
render->need_to_send_host_info_ = true;
|
||||||
render->start_screen_capturer_ = true;
|
render->start_screen_capturer_ = true;
|
||||||
render->start_speaker_capturer_ = true;
|
render->start_speaker_capturer_ = true;
|
||||||
|
#ifdef CROSSDESK_DEBUG
|
||||||
|
render->start_mouse_controller_ = false;
|
||||||
|
render->start_keyboard_capturer_ = false;
|
||||||
|
#else
|
||||||
render->start_mouse_controller_ = true;
|
render->start_mouse_controller_ = true;
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ConnectionStatus::Closed: {
|
case ConnectionStatus::Closed: {
|
||||||
|
|||||||
@@ -288,14 +288,23 @@ int Render::SettingWindow() {
|
|||||||
|
|
||||||
// Video quality
|
// Video quality
|
||||||
if (video_quality_button_value_ == 0) {
|
if (video_quality_button_value_ == 0) {
|
||||||
config_center_->SetVideoQuality(ConfigCenter::VIDEO_QUALITY::HIGH);
|
config_center_->SetVideoQuality(ConfigCenter::VIDEO_QUALITY::LOW);
|
||||||
} else if (video_quality_button_value_ == 1) {
|
} else if (video_quality_button_value_ == 1) {
|
||||||
config_center_->SetVideoQuality(ConfigCenter::VIDEO_QUALITY::MEDIUM);
|
config_center_->SetVideoQuality(ConfigCenter::VIDEO_QUALITY::MEDIUM);
|
||||||
} else {
|
} else {
|
||||||
config_center_->SetVideoQuality(ConfigCenter::VIDEO_QUALITY::LOW);
|
config_center_->SetVideoQuality(ConfigCenter::VIDEO_QUALITY::HIGH);
|
||||||
}
|
}
|
||||||
video_quality_button_value_last_ = video_quality_button_value_;
|
video_quality_button_value_last_ = video_quality_button_value_;
|
||||||
|
|
||||||
|
if (video_frame_rate_button_value_ == 0) {
|
||||||
|
config_center_->SetVideoFrameRate(
|
||||||
|
ConfigCenter::VIDEO_FRAME_RATE::FPS_30);
|
||||||
|
} else if (video_frame_rate_button_value_ == 1) {
|
||||||
|
config_center_->SetVideoFrameRate(
|
||||||
|
ConfigCenter::VIDEO_FRAME_RATE::FPS_60);
|
||||||
|
}
|
||||||
|
video_frame_rate_button_value_last_ = video_frame_rate_button_value_;
|
||||||
|
|
||||||
// Video encode format
|
// Video encode format
|
||||||
if (video_encode_format_button_value_ == 0) {
|
if (video_encode_format_button_value_ == 0) {
|
||||||
config_center_->SetVideoEncodeFormat(
|
config_center_->SetVideoEncodeFormat(
|
||||||
@@ -366,6 +375,11 @@ int Render::SettingWindow() {
|
|||||||
video_quality_button_value_ = video_quality_button_value_last_;
|
video_quality_button_value_ = video_quality_button_value_last_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (video_frame_rate_button_value_ !=
|
||||||
|
video_frame_rate_button_value_last_) {
|
||||||
|
video_frame_rate_button_value_ = video_frame_rate_button_value_last_;
|
||||||
|
}
|
||||||
|
|
||||||
if (video_encode_format_button_value_ !=
|
if (video_encode_format_button_value_ !=
|
||||||
video_encode_format_button_value_last_) {
|
video_encode_format_button_value_last_) {
|
||||||
video_encode_format_button_value_ =
|
video_encode_format_button_value_ =
|
||||||
|
|||||||
Submodule submodules/minirtc updated: ac85966241...27a4ef70ab
Reference in New Issue
Block a user