summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar liamwhite2023-08-29 09:27:22 -0400
committerGravatar GitHub2023-08-29 09:27:22 -0400
commitd360abadba9b8d3c1748f1e55ea3421cd1be4a53 (patch)
tree5901b223c88ae9d9fe92672a4dbf6188968f84ed /src
parentMerge pull request #11392 from t895/layout-troubles (diff)
parentUse initial_frame to check interlaced flag (diff)
downloadyuzu-d360abadba9b8d3c1748f1e55ea3421cd1be4a53.tar.gz
yuzu-d360abadba9b8d3c1748f1e55ea3421cd1be4a53.tar.xz
yuzu-d360abadba9b8d3c1748f1e55ea3421cd1be4a53.zip
Merge pull request #11112 from danilaml/nvdec-deinterlace
Use initial_frame to check interlaced flag
Diffstat (limited to '')
-rw-r--r--src/video_core/host1x/codecs/codec.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/video_core/host1x/codecs/codec.cpp b/src/video_core/host1x/codecs/codec.cpp
index 220cce28a..8d7da50fc 100644
--- a/src/video_core/host1x/codecs/codec.cpp
+++ b/src/video_core/host1x/codecs/codec.cpp
@@ -319,6 +319,7 @@ void Codec::Decode() {
319 LOG_WARNING(Service_NVDRV, "Zero width or height in frame"); 319 LOG_WARNING(Service_NVDRV, "Zero width or height in frame");
320 return; 320 return;
321 } 321 }
322 bool is_interlaced = initial_frame->interlaced_frame != 0;
322 if (av_codec_ctx->hw_device_ctx) { 323 if (av_codec_ctx->hw_device_ctx) {
323 final_frame = AVFramePtr{av_frame_alloc(), AVFrameDeleter}; 324 final_frame = AVFramePtr{av_frame_alloc(), AVFrameDeleter};
324 ASSERT_MSG(final_frame, "av_frame_alloc final_frame failed"); 325 ASSERT_MSG(final_frame, "av_frame_alloc final_frame failed");
@@ -334,7 +335,7 @@ void Codec::Decode() {
334 UNIMPLEMENTED_MSG("Unexpected video format: {}", final_frame->format); 335 UNIMPLEMENTED_MSG("Unexpected video format: {}", final_frame->format);
335 return; 336 return;
336 } 337 }
337 if (!final_frame->interlaced_frame) { 338 if (!is_interlaced) {
338 av_frames.push(std::move(final_frame)); 339 av_frames.push(std::move(final_frame));
339 } else { 340 } else {
340 if (!filters_initialized) { 341 if (!filters_initialized) {