diff --git a/src/video_core/host1x/codecs/decoder.cpp b/src/video_core/host1x/codecs/decoder.cpp index 49a601969c..877219ec44 100755 --- a/src/video_core/host1x/codecs/decoder.cpp +++ b/src/video_core/host1x/codecs/decoder.cpp @@ -41,7 +41,7 @@ void Decoder::Decode() { if (!frame.get()) { LOG_ERROR(HW_GPU, - "Nvdec {} dailed to decode interlaced frame for top 0x{:X} bottom 0x{:X}", id, + "Nvdec {} failed to decode interlaced frame for top 0x{:X} bottom 0x{:X}", id, luma_top, luma_bottom); } diff --git a/src/video_core/host1x/ffmpeg/ffmpeg.cpp b/src/video_core/host1x/ffmpeg/ffmpeg.cpp index 6609752bdb..118c0d2eea 100644 --- a/src/video_core/host1x/ffmpeg/ffmpeg.cpp +++ b/src/video_core/host1x/ffmpeg/ffmpeg.cpp @@ -36,8 +36,9 @@ constexpr std::array PreferredGpuDecoders = { AV_HWDEVICE_TYPE_CUDA, AV_HWDEVICE_TYPE_VAAPI, AV_HWDEVICE_TYPE_VDPAU, +#elif defined(__ANDROID__) + AV_HWDEVICE_TYPE_MEDIACODEC #endif - AV_HWDEVICE_TYPE_VULKAN, }; AVPixelFormat GetGpuFormat(AVCodecContext* codec_context, const AVPixelFormat* pix_fmts) { diff --git a/src/video_core/host1x/nvdec.h b/src/video_core/host1x/nvdec.h index 565c65f663..3f25a2c59b 100644 --- a/src/video_core/host1x/nvdec.h +++ b/src/video_core/host1x/nvdec.h @@ -45,7 +45,7 @@ private: NvdecCommon::NvdecRegisters regs{}; std::unique_ptr decoder; - bool wait_needed{false}; + bool wait_needed{true}; }; } // namespace Host1x