Use Combo instead of RadioButton for settings

src/config_center/config_center.cpp

@@ -4,18 +4,28 @@ ConfigCenter::ConfigCenter() {}
 
 ConfigCenter::~ConfigCenter() {}
 
-int ConfigCenter::SetVideoQuality(VIDEO_QUALITY video_quality) {
-  video_quality_ = video_quality;
-  return 0;
-}
-
 int ConfigCenter::SetLanguage(LANGUAGE language) {
   language_ = language;
   return 0;
 }
 
+int ConfigCenter::SetVideoQuality(VIDEO_QUALITY video_quality) {
+  video_quality_ = video_quality;
+  return 0;
+}
+
+int ConfigCenter::SetVideoEncodeFormat(
+    VIDEO_ENCODE_FORMAT video_encode_format) {
+  video_encode_format_ = video_encode_format;
+  return 0;
+}
+
+ConfigCenter::LANGUAGE ConfigCenter::GetLanguage() { return language_; }
+
 ConfigCenter::VIDEO_QUALITY ConfigCenter::GetVideoQuality() {
   return video_quality_;
 }
 
-ConfigCenter::LANGUAGE ConfigCenter::GetLanguage() { return language_; }
+ConfigCenter::VIDEO_ENCODE_FORMAT ConfigCenter::GetVideoEncodeFormat() {
+  return video_encode_format_;
+}

src/config_center/config_center.h

@@ -9,24 +9,28 @@
 
 class ConfigCenter {
  public:
-  enum class VIDEO_QUALITY { LOW = 0, MEDIUM = 1, HIGH = 2 };
   enum class LANGUAGE { CHINESE = 0, ENGLISH = 1 };
+  enum class VIDEO_QUALITY { LOW = 0, MEDIUM = 1, HIGH = 2 };
+  enum class VIDEO_ENCODE_FORMAT { AV1 = 0, H264 = 1 };
 
  public:
   ConfigCenter();
   ~ConfigCenter();
 
  public:
-  int SetVideoQuality(VIDEO_QUALITY video_quality);
   int SetLanguage(LANGUAGE language);
+  int SetVideoQuality(VIDEO_QUALITY video_quality);
+  int SetVideoEncodeFormat(VIDEO_ENCODE_FORMAT video_encode_format);
 
  public:
-  VIDEO_QUALITY GetVideoQuality();
   LANGUAGE GetLanguage();
+  VIDEO_QUALITY GetVideoQuality();
+  VIDEO_ENCODE_FORMAT GetVideoEncodeFormat();
 
  private:
-  VIDEO_QUALITY video_quality_ = VIDEO_QUALITY::MEDIUM;
   LANGUAGE language_ = LANGUAGE::CHINESE;
+  VIDEO_QUALITY video_quality_ = VIDEO_QUALITY::MEDIUM;
+  VIDEO_ENCODE_FORMAT video_encode_format_ = VIDEO_ENCODE_FORMAT::AV1;
 };
 
 #endif

src/localization/localization.h

@@ -21,14 +21,22 @@ static std::vector<std::string> disconnect = {u8"断开连接", "Disconnect"};
 static std::vector<std::string> fullscreen = {u8"全屏", "Fullscreen"};
 static std::vector<std::string> exit_fullscreen = {u8"退出全屏",
                                                    "Exit fullscreen"};
+static std::vector<float> settings_window_width = {188.0f, 228.0f};
 static std::vector<std::string> settings = {u8"设置", "Settings"};
 static std::vector<std::string> language = {u8"语言:", "Language:"};
 static std::vector<std::string> language_zh = {u8"中文", "Chinese"};
 static std::vector<std::string> language_en = {u8"英文", "English"};
-static std::vector<std::string> video_quality = {u8"视频质量", "Video Quality"};
+static std::vector<std::string> video_quality = {u8"视频质量:",
+                                                 "Video Quality:"};
 static std::vector<std::string> video_quality_high = {u8"高", "High"};
 static std::vector<std::string> video_quality_medium = {u8"中", "Medium"};
 static std::vector<std::string> video_quality_low = {u8"低", "Low"};
