summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMai M <mathew1800@gmail.com>2021-08-09 01:02:39 +0200
committerGitHub <noreply@github.com>2021-08-09 01:02:39 +0200
commit2da91ec75bc2a3af81211e2a91f875e9534ea843 (patch)
treede2d4cde08018d3c86bf0c8f25e2d6eba6d789c8
parentMerge pull request #6843 from FernandoS27/lives-in-a-pineapple-under-the-sea-2 (diff)
parentvp9: Ensure the first frame is complete (diff)
downloadyuzu-2da91ec75bc2a3af81211e2a91f875e9534ea843.tar
yuzu-2da91ec75bc2a3af81211e2a91f875e9534ea843.tar.gz
yuzu-2da91ec75bc2a3af81211e2a91f875e9534ea843.tar.bz2
yuzu-2da91ec75bc2a3af81211e2a91f875e9534ea843.tar.lz
yuzu-2da91ec75bc2a3af81211e2a91f875e9534ea843.tar.xz
yuzu-2da91ec75bc2a3af81211e2a91f875e9534ea843.tar.zst
yuzu-2da91ec75bc2a3af81211e2a91f875e9534ea843.zip
-rw-r--r--src/video_core/command_classes/codecs/vp9.cpp4
-rw-r--r--src/video_core/command_classes/codecs/vp9_types.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/command_classes/codecs/vp9.cpp b/src/video_core/command_classes/codecs/vp9.cpp
index 7eecb3991..70030066a 100644
--- a/src/video_core/command_classes/codecs/vp9.cpp
+++ b/src/video_core/command_classes/codecs/vp9.cpp
@@ -397,14 +397,14 @@ Vp9FrameContainer VP9::GetCurrentFrame(const NvdecCommon::NvdecRegisters& state)
next_frame = std::move(temp);
} else {
next_frame.info = current_frame.info;
- next_frame.bit_stream = std::move(current_frame.bit_stream);
+ next_frame.bit_stream = current_frame.bit_stream;
}
return current_frame;
}
std::vector<u8> VP9::ComposeCompressedHeader() {
VpxRangeEncoder writer{};
- const bool update_probs = current_frame_info.show_frame && !current_frame_info.is_key_frame;
+ const bool update_probs = !current_frame_info.is_key_frame && current_frame_info.show_frame;
if (!current_frame_info.lossless) {
if (static_cast<u32>(current_frame_info.transform_mode) >= 3) {
writer.Write(3, 2);
diff --git a/src/video_core/command_classes/codecs/vp9_types.h b/src/video_core/command_classes/codecs/vp9_types.h
index 6820afa26..87eafdb03 100644
--- a/src/video_core/command_classes/codecs/vp9_types.h
+++ b/src/video_core/command_classes/codecs/vp9_types.h
@@ -176,7 +176,7 @@ struct PictureInfo {
.frame_size_changed = (vp9_flags & FrameFlags::FrameSizeChanged) != 0,
.error_resilient_mode = (vp9_flags & FrameFlags::ErrorResilientMode) != 0,
.last_frame_shown = (vp9_flags & FrameFlags::LastShowFrame) != 0,
- .show_frame = false,
+ .show_frame = true,
.ref_frame_sign_bias = ref_frame_sign_bias,
.base_q_index = base_q_index,
.y_dc_delta_q = y_dc_delta_q,