diff options
author | Liam <byteslice@airmail.cc> | 2023-06-08 07:15:51 +0200 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-06-08 07:15:51 +0200 |
commit | 6c34adb1de2965a9c5800970703bb1288764026f (patch) | |
tree | 419d795b517fa790a42ca90ce8f17bda41e85af7 /src/core/hle/service | |
parent | Merge pull request #10650 from qurious-pixel/android_tv (diff) | |
download | yuzu-6c34adb1de2965a9c5800970703bb1288764026f.tar yuzu-6c34adb1de2965a9c5800970703bb1288764026f.tar.gz yuzu-6c34adb1de2965a9c5800970703bb1288764026f.tar.bz2 yuzu-6c34adb1de2965a9c5800970703bb1288764026f.tar.lz yuzu-6c34adb1de2965a9c5800970703bb1288764026f.tar.xz yuzu-6c34adb1de2965a9c5800970703bb1288764026f.tar.zst yuzu-6c34adb1de2965a9c5800970703bb1288764026f.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp | 4 | ||||
-rw-r--r-- | src/core/hle/service/nvnflinger/nvnflinger.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp index 0c7aee1b8..dc45169ad 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp @@ -69,7 +69,7 @@ NvResult nvhost_nvdec::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> in void nvhost_nvdec::OnOpen(DeviceFD fd) { LOG_INFO(Service_NVDRV, "NVDEC video stream started"); - system.AudioCore().SetNVDECActive(true); + system.SetNVDECActive(true); } void nvhost_nvdec::OnClose(DeviceFD fd) { @@ -79,7 +79,7 @@ void nvhost_nvdec::OnClose(DeviceFD fd) { if (iter != host1x_file.fd_to_id.end()) { system.GPU().ClearCdmaInstance(iter->second); } - system.AudioCore().SetNVDECActive(false); + system.SetNVDECActive(false); } } // namespace Service::Nvidia::Devices diff --git a/src/core/hle/service/nvnflinger/nvnflinger.cpp b/src/core/hle/service/nvnflinger/nvnflinger.cpp index 4988e6e17..da2d5890f 100644 --- a/src/core/hle/service/nvnflinger/nvnflinger.cpp +++ b/src/core/hle/service/nvnflinger/nvnflinger.cpp @@ -324,6 +324,10 @@ s64 Nvnflinger::GetNextTicks() const { speed_scale = 0.01f; } } + if (system.GetNVDECActive() && settings.use_video_framerate.GetValue()) { + // Run at intended presentation rate during video playback. + speed_scale = 1.f; + } // As an extension, treat nonpositive swap interval as framerate multiplier. const f32 effective_fps = swap_interval <= 0 ? 120.f * static_cast<f32>(1 - swap_interval) |