diff options
| author | lizzie <lizzie@eden-emu.dev> | 2026-04-29 16:41:25 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2026-04-29 16:41:25 +0200 |
| commit | 90515bc6a2c0534fab99e9a10b6ab31c9279fad0 (patch) | |
| tree | 0bf85468c693df65a3e9526b438ad3996d2286bb /src/video_core/host1x/codecs/decoder.cpp | |
| parent | 676b1aabfcd5f755ba82da963763410d7842ddc6 (diff) | |
[host1x] fix ffmpeg not having va-api on freebsd, inline nvenc (#3878)
- fix va-api not being used on freebsd
small thingies dont affect a lot:
- removes some pointer indirection (why save pointer to GMMU if its accesible via host1x)
- use std::variant<> for decoder
- miscelly vp9/v8/h264 opts
Signed-off-by: lizzie <lizzie@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3878
Reviewed-by: crueter <crueter@eden-emu.dev>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Diffstat (limited to 'src/video_core/host1x/codecs/decoder.cpp')
| -rw-r--r--[-rwxr-xr-x] | src/video_core/host1x/codecs/decoder.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/video_core/host1x/codecs/decoder.cpp b/src/video_core/host1x/codecs/decoder.cpp index 887eb28c8c..c75059db6f 100755..100644 --- a/src/video_core/host1x/codecs/decoder.cpp +++ b/src/video_core/host1x/codecs/decoder.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project @@ -12,10 +12,11 @@ namespace Tegra { -Decoder::Decoder(Host1x::Host1x& host1x_, s32 id_, const Host1x::NvdecCommon::NvdecRegisters& regs_, - Host1x::FrameQueue& frame_queue_) - : host1x(host1x_), memory_manager{host1x.GMMU()}, regs{regs_}, id{id_}, frame_queue{ - frame_queue_} {} +Decoder::Decoder(Host1x::Host1x& host1x_, s32 id_, const Host1x::NvdecCommon::NvdecRegisters& regs_) + : host1x(host1x_) + , regs{regs_} + , id{id_} +{} Decoder::~Decoder() = default; @@ -53,11 +54,11 @@ void Decoder::Decode() { } if (UsingDecodeOrder()) { - frame_queue.PushDecodeOrder(id, luma_top, std::move(frame)); - frame_queue.PushDecodeOrder(id, luma_bottom, std::move(frame_copy)); + host1x.frame_queue.PushDecodeOrder(id, luma_top, std::move(frame)); + host1x.frame_queue.PushDecodeOrder(id, luma_bottom, std::move(frame_copy)); } else { - frame_queue.PushPresentOrder(id, luma_top, std::move(frame)); - frame_queue.PushPresentOrder(id, luma_bottom, std::move(frame_copy)); + host1x.frame_queue.PushPresentOrder(id, luma_top, std::move(frame)); + host1x.frame_queue.PushPresentOrder(id, luma_bottom, std::move(frame_copy)); } } else { auto [luma_offset, chroma_offset] = GetProgressiveOffsets(); @@ -68,9 +69,9 @@ void Decoder::Decode() { } if (UsingDecodeOrder()) { - frame_queue.PushDecodeOrder(id, luma_offset, std::move(frame)); + host1x.frame_queue.PushDecodeOrder(id, luma_offset, std::move(frame)); } else { - frame_queue.PushPresentOrder(id, luma_offset, std::move(frame)); + host1x.frame_queue.PushPresentOrder(id, luma_offset, std::move(frame)); } } } |
