aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/video_core/host1x/nvdec.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_core/host1x/nvdec.cpp')
-rw-r--r--src/video_core/host1x/nvdec.cpp62
1 files changed, 50 insertions, 12 deletions
diff --git a/src/video_core/host1x/nvdec.cpp b/src/video_core/host1x/nvdec.cpp
index b8f5866d3..741a7d5c1 100644
--- a/src/video_core/host1x/nvdec.cpp
+++ b/src/video_core/host1x/nvdec.cpp
@@ -2,6 +2,12 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include "common/assert.h"
+
+#include "common/polyfill_thread.h"
+#include "common/settings.h"
+#include "video_core/host1x/codecs/h264.h"
+#include "video_core/host1x/codecs/vp8.h"
+#include "video_core/host1x/codecs/vp9.h"
#include "video_core/host1x/host1x.h"
#include "video_core/host1x/nvdec.h"
@@ -10,37 +16,69 @@ namespace Tegra::Host1x {
#define NVDEC_REG_INDEX(field_name) \
(offsetof(NvdecCommon::NvdecRegisters, field_name) / sizeof(u64))
-Nvdec::Nvdec(Host1x& host1x_)
- : host1x(host1x_), state{}, codec(std::make_unique<Codec>(host1x, state)) {}
+Nvdec::Nvdec(Host1x& host1x_, s32 id_, u32 syncpt, FrameQueue& frame_queue_)
+ : CDmaPusher{host1x_, id_}, id{id_}, syncpoint{syncpt}, frame_queue{frame_queue_} {
+ LOG_INFO(HW_GPU, "Created nvdec {}", id);
+ frame_queue.Open(id);
+}
-Nvdec::~Nvdec() = default;
+Nvdec::~Nvdec() {
+ LOG_INFO(HW_GPU, "Destroying nvdec {}", id);
+}
void Nvdec::ProcessMethod(u32 method, u32 argument) {
- state.reg_array[method] = static_cast<u64>(argument) << 8;
+ regs.reg_array[method] = argument;
switch (method) {
case NVDEC_REG_INDEX(set_codec_id):
- codec->SetTargetCodec(static_cast<NvdecCommon::VideoCodec>(argument));
+ CreateDecoder(static_cast<NvdecCommon::VideoCodec>(argument));
break;
- case NVDEC_REG_INDEX(execute):
+ case NVDEC_REG_INDEX(execute): {
+ if (wait_needed) {
+ std::this_thread::sleep_for(std::chrono::milliseconds(32));
+ wait_needed = false;
+ }
Execute();
- break;
+ } break;
}
}
-std::unique_ptr<FFmpeg::Frame> Nvdec::GetFrame() {
- return codec->GetCurrentFrame();
+void Nvdec::CreateDecoder(NvdecCommon::VideoCodec codec) {
+ if (decoder.get()) {
+ return;
+ }
+ switch (codec) {
+ case NvdecCommon::VideoCodec::H264:
+ decoder = std::make_unique<Decoders::H264>(host1x, regs, id, frame_queue);
+ break;
+ case NvdecCommon::VideoCodec::VP8:
+ decoder = std::make_unique<Decoders::VP8>(host1x, regs, id, frame_queue);
+ break;
+ case NvdecCommon::VideoCodec::VP9:
+ decoder = std::make_unique<Decoders::VP9>(host1x, regs, id, frame_queue);
+ break;
+ default:
+ UNIMPLEMENTED_MSG("Codec {}", decoder->GetCurrentCodecName());
+ break;
+ }
+ LOG_INFO(HW_GPU, "Created decoder {} for id {}", decoder->GetCurrentCodecName(), id);
}
void Nvdec::Execute() {
- switch (codec->GetCurrentCodec()) {
+ if (Settings::values.nvdec_emulation.GetValue() == Settings::NvdecEmulation::Off) [[unlikely]] {
+ // Signalling syncpts too fast can cause games to get stuck as they don't expect a <1ms
+ // execution time. Sleep for half of a 60 fps frame just in case.
+ std::this_thread::sleep_for(std::chrono::milliseconds(8));
+ return;
+ }
+ switch (decoder->GetCurrentCodec()) {
case NvdecCommon::VideoCodec::H264:
case NvdecCommon::VideoCodec::VP8:
case NvdecCommon::VideoCodec::VP9:
- codec->Decode();
+ decoder->Decode();
break;
default:
- UNIMPLEMENTED_MSG("Codec {}", codec->GetCurrentCodecName());
+ UNIMPLEMENTED_MSG("Codec {}", decoder->GetCurrentCodecName());
break;
}
}