Merge branch 'yuzu-emu:master' into cinematic-fix-pr

This reverts commit 743211e6d1.

src/common/settings.cpp

@@ -54,6 +54,7 @@ void LogSettings() {
     log_setting("Renderer_AntiAliasing", values.anti_aliasing.GetValue());
     log_setting("Renderer_UseSpeedLimit", values.use_speed_limit.GetValue());
     log_setting("Renderer_SpeedLimit", values.speed_limit.GetValue());
+    log_setting("Renderer_VideoFramerate", values.video_framerate.GetValue());
     log_setting("Renderer_UseDiskShaderCache", values.use_disk_shader_cache.GetValue());
     log_setting("Renderer_GPUAccuracyLevel", values.gpu_accuracy.GetValue());
     log_setting("Renderer_UseAsynchronousGpuEmulation",
@@ -219,6 +220,8 @@ void RestoreGlobalState(bool is_powered_on) {
     values.max_anisotropy.SetGlobal(true);
     values.use_speed_limit.SetGlobal(true);
     values.speed_limit.SetGlobal(true);
+    values.use_video_framerate.SetGlobal(true);
+    values.video_framerate.SetGlobal(true);
     values.use_disk_shader_cache.SetGlobal(true);
     values.gpu_accuracy.SetGlobal(true);
     values.use_asynchronous_gpu_emulation.SetGlobal(true);

src/common/settings.h

@@ -462,6 +462,8 @@ struct Values {
     SwitchableSetting<int, true> max_anisotropy{0, 0, 5, "max_anisotropy"};
     SwitchableSetting<bool> use_speed_limit{true, "use_speed_limit"};
     SwitchableSetting<u16, true> speed_limit{100, 0, 9999, "speed_limit"};
+    SwitchableSetting<bool> use_video_framerate{false, "use_video_framerate"};
+    SwitchableSetting<u16, true> video_framerate{30, 1, 240, "video_framerate"};
     SwitchableSetting<bool> use_disk_shader_cache{true, "use_disk_shader_cache"};
     SwitchableSetting<GPUAccuracy, true> gpu_accuracy{GPUAccuracy::High, GPUAccuracy::Normal,
                                                       GPUAccuracy::Extreme, "gpu_accuracy"};

src/video_core/host1x/codecs/codec.cpp

@@ -284,8 +284,25 @@ AVFramePtr Codec::GetCurrentFrame() {
     if (av_frames.empty()) {
         return AVFramePtr{nullptr, AVFrameDeleter};
     }
+
     AVFramePtr frame = std::move(av_frames.front());
     av_frames.pop();
+
+    if (Settings::values.use_video_framerate.GetValue()) {
+        std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
+        std::chrono::microseconds elapsed =
+            std::chrono::duration_cast<std::chrono::microseconds>(now - last_frame_time);
+        std::chrono::microseconds min_frame_interval =
+            std::chrono::microseconds(1000 / Settings::values.video_framerate.GetValue() * 1000);
+
+        if (elapsed < min_frame_interval) {
+            std::this_thread::sleep_for(min_frame_interval - elapsed);
+            now = std::chrono::steady_clock::now();
+        }
+
+        last_frame_time = now;
+    }
+
     return frame;
 }
 

src/video_core/host1x/codecs/codec.h

@@ -58,6 +58,8 @@ public:
     /// Return name of the current codec
     [[nodiscard]] std::string_view GetCurrentCodecName() const;
 
+    std::chrono::steady_clock::time_point last_frame_time = std::chrono::steady_clock::now();
+
 private:
     void InitializeAvCodecContext();
 

src/yuzu/configuration/config.cpp

@@ -705,6 +705,8 @@ void Config::ReadRendererValues() {
     ReadGlobalSetting(Settings::values.anti_aliasing);
     ReadGlobalSetting(Settings::values.max_anisotropy);
     ReadGlobalSetting(Settings::values.speed_limit);
+    ReadGlobalSetting(Settings::values.use_video_framerate);
+    ReadGlobalSetting(Settings::values.video_framerate);
     ReadGlobalSetting(Settings::values.use_disk_shader_cache);
     ReadGlobalSetting(Settings::values.gpu_accuracy);
     ReadGlobalSetting(Settings::values.use_asynchronous_gpu_emulation);
@@ -1348,6 +1350,8 @@ void Config::SaveRendererValues() {
                  Settings::values.anti_aliasing.UsingGlobal());
     WriteGlobalSetting(Settings::values.max_anisotropy);
     WriteGlobalSetting(Settings::values.speed_limit);
+    WriteGlobalSetting(Settings::values.use_video_framerate);
+    WriteGlobalSetting(Settings::values.video_framerate);
     WriteGlobalSetting(Settings::values.use_disk_shader_cache);
     WriteSetting(QString::fromStdString(Settings::values.gpu_accuracy.GetLabel()),
                  static_cast<u32>(Settings::values.gpu_accuracy.GetValue(global)),

src/yuzu/configuration/configure_general.cpp

@@ -20,6 +20,9 @@ ConfigureGeneral::ConfigureGeneral(const Core::System& system_, QWidget* parent)
     SetConfiguration();
 
     if (Settings::IsConfiguringGlobal()) {
+        connect(ui->toggle_video_framerate, &QCheckBox::clicked, ui->video_framerate, [this]() {
+            ui->video_framerate->setEnabled(ui->toggle_video_framerate->isChecked());
+        });
         connect(ui->toggle_speed_limit, &QCheckBox::clicked, ui->speed_limit,
                 [this]() { ui->speed_limit->setEnabled(ui->toggle_speed_limit->isChecked()); });
     }
@@ -41,14 +44,21 @@ void ConfigureGeneral::SetConfiguration() {
     ui->toggle_background_pause->setChecked(UISettings::values.pause_when_in_background.GetValue());
     ui->toggle_hide_mouse->setChecked(UISettings::values.hide_mouse.GetValue());
 
+    ui->toggle_video_framerate->setChecked(Settings::values.use_video_framerate.GetValue());
+    ui->video_framerate->setValue(Settings::values.video_framerate.GetValue());
+
     ui->toggle_speed_limit->setChecked(Settings::values.use_speed_limit.GetValue());
     ui->speed_limit->setValue(Settings::values.speed_limit.GetValue());
 
     ui->button_reset_defaults->setEnabled(runtime_lock);
 
     if (Settings::IsConfiguringGlobal()) {
+        ui->video_framerate->setEnabled(Settings::values.use_video_framerate.GetValue());
         ui->speed_limit->setEnabled(Settings::values.use_speed_limit.GetValue());
     } else {
+        ui->video_framerate->setEnabled(Settings::values.use_video_framerate.GetValue() &&
+            use_video_framerate !=
+                ConfigurationShared::CheckState::Global);
         ui->speed_limit->setEnabled(Settings::values.use_speed_limit.GetValue() &&
                                     use_speed_limit != ConfigurationShared::CheckState::Global);
     }
@@ -83,6 +93,11 @@ void ConfigureGeneral::ApplyConfiguration() {
         UISettings::values.pause_when_in_background = ui->toggle_background_pause->isChecked();
         UISettings::values.hide_mouse = ui->toggle_hide_mouse->isChecked();
 
+        if (Settings::values.use_video_framerate.UsingGlobal()) {
+            Settings::values.use_video_framerate.SetValue(
+                ui->toggle_video_framerate->checkState() == Qt::Checked);
+            Settings::values.video_framerate.SetValue(ui->video_framerate->value());
+        }
         // Guard if during game and set to game-specific value
         if (Settings::values.use_speed_limit.UsingGlobal()) {
             Settings::values.use_speed_limit.SetValue(ui->toggle_speed_limit->checkState() ==
@@ -118,6 +133,8 @@ void ConfigureGeneral::SetupPerGameUI() {
         // Disables each setting if:
         //  - A game is running (thus settings in use), and
         //  - A non-global setting is applied.
+        ui->toggle_video_framerate->setEnabled(Settings::values.use_video_framerate.UsingGlobal());
+        ui->video_framerate->setEnabled(Settings::values.video_framerate.UsingGlobal());
         ui->toggle_speed_limit->setEnabled(Settings::values.use_speed_limit.UsingGlobal());
         ui->speed_limit->setEnabled(Settings::values.speed_limit.UsingGlobal());
 
@@ -131,11 +148,18 @@ void ConfigureGeneral::SetupPerGameUI() {
 
     ui->button_reset_defaults->setVisible(false);
 
+    ConfigurationShared::SetColoredTristate(
+        ui->toggle_video_framerate, Settings::values.use_video_framerate, use_video_framerate);
     ConfigurationShared::SetColoredTristate(ui->toggle_speed_limit,
                                             Settings::values.use_speed_limit, use_speed_limit);
     ConfigurationShared::SetColoredTristate(ui->use_multi_core, Settings::values.use_multi_core,
                                             use_multi_core);
 
+    connect(ui->toggle_video_framerate, &QCheckBox::clicked, ui->video_framerate, [this]() {
+        ui->video_framerate->setEnabled(
+            ui->toggle_video_framerate->isChecked() &&
+                (use_video_framerate != ConfigurationShared::CheckState::Global));
+    });
     connect(ui->toggle_speed_limit, &QCheckBox::clicked, ui->speed_limit, [this]() {
         ui->speed_limit->setEnabled(ui->toggle_speed_limit->isChecked() &&
                                     (use_speed_limit != ConfigurationShared::CheckState::Global));

src/yuzu/configuration/configure_general.h

@@ -46,6 +46,7 @@ private:
     std::unique_ptr<Ui::ConfigureGeneral> ui;
 
     ConfigurationShared::CheckState use_speed_limit;
+    ConfigurationShared::CheckState use_video_framerate;
     ConfigurationShared::CheckState use_multi_core;
 
     const Core::System& system;

src/yuzu/configuration/configure_general.ui

@@ -89,6 +89,33 @@
             </property>
            </widget>
           </item>
+          <item>
+            <layout class="QHBoxLayout" name="horizontalLayout_3">
+              <item>
+                <widget class="QCheckBox" name="toggle_video_framerate">
+                  <property name="text">
+                    <string>Limit Videos Framerate</string>
+                  </property>
+                </widget>
+              </item>
+              <item>
+                <widget class="QSpinBox" name="video_framerate">
+                  <property name="suffix">
+                    <string>fps</string>
+                  </property>
+                  <property name="minimum">
+                    <number>1</number>
+                  </property>
+                  <property name="maximum">
+                    <number>240</number>
+                  </property>
+                  <property name="value">
+                    <number>30</number>
+                  </property>
+                </widget>
+              </item>
+             </layout>
+           </item>
          </layout>
         </item>
        </layout>