summaryrefslogtreecommitdiff
path: root/src/video_core/host1x/codecs
diff options
context:
space:
mode:
authorGravatar liamwhite2023-08-02 14:25:52 -0400
committerGravatar GitHub2023-08-02 14:25:52 -0400
commitfca7d975fdbeb1c63677b80efc03920affee4b12 (patch)
treebbded6cf80886c6def87bae92cf6784340165de9 /src/video_core/host1x/codecs
parentMerge pull request #11204 from liamwhite/eds3-blend-amd (diff)
parentconfig(qt): Fix name of network category (diff)
downloadyuzu-fca7d975fdbeb1c63677b80efc03920affee4b12.tar.gz
yuzu-fca7d975fdbeb1c63677b80efc03920affee4b12.tar.xz
yuzu-fca7d975fdbeb1c63677b80efc03920affee4b12.zip
Merge pull request #10839 from lat9nq/pgc-plus
general: Reimplement per-game configurations
Diffstat (limited to 'src/video_core/host1x/codecs')
-rw-r--r--src/video_core/host1x/codecs/codec.cpp2
-rw-r--r--src/video_core/host1x/codecs/h264.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/host1x/codecs/codec.cpp b/src/video_core/host1x/codecs/codec.cpp
index da07a556f..220cce28a 100644
--- a/src/video_core/host1x/codecs/codec.cpp
+++ b/src/video_core/host1x/codecs/codec.cpp
@@ -247,7 +247,7 @@ void Codec::Initialize() {
247 av_codec = avcodec_find_decoder(codec); 247 av_codec = avcodec_find_decoder(codec);
248 248
249 InitializeAvCodecContext(); 249 InitializeAvCodecContext();
250 if (Settings::values.nvdec_emulation.GetValue() == Settings::NvdecEmulation::GPU) { 250 if (Settings::values.nvdec_emulation.GetValue() == Settings::NvdecEmulation::Gpu) {
251 InitializeGpuDecoder(); 251 InitializeGpuDecoder();
252 } 252 }
253 if (const int res = avcodec_open2(av_codec_ctx, av_codec, nullptr); res < 0) { 253 if (const int res = avcodec_open2(av_codec_ctx, av_codec, nullptr); res < 0) {
diff --git a/src/video_core/host1x/codecs/h264.cpp b/src/video_core/host1x/codecs/h264.cpp
index 862904e39..ece79b1e2 100644
--- a/src/video_core/host1x/codecs/h264.cpp
+++ b/src/video_core/host1x/codecs/h264.cpp
@@ -84,7 +84,7 @@ std::span<const u8> H264::ComposeFrame(const Host1x::NvdecCommon::NvdecRegisters
84 84
85 // TODO (ameerj): Where do we get this number, it seems to be particular for each stream 85 // TODO (ameerj): Where do we get this number, it seems to be particular for each stream
86 const auto nvdec_decoding = Settings::values.nvdec_emulation.GetValue(); 86 const auto nvdec_decoding = Settings::values.nvdec_emulation.GetValue();
87 const bool uses_gpu_decoding = nvdec_decoding == Settings::NvdecEmulation::GPU; 87 const bool uses_gpu_decoding = nvdec_decoding == Settings::NvdecEmulation::Gpu;
88 const u32 max_num_ref_frames = uses_gpu_decoding ? 6u : 16u; 88 const u32 max_num_ref_frames = uses_gpu_decoding ? 6u : 16u;
89 writer.WriteUe(max_num_ref_frames); 89 writer.WriteUe(max_num_ref_frames);
90 writer.WriteBit(false); 90 writer.WriteBit(false);