diff options
author | Feng Chen <vonchenplus@gmail.com> | 2021-12-03 05:31:07 +0100 |
---|---|---|
committer | vonchenplus <vonchenplus@gmail.com> | 2021-12-04 17:06:14 +0100 |
commit | 5462485cc3835941713b835bce3b671b15d210b7 (patch) | |
tree | e054071cd06fd36a0ca03478e168cb866a057b15 /src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp | |
parent | Support multiple videos playing (diff) | |
download | yuzu-5462485cc3835941713b835bce3b671b15d210b7.tar yuzu-5462485cc3835941713b835bce3b671b15d210b7.tar.gz yuzu-5462485cc3835941713b835bce3b671b15d210b7.tar.bz2 yuzu-5462485cc3835941713b835bce3b671b15d210b7.tar.lz yuzu-5462485cc3835941713b835bce3b671b15d210b7.tar.xz yuzu-5462485cc3835941713b835bce3b671b15d210b7.tar.zst yuzu-5462485cc3835941713b835bce3b671b15d210b7.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp index 8e2a16d86..8314d1ec2 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp @@ -20,8 +20,12 @@ NvResult nvhost_nvdec::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& switch (command.group) { case 0x0: switch (command.cmd) { - case 0x1: + case 0x1: { + if (!fd_to_id.contains(fd)) { + fd_to_id[fd] = next_id++; + } return Submit(fd, input, output); + } case 0x2: return GetSyncpoint(input, output); case 0x3: @@ -62,15 +66,13 @@ NvResult nvhost_nvdec::Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& return NvResult::NotImplemented; } -void nvhost_nvdec::OnOpen(DeviceFD fd) { - static u32 next_id{}; - fd_to_id[fd] = next_id++; -} +void nvhost_nvdec::OnOpen(DeviceFD fd) {} void nvhost_nvdec::OnClose(DeviceFD fd) { LOG_INFO(Service_NVDRV, "NVDEC video stream ended"); - if (fd_to_id.find(fd) != fd_to_id.end()) { - system.GPU().ClearCdmaInstance(fd_to_id[fd]); + const auto iter = fd_to_id.find(fd); + if (iter != fd_to_id.end()) { + system.GPU().ClearCdmaInstance(iter->second); } } |