diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-08-29 09:27:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-29 09:27:22 -0400 |
| commit | d360abadba9b8d3c1748f1e55ea3421cd1be4a53 (patch) | |
| tree | 5901b223c88ae9d9fe92672a4dbf6188968f84ed /src | |
| parent | 2f18fa5cd1258b38110dbe05fb26aaefc5b45e3b (diff) | |
| parent | 164f880f2385c8c7e3498286eebb9ef4782674c3 (diff) | |
Merge pull request #11112 from danilaml/nvdec-deinterlace
Use initial_frame to check interlaced flag
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/host1x/codecs/codec.cpp | 3 |
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() { LOG_WARNING(Service_NVDRV, "Zero width or height in frame"); return; } + bool is_interlaced = initial_frame->interlaced_frame != 0; if (av_codec_ctx->hw_device_ctx) { final_frame = AVFramePtr{av_frame_alloc(), AVFrameDeleter}; ASSERT_MSG(final_frame, "av_frame_alloc final_frame failed"); @@ -334,7 +335,7 @@ void Codec::Decode() { UNIMPLEMENTED_MSG("Unexpected video format: {}", final_frame->format); return; } - if (!final_frame->interlaced_frame) { + if (!is_interlaced) { av_frames.push(std::move(final_frame)); } else { if (!filters_initialized) { |