Browse Source
Merge pull request #11112 from danilaml/nvdec-deinterlace
Use initial_frame to check interlaced flag
pull/15/merge
liamwhite
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
3 deletions
-
externals/ffmpeg/CMakeLists.txt
-
src/video_core/host1x/codecs/codec.cpp
|
|
|
@ -164,7 +164,7 @@ if (NOT WIN32 AND NOT ANDROID) |
|
|
|
--enable-decoder=h264 |
|
|
|
--enable-decoder=vp8 |
|
|
|
--enable-decoder=vp9 |
|
|
|
--enable-filter=yadif |
|
|
|
--enable-filter=yadif,scale |
|
|
|
--cc="${FFmpeg_CC}" |
|
|
|
--cxx="${FFmpeg_CXX}" |
|
|
|
${FFmpeg_HWACCEL_FLAGS} |
|
|
|
@ -254,7 +254,7 @@ elseif(ANDROID) |
|
|
|
set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE) |
|
|
|
elseif(WIN32) |
|
|
|
# Use yuzu FFmpeg binaries |
|
|
|
set(FFmpeg_EXT_NAME "ffmpeg-5.1.3") |
|
|
|
set(FFmpeg_EXT_NAME "ffmpeg-6.0") |
|
|
|
set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") |
|
|
|
download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") |
|
|
|
set(FFmpeg_FOUND YES) |
|
|
|
|
|
|
|
@ -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) { |
|
|
|
|
