VERY experimental Nintendo Switch 2 emulator
C++
[host1x] Fix FFmpeg crash on Linux (#37)
MaranBre9ca3f4c069b
diff --git a/.ci/linux/build.sh b/.ci/linux/build.shindex aa15333ac2..093b30a7ea 100755--- a/.ci/linux/build.sh+++ b/.ci/linux/build.sh@@ -36,15 +36,16 @@ case "$1" inARCH=armv9ARCH_FLAGS="-march=armv9-a -mtune=generic -w";;+ *)+ echo "Invalid target $1 specified, must be one of amd64, steamdeck, allyx, rog-ally, legacy, aarch64, armv9"+ exit 1+ ;;esacexport ARCH_FLAGS="$ARCH_FLAGS -O3"-NPROC="$2"if [ -z "$NPROC" ]; thenNPROC="$(nproc)"-else- shiftfiif [ "$1" != "" ]; then shift; fi@@ -72,11 +73,15 @@ elseMULTIMEDIA=ONfi+if [ -z "$BUILD_TYPE" ]; then+ export BUILD_TYPE="Release"+fi+export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" $@)mkdir -p build && cd buildcmake .. -G Ninja \- -DCMAKE_BUILD_TYPE=Release \+ -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \-DENABLE_QT_TRANSLATION=ON \-DUSE_DISCORD_PRESENCE=ON \-DCMAKE_CXX_FLAGS="$ARCH_FLAGS" \diff --git a/.ci/windows/build.sh b/.ci/windows/build.shindex 667fd316fa..d0c697655a 100644--- a/.ci/windows/build.sh+++ b/.ci/windows/build.sh@@ -17,6 +17,10 @@ elseexport EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DYUZU_USE_BUNDLED_QT=OFF)fi+if [ -z "$BUILD_TYPE" ]; then+ export BUILD_TYPE="Release"+fi+if [ "$WINDEPLOYQT" == "" ]; thenecho "You must supply the WINDEPLOYQT environment variable."exit 1@@ -38,7 +42,7 @@ export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" $@)mkdir -p build && cd buildcmake .. -G Ninja \- -DCMAKE_BUILD_TYPE=Release \+ -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \-DENABLE_QT_TRANSLATION=ON \-DUSE_DISCORD_PRESENCE=ON \-DYUZU_USE_BUNDLED_SDL2=OFF \diff --git a/src/video_core/host1x/ffmpeg/ffmpeg.cpp b/src/video_core/host1x/ffmpeg/ffmpeg.cppindex 5321c8c98c..d6eff2bdd7 100644--- a/src/video_core/host1x/ffmpeg/ffmpeg.cpp+++ b/src/video_core/host1x/ffmpeg/ffmpeg.cpp@@ -216,18 +216,16 @@ bool DecoderContext::OpenContext(const Decoder& decoder) {bool DecoderContext::SendPacket(const Packet& packet) {m_temp_frame = std::make_shared<Frame>();-- if (const int ret = avcodec_send_packet(m_codec_context, packet.GetPacket()); ret < 0) {+ if (const int ret = avcodec_send_packet(m_codec_context, packet.GetPacket()); ret < 0 && ret != AVERROR_EOF) {LOG_ERROR(HW_GPU, "avcodec_send_packet error: {}", AVError(ret));return false;}-return true;}std::shared_ptr<Frame> DecoderContext::ReceiveFrame() {auto ReceiveImpl = [&](AVFrame* frame) -> bool {- if (const int ret = avcodec_receive_frame(m_codec_context, frame); ret < 0) {+ if (const int ret = avcodec_receive_frame(m_codec_context, frame); ret < 0 && ret != AVERROR_EOF) {LOG_ERROR(HW_GPU, "avcodec_receive_frame error: {}", AVError(ret));return false;}