+static std::vector<std::string> video_encode_format = {u8"视频编码格式:",
+                                                       "Video Encode Format:"};
+static std::vector<std::string> av1 = {u8"AV1", "AV1"};
+static std::vector<std::string> h264 = {u8"H.264", "H.264"};
+static std::vector<std::string> enable_hardware_video_codec = {
+    u8"启用硬件编解码器:", "Enable Hardware Video Codec:"};
 
 static std::vector<std::string> ok = {u8"确认", "OK"};
 static std::vector<std::string> cancel = {u8"取消", "Cancel"};

src/main_window/main_window.cpp

@@ -14,6 +14,21 @@
 #define REFRESH_EVENT (SDL_USEREVENT + 1)
 #define NV12_BUFFER_SIZE 1280 * 720 * 3 / 2
 
+static std::string _labelPrefix(const char *const label) {
+  float width = ImGui::CalcItemWidth();
+
+  float x = ImGui::GetCursorPosX();
+  ImGui::Text(label);
+  ImGui::SameLine();
+  ImGui::SetCursorPosX(x + width * 0.5f + ImGui::GetStyle().ItemInnerSpacing.x);
+  ImGui::SetNextItemWidth(-1);
+
+  std::string labelID = "##";
+  labelID += label;
+
+  return labelID;
+}
+
 MainWindow::MainWindow() {}
 
 MainWindow::~MainWindow() {}
@@ -30,10 +45,16 @@ int MainWindow::SaveSettingsIntoCacheFile() {
          sizeof(language_button_value_));
   memcpy(&cd_cache_.video_quality, &video_quality_button_value_,
          sizeof(video_quality_button_value_));
+  memcpy(&cd_cache_.video_encode_format,
+         &video_video_encode_format_button_value_,
+         sizeof(video_video_encode_format_button_value_));
   memcpy(&cd_cache_.settings_language_pos, &settings_language_pos_,
          sizeof(settings_language_pos_));
   memcpy(&cd_cache_.settings_video_quality_pos, &settings_video_quality_pos_,
          sizeof(settings_video_quality_pos_));
+  memcpy(&cd_cache_.settings_video_encode_format_pos,
+         &settings_video_encode_format_pos_,
+         sizeof(settings_video_encode_format_pos_));
   fwrite(&cd_cache_, sizeof(cd_cache_), 1, cd_cache_file_);
   fclose(cd_cache_file_);
 
@@ -52,8 +73,11 @@ int MainWindow::LoadSettingsIntoCacheFile() {
   strncpy(input_password_, cd_cache_.password, sizeof(cd_cache_.password));
   language_button_value_ = cd_cache_.language;
   video_quality_button_value_ = cd_cache_.video_quality;
+  video_video_encode_format_button_value_ = cd_cache_.video_encode_format;
   settings_language_pos_ = cd_cache_.settings_language_pos;
   settings_video_quality_pos_ = cd_cache_.settings_video_quality_pos;
+  settings_video_encode_format_pos_ =
+      cd_cache_.settings_video_encode_format_pos;
 
   return 0;
 }
@@ -501,9 +525,14 @@ int MainWindow::Run() {
         const ImGuiViewport *viewport = ImGui::GetMainViewport();
 
         ImGui::SetNextWindowPos(
-            ImVec2((viewport->WorkSize.x - viewport->WorkPos.x - 200) / 2,
+            ImVec2((viewport->WorkSize.x - viewport->WorkPos.x -
-                   (viewport->WorkSize.y - viewport->WorkPos.y - 160) / 2));
+                    localization::settings_window_width
-        ImGui::SetNextWindowSize(ImVec2(200, 160));
+                        [localization_language_index_]) /
+                       2,
+                   (viewport->WorkSize.y - viewport->WorkPos.y - 190) / 2));
+        ImGui::SetNextWindowSize(ImVec2(
+            localization::settings_window_width[localization_language_index_],
+            190));
 
         ImGui::Begin(
             localization::settings[localization_language_index_].c_str(),
@@ -512,44 +541,75 @@ int MainWindow::Run() {
                 ImGuiWindowFlags_NoMove);
 
         {
+          const char *language_items[] = {
+              localization::language_zh[localization_language_index_].c_str(),
+              localization::language_en[localization_language_index_].c_str()};
+
+          ImGui::SetCursorPosY(32);
           ImGui::Text(
               localization::language[localization_language_index_].c_str());
-
           ImGui::SetCursorPosX(settings_language_pos_);
-          ImGui::RadioButton(
+          ImGui::SetCursorPosY(30);
-              localization::language_zh[localization_language_index_].c_str(),
+          ImGui::SetNextItemWidth(80);
-              &language_button_value_, 0);
+          ImGui::Combo("##language", &language_button_value_, language_items,
-          ImGui::SameLine();
+                       IM_ARRAYSIZE(language_items));
-          ImGui::RadioButton(
-              localization::language_en[localization_language_index_].c_str(),
-              &language_button_value_, 1);
         }
 
         ImGui::Separator();
 
         {
-          ImGui::Text(localization::video_quality[localization_language_index_]
+          const char *video_quality_items[] = {
-                          .c_str());
-
-          ImGui::SetCursorPosX(settings_video_quality_pos_);
-          ImGui::RadioButton(
               localization::video_quality_high[localization_language_index_]
                   .c_str(),
-              &video_quality_button_value_, 0);
-          ImGui::SameLine();
-          ImGui::RadioButton(
               localization::video_quality_medium[localization_language_index_]
                   .c_str(),
-              &video_quality_button_value_, 1);
-          ImGui::SameLine();
-          ImGui::RadioButton(
               localization::video_quality_low[localization_language_index_]
-                  .c_str(),
+                  .c_str()};
-              &video_quality_button_value_, 2);
+
+          ImGui::SetCursorPosY(62);
+          ImGui::Text(localization::video_quality[localization_language_index_]
+                          .c_str());
+          ImGui::SetCursorPosX(settings_video_quality_pos_);
+          ImGui::SetCursorPosY(60);
+          ImGui::SetNextItemWidth(80);
+          ImGui::Combo("##video_quality", &video_quality_button_value_,
+                       video_quality_items, IM_ARRAYSIZE(video_quality_items));
+        }
+
+        ImGui::Separator();
+
+        {
+          const char *video_encode_format_items[] = {
+              localization::av1[localization_language_index_].c_str(),
+              localization::h264[localization_language_index_].c_str()};
+
+          ImGui::SetCursorPosY(92);
+          ImGui::Text(
+              localization::video_encode_format[localization_language_index_]
+                  .c_str());
+          ImGui::SetCursorPosX(settings_video_encode_format_pos_);
+          ImGui::SetCursorPosY(90);
+          ImGui::SetNextItemWidth(80);
+          ImGui::Combo("##video_encode_format", &language_button_value_,
+                       video_encode_format_items,
+                       IM_ARRAYSIZE(video_encode_format_items));
+        }
+
+        ImGui::Separator();
+
+        {
+          ImGui::SetCursorPosY(122);
+          ImGui::Text(localization::enable_hardware_video_codec
+                          [localization_language_index_]
+                              .c_str());
+          ImGui::SetCursorPosX(settings_enable_video_codec_pos_);
+          ImGui::SetCursorPosY(120);
+          ImGui::Checkbox("##enable_hardware_video_codec",
+                          &enable_video_codec_);
         }
 
         ImGui::SetCursorPosX(60.0f);
-        ImGui::SetCursorPosY(130.0f);
+        ImGui::SetCursorPosY(160.0f);
 
         // OK
         if (ImGui::Button(
@@ -559,12 +619,18 @@ int MainWindow::Run() {
           // Language
           if (language_button_value_ == 0) {
             config_center_.SetLanguage(ConfigCenter::LANGUAGE::CHINESE);
-            settings_language_pos_ = 40.0f;
+            settings_language_pos_ = settings_language_pos_default_;
-            settings_video_quality_pos_ = 40.0f;
+            settings_video_quality_pos_ = settings_video_quality_pos_default_;
+            settings_video_encode_format_pos_ =
+                settings_video_encode_format_pos_default_;
+            settings_enable_video_codec_pos_ =
+                settings_enable_video_codec_pos_default_;
           } else {
             config_center_.SetLanguage(ConfigCenter::LANGUAGE::ENGLISH);
-            settings_language_pos_ = 15.0f;
+            settings_language_pos_ = 140.0f;
-            settings_video_quality_pos_ = 15.0f;
+            settings_video_quality_pos_ = 140.0f;
+            settings_video_encode_format_pos_ = 140.0f;
+            settings_enable_video_codec_pos_ = 201.0f;
           }
           language_button_value_last_ = language_button_value_;
           localization_language_ =
@@ -588,6 +654,17 @@ int MainWindow::Run() {
           }
           video_quality_button_value_last_ = video_quality_button_value_;
 
+          // Video encode format
+          if (video_video_encode_format_button_value_ == 0) {
+            config_center_.SetVideoEncodeFormat(
+                ConfigCenter::VIDEO_ENCODE_FORMAT::AV1);
+          } else if (video_quality_button_value_ == 1) {
+            config_center_.SetVideoEncodeFormat(
+                ConfigCenter::VIDEO_ENCODE_FORMAT::H264);
+          }
+          video_video_encode_format_button_value_last_ =
+              video_video_encode_format_button_value_;
+
           SaveSettingsIntoCacheFile();
           // To do: set encode resolution
         }
@@ -603,6 +680,12 @@ int MainWindow::Run() {
           if (video_quality_button_value_ != video_quality_button_value_last_) {
             video_quality_button_value_ = video_quality_button_value_last_;
           }
+
+          if (video_video_encode_format_button_value_ !=
+              video_video_encode_format_button_value_last_) {
+            video_video_encode_format_button_value_ =
+                video_video_encode_format_button_value_last_;
+          }
         }
 
         ImGui::End();

src/main_window/main_window.h

@@ -64,10 +64,12 @@ class MainWindow {
  private:
   typedef struct {
     char password[7];
-    int video_quality;
     int language;
+    int video_quality;
+    int video_encode_format;
     float settings_language_pos;
     float settings_video_quality_pos;
+    float settings_video_encode_format_pos;
   } CDCache;
 
  private:
@@ -157,12 +159,26 @@ class MainWindow {
 #endif
 
  private:
-  float settings_language_pos_ = 40.0f;
+  float settings_language_pos_default_ = 100.0f;
-  float settings_video_quality_pos_ = 40.0f;
+  float settings_video_quality_pos_default_ = 100.0f;
+  float settings_video_encode_format_pos_default_ = 100.0f;
+  float settings_enable_video_codec_pos_default_ = 161.0f;
+
+  float settings_language_pos_ = settings_language_pos_default_;
+  float settings_video_quality_pos_ = settings_video_quality_pos_default_;
+  float settings_video_encode_format_pos_ =
+      settings_video_encode_format_pos_default_;
+  float settings_enable_video_codec_pos_ =
+      settings_enable_video_codec_pos_default_;
+
   int language_button_value_ = 0;
   int video_quality_button_value_ = 0;
+  int video_video_encode_format_button_value_ = 0;
   int language_button_value_last_ = 0;
   int video_quality_button_value_last_ = 0;
+  int video_video_encode_format_button_value_last_ = 0;
+  bool enable_video_codec_ = false;
+  bool enable_video_codec_last_ = false;
 
  private:
   std::atomic<bool> start_screen_capture_{false};