diff --git a/.gitmodules b/.gitmodules index f352d478..0d95d984 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "dependencies/ZArchive"] path = dependencies/ZArchive - url = https://github.com/Exzap/ZArchive + url = https://github.com/SSimco/ZArchive shallow = true [submodule "dependencies/cubeb"] path = dependencies/cubeb diff --git a/CMakeLists.txt b/CMakeLists.txt index c988508c..17390911 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,13 +17,20 @@ if (EXPERIMENTAL_VERSION) endif() if (ENABLE_VCPKG) - if(UNIX AND NOT APPLE) + + if(UNIX AND NOT APPLE AND NOT VCPKG_TARGET_ANDROID) set(VCPKG_OVERLAY_PORTS "${CMAKE_CURRENT_LIST_DIR}/dependencies/vcpkg_overlay_ports_linux") else() set(VCPKG_OVERLAY_PORTS "${CMAKE_CURRENT_LIST_DIR}/dependencies/vcpkg_overlay_ports") endif() - set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/vcpkg/scripts/buildsystems/vcpkg.cmake" - CACHE STRING "Vcpkg toolchain file") + if(VCPKG_TARGET_ANDROID) + set(ENV{ANDROID_NDK_HOME} ${ANDROID_NDK}) + set(ENV{VCPKG_ROOT} "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/vcpkg") + include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/vcpkg_android.cmake") + else() + set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/vcpkg/scripts/buildsystems/vcpkg.cmake" + CACHE STRING "Vcpkg toolchain file") + endif() # Set this so that all the various find_package() calls don't need an explicit # CONFIG option set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE) @@ -50,8 +57,10 @@ endif() set_property(GLOBAL PROPERTY USE_FOLDERS ON) # enable link time optimization for release builds -set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ON) -set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO ON) +if(NOT ANDROID) + set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ON) + set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO ON) +endif() if (MSVC) set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT CemuBin) @@ -122,11 +131,17 @@ option(ENABLE_WXWIDGETS "Build with wxWidgets UI (Currently required)" ON) set(THREADS_PREFER_PTHREAD_FLAG true) find_package(Threads REQUIRED) -find_package(SDL2 REQUIRED) +if(ENABLE_SDL) + find_package(SDL2 REQUIRED) + add_compile_definitions("HAS_SDL=1") +endif() find_package(CURL REQUIRED) find_package(pugixml REQUIRED) find_package(RapidJSON REQUIRED) find_package(Boost COMPONENTS program_options filesystem nowide REQUIRED) +if(ANDROID) + find_package(Boost COMPONENTS context iostreams REQUIRED) +endif() find_package(libzip REQUIRED) find_package(glslang REQUIRED) find_package(ZLIB REQUIRED) @@ -141,7 +156,7 @@ if (NOT TARGET glslang::SPIRV AND TARGET SPIRV) add_library(glslang::SPIRV ALIAS SPIRV) endif() -if (UNIX AND NOT APPLE) +if (UNIX AND NOT APPLE AND NOT ANDROID) find_package(X11 REQUIRED) if (ENABLE_WAYLAND) find_package(Wayland REQUIRED Client) @@ -180,7 +195,7 @@ if (ENABLE_HIDAPI) add_compile_definitions(HAS_HIDAPI) endif () -if(UNIX AND NOT APPLE) +if(UNIX AND NOT APPLE AND NOT ANDROID) if(ENABLE_FERAL_GAMEMODE) add_compile_definitions(ENABLE_FERAL_GAMEMODE) add_subdirectory(dependencies/gamemode EXCLUDE_FROM_ALL) diff --git a/cmake/vcpkg_android.cmake b/cmake/vcpkg_android.cmake new file mode 100644 index 00000000..3f09b111 --- /dev/null +++ b/cmake/vcpkg_android.cmake @@ -0,0 +1,99 @@ +# +# vcpkg_android.cmake +# +# Helper script when using vcpkg with cmake. It should be triggered via the variable VCPKG_TARGET_ANDROID +# +# For example: +# if (VCPKG_TARGET_ANDROID) +# include("cmake/vcpkg_android.cmake") +# endif() +# +# This script will: +# 1 & 2. check the presence of needed env variables: ANDROID_NDK_HOME and VCPKG_ROOT +# 3. set VCPKG_TARGET_TRIPLET according to ANDROID_ABI +# 4. Combine vcpkg and Android toolchains by setting CMAKE_TOOLCHAIN_FILE +# and VCPKG_CHAINLOAD_TOOLCHAIN_FILE + +# Note: VCPKG_TARGET_ANDROID is not an official Vcpkg variable. +# it is introduced for the need of this script + +if (VCPKG_TARGET_ANDROID) + + # + # 1. Check the presence of environment variable ANDROID_NDK_HOME + # + if (NOT DEFINED ENV{ANDROID_NDK_HOME}) + message(FATAL_ERROR " + Please set an environment variable ANDROID_NDK_HOME + For example: + export ANDROID_NDK_HOME=/home/your-account/Android/Sdk/ndk-bundle + Or: + export ANDROID_NDK_HOME=/home/your-account/Android/android-ndk-r21b + ") + endif() + + # + # 2. Check the presence of environment variable VCPKG_ROOT + # + if (NOT DEFINED ENV{VCPKG_ROOT}) + message(FATAL_ERROR " + Please set an environment variable VCPKG_ROOT + For example: + export VCPKG_ROOT=/path/to/vcpkg + ") + endif() + + + # + # 3. Set VCPKG_TARGET_TRIPLET according to ANDROID_ABI + # + # There are four different Android ABI, each of which maps to + # a vcpkg triplet. The following table outlines the mapping from vcpkg architectures to android architectures + # + # |VCPKG_TARGET_TRIPLET | ANDROID_ABI | + # |---------------------------|----------------------| + # |arm64-android | arm64-v8a | + # |arm-android | armeabi-v7a | + # |x64-android | x86_64 | + # |x86-android | x86 | + # + # The variable must be stored in the cache in order to successfully the two toolchains. + # + if (ANDROID_ABI MATCHES "arm64-v8a") + set(VCPKG_TARGET_TRIPLET "arm64-android" CACHE STRING "" FORCE) + elseif(ANDROID_ABI MATCHES "armeabi-v7a") + set(VCPKG_TARGET_TRIPLET "arm-android" CACHE STRING "" FORCE) + elseif(ANDROID_ABI MATCHES "x86_64") + set(VCPKG_TARGET_TRIPLET "x64-android" CACHE STRING "" FORCE) + elseif(ANDROID_ABI MATCHES "x86") + set(VCPKG_TARGET_TRIPLET "x86-android" CACHE STRING "" FORCE) + else() + message(FATAL_ERROR " + Please specify ANDROID_ABI + For example + cmake ... -DANDROID_ABI=armeabi-v7a + + Possible ABIs are: arm64-v8a, armeabi-v7a, x64-android, x86-android + ") + endif() + message("vcpkg_android.cmake: VCPKG_TARGET_TRIPLET was set to ${VCPKG_TARGET_TRIPLET}") + + + # + # 4. Combine vcpkg and Android toolchains + # + + # vcpkg and android both provide dedicated toolchains: + # + # vcpkg_toolchain_file=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake + # android_toolchain_file=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake + # + # When using vcpkg, the vcpkg toolchain shall be specified first. + # However, vcpkg provides a way to preload and additional toolchain, + # with the VCPKG_CHAINLOAD_TOOLCHAIN_FILE option. + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE $ENV{ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake) + set(CMAKE_TOOLCHAIN_FILE $ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake) + message("vcpkg_android.cmake: CMAKE_TOOLCHAIN_FILE was set to ${CMAKE_TOOLCHAIN_FILE}") + message("vcpkg_android.cmake: VCPKG_CHAINLOAD_TOOLCHAIN_FILE was set to ${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") + +endif(VCPKG_TARGET_ANDROID) diff --git a/dependencies/ZArchive b/dependencies/ZArchive index d2c71773..c50b5d22 160000 --- a/dependencies/ZArchive +++ b/dependencies/ZArchive @@ -1 +1 @@ -Subproject commit d2c717730092c7bf8cbb033b12fd4001b7c4d932 +Subproject commit c50b5d222bb599be9287664c835c2a820aa5342a diff --git a/dependencies/ih264d/decoder/ih264d_dpb_mgr.c b/dependencies/ih264d/decoder/ih264d_dpb_mgr.c index ce977d73..0e36cd32 100644 --- a/dependencies/ih264d/decoder/ih264d_dpb_mgr.c +++ b/dependencies/ih264d/decoder/ih264d_dpb_mgr.c @@ -17,9 +17,6 @@ ***************************************************************************** * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore */ -#ifdef __ANDROID__ -#include -#endif #include "ih264_typedefs.h" #include "ih264_macros.h" #include "ih264_platform_macros.h" @@ -902,10 +899,6 @@ WORD32 ih264d_read_mmco_commands(struct _DecStruct * ps_dec) { if (j >= MAX_REF_BUFS) { -#ifdef __ANDROID__ - ALOGE("b/25818142"); - android_errorWriteLog(0x534e4554, "25818142"); -#endif ps_dpb_cmds->u1_num_of_commands = 0; return -1; } diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index de9a6600..bfccf7cb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,6 +18,8 @@ elseif(UNIX) VK_USE_PLATFORM_MACOS_MVK VK_USE_PLATFORM_METAL_EXT ) + elseif(ANDROID) + add_compile_definitions(VK_USE_PLATFORM_ANDROID_KHR) else() add_compile_definitions( VK_USE_PLATFORM_XLIB_KHR # legacy. Do we need to support XLIB surfaces? @@ -40,7 +42,11 @@ add_compile_definitions(VK_NO_PROTOTYPES) set(CMAKE_INCLUDE_CURRENT_DIR ON) add_subdirectory(Common) -add_subdirectory(gui) +if(ANDROID) + add_subdirectory(android/app/src/main/cpp) +else() + add_subdirectory(gui) +endif() add_subdirectory(Cafe) add_subdirectory(Cemu) add_subdirectory(config) @@ -51,22 +57,28 @@ add_subdirectory(imgui) add_subdirectory(resource) add_subdirectory(asm) -add_executable(CemuBin - main.cpp - mainLLE.cpp -) +if(ANDROID) + add_library(CemuBin STATIC + main.cpp + mainLLE.cpp + ) +else() + add_executable(CemuBin + main.cpp + mainLLE.cpp + ) -if(WIN32) - target_sources(CemuBin PRIVATE - resource/cemu.rc + if(WIN32) + target_sources(CemuBin PRIVATE + resource/cemu.rc ../dist/windows/cemu.manifest ) + endif() + set_property(TARGET CemuBin PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") + set_property(TARGET CemuBin PROPERTY WIN32_EXECUTABLE $>) + set(OUTPUT_NAME "Cemu_$>") endif() -set_property(TARGET CemuBin PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") -set_property(TARGET CemuBin PROPERTY WIN32_EXECUTABLE $>) -set(OUTPUT_NAME "Cemu_$>") - if (MACOS_BUNDLE) set_property(TARGET CemuBin PROPERTY MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/resource/MacOSXBundleInfo.plist.in") @@ -115,13 +127,22 @@ target_link_libraries(CemuBin PRIVATE CemuCommon CemuComponents CemuConfig - CemuGui CemuInput CemuUtil - OpenGL::GL - SDL2::SDL2 ) +if(NOT ANDROID) + target_link_libraries(CemuBin PRIVATE CemuGui) +endif() + +if(ENABLE_OPENGL) + target_link_libraries(CemuBin PRIVATE OpenGL::GL) +endif() + +if(ENABLE_SDL) + target_link_libraries(CemuBin PRIVATE SDL2::SDL2) +endif() + if(UNIX AND NOT APPLE) # due to nasm output some linkers will make stack executable # cemu does not require this so we explicity disable it diff --git a/src/Cafe/CMakeLists.txt b/src/Cafe/CMakeLists.txt index 29c5a0b3..c8470064 100644 --- a/src/Cafe/CMakeLists.txt +++ b/src/Cafe/CMakeLists.txt @@ -497,6 +497,13 @@ if(APPLE) target_sources(CemuCafe PRIVATE "HW/Latte/Renderer/Vulkan/CocoaSurface.mm") endif() +if(ANDROID) + target_sources(CemuCafe PRIVATE + Filesystem/fscDeviceAndroidSAF.cpp + Filesystem/fscDeviceAndroidSAF.h + ) +endif() + set_property(TARGET CemuCafe PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") target_include_directories(CemuCafe PUBLIC "../") @@ -507,7 +514,6 @@ target_link_libraries(CemuCafe PRIVATE CemuCommon CemuComponents CemuConfig - CemuGui CemuInput CemuResource CemuUtil @@ -543,10 +549,6 @@ if (ENABLE_NSYSHID_LIBUSB) endif () endif () -if (ENABLE_WXWIDGETS) - target_link_libraries(CemuCafe PRIVATE wx::base wx::core) -endif() - if(WIN32) target_link_libraries(CemuCafe PRIVATE iphlpapi) endif() diff --git a/src/Cafe/CafeSystem.cpp b/src/Cafe/CafeSystem.cpp index 30dab1d4..4bc6e8a0 100644 --- a/src/Cafe/CafeSystem.cpp +++ b/src/Cafe/CafeSystem.cpp @@ -1,5 +1,4 @@ #include "Cafe/OS/common/OSCommon.h" -#include "gui/wxgui.h" #include "Cafe/OS/libs/gx2/GX2.h" #include "Cafe/GameProfile/GameProfile.h" #include "Cafe/HW/Espresso/Interpreter/PPCInterpreterInternal.h" @@ -61,9 +60,6 @@ // HW interfaces #include "Cafe/HW/SI/si.h" -// dependency to be removed -#include "gui/guiWrapper.h" - #include #if BOOST_OS_LINUX @@ -168,7 +164,7 @@ void LoadMainExecutable() applicationRPX = RPLLoader_LoadFromMemory(rpxData, rpxSize, (char*)_pathToExecutable.c_str()); if (!applicationRPX) { - wxMessageBox(_("Failed to run this title because the executable is damaged")); + cemuLog_log(LogType::Force, "Failed to run this title because the executable is damaged"); cemuLog_createLogFile(false); cemuLog_waitForFlush(); exit(0); @@ -353,7 +349,9 @@ uint32 LoadSharedData() void cemu_initForGame() { - gui_updateWindowTitles(false, true, 0.0); + auto cafeSystemCallbacks = CafeSystem::getCafeSystemCallbacks(); + if (cafeSystemCallbacks) + cafeSystemCallbacks->updateWindowTitles(false, true, 0.0); // input manager apply game profile InputManager::instance().apply_game_profile(); // log info for launched title @@ -423,6 +421,20 @@ void cemu_initForGame() namespace CafeSystem { + CafeSystemCallbacks* sCafeSystemCallbacks = nullptr; + void registerCafeSystemCallbacks(CafeSystemCallbacks* cafeSystemCallbacks) + { + sCafeSystemCallbacks = cafeSystemCallbacks; + } + void unregisterCafeSystemCallbacks() + { + sCafeSystemCallbacks = nullptr; + } + CafeSystemCallbacks* getCafeSystemCallbacks() + { + return sCafeSystemCallbacks; + } + void InitVirtualMlcStorage(); void MlcStorageMountTitle(TitleInfo& titleInfo); void MlcStorageUnmountAllTitles(); @@ -798,10 +810,10 @@ namespace CafeSystem // check for content folder fs::path contentPath = executablePath.parent_path().parent_path().append("content"); std::error_code ec; - if (fs::is_directory(contentPath, ec)) + if (cemu::fs::is_directory(contentPath, ec)) { // mounting content folder - bool r = FSCDeviceHostFS_Mount(std::string("/vol/content").c_str(), _pathToUtf8(contentPath), FSC_PRIORITY_BASE); + bool r = FSCDeviceHost_Mount(std::string("/vol/content").c_str(), _pathToUtf8(contentPath), FSC_PRIORITY_BASE); if (!r) { cemuLog_log(LogType::Force, "Failed to mount {}", _pathToUtf8(contentPath)); @@ -810,7 +822,7 @@ namespace CafeSystem } } // mount code folder to a virtual temporary path - FSCDeviceHostFS_Mount(std::string("/internal/code/").c_str(), _pathToUtf8(executablePath.parent_path()), FSC_PRIORITY_BASE); + FSCDeviceHost_Mount(std::string("/internal/code/").c_str(), _pathToUtf8(executablePath.parent_path()), FSC_PRIORITY_BASE); std::string internalExecutablePath = "/internal/code/"; internalExecutablePath.append(_pathToUtf8(executablePath.filename())); _pathToExecutable = internalExecutablePath; @@ -847,7 +859,9 @@ namespace CafeSystem PPCTimer_waitForInit(); // start system sSystemRunning = true; - gui_notifyGameLoaded(); + auto cafeSystemCallbacks = CafeSystem::getCafeSystemCallbacks(); + if (cafeSystemCallbacks) + cafeSystemCallbacks->notifyGameLoaded(); std::thread t(_LaunchTitleThread); t.detach(); } diff --git a/src/Cafe/CafeSystem.h b/src/Cafe/CafeSystem.h index 336c2f40..a1ee557a 100644 --- a/src/Cafe/CafeSystem.h +++ b/src/Cafe/CafeSystem.h @@ -20,6 +20,17 @@ namespace CafeSystem //BAD_META_DATA, - the title list only stores titles with valid meta, so this error code is impossible }; + class CafeSystemCallbacks + { + public: + virtual void updateWindowTitles(bool isIdle, bool isLoading, double fps) = 0; + virtual void notifyGameLoaded() = 0; + }; + + void registerCafeSystemCallbacks(CafeSystemCallbacks* cafeSystemCallbacks); + void unregisterCafeSystemCallbacks(); + CafeSystemCallbacks* getCafeSystemCallbacks(); + void Initialize(); void SetImplementation(SystemImplementation* impl); void Shutdown(); diff --git a/src/Cafe/Filesystem/FST/KeyCache.cpp b/src/Cafe/Filesystem/FST/KeyCache.cpp index 29903e84..425e719e 100644 --- a/src/Cafe/Filesystem/FST/KeyCache.cpp +++ b/src/Cafe/Filesystem/FST/KeyCache.cpp @@ -1,4 +1,3 @@ -#include #include #include @@ -75,7 +74,7 @@ void KeyCache_Prepare() } else { - wxMessageBox(_("Unable to create file keys.txt\nThis can happen if Cemu does not have write permission to its own directory, the disk is full or if anti-virus software is blocking Cemu."), _("Error"), wxOK | wxCENTRE | wxICON_ERROR); + cemuLog_log(LogType::Force, "Unable to create file keys.txt\nThis can happen if Cemu does not have write permission to it's own directory, the disk is full or if anti-virus software is blocking Cemu."); } mtxKeyCache.unlock(); return; @@ -108,8 +107,7 @@ void KeyCache_Prepare() continue; if( strishex(line) == false ) { - auto errorMsg = formatWxString(_("Error in keys.txt at line {}"), lineNumber); - wxMessageBox(errorMsg, _("Error"), wxOK | wxCENTRE | wxICON_ERROR); + cemuLog_log(LogType::Force, "rror in keys.txt in line {}", lineNumber); continue; } if(line.size() == 32 ) diff --git a/src/Cafe/Filesystem/fsc.h b/src/Cafe/Filesystem/fsc.h index 09c1f508..1daa1c2e 100644 --- a/src/Cafe/Filesystem/fsc.h +++ b/src/Cafe/Filesystem/fsc.h @@ -210,3 +210,18 @@ bool FSCDeviceHostFS_Mount(std::string_view mountPath, std::string_view hostTarg // redirect device void fscDeviceRedirect_map(); void fscDeviceRedirect_add(std::string_view virtualSourcePath, const fs::path& targetFilePath, sint32 priority); + +#if __ANDROID__ +#include "Common/unix/FilesystemAndroid.h" +bool FSCDeviceAndroidSAF_Mount(std::string_view mountPath, std::string_view hostTargetPath, sint32 priority); +#endif // __ANDROID__ + +inline bool FSCDeviceHost_Mount(std::string_view mountPath, std::string_view hostTargetPath, sint32 priority) +{ +#if __ANDROID__ + if (FilesystemAndroid::isContentUri(std::string(hostTargetPath))) + return FSCDeviceAndroidSAF_Mount(mountPath, hostTargetPath, priority); + else +#endif // __ANDROID__ + return FSCDeviceHostFS_Mount(mountPath, hostTargetPath, priority); +} diff --git a/src/Cafe/Filesystem/fscDeviceAndroidSAF.cpp b/src/Cafe/Filesystem/fscDeviceAndroidSAF.cpp new file mode 100644 index 00000000..b063dd3b --- /dev/null +++ b/src/Cafe/Filesystem/fscDeviceAndroidSAF.cpp @@ -0,0 +1,235 @@ +#include "Cafe/Filesystem/fscDeviceAndroidSAF.h" + +#include +#include + +#include "Cafe/Filesystem/fsc.h" +#include "Common/FileStream.h" +#include "Common/unix/FilesystemAndroid.h" + +FSCVirtualFile_AndroidSAF::~FSCVirtualFile_AndroidSAF() +{ + if (m_type == FSC_TYPE_FILE) + delete m_fs; +} + +sint32 FSCVirtualFile_AndroidSAF::fscGetType() +{ + return m_type; +} + +uint32 FSCVirtualFile_AndroidSAF::fscDeviceAndroidSAFFSFile_getFileSize() +{ + if (m_type == FSC_TYPE_FILE) + { + if (m_fileSize > 0xFFFFFFFFULL) + cemu_assert_suspicious(); // files larger than 4GB are not supported by Wii U filesystem + return (uint32)m_fileSize; + } + return 0; +} + +uint64 FSCVirtualFile_AndroidSAF::fscQueryValueU64(uint32 id) +{ + if (m_type == FSC_TYPE_FILE) + { + if (id == FSC_QUERY_SIZE) + return fscDeviceAndroidSAFFSFile_getFileSize(); + else if (id == FSC_QUERY_WRITEABLE) + return m_isWritable; + else + cemu_assert_unimplemented(); + } + else if (m_type == FSC_TYPE_DIRECTORY) + { + if (id == FSC_QUERY_SIZE) + return fscDeviceAndroidSAFFSFile_getFileSize(); + else + cemu_assert_unimplemented(); + } + cemu_assert_unimplemented(); + return 0; +} + +uint32 FSCVirtualFile_AndroidSAF::fscWriteData(void* buffer, uint32 size) +{ + throw std::logic_error("write not supported with SAF"); + return 0; +} + +uint32 FSCVirtualFile_AndroidSAF::fscReadData(void* buffer, uint32 size) +{ + if (m_type != FSC_TYPE_FILE) + return 0; + if (size >= (2UL * 1024UL * 1024UL * 1024UL)) + { + cemu_assert_suspicious(); + return 0; + } + uint32 bytesLeft = (uint32)(m_fileSize - m_seek); + bytesLeft = std::min(bytesLeft, 0x7FFFFFFFu); + sint32 bytesToRead = std::min(bytesLeft, size); + uint32 bytesRead = m_fs->readData(buffer, bytesToRead); + m_seek += bytesRead; + return bytesRead; +} + +void FSCVirtualFile_AndroidSAF::fscSetSeek(uint64 seek) +{ + if (m_type != FSC_TYPE_FILE) + return; + this->m_seek = seek; + cemu_assert_debug(seek <= m_fileSize); + m_fs->SetPosition(seek); +} + +uint64 FSCVirtualFile_AndroidSAF::fscGetSeek() +{ + if (m_type != FSC_TYPE_FILE) + return 0; + return m_seek; +} + +void FSCVirtualFile_AndroidSAF::fscSetFileLength(uint64 endOffset) +{ + if (m_type != FSC_TYPE_FILE) + return; + m_fs->SetPosition(endOffset); + bool r = m_fs->SetEndOfFile(); + m_seek = std::min(m_seek, endOffset); + m_fileSize = m_seek; + m_fs->SetPosition(m_seek); + if (!r) + cemuLog_log(LogType::Force, "fscSetFileLength: Failed to set size to 0x{:x}", endOffset); +} + +bool FSCVirtualFile_AndroidSAF::fscDirNext(FSCDirEntry* dirEntry) +{ + if (m_type != FSC_TYPE_DIRECTORY) + return false; + + if (!m_files) + { + // init iterator on first iteration attempt + m_files = std::make_unique>(FilesystemAndroid::listFiles(*m_path)); + m_filesIterator = m_files->begin(); + if (!m_files) + { + cemuLog_log(LogType::Force, "Failed to iterate directory: {}", _pathToUtf8(*m_path)); + return false; + } + } + if (m_filesIterator == m_files->end()) + return false; + + const fs::path& file = *m_filesIterator; + + std::string fileName = file.filename().generic_string(); + if (fileName.size() >= sizeof(dirEntry->path) - 1) + fileName.resize(sizeof(dirEntry->path) - 1); + strncpy(dirEntry->path, fileName.data(), sizeof(dirEntry->path)); + if (FilesystemAndroid::isDirectory(file)) + { + dirEntry->isDirectory = true; + dirEntry->isFile = false; + dirEntry->fileSize = 0; + } + else + { + dirEntry->isDirectory = false; + dirEntry->isFile = true; + dirEntry->fileSize = 0; + auto fs = FileStream::openFile2(file); + if (fs) + { + dirEntry->fileSize = fs->GetSize(); + delete fs; + } + } + m_filesIterator++; + return true; +} + +FSCVirtualFile* FSCVirtualFile_AndroidSAF::OpenFile(const fs::path& path, FSC_ACCESS_FLAG accessFlags, sint32& fscStatus) +{ + if (!HAS_FLAG(accessFlags, FSC_ACCESS_FLAG::OPEN_FILE) && !HAS_FLAG(accessFlags, FSC_ACCESS_FLAG::OPEN_DIR)) + cemu_assert_debug(false); // not allowed. At least one of both flags must be set + if (HAS_FLAG(accessFlags, FSC_ACCESS_FLAG::WRITE_PERMISSION) || + HAS_FLAG(accessFlags, FSC_ACCESS_FLAG::FILE_ALLOW_CREATE) || + HAS_FLAG(accessFlags, FSC_ACCESS_FLAG::FILE_ALWAYS_CREATE)) + throw std::logic_error("writing and creating a file is not supported with SAF"); + // attempt to open as file + if (HAS_FLAG(accessFlags, FSC_ACCESS_FLAG::OPEN_FILE)) + { + FileStream* fs = FileStream::openFile2(path); + if (fs) + { + FSCVirtualFile_AndroidSAF* vf = new FSCVirtualFile_AndroidSAF(FSC_TYPE_FILE); + vf->m_fs = fs; + vf->m_isWritable = false; + vf->m_fileSize = fs->GetSize(); + fscStatus = FSC_STATUS_OK; + return vf; + } + } + + // attempt to open as directory + if (HAS_FLAG(accessFlags, FSC_ACCESS_FLAG::OPEN_DIR)) + { + bool isExistingDir = FilesystemAndroid::exists(path); + if (isExistingDir) + { + FSCVirtualFile_AndroidSAF* vf = new FSCVirtualFile_AndroidSAF(FSC_TYPE_DIRECTORY); + vf->m_path.reset(new std::filesystem::path(path)); + fscStatus = FSC_STATUS_OK; + return vf; + } + } + fscStatus = FSC_STATUS_FILE_NOT_FOUND; + return nullptr; +} + +/* Device implementation */ + +class fscDeviceAndroidSAFFSC : public fscDeviceC +{ + public: + FSCVirtualFile* fscDeviceOpenByPath(std::string_view path, FSC_ACCESS_FLAG accessFlags, void* ctx, sint32* fscStatus) override + { + *fscStatus = FSC_STATUS_OK; + FSCVirtualFile* vf = FSCVirtualFile_AndroidSAF::OpenFile(_utf8ToPath(path), accessFlags, *fscStatus); + cemu_assert_debug((bool)vf == (*fscStatus == FSC_STATUS_OK)); + return vf; + } + + bool fscDeviceCreateDir(std::string_view path, void* ctx, sint32* fscStatus) override + { + throw std::logic_error("creating a directory is not supported with SAF"); + return false; + } + + bool fscDeviceRemoveFileOrDir(std::string_view path, void* ctx, sint32* fscStatus) override + { + throw std::logic_error("removing a file or dir is not supported with SAF"); + return false; + } + + bool fscDeviceRename(std::string_view srcPath, std::string_view dstPath, void* ctx, sint32* fscStatus) override + { + throw std::logic_error("renaming not supported with SAF"); + return false; + } + + // singleton + public: + static fscDeviceAndroidSAFFSC& instance() + { + static fscDeviceAndroidSAFFSC _instance; + return _instance; + } +}; + +bool FSCDeviceAndroidSAF_Mount(std::string_view mountPath, std::string_view hostTargetPath, sint32 priority) +{ + return fsc_mount(mountPath, hostTargetPath, &fscDeviceAndroidSAFFSC::instance(), nullptr, priority) == FSC_STATUS_OK; +} diff --git a/src/Cafe/Filesystem/fscDeviceAndroidSAF.h b/src/Cafe/Filesystem/fscDeviceAndroidSAF.h new file mode 100644 index 00000000..86f7eba8 --- /dev/null +++ b/src/Cafe/Filesystem/fscDeviceAndroidSAF.h @@ -0,0 +1,36 @@ +#pragma once + +#include "Cafe/Filesystem/fsc.h" + +class FSCVirtualFile_AndroidSAF : public FSCVirtualFile +{ + public: + static FSCVirtualFile* OpenFile(const fs::path& path, FSC_ACCESS_FLAG accessFlags, sint32& fscStatus); + ~FSCVirtualFile_AndroidSAF() override; + + sint32 fscGetType() override; + + uint32 fscDeviceAndroidSAFFSFile_getFileSize(); + + uint64 fscQueryValueU64(uint32 id) override; + uint32 fscWriteData(void* buffer, uint32 size) override; + uint32 fscReadData(void* buffer, uint32 size) override; + void fscSetSeek(uint64 seek) override; + uint64 fscGetSeek() override; + void fscSetFileLength(uint64 endOffset) override; + bool fscDirNext(FSCDirEntry* dirEntry) override; + + private: + FSCVirtualFile_AndroidSAF(uint32 type) : m_type(type){}; + + uint32 m_type; // FSC_TYPE_* + class FileStream* m_fs{}; + // file + uint64 m_seek{0}; + uint64 m_fileSize{0}; + bool m_isWritable{false}; + // directory + std::unique_ptr m_path{}; + std::unique_ptr> m_files{}; + std::vector::iterator m_filesIterator; +}; diff --git a/src/Cafe/GraphicPack/GraphicPack2Patches.cpp b/src/Cafe/GraphicPack/GraphicPack2Patches.cpp index 2c067484..5ed0e489 100644 --- a/src/Cafe/GraphicPack/GraphicPack2Patches.cpp +++ b/src/Cafe/GraphicPack/GraphicPack2Patches.cpp @@ -5,9 +5,7 @@ #include "Cafe/OS/RPL/rpl_structs.h" #include "boost/algorithm/string.hpp" -#include "gui/wxgui.h" // for wxMessageBox #include "gui/helpers/wxHelpers.h" - // error handler void PatchErrorHandler::printError(class PatchGroup* patchGroup, sint32 lineNumber, std::string_view errorMsg) { @@ -63,8 +61,7 @@ void PatchErrorHandler::showStageErrorMessageBox() errorMsg.append("\n"); } } - - wxMessageBox(errorMsg, _("Graphic pack error")); + cemuLog_log(LogType::Force, "Graphic pack error: {}", errorMsg); } // loads Cemu-style patches (patch_.asm) diff --git a/src/Cafe/HW/Espresso/Debugger/Debugger.cpp b/src/Cafe/HW/Espresso/Debugger/Debugger.cpp index 62a5d592..9250282b 100644 --- a/src/Cafe/HW/Espresso/Debugger/Debugger.cpp +++ b/src/Cafe/HW/Espresso/Debugger/Debugger.cpp @@ -1,12 +1,9 @@ -#include "gui/guiWrapper.h" #include "Debugger.h" #include "Cafe/OS/RPL/rpl_structs.h" #include "Cemu/PPCAssembler/ppcAssembler.h" #include "Cafe/HW/Espresso/Recompiler/PPCRecompiler.h" #include "Cemu/ExpressionParser/ExpressionParser.h" -#include "gui/debugger/DebuggerWindow2.h" - #include "Cafe/OS/libs/coreinit/coreinit.h" #if BOOST_OS_WINDOWS @@ -15,6 +12,21 @@ debuggerState_t debuggerState{ }; +DebuggerCallbacks* sDebuggerCallbacks = nullptr; + +void debugger_registerDebuggerCallbacks(DebuggerCallbacks* debuggerCallbacks) +{ + sDebuggerCallbacks = debuggerCallbacks; +} +void debugger_unregisterDebuggerCallbacks() +{ + sDebuggerCallbacks = nullptr; +} +DebuggerCallbacks* debugger_getDebuggerCallbacks() +{ + return sDebuggerCallbacks; +} + DebuggerBreakpoint* debugger_getFirstBP(uint32 address) { for (auto& it : debuggerState.breakpoints) @@ -326,7 +338,8 @@ void debugger_toggleBreakpoint(uint32 address, bool state, DebuggerBreakpoint* b { bp->enabled = state; debugger_updateExecutionBreakpoint(address); - debuggerWindow_updateViewThreadsafe2(); + if (sDebuggerCallbacks) + sDebuggerCallbacks->updateViewThreadsafe(); } else if (bpItr->isMemBP()) { @@ -348,7 +361,8 @@ void debugger_toggleBreakpoint(uint32 address, bool state, DebuggerBreakpoint* b debugger_updateMemoryBreakpoint(bpItr); else debugger_updateMemoryBreakpoint(nullptr); - debuggerWindow_updateViewThreadsafe2(); + if (sDebuggerCallbacks) + sDebuggerCallbacks->updateViewThreadsafe(); } return; } @@ -456,8 +470,8 @@ void debugger_stepInto(PPCInterpreter_t* hCPU, bool updateDebuggerWindow = true) PPCInterpreterSlim_executeInstruction(hCPU); debugger_updateExecutionBreakpoint(initialIP); debuggerState.debugSession.instructionPointer = hCPU->instructionPointer; - if(updateDebuggerWindow) - debuggerWindow_moveIP(); + if(updateDebuggerWindow && sDebuggerCallbacks) + sDebuggerCallbacks->moveIP(); ppcRecompilerEnabled = isRecEnabled; } @@ -476,7 +490,8 @@ bool debugger_stepOver(PPCInterpreter_t* hCPU) // nothing to skip, use step-into debugger_stepInto(hCPU); debugger_updateExecutionBreakpoint(initialIP); - debuggerWindow_moveIP(); + if (sDebuggerCallbacks) + sDebuggerCallbacks->moveIP(); ppcRecompilerEnabled = isRecEnabled; return false; } @@ -484,7 +499,8 @@ bool debugger_stepOver(PPCInterpreter_t* hCPU) debugger_createCodeBreakpoint(initialIP + 4, DEBUGGER_BP_T_ONE_SHOT); // step over current instruction (to avoid breakpoint) debugger_stepInto(hCPU); - debuggerWindow_moveIP(); + if (sDebuggerCallbacks) + sDebuggerCallbacks->moveIP(); // restore breakpoints debugger_updateExecutionBreakpoint(initialIP); // run @@ -543,8 +559,11 @@ void debugger_enterTW(PPCInterpreter_t* hCPU) DebuggerBreakpoint* singleshotBP = debugger_getFirstBP(debuggerState.debugSession.instructionPointer, DEBUGGER_BP_T_ONE_SHOT); if (singleshotBP) debugger_deleteBreakpoint(singleshotBP); - debuggerWindow_notifyDebugBreakpointHit2(); - debuggerWindow_updateViewThreadsafe2(); + if (sDebuggerCallbacks) + { + sDebuggerCallbacks->notifyDebugBreakpointHit(); + sDebuggerCallbacks->updateViewThreadsafe(); + } // reset step control debuggerState.debugSession.stepInto = false; debuggerState.debugSession.stepOver = false; @@ -561,14 +580,16 @@ void debugger_enterTW(PPCInterpreter_t* hCPU) break; // if true is returned, continue with execution } debugger_createPPCStateSnapshot(hCPU); - debuggerWindow_updateViewThreadsafe2(); + if (sDebuggerCallbacks) + sDebuggerCallbacks->updateViewThreadsafe(); debuggerState.debugSession.stepOver = false; } if (debuggerState.debugSession.stepInto) { debugger_stepInto(hCPU); debugger_createPPCStateSnapshot(hCPU); - debuggerWindow_updateViewThreadsafe2(); + if (sDebuggerCallbacks) + sDebuggerCallbacks->updateViewThreadsafe(); debuggerState.debugSession.stepInto = false; continue; } @@ -585,8 +606,11 @@ void debugger_enterTW(PPCInterpreter_t* hCPU) debuggerState.debugSession.isTrapped = false; debuggerState.debugSession.hCPU = nullptr; - debuggerWindow_updateViewThreadsafe2(); - debuggerWindow_notifyRun(); + if (sDebuggerCallbacks) + { + sDebuggerCallbacks->updateViewThreadsafe(); + sDebuggerCallbacks->notifyRun(); + } } void debugger_shouldBreak(PPCInterpreter_t* hCPU) diff --git a/src/Cafe/HW/Espresso/Debugger/Debugger.h b/src/Cafe/HW/Espresso/Debugger/Debugger.h index 717df28a..6901544a 100644 --- a/src/Cafe/HW/Espresso/Debugger/Debugger.h +++ b/src/Cafe/HW/Espresso/Debugger/Debugger.h @@ -98,6 +98,21 @@ typedef struct extern debuggerState_t debuggerState; // new API +class DebuggerCallbacks +{ + public: + virtual void updateViewThreadsafe() = 0; + virtual void notifyDebugBreakpointHit() = 0; + virtual void notifyRun() = 0; + virtual void moveIP() = 0; + virtual void notifyModuleLoaded(void* module) = 0; + virtual void notifyModuleUnloaded(void* module) = 0; +}; + +void debugger_registerDebuggerCallbacks(DebuggerCallbacks* debuggerCallbacks); +void debugger_unregisterDebuggerCallbacks(); +DebuggerCallbacks* debugger_getDebuggerCallbacks(); + DebuggerBreakpoint* debugger_getFirstBP(uint32 address); void debugger_createCodeBreakpoint(uint32 address, uint8 bpType); void debugger_createExecuteBreakpoint(uint32 address); diff --git a/src/Cafe/HW/Latte/Core/LatteOverlay.cpp b/src/Cafe/HW/Latte/Core/LatteOverlay.cpp index 238f85e8..479f601a 100644 --- a/src/Cafe/HW/Latte/Core/LatteOverlay.cpp +++ b/src/Cafe/HW/Latte/Core/LatteOverlay.cpp @@ -1,6 +1,5 @@ #include "Cafe/HW/Latte/Core/LatteOverlay.h" #include "Cafe/HW/Latte/Core/LattePerformanceMonitor.h" -#include "gui/guiWrapper.h" #include "config/CemuConfig.h" @@ -14,6 +13,8 @@ #include "input/InputManager.h" #include "util/SystemInfo/SystemInfo.h" +#include "Cemu/GuiSystem/GuiSystem.h" + #include struct OverlayStats @@ -513,17 +514,17 @@ void LatteOverlay_render(bool pad_view) return; sint32 w = 0, h = 0; - if (pad_view && gui_isPadWindowOpen()) - gui_getPadWindowPhysSize(w, h); + if (pad_view && GuiSystem::isPadWindowOpen()) + GuiSystem::getPadWindowPhysSize(w, h); else - gui_getWindowPhysSize(w, h); + GuiSystem::getWindowPhysSize(w, h); if (w == 0 || h == 0) return; const Vector2f window_size{ (float)w,(float)h }; - float fontDPIScale = !pad_view ? gui_getWindowDPIScale() : gui_getPadDPIScale(); + float fontDPIScale = !pad_view ? GuiSystem::getWindowDPIScale() : GuiSystem::getPadDPIScale(); float overlayFontSize = 14.0f * (float)config.overlay.text_scale / 100.0f * fontDPIScale; diff --git a/src/Cafe/HW/Latte/Core/LattePerformanceMonitor.cpp b/src/Cafe/HW/Latte/Core/LattePerformanceMonitor.cpp index f2767446..ee22892e 100644 --- a/src/Cafe/HW/Latte/Core/LattePerformanceMonitor.cpp +++ b/src/Cafe/HW/Latte/Core/LattePerformanceMonitor.cpp @@ -1,6 +1,6 @@ #include "Cafe/HW/Latte/Core/LattePerformanceMonitor.h" #include "Cafe/HW/Latte/Core/LatteOverlay.h" -#include "gui/guiWrapper.h" +#include "Cafe/CafeSystem.h" performanceMonitor_t performanceMonitor{}; @@ -104,15 +104,18 @@ void LattePerformanceMonitor_frameEnd() // next update in 1 second performanceMonitor.cycle[performanceMonitor.cycleIndex].lastUpdate = GetTickCount(); + auto cafeSystemCallbacks = CafeSystem::getCafeSystemCallbacks(); if (isFirstUpdate) { LatteOverlay_updateStats(0.0, 0, 0); - gui_updateWindowTitles(false, false, 0.0); + if (cafeSystemCallbacks) + cafeSystemCallbacks->updateWindowTitles(false, false, 0.0); } else { LatteOverlay_updateStats(fps, drawCallCounter / elapsedFrames, fastDrawCallCounter / elapsedFrames); - gui_updateWindowTitles(false, false, fps); + if (cafeSystemCallbacks) + cafeSystemCallbacks->updateWindowTitles(false, false, fps); } } } diff --git a/src/Cafe/HW/Latte/Core/LatteRenderTarget.cpp b/src/Cafe/HW/Latte/Core/LatteRenderTarget.cpp index abdfda21..40dee43d 100644 --- a/src/Cafe/HW/Latte/Core/LatteRenderTarget.cpp +++ b/src/Cafe/HW/Latte/Core/LatteRenderTarget.cpp @@ -12,7 +12,7 @@ #include "Cafe/GraphicPack/GraphicPack2.h" #include "config/ActiveSettings.h" #include "Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h" -#include "gui/guiWrapper.h" +#include "Cemu/GuiSystem/GuiSystem.h" #include "Cafe/OS/libs/erreula/erreula.h" #include "input/InputManager.h" #include "Cafe/OS/libs/swkbd/swkbd.h" @@ -871,10 +871,10 @@ sint32 _currentOutputImageHeight = 0; void LatteRenderTarget_getScreenImageArea(sint32* x, sint32* y, sint32* width, sint32* height, sint32* fullWidth, sint32* fullHeight, bool padView) { int w, h; - if(padView && gui_isPadWindowOpen()) - gui_getPadWindowPhysSize(w, h); + if(padView && GuiSystem::isPadWindowOpen()) + GuiSystem::getPadWindowPhysSize(w, h); else - gui_getWindowPhysSize(w, h); + GuiSystem::getWindowPhysSize(w, h); sint32 scaledOutputX; sint32 scaledOutputY; @@ -1039,8 +1039,8 @@ void LatteRenderTarget_itHLECopyColorBufferToScanBuffer(MPTR colorBufferPtr, uin return; } - const bool tabPressed = gui_isKeyDown(PlatformKeyCodes::TAB); - const bool ctrlPressed = gui_isKeyDown(PlatformKeyCodes::LCONTROL); + const bool tabPressed = GuiSystem::isKeyDown(GuiSystem::PlatformKeyCodes::TAB); + const bool ctrlPressed = GuiSystem::isKeyDown(GuiSystem::PlatformKeyCodes::LCONTROL); bool showDRC = swkbd_hasKeyboardInputHook() == false && tabPressed; bool& alwaysDisplayDRC = LatteGPUState.alwaysDisplayDRC; diff --git a/src/Cafe/HW/Latte/Core/LatteShaderCache.cpp b/src/Cafe/HW/Latte/Core/LatteShaderCache.cpp index 9576eb2e..5e092c55 100644 --- a/src/Cafe/HW/Latte/Core/LatteShaderCache.cpp +++ b/src/Cafe/HW/Latte/Core/LatteShaderCache.cpp @@ -4,9 +4,9 @@ #include "Cafe/HW/Latte/Core/LatteShader.h" #include "Cafe/HW/Latte/LegacyShaderDecompiler/LatteDecompiler.h" #include "Cafe/HW/Latte/Core/FetchShader.h" -#include "Cemu/FileCache/FileCache.h" #include "Cafe/GameProfile/GameProfile.h" -#include "gui/guiWrapper.h" +#include "Cemu/FileCache/FileCache.h" +#include "Cemu/GuiSystem/GuiSystem.h" #include "Cafe/HW/Latte/Renderer/Renderer.h" #include "Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.h" @@ -24,8 +24,6 @@ #include "Cafe/HW/Latte/Common/ShaderSerializer.h" #include "util/helpers/Serializer.h" -#include - #if BOOST_OS_WINDOWS #include #endif @@ -66,8 +64,6 @@ void LatteShaderCache_LoadVulkanPipelineCache(uint64 cacheTitleId); bool LatteShaderCache_updatePipelineLoadingProgress(); void LatteShaderCache_ShowProgress(const std::function & loadUpdateFunc, bool isPipelines); -void LatteShaderCache_handleDeprecatedCacheFiles(fs::path pathGeneric, fs::path pathGenericPre1_25_0, fs::path pathGenericPre1_16_0); - struct { struct @@ -245,10 +241,7 @@ void LatteShaderCache_Load() RendererShaderGL::ShaderCacheLoading_begin(cacheTitleId); // get cache file name const auto pathGeneric = ActiveSettings::GetCachePath("shaderCache/transferable/{:016x}_shaders.bin", cacheTitleId); - const auto pathGenericPre1_25_0 = ActiveSettings::GetCachePath("shaderCache/transferable/{:016x}.bin", cacheTitleId); // before 1.25.0 - const auto pathGenericPre1_16_0 = ActiveSettings::GetCachePath("shaderCache/transferable/{:08x}.bin", CafeSystem::GetRPXHashBase()); // before 1.16.0 - LatteShaderCache_handleDeprecatedCacheFiles(pathGeneric, pathGenericPre1_25_0, pathGenericPre1_16_0); // calculate extraVersion for transferable and precompiled shader cache uint32 transferableExtraVersion = SHADER_CACHE_GENERIC_EXTRA_VERSION; s_shaderCacheGeneric = FileCache::Open(pathGeneric, false, transferableExtraVersion); // legacy extra version (1.25.0 - 1.25.1b) @@ -345,7 +338,7 @@ void LatteShaderCache_Load() if (g_renderer->GetType() == RendererAPI::Vulkan) LatteShaderCache_LoadVulkanPipelineCache(cacheTitleId); - +#if !__ANDROID__ g_renderer->BeginFrame(true); if (g_renderer->ImguiBegin(true)) { @@ -358,7 +351,7 @@ void LatteShaderCache_Load() LatteShaderCache_drawBackgroundImage(g_shaderCacheLoaderState.textureDRCId, 854, 480); g_renderer->ImguiEnd(); } - +#endif // __ANDROID__ g_renderer->SwapBuffers(true, true); if (g_shaderCacheLoaderState.textureTVId) @@ -388,7 +381,7 @@ void LatteShaderCache_ShowProgress(const std::function & loadUpdateF continue; int w, h; - gui_getWindowPhysSize(w, h); + GuiSystem::getWindowPhysSize(w, h); const Vector2f window_size{ (float)w,(float)h }; ImGui_GetFont(window_size.y / 32.0f); // = 24 by default @@ -779,30 +772,3 @@ void LatteShaderCache_Close() if (g_renderer->GetType() == RendererAPI::Vulkan) VulkanPipelineStableCache::GetInstance().Close(); } - -#include - -void LatteShaderCache_handleDeprecatedCacheFiles(fs::path pathGeneric, fs::path pathGenericPre1_25_0, fs::path pathGenericPre1_16_0) -{ - std::error_code ec; - - bool hasOldCacheFiles = fs::exists(pathGenericPre1_25_0, ec) || fs::exists(pathGenericPre1_16_0, ec); - bool hasNewCacheFiles = fs::exists(pathGeneric, ec); - - if (hasOldCacheFiles && !hasNewCacheFiles) - { - // ask user if they want to delete or keep the old cache file - auto infoMsg = _("Cemu detected that the shader cache for this game is outdated.\nOnly shader caches generated with Cemu 1.25.0 or above are supported.\n\nWe recommend deleting the outdated cache file as it will no longer be used by Cemu."); - - wxMessageDialog dialog(nullptr, infoMsg, _("Outdated shader cache"), - wxYES_NO | wxCENTRE | wxICON_EXCLAMATION); - - dialog.SetYesNoLabels(_("Delete outdated cache file [recommended]"), _("Keep outdated cache file")); - const auto result = dialog.ShowModal(); - if (result == wxID_YES) - { - fs::remove(pathGenericPre1_16_0, ec); - fs::remove(pathGenericPre1_25_0, ec); - } - } -} diff --git a/src/Cafe/HW/Latte/Core/LatteThread.cpp b/src/Cafe/HW/Latte/Core/LatteThread.cpp index 60b32ec4..45143ef2 100644 --- a/src/Cafe/HW/Latte/Core/LatteThread.cpp +++ b/src/Cafe/HW/Latte/Core/LatteThread.cpp @@ -6,7 +6,7 @@ #include "Cafe/HW/Latte/Core/LatteAsyncCommands.h" #include "Cafe/GameProfile/GameProfile.h" #include "Cafe/GraphicPack/GraphicPack2.h" -#include "gui/guiWrapper.h" +#include "Cemu/GuiSystem/GuiSystem.h" #include "Cafe/HW/Latte/Core/LatteBufferCache.h" @@ -115,7 +115,7 @@ int Latte_ThreadEntry() { SetThreadName("LatteThread"); sint32 w,h; - gui_getWindowPhysSize(w,h); + GuiSystem::getWindowPhysSize(w,h); // renderer g_renderer->Initialize(); @@ -172,8 +172,7 @@ int Latte_ThreadEntry() g_renderer->DrawEmptyFrame(true); g_renderer->DrawEmptyFrame(false); - - gui_hasScreenshotRequest(); // keep the screenshot request queue empty + g_renderer->CancelScreenshotRequest(); std::this_thread::sleep_for(std::chrono::milliseconds(1000/60)); } diff --git a/src/Cafe/HW/Latte/LatteAddrLib/LatteAddrLib.cpp b/src/Cafe/HW/Latte/LatteAddrLib/LatteAddrLib.cpp index 60a6e2c4..c111e5af 100644 --- a/src/Cafe/HW/Latte/LatteAddrLib/LatteAddrLib.cpp +++ b/src/Cafe/HW/Latte/LatteAddrLib/LatteAddrLib.cpp @@ -2,7 +2,9 @@ #include "Cafe/HW/Latte/LatteAddrLib/LatteAddrLib.h" #include "Cafe/OS/libs/gx2/GX2_Surface.h" #include - +#if __ANDROID__ +#include +#endif /* Info: @@ -73,7 +75,11 @@ namespace LatteAddrLib uint32 NextPow2(uint32 dim) { +#if __ANDROID__ + return boost::core::bit_ceil(dim); +#else return std::bit_ceil(dim); +#endif } uint32 GetBitsPerPixel(E_HWSURFFMT format, uint32* pElemMode, uint32* pExpandX, uint32* pExpandY) diff --git a/src/Cafe/HW/Latte/Renderer/OpenGL/GLCanvas.h b/src/Cafe/HW/Latte/Renderer/OpenGL/GLCanvas.h new file mode 100644 index 00000000..cb4665a5 --- /dev/null +++ b/src/Cafe/HW/Latte/Renderer/OpenGL/GLCanvas.h @@ -0,0 +1,5 @@ +#pragma once + +bool GLCanvas_MakeCurrent(bool padView); +void GLCanvas_SwapBuffers(bool swapTV, bool swapDRC); +bool GLCanvas_HasPadViewOpen(); diff --git a/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.cpp b/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.cpp index f09f04f1..d3dd6803 100644 --- a/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.cpp +++ b/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.cpp @@ -1,5 +1,4 @@ #include "Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.h" -#include "gui/guiWrapper.h" #include "Cafe/HW/Latte/Core/LatteRingBuffer.h" #include "Cafe/HW/Latte/Core/LatteDraw.h" @@ -19,7 +18,9 @@ #include "Cafe/HW/Latte/ISA/RegDefines.h" #include "Cafe/OS/libs/gx2/GX2.h" -#include "gui/canvas/OpenGLCanvas.h" +#include "Cemu/GuiSystem/GuiSystem.h" + +#include "GLCanvas.h" #define STRINGIFY2(X) #X #define STRINGIFY(X) STRINGIFY2(X) @@ -123,7 +124,7 @@ bool OpenGLRenderer::ImguiBegin(bool mainWindow) { if (!mainWindow) { - GLCanvas_MakeCurrent(true); + m_openGLCallbacks->GLCanvas_MakeCurrent(true); m_isPadViewContext = true; } @@ -150,7 +151,7 @@ void OpenGLRenderer::ImguiEnd() if (m_isPadViewContext) { - GLCanvas_MakeCurrent(false); + m_openGLCallbacks->GLCanvas_MakeCurrent(false); m_isPadViewContext = false; } @@ -207,6 +208,11 @@ void LoadOpenGLImports() #include "Common/GLInclude/glFunctions.h" #undef GLFUNC } +#elif __ANDROID__ +void LoadOpenGLImports() +{ + cemu_assert_unimplemented(); +} #elif BOOST_OS_LINUX GL_IMPORT _GetOpenGLFunction(void* hLib, PFNGLXGETPROCADDRESSPROC func, const char* name) { @@ -254,7 +260,7 @@ void OpenGLRenderer::Initialize() auto lock = cemuLog_acquire(); cemuLog_log(LogType::Force, "------- Init OpenGL graphics backend -------"); - GLCanvas_MakeCurrent(false); + m_openGLCallbacks->GLCanvas_MakeCurrent(false); LoadOpenGLImports(); GetVendorInformation(); @@ -342,7 +348,7 @@ void OpenGLRenderer::Initialize() bool OpenGLRenderer::IsPadWindowActive() { - return GLCanvas_HasPadViewOpen(); + return m_openGLCallbacks->GLCanvas_HasPadViewOpen(); } void OpenGLRenderer::Flush(bool waitIdle) @@ -357,6 +363,15 @@ void OpenGLRenderer::NotifyLatteCommandProcessorIdle() glFlush(); } +void OpenGLRenderer::RegisterOpenGLCallbacks(OpenGLCallbacks* openGLCallbacks) +{ + m_openGLCallbacks = openGLCallbacks; +} + +void OpenGLRenderer::UnregisterOpenGLCallbacks() +{ + m_openGLCallbacks = nullptr; +} void OpenGLRenderer::GetVendorInformation() { // example vendor strings: @@ -430,7 +445,7 @@ void OpenGLRenderer::EnableDebugMode() void OpenGLRenderer::SwapBuffers(bool swapTV, bool swapDRC) { - GLCanvas_SwapBuffers(swapTV, swapDRC); + m_openGLCallbacks->GLCanvas_SwapBuffers(swapTV, swapDRC); if (swapTV) cleanupAfterFrame(); @@ -441,7 +456,7 @@ bool OpenGLRenderer::BeginFrame(bool mainWindow) if (!mainWindow && !IsPadWindowActive()) return false; - GLCanvas_MakeCurrent(!mainWindow); + m_openGLCallbacks->GLCanvas_MakeCurrent(!mainWindow); ClearColorbuffer(!mainWindow); return true; @@ -464,7 +479,7 @@ void OpenGLRenderer::ClearColorbuffer(bool padView) void OpenGLRenderer::HandleScreenshotRequest(LatteTextureView* texView, bool padView) { - const bool hasScreenshotRequest = gui_hasScreenshotRequest(); + const bool hasScreenshotRequest = std::exchange(m_screenshot_requested, false); if(!hasScreenshotRequest && m_screenshot_state == ScreenshotState::None) return; @@ -535,7 +550,7 @@ void OpenGLRenderer::DrawBackbufferQuad(LatteTextureView* texView, RendererOutpu return; catchOpenGLError(); - GLCanvas_MakeCurrent(padView); + m_openGLCallbacks->GLCanvas_MakeCurrent(padView); renderstate_resetColorControl(); renderstate_resetDepthControl(); @@ -548,9 +563,9 @@ void OpenGLRenderer::DrawBackbufferQuad(LatteTextureView* texView, RendererOutpu { int windowWidth, windowHeight; if (padView) - gui_getPadWindowPhysSize(windowWidth, windowHeight); + GuiSystem::getPadWindowPhysSize(windowWidth, windowHeight); else - gui_getWindowPhysSize(windowWidth, windowHeight); + GuiSystem::getWindowPhysSize(windowWidth, windowHeight); g_renderer->renderTarget_setViewport(0, 0, windowWidth, windowHeight, 0.0f, 1.0f); g_renderer->ClearColorbuffer(padView); } @@ -593,7 +608,7 @@ void OpenGLRenderer::DrawBackbufferQuad(LatteTextureView* texView, RendererOutpu // switch back to TV context if (padView) - GLCanvas_MakeCurrent(false); + m_openGLCallbacks->GLCanvas_MakeCurrent(false); } void OpenGLRenderer::renderTarget_setViewport(float x, float y, float width, float height, float nearZ, float farZ, bool halfZ /*= false*/) diff --git a/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.h b/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.h index 8a4b1a1d..b46109f8 100644 --- a/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.h +++ b/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.h @@ -154,6 +154,18 @@ public: void occlusionQuery_updateState() override {}; private: + + class OpenGLCallbacks + { + public: + virtual bool GLCanvas_HasPadViewOpen() = 0; + virtual bool GLCanvas_MakeCurrent(bool padView) = 0; + virtual void GLCanvas_SwapBuffers(bool swapTV, bool swapDRC) = 0; + }; + + void RegisterOpenGLCallbacks(OpenGLCallbacks* openGLCallbacks); + void UnregisterOpenGLCallbacks(); + void GetVendorInformation() override; void texture_setActiveTextureUnit(sint32 index); @@ -161,6 +173,8 @@ private: void texture_syncSliceSpecialBC4(LatteTexture* srcTexture, sint32 srcSliceIndex, sint32 srcMipIndex, LatteTexture* dstTexture, sint32 dstSliceIndex, sint32 dstMipIndex); void texture_syncSliceSpecialIntegerToBC3(LatteTexture* srcTexture, sint32 srcSliceIndex, sint32 srcMipIndex, LatteTexture* dstTexture, sint32 dstSliceIndex, sint32 dstMipIndex); + OpenGLCallbacks* m_openGLCallbacks = nullptr; + GLuint m_pipeline = 0; bool m_isPadViewContext{}; diff --git a/src/Cafe/HW/Latte/Renderer/Renderer.cpp b/src/Cafe/HW/Latte/Renderer/Renderer.cpp index 4db88355..7c0dba72 100644 --- a/src/Cafe/HW/Latte/Renderer/Renderer.cpp +++ b/src/Cafe/HW/Latte/Renderer/Renderer.cpp @@ -1,5 +1,5 @@ #include "Cafe/HW/Latte/Renderer/Renderer.h" -#include "gui/guiWrapper.h" +#include "Cemu/GuiSystem/GuiSystem.h" #include "config/CemuConfig.h" #include "Cafe/HW/Latte/Core/LatteOverlay.h" @@ -10,10 +10,6 @@ #include "config/ActiveSettings.h" -#include -#include -#include -#include std::unique_ptr g_renderer; @@ -70,9 +66,9 @@ bool Renderer::ImguiBegin(bool mainWindow) { sint32 w = 0, h = 0; if(mainWindow) - gui_getWindowPhysSize(w, h); - else if(gui_isPadWindowOpen()) - gui_getPadWindowPhysSize(w, h); + GuiSystem::getWindowPhysSize(w, h); + else if(GuiSystem::isPadWindowOpen()) + GuiSystem::getPadWindowPhysSize(w, h); else return false; @@ -114,107 +110,29 @@ uint8 Renderer::RGBComponentToSRGB(uint8 cli) return (uint8)(cs * 255.0f); } -static std::optional GenerateScreenshotFilename(bool isDRC) +void Renderer::RequestScreenshot(const std::function(const std::vector&, int, int, bool)>& onSaveScreenshot) { - fs::path screendir = ActiveSettings::GetUserDataPath("screenshots"); - // build screenshot name with format Screenshot_YYYY-MM-DD_HH-MM-SS[_GamePad].png - // if the file already exists add a suffix counter (_2.png, _3.png etc) - std::time_t time_t = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()); - std::tm* tm = std::localtime(&time_t); - - std::string screenshotFileName = fmt::format("Screenshot_{:04}-{:02}-{:02}_{:02}-{:02}-{:02}", tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); - if (isDRC) - screenshotFileName.append("_GamePad"); - - fs::path screenshotPath; - for(sint32 i=0; i<999; i++) - { - screenshotPath = screendir; - if (i == 0) - screenshotPath.append(fmt::format("{}.png", screenshotFileName)); - else - screenshotPath.append(fmt::format("{}_{}.png", screenshotFileName, i + 1)); - - std::error_code ec; - bool exists = fs::exists(screenshotPath, ec); - - if (!ec && !exists) - return screenshotPath; - } - return std::nullopt; + m_screenshot_requested = true; + m_on_save_screenshot = onSaveScreenshot; } -std::mutex s_clipboardMutex; - -static bool SaveScreenshotToClipboard(const wxImage &image) +void Renderer::CancelScreenshotRequest() { - bool success = false; - - s_clipboardMutex.lock(); - if (wxTheClipboard->Open()) - { - wxTheClipboard->SetData(new wxImageDataObject(image)); - wxTheClipboard->Close(); - success = true; - } - s_clipboardMutex.unlock(); - - return success; -} - -static bool SaveScreenshotToFile(const wxImage &image, bool mainWindow) -{ - auto path = GenerateScreenshotFilename(!mainWindow); - if (!path) return false; - - std::error_code ec; - fs::create_directories(path->parent_path(), ec); - if (ec) return false; - - // suspend wxWidgets logging for the lifetime this object, to prevent a message box if wxImage::SaveFile fails - wxLogNull _logNo; - return image.SaveFile(path->wstring()); -} - -static void ScreenshotThread(std::vector data, bool save_screenshot, int width, int height, bool mainWindow) -{ -#if BOOST_OS_WINDOWS - // on Windows wxWidgets uses OLE API for the clipboard - // to make this work we need to call OleInitialize() on the same thread - OleInitialize(nullptr); -#endif - - wxImage image(width, height, data.data(), true); - - if (mainWindow) - { - if(SaveScreenshotToClipboard(image)) - { - if (!save_screenshot) - LatteOverlay_pushNotification("Screenshot saved to clipboard", 2500); - } - else - { - LatteOverlay_pushNotification("Failed to open clipboard", 2500); - } - } - - if (save_screenshot) - { - if (SaveScreenshotToFile(image, mainWindow)) - { - if (mainWindow) - LatteOverlay_pushNotification("Screenshot saved", 2500); - } - else - { - LatteOverlay_pushNotification("Failed to save screenshot to file", 2500); - } - } + m_screenshot_requested = false; + m_on_save_screenshot = nullptr; } void Renderer::SaveScreenshot(const std::vector& rgb_data, int width, int height, bool mainWindow) const { - const bool save_screenshot = GetConfig().save_screenshot; - std::thread(ScreenshotThread, rgb_data, save_screenshot, width, height, mainWindow).detach(); + std::thread( + [=, this]() + { + if (m_on_save_screenshot) + { + auto notificationMessage = m_on_save_screenshot(rgb_data, width, height, mainWindow); + if (notificationMessage.has_value()) + LatteOverlay_pushNotification(notificationMessage.value(), 2500); + } + }) + .detach(); } diff --git a/src/Cafe/HW/Latte/Renderer/Renderer.h b/src/Cafe/HW/Latte/Renderer/Renderer.h index 93edaf8d..2c2ab44b 100644 --- a/src/Cafe/HW/Latte/Renderer/Renderer.h +++ b/src/Cafe/HW/Latte/Renderer/Renderer.h @@ -67,6 +67,9 @@ public: virtual void DrawEmptyFrame(bool mainWindow) = 0; virtual void SwapBuffers(bool swapTV, bool swapDRC) = 0; + void RequestScreenshot(const std::function(const std::vector&, int, int, bool)>& onSaveScreenshot); + void CancelScreenshotRequest(); + virtual void HandleScreenshotRequest(LatteTextureView* texView, bool padView){} virtual void DrawBackbufferQuad(LatteTextureView* texView, RendererOutputShader* shader, bool useLinearTexFilter, @@ -166,6 +169,8 @@ protected: Pad, }; ScreenshotState m_screenshot_state = ScreenshotState::None; + bool m_screenshot_requested = false; + std::function(const std::vector&, int, int, bool)> m_on_save_screenshot; void SaveScreenshot(const std::vector& rgb_data, int width, int height, bool mainWindow) const; diff --git a/src/Cafe/HW/Latte/Renderer/RendererOuputShader.cpp b/src/Cafe/HW/Latte/Renderer/RendererOuputShader.cpp index cdbeb3f3..936418a3 100644 --- a/src/Cafe/HW/Latte/Renderer/RendererOuputShader.cpp +++ b/src/Cafe/HW/Latte/Renderer/RendererOuputShader.cpp @@ -296,16 +296,16 @@ std::string RendererOutputShader::GetVulkanVertexSource(bool render_upside_down) { // vertex shader std::ostringstream vertex_source; - vertex_source << - R"(#version 450 + vertex_source << R"(#version 450 layout(location = 0) out vec2 passUV; - out gl_PerVertex { vec4 gl_Position; -}; - -void main(){ +};)"; +#if __ANDROID__ + vertex_source << "layout (push_constant) uniform PushConstants { mat2 preRotate; } pushConstants;\n"; +#endif // __ANDROID__ + vertex_source << R"(void main(){ vec2 vPos; vec2 vUV; int vID = gl_VertexIndex; @@ -334,12 +334,13 @@ void main(){ )"; } - vertex_source << - R"( passUV = vUV; - gl_Position = vec4(vPos, 0.0, 1.0); -} -)"; - return vertex_source.str(); + vertex_source << "passUV = vUV;\n"; +#if __ANDROID__ + vertex_source << "gl_Position = vec4(pushConstants.preRotate * vPos, 0.0, 1.0);}"; +#else + vertex_source << "gl_Position = vec4(vPos, 0.0, 1.0);}"; +#endif // __ANDROID__ + return vertex_source.str(); } void RendererOutputShader::InitializeStatic() { diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.cpp index 14b7a17c..1bed55ea 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.cpp +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.cpp @@ -12,6 +12,9 @@ void SwapchainInfoVk::Create(VkPhysicalDevice physicalDevice, VkDevice logicalDe const auto details = QuerySwapchainSupport(surface, physicalDevice); m_surfaceFormat = ChooseSurfaceFormat(details.formats); m_actualExtent = ChooseSwapExtent(details.capabilities); +#if __ANDROID__ + m_preTransform = details.capabilities.currentTransform; +#endif // __ANDROID__ // use at least two swapchain images. fewer than that causes problems on some drivers uint32_t image_count = std::max(2u, details.capabilities.minImageCount); diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.h b/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.h index 26dbc7d1..e992302e 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.h +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.h @@ -76,7 +76,9 @@ struct SwapchainInfoVk bool m_usesSRGB = false; VSync m_vsyncState = VSync::Immediate; bool hasDefinedSwapchainImage{}; // indicates if the swapchain image is in a defined state - +#if __ANDROID__ + VkSurfaceTransformFlagBitsKHR m_preTransform{}; +#endif // __ANDROID__ VkPhysicalDevice m_physicalDevice{}; VkDevice m_logicalDevice{}; VkSurfaceKHR surface{}; diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VsyncDriver.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/VsyncDriver.cpp index 6ccca80f..cbbed5fb 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/VsyncDriver.cpp +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VsyncDriver.cpp @@ -1,5 +1,3 @@ -#include "gui/MainWindow.h" - #if BOOST_OS_WINDOWS #include diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanAPI.h b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanAPI.h index 0489bb4e..ce802ca6 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanAPI.h +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanAPI.h @@ -131,12 +131,16 @@ VKFUNC_DEVICE(vkCmdBindPipeline); // swapchain #if BOOST_OS_LINUX +#if __ANDROID__ +VKFUNC_INSTANCE(vkCreateAndroidSurfaceKHR); +#else VKFUNC_INSTANCE(vkCreateXlibSurfaceKHR); VKFUNC_INSTANCE(vkCreateXcbSurfaceKHR); #ifdef HAS_WAYLAND VKFUNC_INSTANCE(vkCreateWaylandSurfaceKHR); -#endif -#endif +#endif // HAS_WAYLAND +#endif // __ANDROID__ +#endif // BOOST_OS_LINUX #if BOOST_OS_WINDOWS VKFUNC_INSTANCE(vkCreateWin32SurfaceKHR); diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp index 44214606..d6c5909c 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp @@ -12,12 +12,12 @@ #include "Cafe/CafeSystem.h" +#include "Cemu/GuiSystem/GuiSystem.h" #include "util/helpers/helpers.h" #include "util/helpers/StringHelpers.h" #include "config/ActiveSettings.h" #include "config/CemuConfig.h" -#include "gui/guiWrapper.h" #include "imgui/imgui_extension.h" #include "imgui/imgui_impl_vulkan.h" @@ -28,8 +28,6 @@ #include -#include - #ifndef VK_API_VERSION_MAJOR #define VK_API_VERSION_MAJOR(version) (((uint32_t)(version) >> 22) & 0x7FU) #define VK_API_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3FFU) @@ -51,7 +49,9 @@ const std::vector kOptionalDeviceExtensions = const std::vector kRequiredDeviceExtensions = { VK_KHR_SWAPCHAIN_EXTENSION_NAME, +#if !__ANDROID__ VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME +#endif }; // Intel doesnt support VK_EXT_DEPTH_RANGE_UNRESTRICTED_EXTENSION_NAME VKAPI_ATTR VkBool32 VKAPI_CALL DebugUtilsCallback(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageTypes, const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData, void* pUserData) @@ -108,15 +108,19 @@ std::vector VulkanRenderer::GetDevices() requiredExtensions.emplace_back(VK_KHR_SURFACE_EXTENSION_NAME); #if BOOST_OS_WINDOWS requiredExtensions.emplace_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME); - #elif BOOST_OS_LINUX - auto backend = gui_getWindowInfo().window_main.backend; - if(backend == WindowHandleInfo::Backend::X11) + #elif BOOST_OS_LINUX + #if __ANDROID__ + requiredExtensions.emplace_back(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME); + #else + auto backend = GuiSystem::getWindowInfo().window_main.backend; + if(backend == GuiSystem::WindowHandleInfo::Backend::X11) requiredExtensions.emplace_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME); #ifdef HAS_WAYLAND - else if (backend == WindowHandleInfo::Backend::WAYLAND) + else if (backend == GuiSystem::WindowHandleInfo::Backend::Wayland) requiredExtensions.emplace_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME); - #endif - #elif BOOST_OS_MACOS + #endif // HAS_WAYLAND + #endif // __ANDROID__ + #elif BOOST_OS_MACOS requiredExtensions.emplace_back(VK_EXT_METAL_SURFACE_EXTENSION_NAME); #endif @@ -152,7 +156,7 @@ std::vector VulkanRenderer::GetDevices() throw std::runtime_error("Failed to find a GPU with Vulkan support."); // create tmp surface to create a logical device - auto surface = CreateFramebufferSurface(instance, gui_getWindowInfo().window_main); + auto surface = CreateFramebufferSurface(instance, GuiSystem::getWindowInfo().window_main); std::vector devices(device_count); vkEnumeratePhysicalDevices(instance, &device_count, devices.data()); for (const auto& device : devices) @@ -280,12 +284,8 @@ void VulkanRenderer::GetDeviceFeatures() cemuLog_log(LogType::Force, "Shader round mode control not available on this device or driver. Some rendering issues might occur."); if (!m_featureControl.deviceExtensions.pipeline_creation_cache_control) - { cemuLog_log(LogType::Force, "VK_EXT_pipeline_creation_cache_control not supported. Cannot use asynchronous shader and pipeline compilation"); - // if async shader compilation is enabled show warning message - if (GetConfig().async_compile) - wxMessageBox(_("The currently installed graphics driver does not support the Vulkan extension necessary for asynchronous shader compilation. Asynchronous compilation cannot be used.\n \nRequired extension: VK_EXT_pipeline_creation_cache_control\n\nInstalling the latest graphics driver may solve this error."), _("Information"), wxOK | wxCENTRE); - } + if (!m_featureControl.deviceExtensions.custom_border_color_without_format) { if (m_featureControl.deviceExtensions.custom_border_color) @@ -369,7 +369,7 @@ VulkanRenderer::VulkanRenderer() throw std::runtime_error("Failed to find a GPU with Vulkan support."); // create tmp surface to create a logical device - auto surface = CreateFramebufferSurface(m_instance, gui_getWindowInfo().window_main); + auto surface = CreateFramebufferSurface(m_instance, GuiSystem::getWindowInfo().window_main); auto& config = GetConfig(); decltype(config.graphic_device_uuid) zero{}; @@ -451,7 +451,7 @@ VulkanRenderer::VulkanRenderer() deviceFeatures.imageCubeArray = VK_TRUE; #if !BOOST_OS_MACOS deviceFeatures.geometryShader = VK_TRUE; - deviceFeatures.logicOp = VK_TRUE; +// deviceFeatures.logicOp = VK_TRUE; #endif deviceFeatures.occlusionQueryPrecise = VK_TRUE; deviceFeatures.depthClamp = VK_TRUE; @@ -689,7 +689,7 @@ VulkanRenderer* VulkanRenderer::GetInstance() void VulkanRenderer::InitializeSurface(const Vector2i& size, bool mainWindow) { - auto& windowHandleInfo = mainWindow ? gui_getWindowInfo().canvas_main : gui_getWindowInfo().canvas_pad; + auto& windowHandleInfo = mainWindow ? GuiSystem::getWindowInfo().canvas_main : GuiSystem::getWindowInfo().canvas_pad; const auto surface = CreateFramebufferSurface(m_instance, windowHandleInfo); if (mainWindow) @@ -733,7 +733,7 @@ bool VulkanRenderer::IsPadWindowActive() void VulkanRenderer::HandleScreenshotRequest(LatteTextureView* texView, bool padView) { - const bool hasScreenshotRequest = gui_hasScreenshotRequest(); + const bool hasScreenshotRequest = std::exchange(m_screenshot_requested, false); if (!hasScreenshotRequest && m_screenshot_state == ScreenshotState::None) return; @@ -1184,14 +1184,18 @@ std::vector VulkanRenderer::CheckInstanceExtensionSupport(FeatureCo requiredInstanceExtensions.emplace_back(VK_KHR_SURFACE_EXTENSION_NAME); #if BOOST_OS_WINDOWS requiredInstanceExtensions.emplace_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME); - #elif BOOST_OS_LINUX - auto backend = gui_getWindowInfo().window_main.backend; - if(backend == WindowHandleInfo::Backend::X11) + #elif BOOST_OS_LINUX + #if __ANDROID__ + requiredInstanceExtensions.emplace_back(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME); + #else + auto backend = GuiSystem::getWindowInfo().window_main.backend; + if(backend == GuiSystem::WindowHandleInfo::Backend::X11) requiredInstanceExtensions.emplace_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME); #if HAS_WAYLAND - else if (backend == WindowHandleInfo::Backend::WAYLAND) + else if (backend == GuiSystem::WindowHandleInfo::Backend::Wayland) requiredInstanceExtensions.emplace_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME); - #endif + #endif // HAS_WAYLAND + #endif // __ANDROID__ #elif BOOST_OS_MACOS requiredInstanceExtensions.emplace_back(VK_EXT_METAL_SURFACE_EXTENSION_NAME); #endif @@ -1272,6 +1276,25 @@ VkSurfaceKHR VulkanRenderer::CreateWinSurface(VkInstance instance, HWND hwindow) #endif #if BOOST_OS_LINUX +#if __ANDROID__ +VkSurfaceKHR VulkanRenderer::CreateAndroidSurface(VkInstance instance, ANativeWindow* window) +{ + VkAndroidSurfaceCreateInfoKHR sci{}; + sci.sType = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR; + sci.flags = 0; + sci.window = window; + + VkSurfaceKHR result; + VkResult err; + if ((err = vkCreateAndroidSurfaceKHR(instance, &sci, nullptr, &result)) != VK_SUCCESS) + { + cemuLog_log(LogType::Force, "Cannot create an Android Vulkan surface: {}", (sint32)err); + throw std::runtime_error(fmt::format("Cannot create an Android Vulkan surface: {}", err)); + } + + return result; +} +#else VkSurfaceKHR VulkanRenderer::CreateXlibSurface(VkInstance instance, Display* dpy, Window window) { VkXlibSurfaceCreateInfoKHR sci{}; @@ -1329,22 +1352,27 @@ VkSurfaceKHR VulkanRenderer::CreateWaylandSurface(VkInstance instance, wl_displa return result; } #endif // HAS_WAYLAND +#endif // __ANDROID__ #endif // BOOST_OS_LINUX -VkSurfaceKHR VulkanRenderer::CreateFramebufferSurface(VkInstance instance, struct WindowHandleInfo& windowInfo) +VkSurfaceKHR VulkanRenderer::CreateFramebufferSurface(VkInstance instance, struct GuiSystem::WindowHandleInfo& windowInfo) { #if BOOST_OS_WINDOWS - return CreateWinSurface(instance, windowInfo.hwnd); + return CreateWinSurface(instance, reinterpret_cast(windowInfo.hwnd)); #elif BOOST_OS_LINUX - if(windowInfo.backend == WindowHandleInfo::Backend::X11) - return CreateXlibSurface(instance, windowInfo.xlib_display, windowInfo.xlib_window); +#if __ANDROID__ + return CreateAndroidSurface(instance, static_cast(windowInfo.surface)); +#else + if(windowInfo.backend == GuiSystem::WindowHandleInfo::Backend::X11) + return CreateXlibSurface(instance, static_cast(windowInfo.display), reinterpret_cast(windowInfo.surface)); #ifdef HAS_WAYLAND - if(windowInfo.backend == WindowHandleInfo::Backend::WAYLAND) - return CreateWaylandSurface(instance, windowInfo.display, windowInfo.surface); + if(windowInfo.backend == GuiSystem::WindowHandleInfo::Backend::Wayland) + return CreateWaylandSurface(instance, static_cast(windowInfo.display), static_cast(windowInfo.surface)); #endif return {}; +#endif // __ANDROID__ #elif BOOST_OS_MACOS - return CreateCocoaSurface(instance, windowInfo.handle); + return CreateCocoaSurface(instance, windowInfo.surface); #endif } @@ -2618,7 +2646,13 @@ bool VulkanRenderer::AcquireNextSwapchainImage(bool mainWindow) m_padCloseReadySemaphore.notify(); return false; } - +#if __ANDROID__ + std::unique_lock lock(m_surfaceMutex); + m_surfaceCondVar.wait(lock,[&](){ + auto& chainInfo = GetChainInfoPtr(mainWindow); + return chainInfo && chainInfo->surface; + }); +#endif // __ANDROID__ auto& chainInfo = GetChainInfo(mainWindow); if (chainInfo.swapchainImageIndex != -1) @@ -2647,11 +2681,11 @@ void VulkanRenderer::RecreateSwapchain(bool mainWindow, bool skipCreate) if (mainWindow) { ImGui_ImplVulkan_Shutdown(); - gui_getWindowPhysSize(size.x, size.y); + GuiSystem::getWindowPhysSize(size.x, size.y); } else { - gui_getPadWindowPhysSize(size.x, size.y); + GuiSystem::getPadWindowPhysSize(size.x, size.y); } chainInfo.swapchainImageIndex = -1; @@ -2681,9 +2715,9 @@ bool VulkanRenderer::UpdateSwapchainProperties(bool mainWindow) int width, height; if (mainWindow) - gui_getWindowPhysSize(width, height); + GuiSystem::getWindowPhysSize(width, height); else - gui_getPadWindowPhysSize(width, height); + GuiSystem::getPadWindowPhysSize(width, height); auto extent = chainInfo.getExtent(); if (width != extent.width || height != extent.height) stateChanged = true; @@ -2886,7 +2920,25 @@ void VulkanRenderer::DrawBackbufferQuad(LatteTextureView* texView, RendererOutpu auto descriptSet = backbufferBlit_createDescriptorSet(m_swapchainDescriptorSetLayout, texViewVk, useLinearTexFilter); vkCmdBeginRenderPass(m_state.currentCommandBuffer, &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE); - +#if __ANDROID__ + float radians = 0.0f; + switch (chainInfo.m_preTransform) + { + case VK_SURFACE_TRANSFORM_ROTATE_90_BIT_KHR: + radians = glm::radians(90.0f); + break; + case VK_SURFACE_TRANSFORM_ROTATE_180_BIT_KHR: + radians = glm::radians(180.0f); + break; + case VK_SURFACE_TRANSFORM_ROTATE_270_BIT_KHR: + radians = glm::radians(270.0f); + break; + default: + break; + } + const glm::mat2 preRotate = glm::rotate(glm::mat4(1.0), radians, glm::vec3(0.0F, 0.0F, 1.0F)); + vkCmdPushConstants(m_state.currentCommandBuffer, m_pipelineLayout, VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(preRotate), &preRotate); +#endif // __ANDROID__ vkCmdBindPipeline(m_state.currentCommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline); m_state.currentPipeline = pipeline; @@ -3710,7 +3762,29 @@ void VulkanRenderer::AppendOverlayDebugInfo() ImGui::Text("--- Tex heaps ---"); memoryManager->appendOverlayHeapDebugInfo(); } - +#if __ANDROID__ +void VulkanRenderer::ClearSurface(bool mainWindow) +{ + std::lock_guard lock(m_surfaceMutex); + auto& chainInfo = GetChainInfoPtr(mainWindow); + if(!chainInfo || !chainInfo->surface) + return; + vkDestroySurfaceKHR(m_instance, chainInfo->surface, nullptr); + chainInfo->surface = nullptr; +} +void VulkanRenderer::NotifySurfaceChanged(bool mainWindow) +{ + std::lock_guard lock(m_surfaceMutex); + auto& chainInfo = GetChainInfoPtr(mainWindow); + if(!chainInfo) + return; + if(mainWindow) + chainInfo->surface = CreateFramebufferSurface(m_instance, GuiSystem::getWindowInfo().canvas_main); + else + chainInfo->surface = CreateFramebufferSurface(m_instance, GuiSystem::getWindowInfo().canvas_pad); + m_surfaceCondVar.notify_one(); +} +#endif // __ANDROID__ void VKRDestructibleObject::flagForCurrentCommandBuffer() { m_lastCmdBufferId = VulkanRenderer::GetInstance()->GetCurrentCommandBufferId(); diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h index b61a0b40..909ef24e 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h @@ -12,6 +12,7 @@ #include "util/helpers/Semaphore.h" #include "util/containers/flat_hash_map.hpp" #include "util/containers/robin_hood.h" +#include "Cemu/GuiSystem/GuiSystem.h" struct VkSupportedFormatInfo_t { @@ -183,7 +184,10 @@ public: void GetDeviceFeatures(); void DetermineVendor(); void InitializeSurface(const Vector2i& size, bool mainWindow); - +#if __ANDROID__ + void ClearSurface(bool mainWindow); + void NotifySurfaceChanged(bool mainWindow); +#endif // __ANDROID const std::unique_ptr& GetChainInfoPtr(bool mainWindow) const; SwapchainInfoVk& GetChainInfo(bool mainWindow) const; @@ -199,14 +203,18 @@ public: static VkSurfaceKHR CreateWinSurface(VkInstance instance, HWND hwindow); #endif #if BOOST_OS_LINUX +#if __ANDROID__ + static VkSurfaceKHR CreateAndroidSurface(VkInstance instance, ANativeWindow* window); +#else static VkSurfaceKHR CreateXlibSurface(VkInstance instance, Display* dpy, Window window); static VkSurfaceKHR CreateXcbSurface(VkInstance instance, xcb_connection_t* connection, xcb_window_t window); - #ifdef HAS_WAYLAND +#ifdef HAS_WAYLAND static VkSurfaceKHR CreateWaylandSurface(VkInstance instance, wl_display* display, wl_surface* surface); - #endif -#endif +#endif // HAS_WAYLAND +#endif // __ANDROID__ +#endif // BOOST_OS_LINUX - static VkSurfaceKHR CreateFramebufferSurface(VkInstance instance, struct WindowHandleInfo& windowInfo); + static VkSurfaceKHR CreateFramebufferSurface(VkInstance instance, GuiSystem::WindowHandleInfo& windowInfo); void AppendOverlayDebugInfo() override; @@ -599,6 +607,11 @@ private: VkPipelineLayout m_pipelineLayout{nullptr}; VkCommandPool m_commandPool{ nullptr }; +#if __ANDROID__ + std::mutex m_surfaceMutex; + std::condition_variable m_surfaceCondVar; +#endif // __ANDROID__ + // buffer to cache uniform vars VkBuffer m_uniformVarBuffer = VK_NULL_HANDLE; VkDeviceMemory m_uniformVarBufferMemory = VK_NULL_HANDLE; diff --git a/src/Cafe/HW/MMU/MMU.cpp b/src/Cafe/HW/MMU/MMU.cpp index 04ee8877..d5751050 100644 --- a/src/Cafe/HW/MMU/MMU.cpp +++ b/src/Cafe/HW/MMU/MMU.cpp @@ -1,7 +1,6 @@ #include "Cafe/HW/MMU/MMU.h" #include "Cafe/GraphicPack/GraphicPack2.h" #include "util/MemMapper/MemMapper.h" -#include #include "config/ActiveSettings.h" uint8* memory_base = NULL; // base address of the reserved 4GB space @@ -90,8 +89,7 @@ void MMURange::mapMem() cemu_assert_debug(!m_isMapped); if (MemMapper::AllocateMemory(memory_base + baseAddress, size, MemMapper::PAGE_PERMISSION::P_RW, true) == nullptr) { - std::string errorMsg = fmt::format("Unable to allocate {} memory", name); - wxMessageBox(errorMsg.c_str(), "Error", wxOK | wxCENTRE | wxICON_ERROR); + cemuLog_log(LogType::Force, "Unable to allocate {} memory", name); #if BOOST_OS_WINDOWS ExitProcess(-1); #else @@ -131,9 +129,8 @@ void memory_init() memory_base = (uint8*)MemMapper::ReserveMemory(nullptr, (size_t)0x100000000, MemMapper::PAGE_PERMISSION::P_RW); if( !memory_base ) { - debug_printf("memory_init(): Unable to reserve 4GB of memory\n"); debugBreakpoint(); - wxMessageBox("Unable to reserve 4GB of memory\n", "Error", wxOK | wxCENTRE | wxICON_ERROR); + cemuLog_log(LogType::Force, "Unable to reserve 4GB of memory"); exit(-1); } for (auto& itr : g_mmuRanges) diff --git a/src/Cafe/IOSU/legacy/iosu_act.cpp b/src/Cafe/IOSU/legacy/iosu_act.cpp index ed3a69bd..dc0fd045 100644 --- a/src/Cafe/IOSU/legacy/iosu_act.cpp +++ b/src/Cafe/IOSU/legacy/iosu_act.cpp @@ -2,7 +2,6 @@ #include "iosu_ioctl.h" #include "Cafe/OS/libs/nn_common.h" -#include "gui/CemuApp.h" #include #include diff --git a/src/Cafe/OS/RPL/rpl.cpp b/src/Cafe/OS/RPL/rpl.cpp index f0703290..7f9d1948 100644 --- a/src/Cafe/OS/RPL/rpl.cpp +++ b/src/Cafe/OS/RPL/rpl.cpp @@ -14,7 +14,6 @@ #include "util/crypto/crc32.h" #include "config/ActiveSettings.h" #include "Cafe/OS/libs/coreinit/coreinit_DynLoad.h" -#include "gui/guiWrapper.h" class PPCCodeHeap : public VHeap { @@ -1795,7 +1794,8 @@ void RPLLoader_UnloadModule(RPLModule* rpl) RPLLoader_decrementModuleDependencyRefs(rpl); // save module config for this module in the debugger - debuggerWindow_notifyModuleUnloaded(rpl); + auto debuggerInterface = debugger_getDebuggerCallbacks(); + if (debuggerInterface) debuggerInterface->notifyModuleLoaded(rpl); // release memory rplLoaderHeap_codeArea2.free(rpl->regionMappingBase_text.GetPtr()); @@ -1878,7 +1878,8 @@ void RPLLoader_Link() RPLLoader_LoadDebugSymbols(rplModuleList[i]); rplModuleList[i]->isLinked = true; // mark as linked GraphicPack2::NotifyModuleLoaded(rplModuleList[i]); - debuggerWindow_notifyModuleLoaded(rplModuleList[i]); + auto debuggerCallbacks = debugger_getDebuggerCallbacks(); + if (debuggerCallbacks) debuggerCallbacks->notifyModuleLoaded(rplModuleList[i]); } } diff --git a/src/Cafe/OS/libs/erreula/erreula.cpp b/src/Cafe/OS/libs/erreula/erreula.cpp index c95816b6..1d88b976 100644 --- a/src/Cafe/OS/libs/erreula/erreula.cpp +++ b/src/Cafe/OS/libs/erreula/erreula.cpp @@ -6,8 +6,6 @@ #include #include "imgui/imgui_extension.h" -#include - #include "Cafe/OS/libs/coreinit/coreinit_FS.h" #include "Cafe/OS/libs/vpad/vpad.h" diff --git a/src/Cafe/OS/libs/nn_save/nn_save.cpp b/src/Cafe/OS/libs/nn_save/nn_save.cpp index 78de8291..c655ec90 100644 --- a/src/Cafe/OS/libs/nn_save/nn_save.cpp +++ b/src/Cafe/OS/libs/nn_save/nn_save.cpp @@ -1,5 +1,4 @@ #include "Cafe/OS/common/OSCommon.h" -#include "gui/wxgui.h" #include "nn_save.h" #include "Cafe/OS/libs/nn_acp/nn_acp.h" @@ -208,79 +207,6 @@ namespace save return ConvertACPToSaveStatus(acp::ACPUnmountSaveDir()); } - void _CheckAndMoveLegacySaves() - { - const uint64 titleId = CafeSystem::GetForegroundTitleId(); - - fs::path targetPath, sourcePath; - try - { - bool copiedUser = false, copiedCommon = false; - - const auto sourceSavePath = ActiveSettings::GetMlcPath("emulatorSave/{:08x}", CafeSystem::GetRPXHashBase()); - sourcePath = sourceSavePath; - - if (fs::exists(sourceSavePath) && is_directory(sourceSavePath)) - { - targetPath = ActiveSettings::GetMlcPath("usr/save/{:08x}/{:08x}/user/{:08x}", GetTitleIdHigh(titleId), GetTitleIdLow(titleId), 0x80000001); - fs::create_directories(targetPath); - copy(sourceSavePath, targetPath, fs::copy_options::overwrite_existing | fs::copy_options::recursive); - copiedUser = true; - } - - const auto sourceCommonPath = ActiveSettings::GetMlcPath("emulatorSave/{:08x}_255", CafeSystem::GetRPXHashBase()); - sourcePath = sourceCommonPath; - - if (fs::exists(sourceCommonPath) && is_directory(sourceCommonPath)) - { - targetPath = ActiveSettings::GetMlcPath("usr/save/{:08x}/{:08x}/user/common", GetTitleIdHigh(titleId), GetTitleIdLow(titleId)); - fs::create_directories(targetPath); - copy(sourceCommonPath, targetPath, fs::copy_options::overwrite_existing | fs::copy_options::recursive); - copiedCommon = true; - } - - if (copiedUser) - fs::remove_all(sourceSavePath); - - if (copiedCommon) - fs::remove_all(sourceCommonPath); - } - catch (const std::exception& ex) - { -#if BOOST_OS_WINDOWS - std::wstringstream errorMsg; - errorMsg << L"Couldn't move your save files!" << std::endl << std::endl; - errorMsg << L"Error: " << ex.what() << std::endl << std::endl; - errorMsg << L"From:" << std::endl << sourcePath << std::endl << std::endl << "To:" << std::endl << targetPath; - - const DWORD lastError = GetLastError(); - if (lastError != ERROR_SUCCESS) - { - LPTSTR lpMsgBuf = nullptr; - FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, nullptr, lastError, 0, (LPTSTR)&lpMsgBuf, 0, nullptr); - if (lpMsgBuf) - { - errorMsg << std::endl << std::endl << L"Details: " << lpMsgBuf; - LocalFree(lpMsgBuf); - } - else - { - errorMsg << std::endl << std::endl << L"Error Code: 0x" << std::hex << lastError; - } - } - - errorMsg << std::endl << std::endl << "Continuing will create a new save at the target location." << std::endl << "Do you want to continue?"; - - int result = wxMessageBox(errorMsg.str(), "Save Migration - Error", wxCENTRE | wxYES_NO | wxICON_ERROR); - if (result != wxYES) - { - exit(0); - return; - } -#endif - } - } - SAVEStatus SAVEInit() { const uint64 titleId = CafeSystem::GetForegroundTitleId(); @@ -300,8 +226,6 @@ namespace save SAVEMountSaveDir(); g_nn_save->initialized = true; - _CheckAndMoveLegacySaves(); - uint32 high = GetTitleIdHigh(titleId) & (~0xC); uint32 low = GetTitleIdLow(titleId); diff --git a/src/Cafe/OS/libs/padscore/padscore.cpp b/src/Cafe/OS/libs/padscore/padscore.cpp index 47f3bc4f..821cd49e 100644 --- a/src/Cafe/OS/libs/padscore/padscore.cpp +++ b/src/Cafe/OS/libs/padscore/padscore.cpp @@ -1,6 +1,5 @@ #include "Cafe/OS/common/OSCommon.h" #include "Cafe/HW/Espresso/PPCCallback.h" -#include "gui/wxgui.h" #include "Cafe/OS/libs/padscore/padscore.h" #include "Cafe/OS/libs/coreinit/coreinit_Time.h" #include "Cafe/OS/libs/coreinit/coreinit_Alarm.h" @@ -450,7 +449,7 @@ sint32 _KPADRead(uint32 channel, KPADStatus_t* samplingBufs, uint32 length, bety samplingBufs->wpadErr = WPAD_ERR_NONE; samplingBufs->data_format = controller->get_data_format(); samplingBufs->devType = controller->get_device_type(); - if(!g_inputConfigWindowHasFocus) + if (!InputManager::input_config_window_has_focus()) { const auto btn_repeat = padscore::g_padscore.controller_data[channel].btn_repeat; controller->KPADRead(*samplingBufs, btn_repeat); diff --git a/src/Cafe/OS/libs/vpad/vpad.cpp b/src/Cafe/OS/libs/vpad/vpad.cpp index 94bb0ca2..85767b56 100644 --- a/src/Cafe/OS/libs/vpad/vpad.cpp +++ b/src/Cafe/OS/libs/vpad/vpad.cpp @@ -1,6 +1,5 @@ #include "Cafe/OS/common/OSCommon.h" #include "Cafe/HW/Espresso/PPCCallback.h" -#include "gui/wxgui.h" #include "Cafe/OS/libs/vpad/vpad.h" #include "audio/IAudioAPI.h" #include "Cafe/OS/libs/coreinit/coreinit_Time.h" @@ -263,7 +262,7 @@ namespace vpad PPCCore_switchToScheduler(); } - if (!g_inputConfigWindowHasFocus) + if (!InputManager::input_config_window_has_focus()) { if (channel <= 1 && vpadDelayEnabled) { diff --git a/src/Cafe/TitleList/TitleInfo.cpp b/src/Cafe/TitleList/TitleInfo.cpp index ff457575..db9951d6 100644 --- a/src/Cafe/TitleList/TitleInfo.cpp +++ b/src/Cafe/TitleList/TitleInfo.cpp @@ -6,6 +6,10 @@ #include "pugixml.hpp" #include "Common/FileStream.h" +#if __ANDROID__ +#include "Common/unix/ContentUriIStream.h" +#endif // __ANDROID__ + #include #include "config/ActiveSettings.h" @@ -178,7 +182,7 @@ bool TitleInfo::ParseWuaTitleFolderName(std::string_view name, TitleId& titleIdO bool TitleInfo::DetectFormat(const fs::path& path, fs::path& pathOut, TitleDataFormat& formatOut) { std::error_code ec; - if (path.has_extension() && fs::is_regular_file(path, ec)) + if (path.has_extension() && cemu::fs::is_file(path, ec)) { std::string filenameStr = _pathToUtf8(path.filename()); if (boost::iends_with(filenameStr, ".rpx")) @@ -190,7 +194,7 @@ bool TitleInfo::DetectFormat(const fs::path& path, fs::path& pathOut, TitleDataF parentPath = parentPath.parent_path(); // next to content and meta? std::error_code ec; - if (fs::exists(parentPath / "content", ec) && fs::exists(parentPath / "meta", ec)) + if (cemu::fs::exists(parentPath / "content", ec) && cemu::fs::exists(parentPath / "meta", ec)) { formatOut = TitleDataFormat::HOST_FS; pathOut = parentPath; @@ -218,7 +222,13 @@ bool TitleInfo::DetectFormat(const fs::path& path, fs::path& pathOut, TitleDataF pathOut = path; // a Wii U archive file can contain multiple titles but TitleInfo only maps to one // we use the first base title that we find. This is the most intuitive behavior when someone launches "game.wua" - ZArchiveReader* zar = ZArchiveReader::OpenFromFile(path); + ZArchiveReader* zar = nullptr; +#if __ANDROID__ + if(FilesystemAndroid::isContentUri(path)) + zar = ZArchiveReader::OpenFromStream(std::make_unique(path)); + else +#endif // __ANDROID__ + zar = ZArchiveReader::OpenFromFile(path); if (!zar) return false; ZArchiveNodeHandle rootDir = zar->LookUp("", false, true); @@ -263,7 +273,7 @@ bool TitleInfo::DetectFormat(const fs::path& path, fs::path& pathOut, TitleDataF { // does it point to the root folder of a title? std::error_code ec; - if (fs::exists(path / "content", ec) && fs::exists(path / "meta", ec) && fs::exists(path / "code", ec)) + if (cemu::fs::exists(path / "content", ec) && cemu::fs::exists(path / "meta", ec) && cemu::fs::exists(path / "code", ec)) { formatOut = TitleDataFormat::HOST_FS; pathOut = path; @@ -343,7 +353,13 @@ ZArchiveReader* _ZArchivePool_AcquireInstance(const fs::path& path) } _lock.unlock(); // opening wua files can be expensive, so we do it outside of the lock - ZArchiveReader* zar = ZArchiveReader::OpenFromFile(path); + ZArchiveReader* zar = nullptr; +#if __ANDROID__ + if(FilesystemAndroid::isContentUri(path)) + zar = ZArchiveReader::OpenFromStream(std::make_unique(path)); + else +#endif // __ANDROID__ + zar = ZArchiveReader::OpenFromFile(path); if (!zar) return nullptr; _lock.lock(); @@ -385,7 +401,7 @@ bool TitleInfo::Mount(std::string_view virtualPath, std::string_view subfolder, { fs::path hostFSPath = m_fullPath; hostFSPath.append(subfolder); - bool r = FSCDeviceHostFS_Mount(std::string(virtualPath).c_str(), _pathToUtf8(hostFSPath), mountPriority); + bool r = FSCDeviceHost_Mount(std::string(virtualPath).c_str(), _pathToUtf8(hostFSPath), mountPriority); cemu_assert_debug(r); if (!r) { diff --git a/src/Cafe/TitleList/TitleList.cpp b/src/Cafe/TitleList/TitleList.cpp index 1cc084b8..61e29195 100644 --- a/src/Cafe/TitleList/TitleList.cpp +++ b/src/Cafe/TitleList/TitleList.cpp @@ -3,6 +3,11 @@ #include "util/helpers/helpers.h" +#if __ANDROID__ +#include "Common/unix/FilesystemAndroid.h" +#include "Common/unix/ContentUriIStream.h" +#endif // __ANDROID__ + #include bool sTLInitialized{ false }; @@ -216,7 +221,13 @@ void CafeTitleList::AddTitleFromPath(fs::path path) { if (path.has_extension() && boost::iequals(_pathToUtf8(path.extension()), ".wua")) { - ZArchiveReader* zar = ZArchiveReader::OpenFromFile(path); + ZArchiveReader* zar = nullptr; +#if __ANDROID__ + if(FilesystemAndroid::isContentUri(path)) + zar = ZArchiveReader::OpenFromStream(std::make_unique(path)); + else +#endif // __ANDROID__ + zar = ZArchiveReader::OpenFromFile(path); if (!zar) { cemuLog_log(LogType::Force, "Found {} but it is not a valid Wii U archive file", _pathToUtf8(path)); @@ -351,25 +362,50 @@ void CafeTitleList::ScanGamePath(const fs::path& path) std::vector filesInDirectory; std::vector dirsInDirectory; bool hasContentFolder = false, hasCodeFolder = false, hasMetaFolder = false; - std::error_code ec; - for (auto& it : fs::directory_iterator(path, ec)) - { - if (it.is_regular_file(ec)) + auto checkForTitleFolders = [&](const std::string& dirName) + { + if (boost::iequals(dirName, "content")) + hasContentFolder = true; + else if (boost::iequals(dirName, "code")) + hasCodeFolder = true; + else if (boost::iequals(dirName, "meta")) + hasMetaFolder = true; + }; +#if __ANDROID__ + if(FilesystemAndroid::isContentUri(path)) + { + for(auto&& file:FilesystemAndroid::listFiles(path)) { - filesInDirectory.emplace_back(it.path()); - } - else if (it.is_directory(ec)) - { - dirsInDirectory.emplace_back(it.path()); - std::string dirName = _pathToUtf8(it.path().filename()); - if (boost::iequals(dirName, "content")) - hasContentFolder = true; - else if (boost::iequals(dirName, "code")) - hasCodeFolder = true; - else if (boost::iequals(dirName, "meta")) - hasMetaFolder = true; + if(FilesystemAndroid::isFile(file)) + { + filesInDirectory.emplace_back(file); + } + else if(FilesystemAndroid::isDirectory(file)) + { + dirsInDirectory.emplace_back(file); + + checkForTitleFolders(_pathToUtf8(file.filename())); + } } } + else +#endif // __ANDROID__ + { + std::error_code ec; + for (auto& it : fs::directory_iterator(path, ec)) + { + if (it.is_regular_file(ec)) + { + filesInDirectory.emplace_back(it.path()); + } + else if (it.is_directory(ec)) + { + dirsInDirectory.emplace_back(it.path()); + checkForTitleFolders(_pathToUtf8(it.path().filename())); + } + } + } + // always check individual files for (auto& it : filesInDirectory) { diff --git a/src/Cemu/CMakeLists.txt b/src/Cemu/CMakeLists.txt index 1fce8ec1..cceb7d06 100644 --- a/src/Cemu/CMakeLists.txt +++ b/src/Cemu/CMakeLists.txt @@ -5,6 +5,8 @@ add_library(CemuComponents ExpressionParser/ExpressionParser.h FileCache/FileCache.cpp FileCache/FileCache.h + GuiSystem/GuiSystem.cpp + GuiSystem/GuiSystem.h Logging/CemuDebugLogging.h Logging/CemuLogging.cpp Logging/CemuLogging.h @@ -40,7 +42,6 @@ target_link_libraries(CemuComponents PRIVATE CemuCafe CemuCommon CemuConfig - CemuGui CemuUtil Boost::headers CURL::libcurl diff --git a/src/Cemu/GuiSystem/GuiSystem.cpp b/src/Cemu/GuiSystem/GuiSystem.cpp new file mode 100644 index 00000000..2d2ce5f5 --- /dev/null +++ b/src/Cemu/GuiSystem/GuiSystem.cpp @@ -0,0 +1,97 @@ +#include "GuiSystem.h" + +namespace GuiSystem +{ +std::function s_key_code_to_string; +void registerKeyCodeToStringCallback(const std::function& keyCodeToString) +{ + s_key_code_to_string = keyCodeToString; +} +void unregisterKeyCodeToStringCallback() +{ + s_key_code_to_string = {}; +} +std::string keyCodeToString(uint32 key) +{ + if (!s_key_code_to_string) + return ""; + return s_key_code_to_string(key); +} + +WindowInfo s_window_info; + +WindowInfo& getWindowInfo() +{ + return s_window_info; +} + +void getWindowSize(int& w, int& h) +{ + w = s_window_info.width; + h = s_window_info.height; +} + +void getPadWindowSize(int& w, int& h) +{ + if (s_window_info.pad_open) + { + w = s_window_info.pad_width; + h = s_window_info.pad_height; + } + else + { + w = 0; + h = 0; + } +} + +void getWindowPhysSize(int& w, int& h) +{ + w = s_window_info.phys_width; + h = s_window_info.phys_height; +} + +void getPadWindowPhysSize(int& w, int& h) +{ + if (s_window_info.pad_open) + { + w = s_window_info.phys_pad_width; + h = s_window_info.phys_pad_height; + } + else + { + w = 0; + h = 0; + } +} + +double getWindowDPIScale() +{ + return s_window_info.dpi_scale; +} + +double getPadDPIScale() +{ + return s_window_info.pad_open ? s_window_info.pad_dpi_scale.load() : 1.0; +} + +bool isPadWindowOpen() +{ + return s_window_info.pad_open; +} + +bool isKeyDown(uint32 key) +{ + return s_window_info.get_keystate(key); +} + +bool isKeyDown(PlatformKeyCodes key) +{ + return s_window_info.get_keystate(key); +} + +bool isFullScreen() +{ + return s_window_info.is_fullscreen; +} +} // namespace GuiSystem \ No newline at end of file diff --git a/src/Cemu/GuiSystem/GuiSystem.h b/src/Cemu/GuiSystem/GuiSystem.h new file mode 100644 index 00000000..8aecf8ca --- /dev/null +++ b/src/Cemu/GuiSystem/GuiSystem.h @@ -0,0 +1,115 @@ +#pragma once + +namespace GuiSystem +{ + +struct WindowHandleInfo +{ + enum class Backend + { + X11, + Wayland, + Android, + Cocoa, + Windows + } backend; + void* display = nullptr; + void* surface = nullptr; +}; + +enum struct PlatformKeyCodes : uint32 +{ + LCONTROL, + RCONTROL, + TAB, + MAX +}; + +struct WindowInfo +{ + std::atomic_bool app_active; // our app is active/has focus + + std::atomic_int32_t width, height; // client size of main window + std::atomic_int32_t phys_width, phys_height; // client size of main window in physical pixels + std::atomic dpi_scale; + + std::atomic_bool pad_open; // if separate pad view is open + std::atomic_int32_t pad_width, pad_height; // client size of pad window + std::atomic_int32_t phys_pad_width, phys_pad_height; // client size of pad window in physical pixels + std::atomic pad_dpi_scale; + + std::atomic_bool pad_maximized = false; + std::atomic_int32_t restored_pad_x = -1, restored_pad_y = -1; + std::atomic_int32_t restored_pad_width = -1, restored_pad_height = -1; + + std::atomic_bool has_screenshot_request; + std::atomic_bool is_fullscreen; + + inline void set_keystate(uint32 keycode, bool state) + { + const std::lock_guard lock(keycode_mutex); + m_keydown[keycode] = state; + } + + inline void set_keystate(PlatformKeyCodes keycode, bool state) + { + const std::lock_guard lock(keycode_mutex); + m_platformkeydown.at(static_cast(keycode)) = state; + } + + inline bool get_keystate(uint32 keycode) + { + const std::lock_guard lock(keycode_mutex); + auto result = m_keydown.find(keycode); + if (result == m_keydown.end()) + return false; + return result->second; + } + + inline bool get_keystate(PlatformKeyCodes keycode) + { + const std::lock_guard lock(keycode_mutex); + return m_platformkeydown.at(static_cast(keycode)); + } + + inline void set_keystates_up() + { + const std::lock_guard lock(keycode_mutex); + std::for_each(m_keydown.begin(), m_keydown.end(), [](std::pair& el) { el.second = false; }); + m_platformkeydown.fill(false); + } + + template + void iter_keystates(fn f) + { + const std::lock_guard lock(keycode_mutex); + std::for_each(m_keydown.cbegin(), m_keydown.cend(), f); + } + + WindowHandleInfo window_main; + WindowHandleInfo window_pad; + + WindowHandleInfo canvas_main; + WindowHandleInfo canvas_pad; + + private: + std::array(PlatformKeyCodes::MAX)> m_platformkeydown; + std::mutex keycode_mutex; + std::unordered_map m_keydown; +}; + +void registerKeyCodeToStringCallback(const std::function& keyCodeToString); +void unregisterKeyCodeToStringCallback(); +std::string keyCodeToString(uint32 key); +void getWindowSize(int& w, int& h); +void getPadWindowSize(int& w, int& h); +void getWindowPhysSize(int& w, int& h); +void getPadWindowPhysSize(int& w, int& h); +double getWindowDPIScale(); +double getPadDPIScale(); +bool isPadWindowOpen(); +bool isKeyDown(uint32 key); +bool isKeyDown(PlatformKeyCodes key); +bool isFullScreen(); +WindowInfo& getWindowInfo(); +} // namespace GuiSystem \ No newline at end of file diff --git a/src/Cemu/Logging/CemuLogging.cpp b/src/Cemu/Logging/CemuLogging.cpp index 6d596acf..299ed62d 100644 --- a/src/Cemu/Logging/CemuLogging.cpp +++ b/src/Cemu/Logging/CemuLogging.cpp @@ -1,5 +1,4 @@ #include "CemuLogging.h" -#include "gui/LoggingWindow.h" #include "util/helpers/helpers.h" #include "config/CemuConfig.h" #include "config/ActiveSettings.h" @@ -57,6 +56,19 @@ const std::map g_logging_window_mapping {LogType::VulkanValidation, "Vulkan validation layer"}, }; +LogCallbacks* g_logCallbacks = nullptr; + +void cemuLog_registerLogCallbacks(LogCallbacks* logCallbacks) +{ + g_logCallbacks = logCallbacks; +} + +void cemuLog_unregisterLogCallbacks() +{ + g_logCallbacks = nullptr; +} + + bool cemuLog_advancedPPCLoggingEnabled() { return GetConfig().advanced_ppc_logging; @@ -144,10 +156,13 @@ bool cemuLog_log(LogType type, std::string_view text) const auto it = std::find_if(g_logging_window_mapping.cbegin(), g_logging_window_mapping.cend(), [type](const auto& entry) { return entry.first == type; }); - if (it == g_logging_window_mapping.cend()) - LoggingWindow::Log(text); - else - LoggingWindow::Log(it->second, text); + if (g_logCallbacks) + { + if (it == g_logging_window_mapping.cend()) + g_logCallbacks->Log("", text); + else + g_logCallbacks->Log(it->second, text); + } return true; } diff --git a/src/Cemu/Logging/CemuLogging.h b/src/Cemu/Logging/CemuLogging.h index 728c8b93..73ed0920 100644 --- a/src/Cemu/Logging/CemuLogging.h +++ b/src/Cemu/Logging/CemuLogging.h @@ -110,6 +110,16 @@ bool cemuLog_logDebug(LogType type, TFmt format, TArgs&&... args) #endif } +class LogCallbacks +{ +public: + virtual void Log(std::string_view filter, std::string_view message) = 0; + virtual void Log(std::string_view filter, std::wstring_view message) = 0; +}; + +void cemuLog_registerLogCallbacks(LogCallbacks* logCallbacks); +void cemuLog_unregisterLogCallbacks(); + // cafe lib calls bool cemuLog_advancedPPCLoggingEnabled(); diff --git a/src/Cemu/Tools/DownloadManager/DownloadManager.cpp b/src/Cemu/Tools/DownloadManager/DownloadManager.cpp index 807a4e72..6b27e067 100644 --- a/src/Cemu/Tools/DownloadManager/DownloadManager.cpp +++ b/src/Cemu/Tools/DownloadManager/DownloadManager.cpp @@ -1,7 +1,6 @@ #include "Cemu/Tools/DownloadManager/DownloadManager.h" #include "Cafe/Account/Account.h" -#include "gui/CemuApp.h" #include "util/crypto/md5.h" #include "Cafe/TitleList/TitleId.h" #include "Common/FileStream.h" @@ -10,7 +9,6 @@ #include "config/ActiveSettings.h" #include "util/ThreadPool/ThreadPool.h" #include "util/helpers/enum_array.hpp" -#include "gui/MainWindow.h" #include "Cafe/Filesystem/FST/FST.h" #include "Cafe/TitleList/TitleList.h" @@ -20,15 +18,21 @@ #include #include -#include "gui/helpers/wxHelpers.h" - #include "Cemu/napi/napi.h" #include "util/helpers/Serializer.h" FileCache* s_nupFileCache = nullptr; -/* version list */ +// Todo: replace this +std::string _(const std::string& str) { return str; } +std::string from_wxString(const std::string& str){ return str; } +void DownloadManager::setOnGameListRefreshRequested(const std::function& onGameListRefreshRequested) +{ + m_onGameListRefreshRequested = onGameListRefreshRequested; +} + +/* version list */ void DownloadManager::downloadTitleVersionList() { if (m_hasTitleVersionList) @@ -371,7 +375,7 @@ bool DownloadManager::syncAccountTickets() for (auto& tiv : resultTicketIds.tivs) { index++; - std::string msg = _("Downloading account ticket").utf8_string(); + std::string msg = _("Downloading account ticket"); msg.append(fmt::format(" {0}/{1}", index, count)); setStatusMessage(msg, DLMGR_STATUS_CODE::CONNECTING); // skip if already cached @@ -508,7 +512,7 @@ bool DownloadManager::syncUpdateTickets() if (titleIdParser.GetType() != TitleIdParser::TITLE_TYPE::BASE_TITLE_UPDATE) continue; - std::string msg = _("Downloading ticket").utf8_string(); + std::string msg = _("Downloading ticket"); msg.append(fmt::format(" {0}/{1}", updateIndex, numUpdates)); updateIndex++; setStatusMessage(msg, DLMGR_STATUS_CODE::CONNECTING); @@ -561,7 +565,7 @@ bool DownloadManager::syncTicketCache() for (auto& ticketInfo : m_ticketCache) { index++; - std::string msg = _("Downloading meta data").utf8_string(); + std::string msg = _("Downloading meta data"); msg.append(fmt::format(" {0}/{1}", index, count)); setStatusMessage(msg, DLMGR_STATUS_CODE::CONNECTING); prepareIDBE(ticketInfo.titleId); @@ -1453,7 +1457,7 @@ void DownloadManager::asyncPackageInstall(Package* package) reportPackageStatus(package); checkPackagesState(); // lastly request game list to be refreshed - MainWindow::RequestGameListRefresh(); + if (m_onGameListRefreshRequested) m_onGameListRefreshRequested(); return; } diff --git a/src/Cemu/Tools/DownloadManager/DownloadManager.h b/src/Cemu/Tools/DownloadManager/DownloadManager.h index 1693318c..8fc4e84c 100644 --- a/src/Cemu/Tools/DownloadManager/DownloadManager.h +++ b/src/Cemu/Tools/DownloadManager/DownloadManager.h @@ -393,6 +393,8 @@ public: return m_userData; } + void setOnGameListRefreshRequested(const std::function& onGameListRefreshRequested); + // register/unregister callbacks // setting valid callbacks will also trigger transfer of the entire title/package state and the current status message void registerCallbacks( @@ -450,6 +452,7 @@ public: } private: + std::function m_onGameListRefreshRequested; void(*m_cbUpdateConnectStatus)(std::string statusText, DLMGR_STATUS_CODE statusCode) { nullptr }; void(*m_cbAddDownloadableTitle)(const DlMgrTitleReport& titleInfo); void(*m_cbRemoveDownloadableTitle)(uint64 titleId, uint16 version); diff --git a/src/Common/CMakeLists.txt b/src/Common/CMakeLists.txt index 9a764593..ad41e662 100644 --- a/src/Common/CMakeLists.txt +++ b/src/Common/CMakeLists.txt @@ -6,6 +6,7 @@ add_library(CemuCommon ExceptionHandler/ExceptionHandler.cpp ExceptionHandler/ExceptionHandler.h FileStream.h + FileStream.cpp GLInclude/glext.h GLInclude/glFunctions.h GLInclude/GLInclude.h @@ -53,6 +54,16 @@ if(UNIX AND NOT APPLE) ) endif() +if(ANDROID) + target_sources(CemuCommon PRIVATE + unix/ContentUriIStream.h + unix/FilesystemAndroid.cpp + unix/FilesystemAndroid.h + unix/FileStream_contentUri.cpp + unix/FileStream_contentUri.h + ) +endif() + # All the targets wanting to use the precompiled.h header # have to link to CemuCommon target_precompile_headers(CemuCommon PUBLIC precompiled.h) @@ -67,7 +78,11 @@ target_link_libraries(CemuCommon PRIVATE glm::glm ) -if (UNIX AND NOT APPLE) +if(ANDROID) + target_link_libraries(CemuCommon PRIVATE Boost::iostreams) +endif() + +if (UNIX AND NOT APPLE AND NOT ANDROID) target_link_libraries(CemuCommon PRIVATE X11::X11 X11::Xrender X11::Xutil) endif() diff --git a/src/Common/ExceptionHandler/ExceptionHandler_posix.cpp b/src/Common/ExceptionHandler/ExceptionHandler_posix.cpp index 34430e37..9e418307 100644 --- a/src/Common/ExceptionHandler/ExceptionHandler_posix.cpp +++ b/src/Common/ExceptionHandler/ExceptionHandler_posix.cpp @@ -10,6 +10,10 @@ #include "ELFSymbolTable.h" #endif +#if __ANDROID__ +#include +#endif // __ANDROID__ + #if BOOST_OS_LINUX void DemangleAndPrintBacktrace(char** backtrace, size_t size) { @@ -74,7 +78,10 @@ void handlerDumpingSignal(int sig, siginfo_t *info, void *context) // should never be the case printf("Unknown core dumping signal!\n"); } - + CrashLog_WriteLine(fmt::format("Error: signal {}:", sig)); +#if __ANDROID__ + CrashLog_WriteLine(to_string(boost::stacktrace::stacktrace())); +#else void* backtraceArray[128]; size_t size; @@ -86,8 +93,6 @@ void handlerDumpingSignal(int sig, siginfo_t *info, void *context) backtraceArray[0] = (void *)uc->uc_mcontext.gregs[REG_RIP]; #endif - CrashLog_WriteLine(fmt::format("Error: signal {}:", sig)); - #if BOOST_OS_LINUX char** symbol_trace = backtrace_symbols(backtraceArray, size); @@ -103,6 +108,7 @@ void handlerDumpingSignal(int sig, siginfo_t *info, void *context) #else backtrace_symbols_fd(backtraceArray, size, STDERR_FILENO); #endif +#endif // __ANDROID__ std::cerr << fmt::format("\nStacktrace and additional info written to:") << std::endl; std::cerr << cemuLog_GetLogFilePath().generic_string() << std::endl; diff --git a/src/Common/FileStream.cpp b/src/Common/FileStream.cpp new file mode 100644 index 00000000..b227b10b --- /dev/null +++ b/src/Common/FileStream.cpp @@ -0,0 +1,155 @@ +#include "Common/FileStream.h" + +#if BOOST_OS_UNIX + +#if __ANDROID__ +#include "Common/unix/FileStream_contentUri.h" +#include "Common/unix/FilesystemAndroid.h" +#endif // __ANDROID__ + +#include "Common/unix/FileStream_unix.h" + +FileStream* FileStream::openFile(std::string_view path) +{ + return openFile2(path, false); +} + +FileStream* FileStream::openFile(const wchar_t* path, bool allowWrite) +{ + return openFile2(path, allowWrite); +} + +FileStream* FileStream::openFile2(const fs::path& path, bool allowWrite) +{ +#if __ANDROID__ + if (FilesystemAndroid::isContentUri(path)) + { + if (allowWrite || FilesystemAndroid::isDirectory(path)) + { + return nullptr; + } + FileStreamContentUri* fs = new FileStreamContentUri(path); + if (fs->m_isValid) + return fs; + delete fs; + return nullptr; + } +#endif // __ANDROID__ + FileStreamUnix* fs = new FileStreamUnix(path, true, allowWrite); + if (fs->m_isValid) + return fs; + delete fs; + return nullptr; +} + +FileStream* FileStream::createFile(const wchar_t* path) +{ + return createFile2(path); +} + +FileStream* FileStream::createFile(std::string_view path) +{ + return createFile2(path); +} + +FileStream* FileStream::createFile2(const fs::path& path) +{ + FileStreamUnix* fs = new FileStreamUnix(path, false, false); + if (fs->m_isValid) + return fs; + delete fs; + return nullptr; +} + +std::optional> FileStream::LoadIntoMemory(const fs::path& path) +{ + FileStream* fs = openFile2(path); + if (!fs) + return std::nullopt; + uint64 fileSize = fs->GetSize(); + if (fileSize > 0xFFFFFFFFull) + { + delete fs; + return std::nullopt; + } + std::optional> v(fileSize); + if (fs->readData(v->data(), (uint32)fileSize) != (uint32)fileSize) + { + delete fs; + return std::nullopt; + } + delete fs; + return v; +} + +#endif // BOOST_OS_UNIX + +#ifdef _WIN32 + +#include "Common/windows/FileStream_win32.h" + +FileStream* FileStream::openFile(std::string_view path) +{ + HANDLE hFile = CreateFileW(boost::nowide::widen(path.data(), path.size()).c_str(), FILE_GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + if (hFile == INVALID_HANDLE_VALUE) + return nullptr; + return new FileStreamWin32(hFile); +} + +FileStream* FileStream::openFile(const wchar_t* path, bool allowWrite) +{ + HANDLE hFile = CreateFileW(path, allowWrite ? (FILE_GENERIC_READ | FILE_GENERIC_WRITE) : FILE_GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + if (hFile == INVALID_HANDLE_VALUE) + return nullptr; + return new FileStreamWin32(hFile); +} + +FileStream* FileStream::openFile2(const fs::path& path, bool allowWrite) +{ + return openFile(path.generic_wstring().c_str(), allowWrite); +} + +FileStream* FileStream::createFile(const wchar_t* path) +{ + HANDLE hFile = CreateFileW(path, FILE_GENERIC_READ | FILE_GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, 0); + if (hFile == INVALID_HANDLE_VALUE) + return nullptr; + return new FileStreamWin32(hFile); +} + +FileStream* FileStream::createFile(std::string_view path) +{ + auto w = boost::nowide::widen(path.data(), path.size()); + HANDLE hFile = CreateFileW(w.c_str(), FILE_GENERIC_READ | FILE_GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, 0); + if (hFile == INVALID_HANDLE_VALUE) + return nullptr; + return new FileStreamWin32(hFile); +} + +FileStream* FileStream::createFile2(const fs::path& path) +{ + return createFile(path.generic_wstring().c_str()); +} + +std::optional> FileStream::LoadIntoMemory(const fs::path& path) +{ + FileStream* fs = openFile2(path); + if (!fs) + return std::nullopt; + uint64 fileSize = fs->GetSize(); + if (fileSize > 0xFFFFFFFFull) + { + delete fs; + return std::nullopt; + } + std::optional> v(fileSize); + if (fs->readData(v->data(), (uint32)fileSize) != (uint32)fileSize) + { + delete fs; + return std::nullopt; + } + delete fs; + return v; +} + +#endif // _WIN32 \ No newline at end of file diff --git a/src/Common/FileStream.h b/src/Common/FileStream.h index f5d8ff0e..e91b0a17 100644 --- a/src/Common/FileStream.h +++ b/src/Common/FileStream.h @@ -1,8 +1,44 @@ #pragma once #include "Common/precompiled.h" -#ifdef _WIN32 -#include "Common/windows/FileStream_win32.h" -#else -#include "Common/unix/FileStream_unix.h" -#endif +class FileStream +{ + public: + static FileStream* openFile(std::string_view path); + static FileStream* openFile(const wchar_t* path, bool allowWrite = false); + static FileStream* openFile2(const fs::path& path, bool allowWrite = false); + + static FileStream* createFile(const wchar_t* path); + static FileStream* createFile(std::string_view path); + static FileStream* createFile2(const fs::path& path); + + // helper function to load a file into memory + static std::optional> LoadIntoMemory(const fs::path& path); + + // size and seek + virtual void SetPosition(uint64 pos) = 0; + + virtual uint64 GetSize() = 0; + virtual bool SetEndOfFile() = 0; + virtual void extract(std::vector& data) = 0; + + // reading + virtual uint32 readData(void* data, uint32 length) = 0; + virtual bool readU64(uint64& v) = 0; + virtual bool readU32(uint32& v) = 0; + virtual bool readU8(uint8& v) = 0; + virtual bool readLine(std::string& line) = 0; + + // writing (binary) + virtual sint32 writeData(const void* data, sint32 length) = 0; + virtual void writeU64(uint64 v) = 0; + virtual void writeU32(uint32 v) = 0; + virtual void writeU8(uint8 v) = 0; + + // writing (strings) + virtual void writeStringFmt(const char* format, ...) = 0; + virtual void writeString(const char* str) = 0; + virtual void writeLine(const char* str) = 0; + + virtual ~FileStream() = default; +}; diff --git a/src/Common/GLInclude/GLInclude.h b/src/Common/GLInclude/GLInclude.h index bf7a6bf8..a41183f1 100644 --- a/src/Common/GLInclude/GLInclude.h +++ b/src/Common/GLInclude/GLInclude.h @@ -6,8 +6,12 @@ #include "wglext.h" #endif -#if BOOST_OS_LINUX > 0 - +#if BOOST_OS_LINUX +#if __ANDROID__ +#define EGL_EGL_PROTOTYPES 0 +#include "egl.h" +#undef EGL_EGL_PROTOTYPES +#else // from Xlib #define Bool int #define Status int @@ -33,8 +37,8 @@ typedef struct __GLXFBConfigRec *GLXFBConfig; #undef Status #undef True #undef False - -#endif +#endif // __ANDROID__ +#endif // BOOST_OS_LINUX #define GLFUNC(__type, __name) extern __type __name; #define EGLFUNC(__type, __name) extern __type __name; diff --git a/src/Common/betype.h b/src/Common/betype.h index e684fb93..da5ff045 100644 --- a/src/Common/betype.h +++ b/src/Common/betype.h @@ -165,36 +165,36 @@ public: return tmp; } - betype& operator^=(const betype& v) requires std::integral + betype& operator^=(const betype& v) requires std::is_integral_v { m_value ^= v.m_value; return *this; } - betype& operator>>=(std::size_t idx) requires std::integral + betype& operator>>=(std::size_t idx) requires std::is_integral_v { m_value = SwapEndian(T(value() >> idx)); return *this; } - betype& operator<<=(std::size_t idx) requires std::integral + betype& operator<<=(std::size_t idx) requires std::is_integral_v { m_value = SwapEndian(T(value() << idx)); return *this; } - betype operator~() const requires std::integral + betype operator~() const requires std::is_integral_v { return from_bevalue(T(~m_value)); } - betype& operator++() requires std::integral + betype& operator++() requires std::is_integral_v { m_value = SwapEndian(T(value() + 1)); return *this; } - betype& operator--() requires std::integral + betype& operator--() requires std::is_integral_v { m_value = SwapEndian(T(value() - 1)); return *this; diff --git a/src/Common/platform.h b/src/Common/platform.h index 3f480f43..25006ecb 100644 --- a/src/Common/platform.h +++ b/src/Common/platform.h @@ -5,6 +5,9 @@ #if BOOST_OS_WINDOWS #include "Common/windows/platform.h" +#elif __ANDROID__ +#include +#include "Common/unix/platform.h" #elif BOOST_OS_LINUX #include #include diff --git a/src/Common/precompiled.h b/src/Common/precompiled.h index 790a001a..9c31706c 100644 --- a/src/Common/precompiled.h +++ b/src/Common/precompiled.h @@ -74,7 +74,6 @@ #include #include #include -#include #include #include @@ -84,6 +83,62 @@ #include namespace fs = std::filesystem; +#if __ANDROID__ +#endif // __ANDROID +#include "Common/unix/FilesystemAndroid.h" + +namespace cemu +{ +namespace fs +{ +inline bool is_directory(const std::filesystem::path& p) +{ + if (FilesystemAndroid::isContentUri(p)) + return FilesystemAndroid::isDirectory(p); + return std::filesystem::is_directory(p); +} +inline bool is_directory(const std::filesystem::path& p, std::error_code& ec) +{ +#if __ANDROID__ + if (FilesystemAndroid::isContentUri(p)) + return FilesystemAndroid::isDirectory(p); +#endif // __ANDROID__ + return std::filesystem::is_directory(p, ec); +} +inline bool is_file(const std::filesystem::path& p) +{ +#if __ANDROID__ + if (FilesystemAndroid::isContentUri(p)) + return FilesystemAndroid::isDirectory(p); +#endif // __ANDROID__ + return std::filesystem::is_regular_file(p); +} +inline bool is_file(const std::filesystem::path& p, std::error_code& ec) +{ +#if __ANDROID__ + if (FilesystemAndroid::isContentUri(p)) + return FilesystemAndroid::isDirectory(p); +#endif // __ANDROID__ + return std::filesystem::is_regular_file(p, ec); +} +inline bool exists(const std::filesystem::path& p) +{ +#if __ANDROID__ + if (FilesystemAndroid::isContentUri(p)) + return FilesystemAndroid::isDirectory(p); +#endif // __ANDROID__ + return std::filesystem::exists(p); +} +inline bool exists(const std::filesystem::path& p, std::error_code& ec) +{ +#if __ANDROID__ + if (FilesystemAndroid::isContentUri(p)) + return FilesystemAndroid::isDirectory(p); +#endif // __ANDROID__ + return std::filesystem::exists(p, ec); +} +} // namespace fs +} // namespace cemu); #include "enumFlags.h" @@ -461,16 +516,24 @@ inline std::string_view _utf8Wrapper(std::u8string_view input) // convert fs::path to utf8 encoded string inline std::string _pathToUtf8(const fs::path& path) { +#if __ANDROID__ + return path.generic_string(); +#else std::u8string strU8 = path.generic_u8string(); std::string v((const char*)strU8.data(), strU8.size()); return v; +#endif // __ANDROID__ } // convert utf8 encoded string to fs::path inline fs::path _utf8ToPath(std::string_view input) { +#if __ANDROID__ + return fs::path(input); +#else std::basic_string_view v((char8_t*)input.data(), input.size()); return fs::path(v); +#endif // __ANDROID__ } // locale-independent variant of tolower() which also matches Wii U behavior diff --git a/src/Common/unix/ContentUriIStream.h b/src/Common/unix/ContentUriIStream.h new file mode 100644 index 00000000..91b94d80 --- /dev/null +++ b/src/Common/unix/ContentUriIStream.h @@ -0,0 +1,26 @@ +#pragma once + +#include +#include + +#include "Common/unix/FilesystemAndroid.h" + +class ContentUriIStream : public std::istream +{ + public: + ContentUriIStream(const std::filesystem::path& path) + : m_fd(FilesystemAndroid::openContentUri(path)), + m_fileDescriptorStreamBuffer(m_fd, boost::iostreams::close_handle), + std::istream(&m_fileDescriptorStreamBuffer) {} + + virtual ~ContentUriIStream() = default; + + inline bool isOpen() const + { + return m_fd != -1; + } + + private: + int m_fd; + boost::iostreams::stream_buffer m_fileDescriptorStreamBuffer; +}; diff --git a/src/Common/unix/FileStream_contentUri.cpp b/src/Common/unix/FileStream_contentUri.cpp new file mode 100644 index 00000000..2a7bf934 --- /dev/null +++ b/src/Common/unix/FileStream_contentUri.cpp @@ -0,0 +1,122 @@ +#include "FileStream_contentUri.h" + +#include "unix/ContentUriIStream.h" + +void ThrowWriteNotSupportedError() +{ + throw std::logic_error("write operation not supported"); +} + +void FileStreamContentUri::SetPosition(uint64 pos) +{ + if (!m_isValid) + return; + m_contentUriIStream.seekg((std::streampos)pos); +} + +uint64 FileStreamContentUri::GetSize() +{ + cemu_assert(m_isValid); + auto currentPos = m_contentUriIStream.tellg(); + m_contentUriIStream.seekg(0, std::ios::end); + auto fileSize = m_contentUriIStream.tellg(); + m_contentUriIStream.seekg(currentPos, std::ios::beg); + uint64 fs = (uint64)fileSize; + return fs; +} + +bool FileStreamContentUri::SetEndOfFile() +{ + return true; +} + +void FileStreamContentUri::extract(std::vector& data) +{ + if (!m_isValid) + return; + uint64 fileSize = GetSize(); + SetPosition(0); + data.resize(fileSize); + readData(data.data(), fileSize); +} + +uint32 FileStreamContentUri::readData(void* data, uint32 length) +{ + m_contentUriIStream.read((char*)data, length); + size_t bytesRead = m_contentUriIStream.gcount(); + return (uint32)bytesRead; +} + +bool FileStreamContentUri::readU64(uint64& v) +{ + return readData(&v, sizeof(uint64)) == sizeof(uint64); +} + +bool FileStreamContentUri::readU32(uint32& v) +{ + return readData(&v, sizeof(uint32)) == sizeof(uint32); +} + +bool FileStreamContentUri::readU8(uint8& v) +{ + return readData(&v, sizeof(uint8)) == sizeof(uint8); +} + +bool FileStreamContentUri::readLine(std::string& line) +{ + line.clear(); + uint8 c; + bool isEOF = true; + while (readU8(c)) + { + isEOF = false; + if (c == '\r') + continue; + if (c == '\n') + break; + line.push_back((char)c); + } + return !isEOF; +} + +sint32 FileStreamContentUri::writeData(const void* data, sint32 length) +{ + ThrowWriteNotSupportedError(); + return -1; +} + +void FileStreamContentUri::writeU64(uint64 v) +{ + ThrowWriteNotSupportedError(); +} + +void FileStreamContentUri::writeU32(uint32 v) +{ + ThrowWriteNotSupportedError(); +} + +void FileStreamContentUri::writeU8(uint8 v) +{ + ThrowWriteNotSupportedError(); +} + +void FileStreamContentUri::writeStringFmt(const char* format, ...) +{ + ThrowWriteNotSupportedError(); +} + +void FileStreamContentUri::writeString(const char* str) +{ + ThrowWriteNotSupportedError(); +} + +void FileStreamContentUri::writeLine(const char* str) +{ + ThrowWriteNotSupportedError(); +} + +FileStreamContentUri::FileStreamContentUri(const std::string& uri) + : m_contentUriIStream(uri) +{ + m_isValid = m_contentUriIStream.isOpen(); +} diff --git a/src/Common/unix/FileStream_contentUri.h b/src/Common/unix/FileStream_contentUri.h new file mode 100644 index 00000000..907dda2e --- /dev/null +++ b/src/Common/unix/FileStream_contentUri.h @@ -0,0 +1,37 @@ +#pragma once + +#include "Common/FileStream.h" +#include "Common/unix/ContentUriIStream.h" + +class FileStreamContentUri : public FileStream +{ + public: + // size and seek + void SetPosition(uint64 pos) override; + + uint64 GetSize() override; + bool SetEndOfFile() override; + void extract(std::vector& data) override; + + // reading + uint32 readData(void* data, uint32 length) override; + bool readU64(uint64& v) override; + bool readU32(uint32& v) override; + bool readU8(uint8& v) override; + bool readLine(std::string& line) override; + + // writing (not supported) + sint32 writeData(const void* data, sint32 length) override; + void writeU64(uint64 v) override; + void writeU32(uint32 v) override; + void writeU8(uint8 v) override; + void writeStringFmt(const char* format, ...) override; + void writeString(const char* str) override; + void writeLine(const char* str) override; + + private: + friend class FileStream; + FileStreamContentUri(const std::string& uri); + ContentUriIStream m_contentUriIStream; + bool m_isValid = false; +}; diff --git a/src/Common/unix/FileStream_unix.cpp b/src/Common/unix/FileStream_unix.cpp index 2dba17b7..cfda5af0 100644 --- a/src/Common/unix/FileStream_unix.cpp +++ b/src/Common/unix/FileStream_unix.cpp @@ -21,66 +21,7 @@ fs::path findPathCI(const fs::path& path) return parentPath / fName; } -FileStream* FileStream::openFile(std::string_view path) -{ - return openFile2(path, false); -} - -FileStream* FileStream::openFile(const wchar_t* path, bool allowWrite) -{ - return openFile2(path, allowWrite); -} - -FileStream* FileStream::openFile2(const fs::path& path, bool allowWrite) -{ - FileStream* fs = new FileStream(path, true, allowWrite); - if (fs->m_isValid) - return fs; - delete fs; - return nullptr; -} - -FileStream* FileStream::createFile(const wchar_t* path) -{ - return createFile2(path); -} - -FileStream* FileStream::createFile(std::string_view path) -{ - return createFile2(path); -} - -FileStream* FileStream::createFile2(const fs::path& path) -{ - FileStream* fs = new FileStream(path, false, false); - if (fs->m_isValid) - return fs; - delete fs; - return nullptr; -} - -std::optional> FileStream::LoadIntoMemory(const fs::path& path) -{ - FileStream* fs = openFile2(path); - if (!fs) - return std::nullopt; - uint64 fileSize = fs->GetSize(); - if (fileSize > 0xFFFFFFFFull) - { - delete fs; - return std::nullopt; - } - std::optional> v(fileSize); - if (fs->readData(v->data(), (uint32)fileSize) != (uint32)fileSize) - { - delete fs; - return std::nullopt; - } - delete fs; - return v; -} - -void FileStream::SetPosition(uint64 pos) +void FileStreamUnix::SetPosition(uint64 pos) { cemu_assert(m_isValid); if (m_prevOperationWasWrite) @@ -89,7 +30,7 @@ void FileStream::SetPosition(uint64 pos) m_fileStream.seekg((std::streampos)pos); } -uint64 FileStream::GetSize() +uint64 FileStreamUnix::GetSize() { cemu_assert(m_isValid); auto currentPos = m_fileStream.tellg(); @@ -100,14 +41,14 @@ uint64 FileStream::GetSize() return fs; } -bool FileStream::SetEndOfFile() +bool FileStreamUnix::SetEndOfFile() { assert_dbg(); return true; //return ::SetEndOfFile(m_hFile) != 0; } -void FileStream::extract(std::vector& data) +void FileStreamUnix::extract(std::vector& data) { uint64 fileSize = GetSize(); SetPosition(0); @@ -115,7 +56,7 @@ void FileStream::extract(std::vector& data) readData(data.data(), fileSize); } -uint32 FileStream::readData(void* data, uint32 length) +uint32 FileStreamUnix::readData(void* data, uint32 length) { SyncReadWriteSeek(false); m_fileStream.read((char*)data, length); @@ -123,22 +64,22 @@ uint32 FileStream::readData(void* data, uint32 length) return (uint32)bytesRead; } -bool FileStream::readU64(uint64& v) +bool FileStreamUnix::readU64(uint64& v) { return readData(&v, sizeof(uint64)) == sizeof(uint64); } -bool FileStream::readU32(uint32& v) +bool FileStreamUnix::readU32(uint32& v) { return readData(&v, sizeof(uint32)) == sizeof(uint32); } -bool FileStream::readU8(uint8& v) +bool FileStreamUnix::readU8(uint8& v) { return readData(&v, sizeof(uint8)) == sizeof(uint8); } -bool FileStream::readLine(std::string& line) +bool FileStreamUnix::readLine(std::string& line) { line.clear(); uint8 c; @@ -155,29 +96,29 @@ bool FileStream::readLine(std::string& line) return !isEOF; } -sint32 FileStream::writeData(const void* data, sint32 length) +sint32 FileStreamUnix::writeData(const void* data, sint32 length) { SyncReadWriteSeek(true); m_fileStream.write((const char*)data, length); return length; } -void FileStream::writeU64(uint64 v) +void FileStreamUnix::writeU64(uint64 v) { writeData(&v, sizeof(uint64)); } -void FileStream::writeU32(uint32 v) +void FileStreamUnix::writeU32(uint32 v) { writeData(&v, sizeof(uint32)); } -void FileStream::writeU8(uint8 v) +void FileStreamUnix::writeU8(uint8 v) { writeData(&v, sizeof(uint8)); } -void FileStream::writeStringFmt(const char* format, ...) +void FileStreamUnix::writeStringFmt(const char* format, ...) { char buffer[2048]; va_list args; @@ -186,18 +127,18 @@ void FileStream::writeStringFmt(const char* format, ...) writeData(buffer, (sint32)strlen(buffer)); } -void FileStream::writeString(const char* str) +void FileStreamUnix::writeString(const char* str) { writeData(str, (sint32)strlen(str)); } -void FileStream::writeLine(const char* str) +void FileStreamUnix::writeLine(const char* str) { writeData(str, (sint32)strlen(str)); writeData("\r\n", 2); } -FileStream::~FileStream() +FileStreamUnix::~FileStreamUnix() { if (m_isValid) { @@ -206,7 +147,7 @@ FileStream::~FileStream() // CloseHandle(m_hFile); } -FileStream::FileStream(const fs::path& path, bool isOpen, bool isWriteable) +FileStreamUnix::FileStreamUnix(const fs::path& path, bool isOpen, bool isWriteable) { fs::path CIPath = findPathCI(path); if (isOpen) @@ -226,7 +167,7 @@ FileStream::FileStream(const fs::path& path, bool isOpen, bool isWriteable) } } -void FileStream::SyncReadWriteSeek(bool nextOpIsWrite) +void FileStreamUnix::SyncReadWriteSeek(bool nextOpIsWrite) { // nextOpIsWrite == false -> read. Otherwise write if (nextOpIsWrite == m_prevOperationWasWrite) diff --git a/src/Common/unix/FileStream_unix.h b/src/Common/unix/FileStream_unix.h index 12c971d1..425a5731 100644 --- a/src/Common/unix/FileStream_unix.h +++ b/src/Common/unix/FileStream_unix.h @@ -1,56 +1,44 @@ #pragma once #include "Common/precompiled.h" +#include "Common/FileStream.h" -class FileStream +class FileStreamUnix : public FileStream { - public: - static FileStream* openFile(std::string_view path); - static FileStream* openFile(const wchar_t* path, bool allowWrite = false); - static FileStream* openFile2(const fs::path& path, bool allowWrite = false); + public: + // size and seek + void SetPosition(uint64 pos) override; - static FileStream* createFile(const wchar_t* path); - static FileStream* createFile(std::string_view path); - static FileStream* createFile2(const fs::path& path); + uint64 GetSize() override; + bool SetEndOfFile() override; + void extract(std::vector& data) override; - // helper function to load a file into memory - static std::optional> LoadIntoMemory(const fs::path& path); + // reading + uint32 readData(void* data, uint32 length) override; + bool readU64(uint64& v) override; + bool readU32(uint32& v) override; + bool readU8(uint8& v) override; + bool readLine(std::string& line) override; - // size and seek - void SetPosition(uint64 pos); + // writing (binary) + sint32 writeData(const void* data, sint32 length) override; + void writeU64(uint64 v) override; + void writeU32(uint32 v) override; + void writeU8(uint8 v) override; - uint64 GetSize(); - bool SetEndOfFile(); - void extract(std::vector& data); + // writing (strings) + void writeStringFmt(const char* format, ...) override; + void writeString(const char* str) override; + void writeLine(const char* str) override; - // reading - uint32 readData(void* data, uint32 length); - bool readU64(uint64& v); - bool readU32(uint32& v); - bool readU16(uint16& v); - bool readU8(uint8& v); - bool readLine(std::string& line); + virtual ~FileStreamUnix(); + FileStreamUnix() = default; - // writing (binary) - sint32 writeData(const void* data, sint32 length); - void writeU64(uint64 v); - void writeU32(uint32 v); - void writeU16(uint16 v); - void writeU8(uint8 v); - - // writing (strings) - void writeStringFmt(const char* format, ...); - void writeString(const char* str); - void writeLine(const char* str); - - ~FileStream(); - FileStream() {}; - - private: - void SyncReadWriteSeek(bool nextOpIsWrite); - FileStream(const fs::path& path, bool isOpen, bool isWriteable); - - bool m_isValid{}; - std::fstream m_fileStream; - bool m_prevOperationWasWrite{false}; + private: + friend class FileStream; + void SyncReadWriteSeek(bool nextOpIsWrite); + FileStreamUnix(const fs::path& path, bool isOpen, bool isWriteable); + bool m_isValid{}; + std::fstream m_fileStream; + bool m_prevOperationWasWrite{false}; }; diff --git a/src/Common/unix/FilesystemAndroid.cpp b/src/Common/unix/FilesystemAndroid.cpp new file mode 100644 index 00000000..f072d4c0 --- /dev/null +++ b/src/Common/unix/FilesystemAndroid.cpp @@ -0,0 +1,48 @@ +#include "FilesystemAndroid.h" + +namespace FilesystemAndroid +{ +std::shared_ptr g_filesystemCallbacks = nullptr; + +void setFilesystemCallbacks(const std::shared_ptr &filesystemCallbacks) +{ + g_filesystemCallbacks = filesystemCallbacks; +} + +int openContentUri(const fs::path &uri) +{ + if (g_filesystemCallbacks) + return g_filesystemCallbacks->openContentUri(uri); + return -1; +} + +std::vector listFiles(const fs::path &uri) +{ + if (g_filesystemCallbacks) + return g_filesystemCallbacks->listFiles(uri); + return {}; +} +bool isDirectory(const fs::path &uri) +{ + if (g_filesystemCallbacks) + return g_filesystemCallbacks->isDirectory(uri); + return false; +} +bool isFile(const fs::path &uri) +{ + if (g_filesystemCallbacks) + return g_filesystemCallbacks->isFile(uri); + return false; +} +bool exists(const fs::path &uri) +{ + if (g_filesystemCallbacks) + return g_filesystemCallbacks->exists(uri); + return false; +} +bool isContentUri(const std::string &uri) +{ + static constexpr auto content = "content://"; + return uri.starts_with(content); +} +} // namespace FilesystemAndroid \ No newline at end of file diff --git a/src/Common/unix/FilesystemAndroid.h b/src/Common/unix/FilesystemAndroid.h new file mode 100644 index 00000000..b67c5be0 --- /dev/null +++ b/src/Common/unix/FilesystemAndroid.h @@ -0,0 +1,29 @@ +#pragma once + +namespace FilesystemAndroid +{ +class FilesystemCallbacks +{ + public: + virtual int openContentUri(const std::filesystem::path &uri) = 0; + virtual std::vector listFiles(const std::filesystem::path &uri) = 0; + virtual bool isDirectory(const std::filesystem::path &uri) = 0; + virtual bool isFile(const std::filesystem::path &uri) = 0; + virtual bool exists(const std::filesystem::path &uri) = 0; +}; + +void setFilesystemCallbacks(const std::shared_ptr &filesystemCallbacks); + +int openContentUri(const std::filesystem::path &uri); + +std::vector listFiles(const std::filesystem::path &uri); + +bool isDirectory(const std::filesystem::path &uri); + +bool isFile(const std::filesystem::path &uri); + +bool exists(const std::filesystem::path& uri); + +bool isContentUri(const std::string &uri); + +} // namespace FilesystemAndroid diff --git a/src/Common/windows/FileStream_win32.cpp b/src/Common/windows/FileStream_win32.cpp index 2ae1247f..3cdc80e4 100644 --- a/src/Common/windows/FileStream_win32.cpp +++ b/src/Common/windows/FileStream_win32.cpp @@ -1,77 +1,13 @@ #include "Common/windows/FileStream_win32.h" -FileStream* FileStream::openFile(std::string_view path) -{ - HANDLE hFile = CreateFileW(boost::nowide::widen(path.data(), path.size()).c_str(), FILE_GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); - if (hFile == INVALID_HANDLE_VALUE) - return nullptr; - return new FileStream(hFile); -} - -FileStream* FileStream::openFile(const wchar_t* path, bool allowWrite) -{ - HANDLE hFile = CreateFileW(path, allowWrite ? (FILE_GENERIC_READ | FILE_GENERIC_WRITE) : FILE_GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); - if (hFile == INVALID_HANDLE_VALUE) - return nullptr; - return new FileStream(hFile); -} - -FileStream* FileStream::openFile2(const fs::path& path, bool allowWrite) -{ - return openFile(path.generic_wstring().c_str(), allowWrite); -} - -FileStream* FileStream::createFile(const wchar_t* path) -{ - HANDLE hFile = CreateFileW(path, FILE_GENERIC_READ | FILE_GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, 0); - if (hFile == INVALID_HANDLE_VALUE) - return nullptr; - return new FileStream(hFile); -} - -FileStream* FileStream::createFile(std::string_view path) -{ - auto w = boost::nowide::widen(path.data(), path.size()); - HANDLE hFile = CreateFileW(w.c_str(), FILE_GENERIC_READ | FILE_GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, 0); - if (hFile == INVALID_HANDLE_VALUE) - return nullptr; - return new FileStream(hFile); -} - -FileStream* FileStream::createFile2(const fs::path& path) -{ - return createFile(path.generic_wstring().c_str()); -} - -std::optional> FileStream::LoadIntoMemory(const fs::path& path) -{ - FileStream* fs = openFile2(path); - if (!fs) - return std::nullopt; - uint64 fileSize = fs->GetSize(); - if(fileSize > 0xFFFFFFFFull) - { - delete fs; - return std::nullopt; - } - std::optional> v(fileSize); - if (fs->readData(v->data(), (uint32)fileSize) != (uint32)fileSize) - { - delete fs; - return std::nullopt; - } - delete fs; - return v; -} - -void FileStream::SetPosition(uint64 pos) +void FileStreamWin32::SetPosition(uint64 pos) { LONG posHigh = (LONG)(pos >> 32); LONG posLow = (LONG)(pos); SetFilePointer(m_hFile, posLow, &posHigh, FILE_BEGIN); } -uint64 FileStream::GetSize() +uint64 FileStreamWin32::GetSize() { DWORD fileSizeHigh = 0; DWORD fileSizeLow = 0; @@ -79,12 +15,12 @@ uint64 FileStream::GetSize() return ((uint64)fileSizeHigh << 32) | (uint64)fileSizeLow; } -bool FileStream::SetEndOfFile() +bool FileStreamWin32::SetEndOfFile() { return ::SetEndOfFile(m_hFile) != 0; } -void FileStream::extract(std::vector& data) +void FileStreamWin32::extract(std::vector& data) { DWORD fileSize = GetFileSize(m_hFile, nullptr); data.resize(fileSize); @@ -93,29 +29,29 @@ void FileStream::extract(std::vector& data) ReadFile(m_hFile, data.data(), fileSize, &bt, nullptr); } -uint32 FileStream::readData(void* data, uint32 length) +uint32 FileStreamWin32::readData(void* data, uint32 length) { DWORD bytesRead = 0; ReadFile(m_hFile, data, length, &bytesRead, NULL); return bytesRead; } -bool FileStream::readU64(uint64& v) +bool FileStreamWin32::readU64(uint64& v) { return readData(&v, sizeof(uint64)) == sizeof(uint64); } -bool FileStream::readU32(uint32& v) +bool FileStreamWin32::readU32(uint32& v) { return readData(&v, sizeof(uint32)) == sizeof(uint32); } -bool FileStream::readU8(uint8& v) +bool FileStreamWin32::readU8(uint8& v) { return readData(&v, sizeof(uint8)) == sizeof(uint8); } -bool FileStream::readLine(std::string& line) +bool FileStreamWin32::readLine(std::string& line) { line.clear(); uint8 c; @@ -132,29 +68,29 @@ bool FileStream::readLine(std::string& line) return !isEOF; } -sint32 FileStream::writeData(const void* data, sint32 length) +sint32 FileStreamWin32::writeData(const void* data, sint32 length) { DWORD bytesWritten = 0; WriteFile(m_hFile, data, length, &bytesWritten, NULL); return bytesWritten; } -void FileStream::writeU64(uint64 v) +void FileStreamWin32::writeU64(uint64 v) { writeData(&v, sizeof(uint64)); } -void FileStream::writeU32(uint32 v) +void FileStreamWin32::writeU32(uint32 v) { writeData(&v, sizeof(uint32)); } -void FileStream::writeU8(uint8 v) +void FileStreamWin32::writeU8(uint8 v) { writeData(&v, sizeof(uint8)); } -void FileStream::writeStringFmt(const char* format, ...) +void FileStreamWin32::writeStringFmt(const char* format, ...) { char buffer[2048]; va_list args; @@ -163,24 +99,24 @@ void FileStream::writeStringFmt(const char* format, ...) writeData(buffer, (sint32)strlen(buffer)); } -void FileStream::writeString(const char* str) +void FileStreamWin32::writeString(const char* str) { writeData(str, (sint32)strlen(str)); } -void FileStream::writeLine(const char* str) +void FileStreamWin32::writeLine(const char* str) { writeData(str, (sint32)strlen(str)); writeData("\r\n", 2); } -FileStream::~FileStream() +FileStreamWin32::~FileStreamWin32() { if(m_isValid) CloseHandle(m_hFile); } -FileStream::FileStream(HANDLE hFile) +FileStreamWin32::FileStreamWin32(HANDLE hFile) { m_hFile = hFile; m_isValid = true; diff --git a/src/Common/windows/FileStream_win32.h b/src/Common/windows/FileStream_win32.h index a0b1b30a..b9a0c861 100644 --- a/src/Common/windows/FileStream_win32.h +++ b/src/Common/windows/FileStream_win32.h @@ -1,52 +1,44 @@ #pragma once #include "Common/precompiled.h" +#include "Common/FileStream.h" -class FileStream +class FileStreamWin32 : public FileStream { public: - static FileStream* openFile(std::string_view path); - static FileStream* openFile(const wchar_t* path, bool allowWrite = false); - static FileStream* openFile2(const fs::path& path, bool allowWrite = false); - - static FileStream* createFile(const wchar_t* path); - static FileStream* createFile(std::string_view path); - static FileStream* createFile2(const fs::path& path); - // helper function to load a file into memory static std::optional> LoadIntoMemory(const fs::path& path); // size and seek - void SetPosition(uint64 pos); + void SetPosition(uint64 pos) override; - uint64 GetSize(); - bool SetEndOfFile(); - void extract(std::vector& data); + uint64 GetSize() override; + bool SetEndOfFile() override; + void extract(std::vector& data) override; // reading - uint32 readData(void* data, uint32 length); - bool readU64(uint64& v); - bool readU32(uint32& v); - bool readU16(uint16& v); - bool readU8(uint8& v); - bool readLine(std::string& line); + uint32 readData(void* data, uint32 length) override; + bool readU64(uint64& v) override; + bool readU32(uint32& v) override; + bool readU8(uint8& v) override; + bool readLine(std::string& line) override; // writing (binary) - sint32 writeData(const void* data, sint32 length); - void writeU64(uint64 v); - void writeU32(uint32 v); - void writeU16(uint16 v); - void writeU8(uint8 v); + sint32 writeData(const void* data, sint32 length) override; + void writeU64(uint64 v) override; + void writeU32(uint32 v) override; + void writeU8(uint8 v) override; // writing (strings) - void writeStringFmt(const char* format, ...); - void writeString(const char* str); - void writeLine(const char* str); + void writeStringFmt(const char* format, ...) override; + void writeString(const char* str) override; + void writeLine(const char* str) override; - ~FileStream(); - FileStream() = default; + virtual ~FileStreamWin32(); + FileStreamWin32() = default; private: - FileStream(HANDLE hFile); + friend class FileStream; + FileStreamWin32(HANDLE hFile); bool m_isValid{}; HANDLE m_hFile; diff --git a/src/android/.gitignore b/src/android/.gitignore new file mode 100644 index 00000000..aa724b77 --- /dev/null +++ b/src/android/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/src/android/app/.gitignore b/src/android/app/.gitignore new file mode 100644 index 00000000..42afabfd --- /dev/null +++ b/src/android/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/src/android/app/build.gradle b/src/android/app/build.gradle new file mode 100644 index 00000000..4edf3415 --- /dev/null +++ b/src/android/app/build.gradle @@ -0,0 +1,71 @@ +plugins { + id 'com.android.application' +} + +android { + namespace 'info.cemu.Cemu' + compileSdk 34 + ndkVersion '25.2.9519653' + defaultConfig { + applicationId "info.cemu.Cemu" + minSdk 30 + targetSdk 34 + versionCode 1 + versionName "1.0" + ndk { +// abiFilters("x86_64", "arm64-v8a") + abiFilters("arm64-v8a") + } + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + externalNativeBuild { + cmake { + version '3.22.1' + path file('../../../CMakeLists.txt') + } + } + defaultConfig { + externalNativeBuild { + cmake { + arguments( + '-DENABLE_VCPKG=ON', + '-DVCPKG_TARGET_ANDROID=ON', + '-DENABLE_SDL=OFF', + '-DENABLE_WXWIDGETS=OFF', + '-DENABLE_OPENGL=OFF', + '-DBUNDLE_SPEEX=ON', + '-DENABLE_DISCORD_RPC=OFF', + '-DENABLE_WAYLAND=OFF' + ) +// abiFilters("x86_64", "arm64-v8a") + abiFilters("arm64-v8a") + } + } + } + buildFeatures { + viewBinding true + } +} + +dependencies { + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.9.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' + implementation 'androidx.navigation:navigation-fragment:2.5.3' + implementation 'androidx.navigation:navigation-ui:2.5.3' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' +} \ No newline at end of file diff --git a/src/android/app/proguard-rules.pro b/src/android/app/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/src/android/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/src/android/app/src/androidTest/java/info/cemu/Cemu/ExampleInstrumentedTest.java b/src/android/app/src/androidTest/java/info/cemu/Cemu/ExampleInstrumentedTest.java new file mode 100644 index 00000000..a681e31f --- /dev/null +++ b/src/android/app/src/androidTest/java/info/cemu/Cemu/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package info.cemu.Cemu; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + assertEquals("info.cemu.Cemu", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..bb78d539 --- /dev/null +++ b/src/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/cpp/AndroidAudio.cpp b/src/android/app/src/main/cpp/AndroidAudio.cpp new file mode 100644 index 00000000..f409fc82 --- /dev/null +++ b/src/android/app/src/main/cpp/AndroidAudio.cpp @@ -0,0 +1,56 @@ +#include "AndroidAudio.h" + +#include "Cafe/OS/libs/snd_core/ax.h" +#include "audio/IAudioAPI.h" + +#if HAS_CUBEB +#include "audio/CubebAPI.h" +#endif // HAS_CUBEB + +namespace AndroidAudio +{ + +void createAudioDevice(IAudioAPI::AudioAPI audioApi, sint32 channels, sint32 volume, bool isTV) +{ + static constexpr int AX_FRAMES_PER_GROUP = 4; + std::unique_lock lock(g_audioMutex); + auto& audioDevice = isTV ? g_tvAudio : g_padAudio; + switch (channels) + { + case 0: + channels = 1; + break; + case 2: + channels = 6; + break; + default: // stereo + channels = 2; + break; + } + switch (audioApi) + { +#if HAS_CUBEB + case IAudioAPI::AudioAPI::Cubeb: + { + audioDevice.reset(); + std::shared_ptr deviceDescriptionPtr = std::make_shared(nullptr, std::string(), std::wstring()); + audioDevice = IAudioAPI::CreateDevice(IAudioAPI::AudioAPI::Cubeb, deviceDescriptionPtr, 48000, channels, snd_core::AX_SAMPLES_PER_3MS_48KHZ * AX_FRAMES_PER_GROUP, 16); + audioDevice->SetVolume(volume); + break; + } +#endif // HAS_CUBEB + default: + cemuLog_log(LogType::Force, fmt::format("Invalid audio api: {}", audioApi)); + break; + } +} + +void setAudioVolume(sint32 volume, bool isTV) +{ + std::shared_lock lock(g_audioMutex); + auto& audioDevice = isTV ? g_tvAudio : g_padAudio; + if (audioDevice) + audioDevice->SetVolume(volume); +} + +}; // namespace AndroidAudio diff --git a/src/android/app/src/main/cpp/AndroidAudio.h b/src/android/app/src/main/cpp/AndroidAudio.h new file mode 100644 index 00000000..ce03ab85 --- /dev/null +++ b/src/android/app/src/main/cpp/AndroidAudio.h @@ -0,0 +1,9 @@ +#pragma once + +#include "audio/IAudioAPI.h" + +namespace AndroidAudio +{ +void createAudioDevice(IAudioAPI::AudioAPI audioApi, sint32 channels, sint32 volume, bool isTV = true); +void setAudioVolume(sint32 volume, bool isTV = true); +}; // namespace AndroidAudio diff --git a/src/android/app/src/main/cpp/AndroidEmulatedController.cpp b/src/android/app/src/main/cpp/AndroidEmulatedController.cpp new file mode 100644 index 00000000..1d69a19c --- /dev/null +++ b/src/android/app/src/main/cpp/AndroidEmulatedController.cpp @@ -0,0 +1,3 @@ +#include "AndroidEmulatedController.h" + +std::array, InputManager::kMaxController> AndroidEmulatedController::s_emulatedControllers; diff --git a/src/android/app/src/main/cpp/AndroidEmulatedController.h b/src/android/app/src/main/cpp/AndroidEmulatedController.h new file mode 100644 index 00000000..7ca22713 --- /dev/null +++ b/src/android/app/src/main/cpp/AndroidEmulatedController.h @@ -0,0 +1,112 @@ +#pragma once + +#include "input/InputManager.h" +#include "input/api/Controller.h" +#include "input/emulated/ClassicController.h" +#include "input/emulated/ProController.h" +#include "input/emulated/WiimoteController.h" + +class AndroidEmulatedController +{ + private: + size_t m_index; + static std::array, InputManager::kMaxController> s_emulatedControllers; + EmulatedControllerPtr m_emulatedController; + AndroidEmulatedController(size_t index) : m_index(index) + { + m_emulatedController = InputManager::instance().get_controller(m_index); + } + + public: + static AndroidEmulatedController &getAndroidEmulatedController(size_t index) + { + auto &controller = s_emulatedControllers.at(index); + if (!controller) + controller = std::unique_ptr(new AndroidEmulatedController(index)); + return *controller; + } + void setType(EmulatedController::Type type) + { + if (m_emulatedController && m_emulatedController->type() == type) + return; + m_emulatedController = InputManager::instance().set_controller(m_index, type); + InputManager::instance().save(m_index); + } + void setMapping(uint64 mappingId, ControllerPtr controller, uint64 buttonId) + { + if (m_emulatedController && controller) + { + const auto &controllers = m_emulatedController->get_controllers(); + auto controllerIt = std::find_if(controllers.begin(), controllers.end(), [&](const ControllerPtr &c) + { return c->api() == controller->api() && c->uuid() == controller->uuid(); }); + if (controllerIt == controllers.end()) + m_emulatedController->add_controller(controller); + else + controller = *controllerIt; + m_emulatedController->set_mapping(mappingId, controller, buttonId); + InputManager::instance().save(m_index); + } + } + std::optional getMapping(uint64 mapping) const + { + if (!m_emulatedController) + return {}; + auto controller = m_emulatedController->get_mapping_controller(mapping); + if (!controller) + return {}; + auto mappingName = m_emulatedController->get_mapping_name(mapping); + return fmt::format("{}: {}", controller->display_name(), mappingName); + } + std::map getMappings() const + { + if (!m_emulatedController) + return {}; + std::map mappings; + auto type = m_emulatedController->type(); + uint64 mapping = 0; + uint64 maxMapping = 0; + if (type == EmulatedController::Type::VPAD) + { + mapping = VPADController::ButtonId::kButtonId_A; + maxMapping = VPADController::ButtonId::kButtonId_Max; + } + if (type == EmulatedController::Type::Pro) + { + mapping = ProController::ButtonId::kButtonId_A; + maxMapping = ProController::ButtonId::kButtonId_Max; + } + if (type == EmulatedController::Type::Classic) + { + mapping = ClassicController::ButtonId::kButtonId_A; + maxMapping = ClassicController::ButtonId::kButtonId_Max; + } + if (type == EmulatedController::Type::Wiimote) + { + mapping = WiimoteController::ButtonId::kButtonId_A; + maxMapping = WiimoteController::ButtonId::kButtonId_Max; + } + for (; mapping < maxMapping; mapping++) + { + auto mappingName = getMapping(mapping); + if (mappingName.has_value()) + mappings[mapping] = mappingName.value(); + } + return mappings; + } + void setDisabled() + { + InputManager::instance().delete_controller(m_index, true); + m_emulatedController.reset(); + } + EmulatedControllerPtr getEmulatedController() + { + return m_emulatedController; + } + + void clearMapping(uint64 mapping) + { + if (!m_emulatedController) + return; + m_emulatedController->delete_mapping(mapping); + } +}; diff --git a/src/android/app/src/main/cpp/AndroidFilesystemCallbacks.h b/src/android/app/src/main/cpp/AndroidFilesystemCallbacks.h new file mode 100644 index 00000000..67dc10fe --- /dev/null +++ b/src/android/app/src/main/cpp/AndroidFilesystemCallbacks.h @@ -0,0 +1,144 @@ +#pragma once + +#include "JNIUtils.h" +#include "Common/unix/FilesystemAndroid.h" + +class AndroidFilesystemCallbacks : public FilesystemAndroid::FilesystemCallbacks +{ + jmethodID m_openContentUriMid; + jmethodID m_listFilesMid; + jmethodID m_isDirectoryMid; + jmethodID m_isFileMid; + jmethodID m_existsMid; + JNIUtils::Scopedjclass m_fileUtilClass; + std::function m_function = nullptr; + std::mutex m_functionMutex; + std::condition_variable m_functionCV; + std::thread m_thread; + std::mutex m_threadMutex; + std::condition_variable m_threadCV; + std::atomic_bool m_continue = true; + + bool callBooleanFunction(const std::filesystem::path &uri, jmethodID methodId) + { + std::lock_guard lock(m_functionMutex); + bool functionFinished = false; + bool result = false; + m_function = [&, this](JNIEnv *env) + { + jstring uriString = env->NewStringUTF(uri.c_str()); + result = env->CallStaticBooleanMethod(*m_fileUtilClass, methodId, uriString); + env->DeleteLocalRef(uriString); + functionFinished = true; + }; + m_threadCV.notify_one(); + { + std::unique_lock threadLock(m_threadMutex); + m_functionCV.wait(threadLock, [&]() -> bool + { return functionFinished; }); + } + return result; + } + + void runFilesystemCallbacks() + { + JNIUtils::ScopedJNIENV env; + while (m_continue) + { + std::unique_lock threadLock(m_threadMutex); + m_threadCV.wait(threadLock, [&] + { return m_function || !m_continue; }); + if (!m_continue) + return; + m_function(*env); + m_function = nullptr; + m_functionCV.notify_one(); + } + } + + public: + AndroidFilesystemCallbacks() + { + JNIUtils::ScopedJNIENV env; + m_fileUtilClass = JNIUtils::Scopedjclass("info/cemu/Cemu/FileUtil"); + m_openContentUriMid = env->GetStaticMethodID(*m_fileUtilClass, "openContentUri", "(Ljava/lang/String;)I"); + m_listFilesMid = env->GetStaticMethodID(*m_fileUtilClass, "listFiles", "(Ljava/lang/String;)[Ljava/lang/String;"); + m_isDirectoryMid = env->GetStaticMethodID(*m_fileUtilClass, "isDirectory", "(Ljava/lang/String;)Z"); + m_isFileMid = env->GetStaticMethodID(*m_fileUtilClass, "isFile", "(Ljava/lang/String;)Z"); + m_existsMid = env->GetStaticMethodID(*m_fileUtilClass, "exists", "(Ljava/lang/String;)Z"); + m_thread = std::thread(&AndroidFilesystemCallbacks::runFilesystemCallbacks, this); + } + + ~AndroidFilesystemCallbacks() + { + m_continue = false; + m_threadCV.notify_one(); + m_thread.join(); + } + + int openContentUri(const std::filesystem::path &uri) override + { + std::lock_guard lock(m_functionMutex); + bool functionFinished = false; + int fd = -1; + m_function = [&, this](JNIEnv *env) + { + jstring uriString = env->NewStringUTF(uri.c_str()); + fd = env->CallStaticIntMethod(*m_fileUtilClass, m_openContentUriMid, uriString); + env->DeleteLocalRef(uriString); + functionFinished = true; + }; + m_threadCV.notify_one(); + { + std::unique_lock threadLock(m_threadMutex); + m_functionCV.wait(threadLock, [&]() + { return functionFinished; }); + } + return fd; + } + + std::vector listFiles(const std::filesystem::path &uri) override + { + std::lock_guard lock(m_functionMutex); + bool functionFinished = false; + std::vector paths; + m_function = [&, this](JNIEnv *env) + { + jstring uriString = env->NewStringUTF(uri.c_str()); + jobjectArray pathsObjArray = static_cast(env->CallStaticObjectMethod(*m_fileUtilClass, m_listFilesMid, uriString)); + env->DeleteLocalRef(uriString); + jsize arrayLength = env->GetArrayLength(pathsObjArray); + paths.reserve(arrayLength); + for (jsize i = 0; i < arrayLength; i++) + { + jstring pathStr = static_cast(env->GetObjectArrayElement(pathsObjArray, i)); + paths.push_back(JNIUtils::JStringToString(env, pathStr)); + env->DeleteLocalRef(pathStr); + } + env->DeleteLocalRef(pathsObjArray); + functionFinished = true; + }; + m_threadCV.notify_one(); + { + std::unique_lock threadLock(m_threadMutex); + m_functionCV.wait(threadLock, [&]() + { return functionFinished; }); + } + return paths; + } + + bool isDirectory(const std::filesystem::path &uri) override + { + return callBooleanFunction(uri, m_isDirectoryMid); + } + + bool isFile(const std::filesystem::path &uri) override + { + return callBooleanFunction(uri, m_isFileMid); + } + + bool exists(const std::filesystem::path &uri) override + { + return callBooleanFunction(uri, m_existsMid); + } +}; \ No newline at end of file diff --git a/src/android/app/src/main/cpp/AndroidGameIconLoadedCallback.h b/src/android/app/src/main/cpp/AndroidGameIconLoadedCallback.h new file mode 100644 index 00000000..873089a8 --- /dev/null +++ b/src/android/app/src/main/cpp/AndroidGameIconLoadedCallback.h @@ -0,0 +1,25 @@ +#pragma once + +#include "GameIconLoader.h" +#include "JNIUtils.h" + +class AndroidGameIconLoadedCallback : public GameIconLoadedCallback +{ + jmethodID m_onGameIconLoadedMID; + JNIUtils::Scopedjobject m_gameTitleLoadedCallbackObj; + + public: + AndroidGameIconLoadedCallback(jmethodID onGameIconLoadedMID, + jobject gameTitleLoadedCallbackObj) + : m_onGameIconLoadedMID(onGameIconLoadedMID), + m_gameTitleLoadedCallbackObj(gameTitleLoadedCallbackObj) {} + + void onIconLoaded(TitleId titleId, int* colors, int width, int height) override + { + JNIUtils::ScopedJNIENV env; + jintArray jIconData = env->NewIntArray(width * height); + env->SetIntArrayRegion(jIconData, 0, width * height, reinterpret_cast(colors)); + env->CallVoidMethod(*m_gameTitleLoadedCallbackObj, m_onGameIconLoadedMID, *reinterpret_cast(&titleId), jIconData, width, height); + env->DeleteLocalRef(jIconData); + } +}; \ No newline at end of file diff --git a/src/android/app/src/main/cpp/AndroidGameTitleLoadedCallback.h b/src/android/app/src/main/cpp/AndroidGameTitleLoadedCallback.h new file mode 100644 index 00000000..7d3dd02b --- /dev/null +++ b/src/android/app/src/main/cpp/AndroidGameTitleLoadedCallback.h @@ -0,0 +1,23 @@ +#pragma once + +#include "GameTitleLoader.h" + +class AndroidGameTitleLoadedCallback : public GameTitleLoadedCallback +{ + jmethodID m_onGameTitleLoadedMID; + JNIUtils::Scopedjobject m_gameTitleLoadedCallbackObj; + + public: + AndroidGameTitleLoadedCallback(jmethodID onGameTitleLoadedMID, jobject gameTitleLoadedCallbackObj) + : m_onGameTitleLoadedMID(onGameTitleLoadedMID), + m_gameTitleLoadedCallbackObj(gameTitleLoadedCallbackObj) {} + + void onTitleLoaded(const Game &game) override + { + JNIUtils::ScopedJNIENV env; + jstring name = env->NewStringUTF(game.name.c_str()); + jlong titleId = *reinterpret_cast(&game.titleId); + env->CallVoidMethod(*m_gameTitleLoadedCallbackObj, m_onGameTitleLoadedMID, titleId, name); + env->DeleteLocalRef(name); + } +}; diff --git a/src/android/app/src/main/cpp/CMakeLists.txt b/src/android/app/src/main/cpp/CMakeLists.txt new file mode 100644 index 00000000..ac8c60ab --- /dev/null +++ b/src/android/app/src/main/cpp/CMakeLists.txt @@ -0,0 +1,34 @@ +add_library(CemuAndroid SHARED + AndroidAudio.cpp + AndroidAudio.h + AndroidEmulatedController.cpp + AndroidEmulatedController.h + AndroidFilesystemCallbacks.h + AndroidGameIconLoadedCallback.h + AndroidGameTitleLoadedCallback.h + CMakeLists.txt + CafeSystemUtils.cpp + CafeSystemUtils.h + EmulationState.h + GameIconLoader.cpp + GameIconLoader.h + GameTitleLoader.cpp + GameTitleLoader.h + Image.cpp + Image.h + JNIUtils.cpp + JNIUtils.h + Utils.cpp + Utils.h + native-lib.cpp + stb_image.h +) + +target_link_libraries(CemuAndroid PRIVATE + -landroid + CemuCommon + CemuAudio + CemuComponents + CemuCafe + CemuBin +) diff --git a/src/android/app/src/main/cpp/CafeSystemUtils.cpp b/src/android/app/src/main/cpp/CafeSystemUtils.cpp new file mode 100644 index 00000000..0a340f0b --- /dev/null +++ b/src/android/app/src/main/cpp/CafeSystemUtils.cpp @@ -0,0 +1,52 @@ +#include "CafeSystemUtils.h" + +#include "Cafe/CafeSystem.h" +#include "Cafe/TitleList/TitleList.h" + +namespace CafeSystemUtils +{ +void startGame(TitleId titleId) +{ + TitleInfo launchTitle; + + if (!CafeTitleList::GetFirstByTitleId(titleId, launchTitle)) + return; + + if (launchTitle.IsValid()) + { + // the title might not be in the TitleList, so we add it as a temporary entry + CafeTitleList::AddTitleFromPath(launchTitle.GetPath()); + // title is valid, launch from TitleId + TitleId baseTitleId; + if (!CafeTitleList::FindBaseTitleId(launchTitle.GetAppTitleId(), baseTitleId)) + { + } + CafeSystem::STATUS_CODE statusCode = CafeSystem::PrepareForegroundTitle(baseTitleId); + if (statusCode == CafeSystem::STATUS_CODE::INVALID_RPX) + { + } + else if (statusCode == CafeSystem::STATUS_CODE::UNABLE_TO_MOUNT) + { + } + else if (statusCode != CafeSystem::STATUS_CODE::SUCCESS) + { + } + } + else // if (launchTitle.GetFormat() == TitleInfo::TitleDataFormat::INVALID_STRUCTURE ) + { + // title is invalid, if its an RPX/ELF we can launch it directly + // otherwise its an error + CafeTitleFileType fileType = DetermineCafeSystemFileType(launchTitle.GetPath()); + if (fileType == CafeTitleFileType::RPX || fileType == CafeTitleFileType::ELF) + { + CafeSystem::STATUS_CODE statusCode = CafeSystem::PrepareForegroundTitleFromStandaloneRPX( + launchTitle.GetPath()); + if (statusCode != CafeSystem::STATUS_CODE::SUCCESS) + { + return; + } + } + } + CafeSystem::LaunchForegroundTitle(); +} +}; // namespace CafeSystemUtils \ No newline at end of file diff --git a/src/android/app/src/main/cpp/CafeSystemUtils.h b/src/android/app/src/main/cpp/CafeSystemUtils.h new file mode 100644 index 00000000..edf5dff7 --- /dev/null +++ b/src/android/app/src/main/cpp/CafeSystemUtils.h @@ -0,0 +1,8 @@ +#pragma once + +#include "Cafe/TitleList/TitleId.h" + +namespace CafeSystemUtils +{ +void startGame(TitleId titleId); +}; \ No newline at end of file diff --git a/src/android/app/src/main/cpp/EmulationState.h b/src/android/app/src/main/cpp/EmulationState.h new file mode 100644 index 00000000..8640b900 --- /dev/null +++ b/src/android/app/src/main/cpp/EmulationState.h @@ -0,0 +1,234 @@ +#pragma once + +#include + +#include "AndroidAudio.h" +#include "AndroidEmulatedController.h" +#include "AndroidFilesystemCallbacks.h" +#include "Cafe/HW/Latte/Renderer/Vulkan/VulkanAPI.h" +#include "Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h" +#include "CafeSystemUtils.h" +#include "Cemu/GuiSystem/GuiSystem.h" +#include "GameIconLoader.h" +#include "GameTitleLoader.h" +#include "Utils.h" +#include "input/ControllerFactory.h" +#include "input/InputManager.h" +#include "input/api/Android/AndroidController.h" +#include "input/api/Android/AndroidControllerProvider.h" + +int mainEmulatorHLE(); + +class EmulationState +{ + GameIconLoader m_gameIconLoader; + GameTitleLoader m_gameTitleLoader; + + public: + void initializeEmulation() + { + FilesystemAndroid::setFilesystemCallbacks(std::make_shared()); + NetworkConfig::LoadOnce(); + mainEmulatorHLE(); + InputManager::instance().load(); + InitializeGlobalVulkan(); + createCemuDirectories(); + g_config.Load(); + } + + void initializeActiveSettings(const fs::path &dataPath, const fs::path &cachePath) + { + ActiveSettings::LoadOnce({}, dataPath, dataPath, cachePath, dataPath); + } + + void clearSurface(bool isMainCanvas) + { + VulkanRenderer::GetInstance()->ClearSurface(isMainCanvas); + } + + void notifySurfaceChanged(bool isMainCanvas) + { + VulkanRenderer::GetInstance()->NotifySurfaceChanged(isMainCanvas); + } + + void setSurface(JNIEnv *env, jobject surface, bool isMainCanvas) + { + auto &windowHandleInfo = isMainCanvas ? GuiSystem::getWindowInfo().canvas_main : GuiSystem::getWindowInfo().canvas_pad; + if (windowHandleInfo.surface) + { + ANativeWindow_release(static_cast(windowHandleInfo.surface)); + windowHandleInfo.surface = nullptr; + } + if (surface) + windowHandleInfo.surface = ANativeWindow_fromSurface(env, surface); + if (isMainCanvas) + GuiSystem::getWindowInfo().window_main.surface = windowHandleInfo.surface; + } + + void setSurfaceSize(int width, int height, bool isMainCanvas) + { + auto &windowInfo = GuiSystem::getWindowInfo(); + if (isMainCanvas) + { + windowInfo.width = windowInfo.phys_width = width; + windowInfo.height = windowInfo.phys_height = height; + } + else + { + windowInfo.pad_width = windowInfo.phys_pad_width = width; + windowInfo.pad_height = windowInfo.phys_pad_height = height; + } + } + + void onKeyEvent(const std::string &deviceDescriptor, const std::string &deviceName, int keyCode, bool isPressed) + { + auto apiProvider = InputManager::instance().get_api_provider(InputAPI::Android); + auto androidControllerProvider = dynamic_cast(apiProvider.get()); + androidControllerProvider->on_key_event(deviceDescriptor, deviceName, keyCode, isPressed); + } + + void onAxisEvent(const std::string &deviceDescriptor, const std::string &deviceName, int axisCode, float value) + { + auto apiProvider = InputManager::instance().get_api_provider(InputAPI::Android); + auto androidControllerProvider = dynamic_cast(apiProvider.get()); + androidControllerProvider->on_axis_event(deviceDescriptor, deviceName, axisCode, value); + } + + std::optional getEmulatedControllerMapping(size_t index, uint64 mappingId) + { + return AndroidEmulatedController::getAndroidEmulatedController(index).getMapping(mappingId); + } + + int getVPADControllersCount() + { + int vpadCount = 0; + for (int i = 0; i < InputManager::kMaxController; i++) + { + auto emulatedController = AndroidEmulatedController::getAndroidEmulatedController(i).getEmulatedController(); + if (!emulatedController) + continue; + if (emulatedController->type() == EmulatedController::Type::VPAD) + ++vpadCount; + } + return vpadCount; + } + + int getWPADControllersCount() + { + int wpadCount = 0; + for (int i = 0; i < InputManager::kMaxController; i++) + { + auto emulatedController = AndroidEmulatedController::getAndroidEmulatedController( + i) + .getEmulatedController(); + if (!emulatedController) + continue; + if (emulatedController->type() != EmulatedController::Type::VPAD) + ++wpadCount; + } + return wpadCount; + } + + EmulatedController::Type getEmulatedControllerType(size_t index) + { + auto emulatedController = AndroidEmulatedController::getAndroidEmulatedController(index).getEmulatedController(); + if (emulatedController) + return emulatedController->type(); + throw std::runtime_error(fmt::format("can't get type for emulated controller {}", index)); + } + + void clearEmulatedControllerMapping(size_t index, uint64 mapping) + { + AndroidEmulatedController::getAndroidEmulatedController(index).clearMapping(mapping); + } + + void setEmulatedControllerType(size_t index, EmulatedController::Type type) + { + auto &androidEmulatedController = AndroidEmulatedController::getAndroidEmulatedController(index); + if (EmulatedController::Type::VPAD <= type && type < EmulatedController::Type::MAX) + androidEmulatedController.setType(type); + else + androidEmulatedController.setDisabled(); + } + void initializeRenderer() + { + g_renderer = std::make_unique(); + } + void initializeRenderSurface(bool isMainCanvas) + { + int width, height; + if (isMainCanvas) + GuiSystem::getWindowPhysSize(width, height); + else + GuiSystem::getPadWindowPhysSize(width, height); + VulkanRenderer::GetInstance()->InitializeSurface({width, height}, isMainCanvas); + } + + void setDPI(float dpi) + { + auto &windowInfo = GuiSystem::getWindowInfo(); + windowInfo.dpi_scale = windowInfo.pad_dpi_scale = dpi; + } + + bool isEmulatedControllerDisabled(size_t index) + { + return AndroidEmulatedController::getAndroidEmulatedController(index).getEmulatedController() == nullptr; + } + + std::map getEmulatedControllerMappings(size_t index) + { + return AndroidEmulatedController::getAndroidEmulatedController(index).getMappings(); + } + + void setControllerMapping(const std::string &deviceDescriptor, const std::string &deviceName, size_t index, uint64 mappingId, uint64 buttonId) + { + auto apiProvider = InputManager::instance().get_api_provider(InputAPI::Android); + auto controller = ControllerFactory::CreateController(InputAPI::Android, deviceDescriptor, deviceName); + AndroidEmulatedController::getAndroidEmulatedController(index).setMapping(mappingId, controller, buttonId); + } + void initializeAudioDevices() + { + auto &config = g_config.data(); + if (!config.tv_device.empty()) + AndroidAudio::createAudioDevice(IAudioAPI::AudioAPI::Cubeb, config.tv_channels, config.tv_volume, true); + + if (!config.pad_device.empty()) + AndroidAudio::createAudioDevice(IAudioAPI::AudioAPI::Cubeb, config.pad_channels, config.pad_volume, false); + } + + void setOnGameTitleLoaded(const std::shared_ptr &onGameTitleLoaded) + { + m_gameTitleLoader.setOnTitleLoaded(onGameTitleLoaded); + } + + const Image &getGameIcon(TitleId titleId) + { + return m_gameIconLoader.getGameIcon(titleId); + } + + void setOnGameIconLoaded(const std::shared_ptr &onGameIconLoaded) + { + m_gameIconLoader.setOnIconLoaded(onGameIconLoaded); + } + + void addGamePath(const fs::path &gamePath) + { + m_gameTitleLoader.addGamePath(gamePath); + } + + void requestGameIcon(TitleId titleId) + { + m_gameIconLoader.requestIcon(titleId); + } + + void reloadGameTitles() + { + m_gameTitleLoader.reloadGameTitles(); + } + + void startGame(TitleId titleId) + { + initializeAudioDevices(); + CafeSystemUtils::startGame(titleId); + } +}; \ No newline at end of file diff --git a/src/android/app/src/main/cpp/GameIconLoader.cpp b/src/android/app/src/main/cpp/GameIconLoader.cpp new file mode 100644 index 00000000..22e51d6d --- /dev/null +++ b/src/android/app/src/main/cpp/GameIconLoader.cpp @@ -0,0 +1,87 @@ +#include "GameIconLoader.h" + +#include "Cafe/TitleList/TitleInfo.h" +#include "Cafe/TitleList/TitleList.h" + +GameIconLoader::GameIconLoader() +{ + m_loaderThread = std::thread(&GameIconLoader::loadGameIcons, this); +} + +GameIconLoader::~GameIconLoader() +{ + m_continueLoading = false; + m_condVar.notify_one(); + m_loaderThread.join(); +} + +const Image &GameIconLoader::getGameIcon(TitleId titleId) +{ + return m_iconCache.at(titleId); +} + +void GameIconLoader::requestIcon(TitleId titleId) +{ + { + std::lock_guard lock(m_threadMutex); + m_iconsToLoad.emplace_front(titleId); + } + m_condVar.notify_one(); +} + +void GameIconLoader::loadGameIcons() +{ + while (m_continueLoading) + { + TitleId titleId = 0; + { + std::unique_lock lock(m_threadMutex); + m_condVar.wait(lock, [this] + { return !m_iconsToLoad.empty() || !m_continueLoading; }); + if (!m_continueLoading) + return; + titleId = m_iconsToLoad.front(); + m_iconsToLoad.pop_front(); + } + TitleInfo titleInfo; + if (!CafeTitleList::GetFirstByTitleId(titleId, titleInfo)) + continue; + + if (auto iconIt = m_iconCache.find(titleId); iconIt != m_iconCache.end()) + { + auto &icon = iconIt->second; + if (m_onIconLoaded) + m_onIconLoaded->onIconLoaded(titleId, icon.intColors(), icon.m_width, icon.m_height); + continue; + } + + std::string tempMountPath = TitleInfo::GetUniqueTempMountingPath(); + if (!titleInfo.Mount(tempMountPath, "", FSC_PRIORITY_BASE)) + continue; + auto tgaData = fsc_extractFile((tempMountPath + "/meta/iconTex.tga").c_str()); + if (tgaData && tgaData->size() > 16) + { + Image image(tgaData.value()); + if (image.isOk()) + { + if (m_onIconLoaded) + m_onIconLoaded->onIconLoaded(titleId, image.intColors(), image.m_width, image.m_height); + m_iconCache.emplace(titleId, std::move(image)); + } + } + else + { + cemuLog_log(LogType::Force, "Failed to load icon for title {:016x}", titleId); + } + titleInfo.Unmount(tempMountPath); + } +} + +void GameIconLoader::setOnIconLoaded(const std::shared_ptr &onIconLoaded) +{ + { + std::lock_guard lock(m_threadMutex); + m_onIconLoaded = onIconLoaded; + } + m_condVar.notify_one(); +}; diff --git a/src/android/app/src/main/cpp/GameIconLoader.h b/src/android/app/src/main/cpp/GameIconLoader.h new file mode 100644 index 00000000..53968dcb --- /dev/null +++ b/src/android/app/src/main/cpp/GameIconLoader.h @@ -0,0 +1,35 @@ +#pragma once + +#include "Cafe/TitleList/TitleId.h" +#include "Image.h" + +class GameIconLoadedCallback +{ + public: + virtual void onIconLoaded(TitleId titleId, int *colors, int width, int height) = 0; +}; + +class GameIconLoader +{ + std::condition_variable m_condVar; + std::atomic_bool m_continueLoading = true; + std::thread m_loaderThread; + std::mutex m_threadMutex; + std::deque m_iconsToLoad; + std::map m_iconCache; + std::shared_ptr m_onIconLoaded = nullptr; + + public: + GameIconLoader(); + + ~GameIconLoader(); + + const Image &getGameIcon(TitleId titleId); + + void setOnIconLoaded(const std::shared_ptr &onIconLoaded); + + void requestIcon(TitleId titleId); + + private: + void loadGameIcons(); +}; diff --git a/src/android/app/src/main/cpp/GameTitleLoader.cpp b/src/android/app/src/main/cpp/GameTitleLoader.cpp new file mode 100644 index 00000000..6c63e613 --- /dev/null +++ b/src/android/app/src/main/cpp/GameTitleLoader.cpp @@ -0,0 +1,140 @@ +#include "GameTitleLoader.h" + +GameTitleLoader::GameTitleLoader() +{ + m_loaderThread = std::thread(&GameTitleLoader::loadGameTitles, this); +} + +void GameTitleLoader::queueTitle(TitleId titleId) +{ + { + std::lock_guard lock(m_threadMutex); + m_titlesToLoad.emplace_front(titleId); + } + m_condVar.notify_one(); +} + +void GameTitleLoader::setOnTitleLoaded(const std::shared_ptr &gameTitleLoadedCallback) +{ + { + std::lock_guard lock(m_threadMutex); + m_gameTitleLoadedCallback = gameTitleLoadedCallback; + } + m_condVar.notify_one(); +} + +void GameTitleLoader::reloadGameTitles() +{ + if (m_callbackIdTitleList.has_value()) + { + CafeTitleList::Refresh(); + CafeTitleList::UnregisterCallback(m_callbackIdTitleList.value()); + } + m_gameInfos.clear(); + registerCallback(); +} + +GameTitleLoader::~GameTitleLoader() +{ + m_continueLoading = false; + m_condVar.notify_one(); + m_loaderThread.join(); + if (m_callbackIdTitleList.has_value()) + CafeTitleList::UnregisterCallback(m_callbackIdTitleList.value()); +} + +void GameTitleLoader::titleRefresh(TitleId titleId) +{ + GameInfo2 gameInfo = CafeTitleList::GetGameInfo(titleId); + if (!gameInfo.IsValid()) + { + return; + } + TitleId baseTitleId = gameInfo.GetBaseTitleId(); + bool isNewEntry = false; + if (auto gameInfoIt = m_gameInfos.find(baseTitleId); gameInfoIt == m_gameInfos.end()) + { + isNewEntry = true; + m_gameInfos[baseTitleId] = Game(); + } + Game &game = m_gameInfos[baseTitleId]; + game.titleId = baseTitleId; + game.name = GetNameByTitleId(baseTitleId); + game.version = gameInfo.GetVersion(); + game.region = gameInfo.GetRegion(); + if (gameInfo.HasAOC()) + { + game.dlc = gameInfo.GetAOCVersion(); + } + if (isNewEntry) + { + iosu::pdm::GameListStat playTimeStat{}; + if (iosu::pdm::GetStatForGamelist(baseTitleId, playTimeStat)) + game.secondsPlayed = playTimeStat.numMinutesPlayed * 60; + if (m_gameTitleLoadedCallback) + m_gameTitleLoadedCallback->onTitleLoaded(game); + } + else + { + // TODO: Update + } +} + +void GameTitleLoader::loadGameTitles() +{ + while (m_continueLoading) + { + TitleId titleId = 0; + { + std::unique_lock lock(m_threadMutex); + m_condVar.wait(lock, [this] + { return (!m_titlesToLoad.empty()) || + !m_continueLoading; }); + if (!m_continueLoading) + return; + titleId = m_titlesToLoad.front(); + m_titlesToLoad.pop_front(); + } + titleRefresh(titleId); + } +} + +std::string GameTitleLoader::GetNameByTitleId(uint64 titleId) +{ + auto it = m_name_cache.find(titleId); + if (it != m_name_cache.end()) + return it->second; + TitleInfo titleInfo; + if (!CafeTitleList::GetFirstByTitleId(titleId, titleInfo)) + return "Unknown title"; + std::string name; + if (!GetConfig().GetGameListCustomName(titleId, name)) + name = titleInfo.GetMetaTitleName(); + m_name_cache.emplace(titleId, name); + return name; +} + +void GameTitleLoader::registerCallback() +{ + m_callbackIdTitleList = CafeTitleList::RegisterCallback( + [](CafeTitleListCallbackEvent *evt, void *ctx) + { + static_cast(ctx)->HandleTitleListCallback(evt); + }, + this); +} + +void GameTitleLoader::HandleTitleListCallback(CafeTitleListCallbackEvent *evt) +{ + if (evt->eventType == CafeTitleListCallbackEvent::TYPE::TITLE_DISCOVERED || evt->eventType == CafeTitleListCallbackEvent::TYPE::TITLE_REMOVED) + { + queueTitle(evt->titleInfo->GetAppTitleId()); + } +} + +void GameTitleLoader::addGamePath(const fs::path &path) +{ + CafeTitleList::ClearScanPaths(); + CafeTitleList::AddScanPath(path); + CafeTitleList::Refresh(); +} diff --git a/src/android/app/src/main/cpp/GameTitleLoader.h b/src/android/app/src/main/cpp/GameTitleLoader.h new file mode 100644 index 00000000..eca694fc --- /dev/null +++ b/src/android/app/src/main/cpp/GameTitleLoader.h @@ -0,0 +1,58 @@ +#pragma once + +#include "Cafe/IOSU/PDM/iosu_pdm.h" +#include "Cafe/TitleList/TitleId.h" +#include "Cafe/TitleList/TitleList.h" + +struct Game +{ + std::string name; + uint32 secondsPlayed; + uint16 dlc; + uint16 version; + TitleId titleId; + CafeConsoleRegion region; +}; + +class GameTitleLoadedCallback +{ + public: + virtual void onTitleLoaded(const Game &game) = 0; +}; + +class GameTitleLoader +{ + std::mutex m_threadMutex; + std::condition_variable m_condVar; + std::thread m_loaderThread; + std::atomic_bool m_continueLoading = true; + std::deque m_titlesToLoad; + std::optional m_callbackIdTitleList; + std::map m_gameInfos; + std::map m_name_cache; + std::shared_ptr m_gameTitleLoadedCallback = nullptr; + + public: + GameTitleLoader(); + + void queueTitle(TitleId titleId); + + void setOnTitleLoaded(const std::shared_ptr &gameTitleLoadedCallback); + + void reloadGameTitles(); + + ~GameTitleLoader(); + + void titleRefresh(TitleId titleId); + + void addGamePath(const fs::path &path); + + private: + void loadGameTitles(); + + std::string GetNameByTitleId(uint64 titleId); + + void registerCallback(); + + void HandleTitleListCallback(CafeTitleListCallbackEvent *evt); +}; diff --git a/src/android/app/src/main/cpp/Image.cpp b/src/android/app/src/main/cpp/Image.cpp new file mode 100644 index 00000000..391e7b85 --- /dev/null +++ b/src/android/app/src/main/cpp/Image.cpp @@ -0,0 +1,44 @@ +#include "Image.h" + +#define STB_IMAGE_IMPLEMENTATION +#define STBI_ONLY_TGA + +#include "stb_image.h" + +Image::Image(Image &&image) +{ + this->m_image = image.m_image; + this->m_width = image.m_width; + this->m_height = image.m_height; + this->m_channels = image.m_channels; + image.m_image = nullptr; +} + +Image::Image(const std::vector &imageBytes) +{ + m_image = stbi_load_from_memory(imageBytes.data(), imageBytes.size(), &m_width, &m_height, &m_channels, STBI_rgb_alpha); + if (m_image) + { + for (int i = 0; i < m_width * m_height * 4; i += 4) + { + uint8 r = m_image[i]; + uint8 g = m_image[i + 1]; + uint8 b = m_image[i + 2]; + uint8 a = m_image[i + 3]; + m_image[i] = b; + m_image[i + 1] = g; + m_image[i + 2] = r; + m_image[i + 3] = a; + } + } +} + +bool Image::isOk() const { return m_image != nullptr; } + +int *Image::intColors() const { return reinterpret_cast(m_image); } + +Image::~Image() +{ + if (m_image) + stbi_image_free(m_image); +} diff --git a/src/android/app/src/main/cpp/Image.h b/src/android/app/src/main/cpp/Image.h new file mode 100644 index 00000000..37ea78d0 --- /dev/null +++ b/src/android/app/src/main/cpp/Image.h @@ -0,0 +1,19 @@ +#pragma once + +struct Image +{ + uint8_t *m_image = nullptr; + int m_width = 0; + int m_height = 0; + int m_channels = 0; + + Image(Image &&image); + + Image(const std::vector &imageBytes); + + bool isOk() const; + + int *intColors() const; + + ~Image(); +}; diff --git a/src/android/app/src/main/cpp/JNIUtils.cpp b/src/android/app/src/main/cpp/JNIUtils.cpp new file mode 100644 index 00000000..073b6493 --- /dev/null +++ b/src/android/app/src/main/cpp/JNIUtils.cpp @@ -0,0 +1,69 @@ +#include "JNIUtils.h" + +namespace JNIUtils +{ +JavaVM *g_jvm = nullptr; +}; + +std::string JNIUtils::JStringToString(JNIEnv *env, jstring jstr) +{ + const char *c_str = env->GetStringUTFChars(jstr, nullptr); + std::string str(c_str); + env->ReleaseStringUTFChars(jstr, c_str); + return str; +} + +jobject JNIUtils::createJavaStringArrayList(JNIEnv *env, const std::vector &strings) +{ + jclass clsArrayList = env->FindClass("java/util/ArrayList"); + jmethodID arrayListConstructor = env->GetMethodID(clsArrayList, "", "()V"); + jobject arrayListObject = env->NewObject(clsArrayList, arrayListConstructor); + jmethodID addMethod = env->GetMethodID(clsArrayList, "add", "(Ljava/lang/Object;)Z"); + env->DeleteLocalRef(clsArrayList); + + for (const auto &string : strings) + { + jstring element = env->NewStringUTF(string.c_str()); + env->CallBooleanMethod(arrayListObject, addMethod, element); + env->DeleteLocalRef(element); + } + return arrayListObject; +} + +JNIUtils::Scopedjobject JNIUtils::getEnumValue(JNIEnv *env, const std::string &enumClassName, const std::string &enumName) +{ + jclass enumClass = env->FindClass(enumClassName.c_str()); + jfieldID fieldID = env->GetStaticFieldID(enumClass, enumName.c_str(), ("L" + enumClassName + ";").c_str()); + jobject enumValue = env->GetStaticObjectField(enumClass, fieldID); + env->DeleteLocalRef(enumClass); + Scopedjobject enumObj = Scopedjobject(enumValue); + env->DeleteLocalRef(enumValue); + return enumObj; +} + +jobject JNIUtils::createArrayList(JNIEnv *env, const std::vector &objects) +{ + static Scopedjclass listClass = Scopedjclass("java/util/ArrayList"); + static jmethodID listConstructor = env->GetMethodID(*listClass, "", "()V"); + static jmethodID listAdd = env->GetMethodID(*listClass, "add", "(Ljava/lang/Object;)Z"); + + jobject arrayList = env->NewObject(*listClass, listConstructor); + for (auto &&obj : objects) + env->CallBooleanMethod(arrayList, listAdd, obj); + return arrayList; +} + +jobject JNIUtils::createJavaStringArrayList(JNIEnv *env, const std::vector &strings) +{ + jclass arrayListClass = env->FindClass("java/util/ArrayList"); + jmethodID arrayListConstructor = env->GetMethodID(arrayListClass, "", "()V"); + jobject arrayListObject = env->NewObject(arrayListClass, arrayListConstructor); + jmethodID addMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z"); + for (const auto &string : strings) + { + jstring element = env->NewString((jchar *)string.c_str(), string.length()); + env->CallBooleanMethod(arrayListObject, addMethod, element); + env->DeleteLocalRef(element); + } + return arrayListObject; +} diff --git a/src/android/app/src/main/cpp/JNIUtils.h b/src/android/app/src/main/cpp/JNIUtils.h new file mode 100644 index 00000000..197ff571 --- /dev/null +++ b/src/android/app/src/main/cpp/JNIUtils.h @@ -0,0 +1,143 @@ +#pragma once + +#include +#include + +namespace JNIUtils +{ +extern JavaVM *g_jvm; + +std::string JStringToString(JNIEnv *env, jstring jstr); + +jobject createJavaStringArrayList(JNIEnv *env, const std::vector &stringList); + +jobject createJavaStringArrayList(JNIEnv *env, const std::vector &stringList); + +class ScopedJNIENV +{ + public: + ScopedJNIENV() + { + jint result = g_jvm->GetEnv((void **)&m_env, JNI_VERSION_1_6); + if (result == JNI_EDETACHED) + { + JavaVMAttachArgs args; + args.version = JNI_VERSION_1_6; + args.name = nullptr; + args.group = nullptr; + result = g_jvm->AttachCurrentThread(&m_env, &args); + if (result == JNI_OK) + m_threadWasAttached = true; + } + } + + JNIEnv *&operator*() { return m_env; } + + JNIEnv *operator->() { return m_env; } + + ~ScopedJNIENV() + { + if (m_threadWasAttached) + g_jvm->DetachCurrentThread(); + } + + private: + JNIEnv *m_env = nullptr; + bool m_threadWasAttached = false; +}; + +class Scopedjobject +{ + public: + Scopedjobject() = default; + + Scopedjobject(Scopedjobject &&other) + { + this->m_jobject = other.m_jobject; + other.m_jobject = nullptr; + } + void deleteRef() + { + if (m_jobject) + { + ScopedJNIENV()->DeleteGlobalRef(m_jobject); + m_jobject = nullptr; + } + } + Scopedjobject &operator=(Scopedjobject &&other) + { + if (this != &other) + { + deleteRef(); + m_jobject = other.m_jobject; + other.m_jobject = nullptr; + } + return *this; + } + jobject &operator*() { return m_jobject; } + + Scopedjobject(jobject obj) + { + if (obj) + m_jobject = ScopedJNIENV()->NewGlobalRef(obj); + } + + ~Scopedjobject() + { + deleteRef(); + } + + bool isValid() const { return m_jobject; } + + private: + jobject m_jobject = nullptr; +}; + +class Scopedjclass +{ + public: + Scopedjclass() = default; + + Scopedjclass(Scopedjclass &&other) + { + this->m_jclass = other.m_jclass; + other.m_jclass = nullptr; + } + + Scopedjclass &operator=(Scopedjclass &&other) + { + if (this != &other) + { + if (m_jclass) + ScopedJNIENV()->DeleteGlobalRef(m_jclass); + m_jclass = other.m_jclass; + other.m_jclass = nullptr; + } + return *this; + } + + Scopedjclass(const std::string &className) + { + ScopedJNIENV scopedEnv; + jobject tempObj = scopedEnv->FindClass(className.c_str()); + m_jclass = static_cast(scopedEnv->NewGlobalRef(tempObj)); + scopedEnv->DeleteLocalRef(tempObj); + } + + ~Scopedjclass() + { + if (m_jclass) + ScopedJNIENV()->DeleteGlobalRef(m_jclass); + } + + bool isValid() const { return m_jclass; } + + jclass &operator*() { return m_jclass; } + + private: + jclass m_jclass = nullptr; +}; + +Scopedjobject getEnumValue(JNIEnv *env, const std::string &enumClassName, const std::string &enumName); +jobject createArrayList(JNIEnv *env, const std::vector &objects); +} // namespace JNIUtils diff --git a/src/android/app/src/main/cpp/Utils.cpp b/src/android/app/src/main/cpp/Utils.cpp new file mode 100644 index 00000000..0189bd96 --- /dev/null +++ b/src/android/app/src/main/cpp/Utils.cpp @@ -0,0 +1,82 @@ +#include "Utils.h" + +#include "Cemu/ncrypto/ncrypto.h" +#include "config/ActiveSettings.h" + +void createCemuDirectories() +{ + std::wstring mlc = ActiveSettings::GetMlcPath().generic_wstring(); + + // create sys/usr folder in mlc01 + try + { + const auto sysFolder = fs::path(mlc).append(L"sys"); + fs::create_directories(sysFolder); + + const auto usrFolder = fs::path(mlc).append(L"usr"); + fs::create_directories(usrFolder); + fs::create_directories(fs::path(usrFolder).append("title/00050000")); // base + fs::create_directories(fs::path(usrFolder).append("title/0005000c")); // dlc + fs::create_directories(fs::path(usrFolder).append("title/0005000e")); // update + + // Mii Maker save folders {0x500101004A000, 0x500101004A100, 0x500101004A200}, + fs::create_directories(fs::path(mlc).append(L"usr/save/00050010/1004a000/user/common/db")); + fs::create_directories(fs::path(mlc).append(L"usr/save/00050010/1004a100/user/common/db")); + fs::create_directories(fs::path(mlc).append(L"usr/save/00050010/1004a200/user/common/db")); + + // lang files + auto langDir = fs::path(mlc).append(L"sys/title/0005001b/1005c000/content"); + fs::create_directories(langDir); + + auto langFile = fs::path(langDir).append("language.txt"); + if (!fs::exists(langFile)) + { + std::ofstream file(langFile); + if (file.is_open()) + { + const char *langStrings[] = {"ja", "en", "fr", "de", "it", "es", "zh", "ko", "nl", "pt", "ru", "zh"}; + for (const char *lang : langStrings) + file << fmt::format(R"("{}",)", lang) << std::endl; + + file.flush(); + file.close(); + } + } + + auto countryFile = fs::path(langDir).append("country.txt"); + if (!fs::exists(countryFile)) + { + std::ofstream file(countryFile); + for (sint32 i = 0; i < 201; i++) + { + const char *countryCode = NCrypto::GetCountryAsString(i); + if (boost::iequals(countryCode, "NN")) + file << "NULL," << std::endl; + else + file << fmt::format(R"("{}",)", countryCode) << std::endl; + } + file.flush(); + file.close(); + } + } + catch (const std::exception &ex) + { + exit(0); + } + + // cemu directories + try + { + const auto controllerProfileFolder = ActiveSettings::GetConfigPath(L"controllerProfiles").generic_wstring(); + if (!fs::exists(controllerProfileFolder)) + fs::create_directories(controllerProfileFolder); + + const auto memorySearcherFolder = ActiveSettings::GetUserDataPath(L"memorySearcher").generic_wstring(); + if (!fs::exists(memorySearcherFolder)) + fs::create_directories(memorySearcherFolder); + } + catch (const std::exception &ex) + { + exit(0); + } +} \ No newline at end of file diff --git a/src/android/app/src/main/cpp/Utils.h b/src/android/app/src/main/cpp/Utils.h new file mode 100644 index 00000000..1a67e92a --- /dev/null +++ b/src/android/app/src/main/cpp/Utils.h @@ -0,0 +1,6 @@ +#pragma once + +#include "config/ActiveSettings.h" +#include "Cemu/ncrypto/ncrypto.h" + +void createCemuDirectories(); diff --git a/src/android/app/src/main/cpp/native-lib.cpp b/src/android/app/src/main/cpp/native-lib.cpp new file mode 100644 index 00000000..02630cbf --- /dev/null +++ b/src/android/app/src/main/cpp/native-lib.cpp @@ -0,0 +1,294 @@ +#include "AndroidGameIconLoadedCallback.h" +#include "AndroidGameTitleLoadedCallback.h" +#include "EmulationState.h" +#include "JNIUtils.h" + +EmulationState s_emulationState; + +extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, [[maybe_unused]] void *reserved) +{ + JNIUtils::g_jvm = vm; + return JNI_VERSION_1_6; +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_setSurface(JNIEnv *env, [[maybe_unused]] jclass clazz, jobject surface, jboolean is_main_canvas) +{ + s_emulationState.setSurface(env, surface, is_main_canvas); +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_setSurfaceSize([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jint width, jint height, jboolean is_main_canvas) +{ + s_emulationState.setSurfaceSize(width, height, is_main_canvas); +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_startGame([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jlong title_id) +{ + s_emulationState.startGame(*reinterpret_cast(&title_id)); +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_setGameTitleLoadedCallback(JNIEnv *env, [[maybe_unused]] jclass clazz, jobject game_title_loaded_callback) +{ + jclass gameTitleLoadedCallbackClass = env->GetObjectClass(game_title_loaded_callback); + jmethodID onGameTitleLoadedMID = env->GetMethodID(gameTitleLoadedCallbackClass, "onGameTitleLoaded", "(JLjava/lang/String;)V"); + env->DeleteLocalRef(gameTitleLoadedCallbackClass); + s_emulationState.setOnGameTitleLoaded(std::make_shared(onGameTitleLoadedMID, game_title_loaded_callback)); +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_setGameIconLoadedCallback(JNIEnv *env, [[maybe_unused]] jclass clazz, jobject game_icon_loaded_callback) +{ + jclass gameIconLoadedCallbackClass = env->GetObjectClass(game_icon_loaded_callback); + jmethodID gameIconLoadedMID = env->GetMethodID(gameIconLoadedCallbackClass, "onGameIconLoaded", "(J[III)V"); + s_emulationState.setOnGameIconLoaded(std::make_shared(gameIconLoadedMID, game_icon_loaded_callback)); +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_requestGameIcon([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jlong title_id) +{ + s_emulationState.requestGameIcon(*reinterpret_cast(&title_id)); +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_reloadGameTitles([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz) +{ + s_emulationState.reloadGameTitles(); +} +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_initializeActiveSettings(JNIEnv *env, [[maybe_unused]] jclass clazz, jstring data_path, jstring cache_path) +{ + std::string dataPath = JNIUtils::JStringToString(env, data_path); + std::string cachePath = JNIUtils::JStringToString(env, cache_path); + s_emulationState.initializeActiveSettings(dataPath, cachePath); +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_initializeEmulation([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz) +{ + s_emulationState.initializeEmulation(); +} +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_initializerRenderer([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz) +{ + s_emulationState.initializeRenderer(); +} +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_initializeRendererSurface([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jboolean is_main_canvas) +{ + s_emulationState.initializeRenderSurface(is_main_canvas); +} +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_setDPI([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jfloat dpi) +{ + s_emulationState.setDPI(dpi); +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_clearSurface([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jboolean is_main_canvas) +{ + s_emulationState.clearSurface(is_main_canvas); +} +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_recreateRenderSurface([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jboolean is_main_canvas) +{ + s_emulationState.notifySurfaceChanged(is_main_canvas); +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_addGamePath(JNIEnv *env, [[maybe_unused]] jclass clazz, jstring uri) +{ + s_emulationState.addGamePath(JNIUtils::JStringToString(env, uri)); +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_onNativeKey(JNIEnv *env, [[maybe_unused]] jclass clazz, jstring device_descriptor, jstring device_name, jint key, jboolean is_pressed) +{ + auto deviceDescriptor = JNIUtils::JStringToString(env, device_descriptor); + auto deviceName = JNIUtils::JStringToString(env, device_name); + s_emulationState.onKeyEvent(deviceDescriptor, deviceName, key, is_pressed); +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_onNativeAxis(JNIEnv *env, [[maybe_unused]] jclass clazz, jstring device_descriptor, jstring device_name, jint axis, jfloat value) +{ + auto deviceDescriptor = JNIUtils::JStringToString(env, device_descriptor); + auto deviceName = JNIUtils::JStringToString(env, device_name); + s_emulationState.onAxisEvent(deviceDescriptor, deviceName, axis, value); +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_setControllerType([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jint index, jint emulated_controller_type) +{ + s_emulationState.setEmulatedControllerType(index, static_cast(emulated_controller_type)); +} + +extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL +Java_info_cemu_Cemu_NativeLibrary_getControllerType([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jint index) +{ + return s_emulationState.getEmulatedControllerType(index); +} + +extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL +Java_info_cemu_Cemu_NativeLibrary_getWPADControllersCount([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz) +{ + return s_emulationState.getWPADControllersCount(); +} + +extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL +Java_info_cemu_Cemu_NativeLibrary_getVPADControllersCount([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz) +{ + return s_emulationState.getVPADControllersCount(); +} + +extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL +Java_info_cemu_Cemu_NativeLibrary_isControllerDisabled([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jint index) +{ + return s_emulationState.isEmulatedControllerDisabled(index); +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_setControllerMapping(JNIEnv *env, [[maybe_unused]] jclass clazz, jstring device_descriptor, jstring device_name, jint index, jint mapping_id, jint button_id) +{ + auto deviceName = JNIUtils::JStringToString(env, device_name); + auto deviceDescriptor = JNIUtils::JStringToString(env, device_descriptor); + s_emulationState.setControllerMapping(deviceDescriptor, deviceName, index, mapping_id, button_id); +} + +extern "C" [[maybe_unused]] JNIEXPORT jstring JNICALL +Java_info_cemu_Cemu_NativeLibrary_getControllerMapping(JNIEnv *env, [[maybe_unused]] jclass clazz, jint index, jint mapping_id) +{ + auto mapping = s_emulationState.getEmulatedControllerMapping(index, mapping_id); + return env->NewStringUTF(mapping.value_or("").c_str()); +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_clearControllerMapping([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jint index, jint mapping_id) +{ + s_emulationState.clearEmulatedControllerMapping(index, mapping_id); +} + +extern "C" [[maybe_unused]] JNIEXPORT jobject JNICALL +Java_info_cemu_Cemu_NativeLibrary_getControllerMappings(JNIEnv *env, [[maybe_unused]] jclass clazz, jint index) +{ + jclass hashMapClass = env->FindClass("java/util/HashMap"); + jmethodID hashMapConstructor = env->GetMethodID(hashMapClass, "", "()V"); + jmethodID hashMapPut = env->GetMethodID(hashMapClass, "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"); + jclass integerClass = env->FindClass("java/lang/Integer"); + jmethodID integerConstructor = env->GetMethodID(integerClass, "", "(I)V"); + jobject hashMapObj = env->NewObject(hashMapClass, hashMapConstructor); + auto mappings = s_emulationState.getEmulatedControllerMappings(index); + for (const auto &pair : mappings) + { + jint key = pair.first; + jstring buttonName = env->NewStringUTF(pair.second.c_str()); + jobject mappingId = env->NewObject(integerClass, integerConstructor, key); + env->CallObjectMethod(hashMapObj, hashMapPut, mappingId, buttonName); + } + return hashMapObj; +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_onKeyEvent(JNIEnv *env, [[maybe_unused]] jclass clazz, jstring device_descriptor, jstring device_name, jint key_code, jboolean is_pressed) +{ + auto deviceDescriptor = JNIUtils::JStringToString(env, device_descriptor); + auto deviceName = JNIUtils::JStringToString(env, device_name); + s_emulationState.onKeyEvent(deviceDescriptor, deviceName, key_code, is_pressed); +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_onAxisEvent([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jstring device_descriptor, jstring device_name, jint axis_code, jfloat value) +{ + auto deviceDescriptor = JNIUtils::JStringToString(env, device_descriptor); + auto deviceName = JNIUtils::JStringToString(env, device_name); + s_emulationState.onAxisEvent(deviceDescriptor, deviceName, axis_code, value); +} + +extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL +Java_info_cemu_Cemu_NativeLibrary_getAsyncShaderCompile([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz) +{ + return g_config.data().async_compile; +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_setAsyncShaderCompile([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jboolean enabled) +{ + g_config.data().async_compile = enabled; + g_config.Save(); +} + +extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL +Java_info_cemu_Cemu_NativeLibrary_getVSyncMode([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz) +{ + return g_config.data().vsync; +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_setVSyncMode([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jint vsync_mode) +{ + g_config.data().vsync = vsync_mode; + g_config.Save(); +} + +extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL +Java_info_cemu_Cemu_NativeLibrary_getAccurateBarriers([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz) +{ + return g_config.data().vk_accurate_barriers; +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_setAccurateBarriers([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jboolean enabled) +{ + g_config.data().vk_accurate_barriers = enabled; + g_config.Save(); +} + +extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL +Java_info_cemu_Cemu_NativeLibrary_getAudioDeviceEnabled([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jboolean tv) +{ + const auto &device = tv ? g_config.data().tv_device : g_config.data().pad_device; + return !device.empty(); +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_setAudioDeviceEnabled([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jboolean enabled, jboolean tv) +{ + auto &device = tv ? g_config.data().tv_device : g_config.data().pad_device; + if (enabled) + device = L"Default"; + else + device.clear(); + g_config.Save(); +} + +extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL +Java_info_cemu_Cemu_NativeLibrary_getAudioDeviceChannels([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jboolean tv) +{ + const auto &deviceChannels = tv ? g_config.data().tv_channels : g_config.data().pad_channels; + return deviceChannels; +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_setAudioDeviceChannels([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jint channels, jboolean tv) +{ + auto &deviceChannels = tv ? g_config.data().tv_channels : g_config.data().pad_channels; + deviceChannels = static_cast(channels); + g_config.Save(); +} + +extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL +Java_info_cemu_Cemu_NativeLibrary_getAudioDeviceVolume([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jboolean tv) +{ + const auto &deviceVolume = tv ? g_config.data().tv_volume : g_config.data().pad_volume; + return deviceVolume; +} + +extern "C" [[maybe_unused]] JNIEXPORT void JNICALL +Java_info_cemu_Cemu_NativeLibrary_setAudioDeviceVolume([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass clazz, jint volume, jboolean tv) +{ + auto &deviceVolume = tv ? g_config.data().tv_volume : g_config.data().pad_volume; + deviceVolume = volume; + g_config.Save(); +} diff --git a/src/android/app/src/main/cpp/stb_image.h b/src/android/app/src/main/cpp/stb_image.h new file mode 100644 index 00000000..d60371b9 --- /dev/null +++ b/src/android/app/src/main/cpp/stb_image.h @@ -0,0 +1,7897 @@ +/* stb_image - v2.27 - public domain image loader - http://nothings.org/stb + no warranty implied; use at your own risk + + Do this: + #define STB_IMAGE_IMPLEMENTATION + before you include this file in *one* C or C++ file to create the implementation. + + // i.e. it should look like this: + #include ... + #include ... + #include ... + #define STB_IMAGE_IMPLEMENTATION + #include "stb_image.h" + + You can #define STBI_ASSERT(x) before the #include to avoid using assert.h. + And #define STBI_MALLOC, STBI_REALLOC, and STBI_FREE to avoid using malloc,realloc,free + + + QUICK NOTES: + Primarily of interest to game developers and other people who can + avoid problematic images and only need the trivial interface + + JPEG baseline & progressive (12 bpc/arithmetic not supported, same as stock IJG lib) + PNG 1/2/4/8/16-bit-per-channel + + TGA (not sure what subset, if a subset) + BMP non-1bpp, non-RLE + PSD (composited view only, no extra channels, 8/16 bit-per-channel) + + GIF (*comp always reports as 4-channel) + HDR (radiance rgbE format) + PIC (Softimage PIC) + PNM (PPM and PGM binary only) + + Animated GIF still needs a proper API, but here's one way to do it: + http://gist.github.com/urraka/685d9a6340b26b830d49 + + - decode from memory or through FILE (define STBI_NO_STDIO to remove code) + - decode from arbitrary I/O callbacks + - SIMD acceleration on x86/x64 (SSE2) and ARM (NEON) + + Full documentation under "DOCUMENTATION" below. + + +LICENSE + + See end of file for license information. + +RECENT REVISION HISTORY: + + 2.27 (2021-07-11) document stbi_info better, 16-bit PNM support, bug fixes + 2.26 (2020-07-13) many minor fixes + 2.25 (2020-02-02) fix warnings + 2.24 (2020-02-02) fix warnings; thread-local failure_reason and flip_vertically + 2.23 (2019-08-11) fix clang static analysis warning + 2.22 (2019-03-04) gif fixes, fix warnings + 2.21 (2019-02-25) fix typo in comment + 2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs + 2.19 (2018-02-11) fix warning + 2.18 (2018-01-30) fix warnings + 2.17 (2018-01-29) bugfix, 1-bit BMP, 16-bitness query, fix warnings + 2.16 (2017-07-23) all functions have 16-bit variants; optimizations; bugfixes + 2.15 (2017-03-18) fix png-1,2,4; all Imagenet JPGs; no runtime SSE detection on GCC + 2.14 (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs + 2.13 (2016-12-04) experimental 16-bit API, only for PNG so far; fixes + 2.12 (2016-04-02) fix typo in 2.11 PSD fix that caused crashes + 2.11 (2016-04-02) 16-bit PNGS; enable SSE2 in non-gcc x64 + RGB-format JPEG; remove white matting in PSD; + allocate large structures on the stack; + correct channel count for PNG & BMP + 2.10 (2016-01-22) avoid warning introduced in 2.09 + 2.09 (2016-01-16) 16-bit TGA; comments in PNM files; STBI_REALLOC_SIZED + + See end of file for full revision history. + + + ============================ Contributors ========================= + + Image formats Extensions, features + Sean Barrett (jpeg, png, bmp) Jetro Lauha (stbi_info) + Nicolas Schulz (hdr, psd) Martin "SpartanJ" Golini (stbi_info) + Jonathan Dummer (tga) James "moose2000" Brown (iPhone PNG) + Jean-Marc Lienher (gif) Ben "Disch" Wenger (io callbacks) + Tom Seddon (pic) Omar Cornut (1/2/4-bit PNG) + Thatcher Ulrich (psd) Nicolas Guillemot (vertical flip) + Ken Miller (pgm, ppm) Richard Mitton (16-bit PSD) + github:urraka (animated gif) Junggon Kim (PNM comments) + Christopher Forseth (animated gif) Daniel Gibson (16-bit TGA) + socks-the-fox (16-bit PNG) + Jeremy Sawicki (handle all ImageNet JPGs) + Optimizations & bugfixes Mikhail Morozov (1-bit BMP) + Fabian "ryg" Giesen Anael Seghezzi (is-16-bit query) + Arseny Kapoulkine Simon Breuss (16-bit PNM) + John-Mark Allen + Carmelo J Fdez-Aguera + + Bug & warning fixes + Marc LeBlanc David Woo Guillaume George Martins Mozeiko + Christpher Lloyd Jerry Jansson Joseph Thomson Blazej Dariusz Roszkowski + Phil Jordan Dave Moore Roy Eltham + Hayaki Saito Nathan Reed Won Chun + Luke Graham Johan Duparc Nick Verigakis the Horde3D community + Thomas Ruf Ronny Chevalier github:rlyeh + Janez Zemva John Bartholomew Michal Cichon github:romigrou + Jonathan Blow Ken Hamada Tero Hanninen github:svdijk + Eugene Golushkov Laurent Gomila Cort Stratton github:snagar + Aruelien Pocheville Sergio Gonzalez Thibault Reuille github:Zelex + Cass Everitt Ryamond Barbiero github:grim210 + Paul Du Bois Engin Manap Aldo Culquicondor github:sammyhw + Philipp Wiesemann Dale Weiler Oriol Ferrer Mesia github:phprus + Josh Tobin Matthew Gregan github:poppolopoppo + Julian Raschke Gregory Mullen Christian Floisand github:darealshinji + Baldur Karlsson Kevin Schmidt JR Smith github:Michaelangel007 + Brad Weinberger Matvey Cherevko github:mosra + Luca Sas Alexander Veselov Zack Middleton [reserved] + Ryan C. Gordon [reserved] [reserved] + DO NOT ADD YOUR NAME HERE + + Jacko Dirks + + To add your name to the credits, pick a random blank space in the middle and fill it. + 80% of merge conflicts on stb PRs are due to people adding their name at the end + of the credits. +*/ + +#ifndef STBI_INCLUDE_STB_IMAGE_H +#define STBI_INCLUDE_STB_IMAGE_H + +// DOCUMENTATION +// +// Limitations: +// - no 12-bit-per-channel JPEG +// - no JPEGs with arithmetic coding +// - GIF always returns *comp=4 +// +// Basic usage (see HDR discussion below for HDR usage): +// int x,y,n; +// unsigned char *data = stbi_load(filename, &x, &y, &n, 0); +// // ... process data if not NULL ... +// // ... x = width, y = height, n = # 8-bit components per pixel ... +// // ... replace '0' with '1'..'4' to force that many components per pixel +// // ... but 'n' will always be the number that it would have been if you said 0 +// stbi_image_free(data) +// +// Standard parameters: +// int *x -- outputs image width in pixels +// int *y -- outputs image height in pixels +// int *channels_in_file -- outputs # of image components in image file +// int desired_channels -- if non-zero, # of image components requested in result +// +// The return value from an image loader is an 'unsigned char *' which points +// to the pixel data, or NULL on an allocation failure or if the image is +// corrupt or invalid. The pixel data consists of *y scanlines of *x pixels, +// with each pixel consisting of N interleaved 8-bit components; the first +// pixel pointed to is top-left-most in the image. There is no padding between +// image scanlines or between pixels, regardless of format. The number of +// components N is 'desired_channels' if desired_channels is non-zero, or +// *channels_in_file otherwise. If desired_channels is non-zero, +// *channels_in_file has the number of components that _would_ have been +// output otherwise. E.g. if you set desired_channels to 4, you will always +// get RGBA output, but you can check *channels_in_file to see if it's trivially +// opaque because e.g. there were only 3 channels in the source image. +// +// An output image with N components has the following components interleaved +// in this order in each pixel: +// +// N=#comp components +// 1 grey +// 2 grey, alpha +// 3 red, green, blue +// 4 red, green, blue, alpha +// +// If image loading fails for any reason, the return value will be NULL, +// and *x, *y, *channels_in_file will be unchanged. The function +// stbi_failure_reason() can be queried for an extremely brief, end-user +// unfriendly explanation of why the load failed. Define STBI_NO_FAILURE_STRINGS +// to avoid compiling these strings at all, and STBI_FAILURE_USERMSG to get slightly +// more user-friendly ones. +// +// Paletted PNG, BMP, GIF, and PIC images are automatically depalettized. +// +// To query the width, height and component count of an image without having to +// decode the full file, you can use the stbi_info family of functions: +// +// int x,y,n,ok; +// ok = stbi_info(filename, &x, &y, &n); +// // returns ok=1 and sets x, y, n if image is a supported format, +// // 0 otherwise. +// +// Note that stb_image pervasively uses ints in its public API for sizes, +// including sizes of memory buffers. This is now part of the API and thus +// hard to change without causing breakage. As a result, the various image +// loaders all have certain limits on image size; these differ somewhat +// by format but generally boil down to either just under 2GB or just under +// 1GB. When the decoded image would be larger than this, stb_image decoding +// will fail. +// +// Additionally, stb_image will reject image files that have any of their +// dimensions set to a larger value than the configurable STBI_MAX_DIMENSIONS, +// which defaults to 2**24 = 16777216 pixels. Due to the above memory limit, +// the only way to have an image with such dimensions load correctly +// is for it to have a rather extreme aspect ratio. Either way, the +// assumption here is that such larger images are likely to be malformed +// or malicious. If you do need to load an image with individual dimensions +// larger than that, and it still fits in the overall size limit, you can +// #define STBI_MAX_DIMENSIONS on your own to be something larger. +// +// =========================================================================== +// +// UNICODE: +// +// If compiling for Windows and you wish to use Unicode filenames, compile +// with +// #define STBI_WINDOWS_UTF8 +// and pass utf8-encoded filenames. Call stbi_convert_wchar_to_utf8 to convert +// Windows wchar_t filenames to utf8. +// +// =========================================================================== +// +// Philosophy +// +// stb libraries are designed with the following priorities: +// +// 1. easy to use +// 2. easy to maintain +// 3. good performance +// +// Sometimes I let "good performance" creep up in priority over "easy to maintain", +// and for best performance I may provide less-easy-to-use APIs that give higher +// performance, in addition to the easy-to-use ones. Nevertheless, it's important +// to keep in mind that from the standpoint of you, a client of this library, +// all you care about is #1 and #3, and stb libraries DO NOT emphasize #3 above all. +// +// Some secondary priorities arise directly from the first two, some of which +// provide more explicit reasons why performance can't be emphasized. +// +// - Portable ("ease of use") +// - Small source code footprint ("easy to maintain") +// - No dependencies ("ease of use") +// +// =========================================================================== +// +// I/O callbacks +// +// I/O callbacks allow you to read from arbitrary sources, like packaged +// files or some other source. Data read from callbacks are processed +// through a small internal buffer (currently 128 bytes) to try to reduce +// overhead. +// +// The three functions you must define are "read" (reads some bytes of data), +// "skip" (skips some bytes of data), "eof" (reports if the stream is at the end). +// +// =========================================================================== +// +// SIMD support +// +// The JPEG decoder will try to automatically use SIMD kernels on x86 when +// supported by the compiler. For ARM Neon support, you must explicitly +// request it. +// +// (The old do-it-yourself SIMD API is no longer supported in the current +// code.) +// +// On x86, SSE2 will automatically be used when available based on a run-time +// test; if not, the generic C versions are used as a fall-back. On ARM targets, +// the typical path is to have separate builds for NEON and non-NEON devices +// (at least this is true for iOS and Android). Therefore, the NEON support is +// toggled by a build flag: define STBI_NEON to get NEON loops. +// +// If for some reason you do not want to use any of SIMD code, or if +// you have issues compiling it, you can disable it entirely by +// defining STBI_NO_SIMD. +// +// =========================================================================== +// +// HDR image support (disable by defining STBI_NO_HDR) +// +// stb_image supports loading HDR images in general, and currently the Radiance +// .HDR file format specifically. You can still load any file through the existing +// interface; if you attempt to load an HDR file, it will be automatically remapped +// to LDR, assuming gamma 2.2 and an arbitrary scale factor defaulting to 1; +// both of these constants can be reconfigured through this interface: +// +// stbi_hdr_to_ldr_gamma(2.2f); +// stbi_hdr_to_ldr_scale(1.0f); +// +// (note, do not use _inverse_ constants; stbi_image will invert them +// appropriately). +// +// Additionally, there is a new, parallel interface for loading files as +// (linear) floats to preserve the full dynamic range: +// +// float *data = stbi_loadf(filename, &x, &y, &n, 0); +// +// If you load LDR images through this interface, those images will +// be promoted to floating point values, run through the inverse of +// constants corresponding to the above: +// +// stbi_ldr_to_hdr_scale(1.0f); +// stbi_ldr_to_hdr_gamma(2.2f); +// +// Finally, given a filename (or an open file or memory block--see header +// file for details) containing image data, you can query for the "most +// appropriate" interface to use (that is, whether the image is HDR or +// not), using: +// +// stbi_is_hdr(char *filename); +// +// =========================================================================== +// +// iPhone PNG support: +// +// We optionally support converting iPhone-formatted PNGs (which store +// premultiplied BGRA) back to RGB, even though they're internally encoded +// differently. To enable this conversion, call +// stbi_convert_iphone_png_to_rgb(1). +// +// Call stbi_set_unpremultiply_on_load(1) as well to force a divide per +// pixel to remove any premultiplied alpha *only* if the image file explicitly +// says there's premultiplied data (currently only happens in iPhone images, +// and only if iPhone convert-to-rgb processing is on). +// +// =========================================================================== +// +// ADDITIONAL CONFIGURATION +// +// - You can suppress implementation of any of the decoders to reduce +// your code footprint by #defining one or more of the following +// symbols before creating the implementation. +// +// STBI_NO_JPEG +// STBI_NO_PNG +// STBI_NO_BMP +// STBI_NO_PSD +// STBI_NO_TGA +// STBI_NO_GIF +// STBI_NO_HDR +// STBI_NO_PIC +// STBI_NO_PNM (.ppm and .pgm) +// +// - You can request *only* certain decoders and suppress all other ones +// (this will be more forward-compatible, as addition of new decoders +// doesn't require you to disable them explicitly): +// +// STBI_ONLY_JPEG +// STBI_ONLY_PNG +// STBI_ONLY_BMP +// STBI_ONLY_PSD +// STBI_ONLY_TGA +// STBI_ONLY_GIF +// STBI_ONLY_HDR +// STBI_ONLY_PIC +// STBI_ONLY_PNM (.ppm and .pgm) +// +// - If you use STBI_NO_PNG (or _ONLY_ without PNG), and you still +// want the zlib decoder to be available, #define STBI_SUPPORT_ZLIB +// +// - If you define STBI_MAX_DIMENSIONS, stb_image will reject images greater +// than that size (in either width or height) without further processing. +// This is to let programs in the wild set an upper bound to prevent +// denial-of-service attacks on untrusted data, as one could generate a +// valid image of gigantic dimensions and force stb_image to allocate a +// huge block of memory and spend disproportionate time decoding it. By +// default this is set to (1 << 24), which is 16777216, but that's still +// very big. + +#ifndef STBI_NO_STDIO +#include +#endif // STBI_NO_STDIO + +#define STBI_VERSION 1 + +enum +{ + STBI_default = 0, // only used for desired_channels + + STBI_grey = 1, + STBI_grey_alpha = 2, + STBI_rgb = 3, + STBI_rgb_alpha = 4 +}; + +#include +typedef unsigned char stbi_uc; +typedef unsigned short stbi_us; + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef STBIDEF +#ifdef STB_IMAGE_STATIC +#define STBIDEF static +#else +#define STBIDEF extern +#endif +#endif + +////////////////////////////////////////////////////////////////////////////// +// +// PRIMARY API - works on images of any type +// + +// +// load image by filename, open file, or memory buffer +// + +typedef struct +{ + int (*read) (void *user,char *data,int size); // fill 'data' with 'size' bytes. return number of bytes actually read + void (*skip) (void *user,int n); // skip the next 'n' bytes, or 'unget' the last -n bytes if negative + int (*eof) (void *user); // returns nonzero if we are at end of file/data +} stbi_io_callbacks; + +//////////////////////////////////// +// +// 8-bits-per-channel interface +// + +STBIDEF stbi_uc *stbi_load_from_memory (stbi_uc const *buffer, int len , int *x, int *y, int *channels_in_file, int desired_channels); +STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk , void *user, int *x, int *y, int *channels_in_file, int desired_channels); + +#ifndef STBI_NO_STDIO +STBIDEF stbi_uc *stbi_load (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels); +STBIDEF stbi_uc *stbi_load_from_file (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels); +// for stbi_load_from_file, file pointer is left pointing immediately after image +#endif + +#ifndef STBI_NO_GIF +STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp); +#endif + +#ifdef STBI_WINDOWS_UTF8 +STBIDEF int stbi_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input); +#endif + +//////////////////////////////////// +// +// 16-bits-per-channel interface +// + +STBIDEF stbi_us *stbi_load_16_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels); +STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels); + +#ifndef STBI_NO_STDIO +STBIDEF stbi_us *stbi_load_16 (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels); +STBIDEF stbi_us *stbi_load_from_file_16(FILE *f, int *x, int *y, int *channels_in_file, int desired_channels); +#endif + +//////////////////////////////////// +// +// float-per-channel interface +// +#ifndef STBI_NO_LINEAR + STBIDEF float *stbi_loadf_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels); + STBIDEF float *stbi_loadf_from_callbacks (stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels); + + #ifndef STBI_NO_STDIO + STBIDEF float *stbi_loadf (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels); + STBIDEF float *stbi_loadf_from_file (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels); + #endif +#endif + +#ifndef STBI_NO_HDR + STBIDEF void stbi_hdr_to_ldr_gamma(float gamma); + STBIDEF void stbi_hdr_to_ldr_scale(float scale); +#endif // STBI_NO_HDR + +#ifndef STBI_NO_LINEAR + STBIDEF void stbi_ldr_to_hdr_gamma(float gamma); + STBIDEF void stbi_ldr_to_hdr_scale(float scale); +#endif // STBI_NO_LINEAR + +// stbi_is_hdr is always defined, but always returns false if STBI_NO_HDR +STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user); +STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len); +#ifndef STBI_NO_STDIO +STBIDEF int stbi_is_hdr (char const *filename); +STBIDEF int stbi_is_hdr_from_file(FILE *f); +#endif // STBI_NO_STDIO + + +// get a VERY brief reason for failure +// on most compilers (and ALL modern mainstream compilers) this is threadsafe +STBIDEF const char *stbi_failure_reason (void); + +// free the loaded image -- this is just free() +STBIDEF void stbi_image_free (void *retval_from_stbi_load); + +// get image dimensions & components without fully decoding +STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp); +STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp); +STBIDEF int stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len); +STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *clbk, void *user); + +#ifndef STBI_NO_STDIO +STBIDEF int stbi_info (char const *filename, int *x, int *y, int *comp); +STBIDEF int stbi_info_from_file (FILE *f, int *x, int *y, int *comp); +STBIDEF int stbi_is_16_bit (char const *filename); +STBIDEF int stbi_is_16_bit_from_file(FILE *f); +#endif + + + +// for image formats that explicitly notate that they have premultiplied alpha, +// we just return the colors as stored in the file. set this flag to force +// unpremultiplication. results are undefined if the unpremultiply overflow. +STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply); + +// indicate whether we should process iphone images back to canonical format, +// or just pass them through "as-is" +STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert); + +// flip the image vertically, so the first pixel in the output array is the bottom left +STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip); + +// as above, but only applies to images loaded on the thread that calls the function +// this function is only available if your compiler supports thread-local variables; +// calling it will fail to link if your compiler doesn't +STBIDEF void stbi_set_unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply); +STBIDEF void stbi_convert_iphone_png_to_rgb_thread(int flag_true_if_should_convert); +STBIDEF void stbi_set_flip_vertically_on_load_thread(int flag_true_if_should_flip); + +// ZLIB client - used by PNG, available for other purposes + +STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen); +STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header); +STBIDEF char *stbi_zlib_decode_malloc(const char *buffer, int len, int *outlen); +STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); + +STBIDEF char *stbi_zlib_decode_noheader_malloc(const char *buffer, int len, int *outlen); +STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); + + +#ifdef __cplusplus +} +#endif + +// +// +//// end header file ///////////////////////////////////////////////////// +#endif // STBI_INCLUDE_STB_IMAGE_H + +#ifdef STB_IMAGE_IMPLEMENTATION + +#if defined(STBI_ONLY_JPEG) || defined(STBI_ONLY_PNG) || defined(STBI_ONLY_BMP) \ + || defined(STBI_ONLY_TGA) || defined(STBI_ONLY_GIF) || defined(STBI_ONLY_PSD) \ + || defined(STBI_ONLY_HDR) || defined(STBI_ONLY_PIC) || defined(STBI_ONLY_PNM) \ + || defined(STBI_ONLY_ZLIB) + #ifndef STBI_ONLY_JPEG + #define STBI_NO_JPEG + #endif + #ifndef STBI_ONLY_PNG + #define STBI_NO_PNG + #endif + #ifndef STBI_ONLY_BMP + #define STBI_NO_BMP + #endif + #ifndef STBI_ONLY_PSD + #define STBI_NO_PSD + #endif + #ifndef STBI_ONLY_TGA + #define STBI_NO_TGA + #endif + #ifndef STBI_ONLY_GIF + #define STBI_NO_GIF + #endif + #ifndef STBI_ONLY_HDR + #define STBI_NO_HDR + #endif + #ifndef STBI_ONLY_PIC + #define STBI_NO_PIC + #endif + #ifndef STBI_ONLY_PNM + #define STBI_NO_PNM + #endif +#endif + +#if defined(STBI_NO_PNG) && !defined(STBI_SUPPORT_ZLIB) && !defined(STBI_NO_ZLIB) +#define STBI_NO_ZLIB +#endif + + +#include +#include // ptrdiff_t on osx +#include +#include +#include + +#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) +#include // ldexp, pow +#endif + +#ifndef STBI_NO_STDIO +#include +#endif + +#ifndef STBI_ASSERT +#include +#define STBI_ASSERT(x) assert(x) +#endif + +#ifdef __cplusplus +#define STBI_EXTERN extern "C" +#else +#define STBI_EXTERN extern +#endif + + +#ifndef _MSC_VER + #ifdef __cplusplus + #define stbi_inline inline + #else + #define stbi_inline + #endif +#else + #define stbi_inline __forceinline +#endif + +#ifndef STBI_NO_THREAD_LOCALS + #if defined(__cplusplus) && __cplusplus >= 201103L + #define STBI_THREAD_LOCAL thread_local + #elif defined(__GNUC__) && __GNUC__ < 5 + #define STBI_THREAD_LOCAL __thread + #elif defined(_MSC_VER) + #define STBI_THREAD_LOCAL __declspec(thread) + #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_THREADS__) + #define STBI_THREAD_LOCAL _Thread_local + #endif + + #ifndef STBI_THREAD_LOCAL + #if defined(__GNUC__) + #define STBI_THREAD_LOCAL __thread + #endif + #endif +#endif + +#ifdef _MSC_VER +typedef unsigned short stbi__uint16; +typedef signed short stbi__int16; +typedef unsigned int stbi__uint32; +typedef signed int stbi__int32; +#else +#include +typedef uint16_t stbi__uint16; +typedef int16_t stbi__int16; +typedef uint32_t stbi__uint32; +typedef int32_t stbi__int32; +#endif + +// should produce compiler error if size is wrong +typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1]; + +#ifdef _MSC_VER +#define STBI_NOTUSED(v) (void)(v) +#else +#define STBI_NOTUSED(v) (void)sizeof(v) +#endif + +#ifdef _MSC_VER +#define STBI_HAS_LROTL +#endif + +#ifdef STBI_HAS_LROTL + #define stbi_lrot(x,y) _lrotl(x,y) +#else + #define stbi_lrot(x,y) (((x) << (y)) | ((x) >> (-(y) & 31))) +#endif + +#if defined(STBI_MALLOC) && defined(STBI_FREE) && (defined(STBI_REALLOC) || defined(STBI_REALLOC_SIZED)) +// ok +#elif !defined(STBI_MALLOC) && !defined(STBI_FREE) && !defined(STBI_REALLOC) && !defined(STBI_REALLOC_SIZED) +// ok +#else +#error "Must define all or none of STBI_MALLOC, STBI_FREE, and STBI_REALLOC (or STBI_REALLOC_SIZED)." +#endif + +#ifndef STBI_MALLOC +#define STBI_MALLOC(sz) malloc(sz) +#define STBI_REALLOC(p,newsz) realloc(p,newsz) +#define STBI_FREE(p) free(p) +#endif + +#ifndef STBI_REALLOC_SIZED +#define STBI_REALLOC_SIZED(p,oldsz,newsz) STBI_REALLOC(p,newsz) +#endif + +// x86/x64 detection +#if defined(__x86_64__) || defined(_M_X64) +#define STBI__X64_TARGET +#elif defined(__i386) || defined(_M_IX86) +#define STBI__X86_TARGET +#endif + +#if defined(__GNUC__) && defined(STBI__X86_TARGET) && !defined(__SSE2__) && !defined(STBI_NO_SIMD) +// gcc doesn't support sse2 intrinsics unless you compile with -msse2, +// which in turn means it gets to use SSE2 everywhere. This is unfortunate, +// but previous attempts to provide the SSE2 functions with runtime +// detection caused numerous issues. The way architecture extensions are +// exposed in GCC/Clang is, sadly, not really suited for one-file libs. +// New behavior: if compiled with -msse2, we use SSE2 without any +// detection; if not, we don't use it at all. +#define STBI_NO_SIMD +#endif + +#if defined(__MINGW32__) && defined(STBI__X86_TARGET) && !defined(STBI_MINGW_ENABLE_SSE2) && !defined(STBI_NO_SIMD) +// Note that __MINGW32__ doesn't actually mean 32-bit, so we have to avoid STBI__X64_TARGET +// +// 32-bit MinGW wants ESP to be 16-byte aligned, but this is not in the +// Windows ABI and VC++ as well as Windows DLLs don't maintain that invariant. +// As a result, enabling SSE2 on 32-bit MinGW is dangerous when not +// simultaneously enabling "-mstackrealign". +// +// See https://github.com/nothings/stb/issues/81 for more information. +// +// So default to no SSE2 on 32-bit MinGW. If you've read this far and added +// -mstackrealign to your build settings, feel free to #define STBI_MINGW_ENABLE_SSE2. +#define STBI_NO_SIMD +#endif + +#if !defined(STBI_NO_SIMD) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET)) +#define STBI_SSE2 +#include + +#ifdef _MSC_VER + +#if _MSC_VER >= 1400 // not VC6 +#include // __cpuid +static int stbi__cpuid3(void) +{ + int info[4]; + __cpuid(info,1); + return info[3]; +} +#else +static int stbi__cpuid3(void) +{ + int res; + __asm { + mov eax,1 + cpuid + mov res,edx + } + return res; +} +#endif + +#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name + +#if !defined(STBI_NO_JPEG) && defined(STBI_SSE2) +static int stbi__sse2_available(void) +{ + int info3 = stbi__cpuid3(); + return ((info3 >> 26) & 1) != 0; +} +#endif + +#else // assume GCC-style if not VC++ +#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) + +#if !defined(STBI_NO_JPEG) && defined(STBI_SSE2) +static int stbi__sse2_available(void) +{ + // If we're even attempting to compile this on GCC/Clang, that means + // -msse2 is on, which means the compiler is allowed to use SSE2 + // instructions at will, and so are we. + return 1; +} +#endif + +#endif +#endif + +// ARM NEON +#if defined(STBI_NO_SIMD) && defined(STBI_NEON) +#undef STBI_NEON +#endif + +#ifdef STBI_NEON +#include +#ifdef _MSC_VER +#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name +#else +#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) +#endif +#endif + +#ifndef STBI_SIMD_ALIGN +#define STBI_SIMD_ALIGN(type, name) type name +#endif + +#ifndef STBI_MAX_DIMENSIONS +#define STBI_MAX_DIMENSIONS (1 << 24) +#endif + +/////////////////////////////////////////////// +// +// stbi__context struct and start_xxx functions + +// stbi__context structure is our basic context used by all images, so it +// contains all the IO context, plus some basic image information +typedef struct +{ + stbi__uint32 img_x, img_y; + int img_n, img_out_n; + + stbi_io_callbacks io; + void *io_user_data; + + int read_from_callbacks; + int buflen; + stbi_uc buffer_start[128]; + int callback_already_read; + + stbi_uc *img_buffer, *img_buffer_end; + stbi_uc *img_buffer_original, *img_buffer_original_end; +} stbi__context; + + +static void stbi__refill_buffer(stbi__context *s); + +// initialize a memory-decode context +static void stbi__start_mem(stbi__context *s, stbi_uc const *buffer, int len) +{ + s->io.read = NULL; + s->read_from_callbacks = 0; + s->callback_already_read = 0; + s->img_buffer = s->img_buffer_original = (stbi_uc *) buffer; + s->img_buffer_end = s->img_buffer_original_end = (stbi_uc *) buffer+len; +} + +// initialize a callback-based context +static void stbi__start_callbacks(stbi__context *s, stbi_io_callbacks *c, void *user) +{ + s->io = *c; + s->io_user_data = user; + s->buflen = sizeof(s->buffer_start); + s->read_from_callbacks = 1; + s->callback_already_read = 0; + s->img_buffer = s->img_buffer_original = s->buffer_start; + stbi__refill_buffer(s); + s->img_buffer_original_end = s->img_buffer_end; +} + +#ifndef STBI_NO_STDIO + +static int stbi__stdio_read(void *user, char *data, int size) +{ + return (int) fread(data,1,size,(FILE*) user); +} + +static void stbi__stdio_skip(void *user, int n) +{ + int ch; + fseek((FILE*) user, n, SEEK_CUR); + ch = fgetc((FILE*) user); /* have to read a byte to reset feof()'s flag */ + if (ch != EOF) { + ungetc(ch, (FILE *) user); /* push byte back onto stream if valid. */ + } +} + +static int stbi__stdio_eof(void *user) +{ + return feof((FILE*) user) || ferror((FILE *) user); +} + +static stbi_io_callbacks stbi__stdio_callbacks = +{ + stbi__stdio_read, + stbi__stdio_skip, + stbi__stdio_eof, +}; + +static void stbi__start_file(stbi__context *s, FILE *f) +{ + stbi__start_callbacks(s, &stbi__stdio_callbacks, (void *) f); +} + +//static void stop_file(stbi__context *s) { } + +#endif // !STBI_NO_STDIO + +static void stbi__rewind(stbi__context *s) +{ + // conceptually rewind SHOULD rewind to the beginning of the stream, + // but we just rewind to the beginning of the initial buffer, because + // we only use it after doing 'test', which only ever looks at at most 92 bytes + s->img_buffer = s->img_buffer_original; + s->img_buffer_end = s->img_buffer_original_end; +} + +enum +{ + STBI_ORDER_RGB, + STBI_ORDER_BGR +}; + +typedef struct +{ + int bits_per_channel; + int num_channels; + int channel_order; +} stbi__result_info; + +#ifndef STBI_NO_JPEG +static int stbi__jpeg_test(stbi__context *s); +static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PNG +static int stbi__png_test(stbi__context *s); +static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp); +static int stbi__png_is16(stbi__context *s); +#endif + +#ifndef STBI_NO_BMP +static int stbi__bmp_test(stbi__context *s); +static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_TGA +static int stbi__tga_test(stbi__context *s); +static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PSD +static int stbi__psd_test(stbi__context *s); +static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc); +static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp); +static int stbi__psd_is16(stbi__context *s); +#endif + +#ifndef STBI_NO_HDR +static int stbi__hdr_test(stbi__context *s); +static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PIC +static int stbi__pic_test(stbi__context *s); +static void *stbi__pic_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_GIF +static int stbi__gif_test(stbi__context *s); +static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp); +static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PNM +static int stbi__pnm_test(stbi__context *s); +static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp); +static int stbi__pnm_is16(stbi__context *s); +#endif + +static +#ifdef STBI_THREAD_LOCAL +STBI_THREAD_LOCAL +#endif +const char *stbi__g_failure_reason; + +STBIDEF const char *stbi_failure_reason(void) +{ + return stbi__g_failure_reason; +} + +#ifndef STBI_NO_FAILURE_STRINGS +static int stbi__err(const char *str) +{ + stbi__g_failure_reason = str; + return 0; +} +#endif + +static void *stbi__malloc(size_t size) +{ + return STBI_MALLOC(size); +} + +// stb_image uses ints pervasively, including for offset calculations. +// therefore the largest decoded image size we can support with the +// current code, even on 64-bit targets, is INT_MAX. this is not a +// significant limitation for the intended use case. +// +// we do, however, need to make sure our size calculations don't +// overflow. hence a few helper functions for size calculations that +// multiply integers together, making sure that they're non-negative +// and no overflow occurs. + +// return 1 if the sum is valid, 0 on overflow. +// negative terms are considered invalid. +static int stbi__addsizes_valid(int a, int b) +{ + if (b < 0) return 0; + // now 0 <= b <= INT_MAX, hence also + // 0 <= INT_MAX - b <= INTMAX. + // And "a + b <= INT_MAX" (which might overflow) is the + // same as a <= INT_MAX - b (no overflow) + return a <= INT_MAX - b; +} + +// returns 1 if the product is valid, 0 on overflow. +// negative factors are considered invalid. +static int stbi__mul2sizes_valid(int a, int b) +{ + if (a < 0 || b < 0) return 0; + if (b == 0) return 1; // mul-by-0 is always safe + // portable way to check for no overflows in a*b + return a <= INT_MAX/b; +} + +#if !defined(STBI_NO_JPEG) || !defined(STBI_NO_PNG) || !defined(STBI_NO_TGA) || !defined(STBI_NO_HDR) +// returns 1 if "a*b + add" has no negative terms/factors and doesn't overflow +static int stbi__mad2sizes_valid(int a, int b, int add) +{ + return stbi__mul2sizes_valid(a, b) && stbi__addsizes_valid(a*b, add); +} +#endif + +// returns 1 if "a*b*c + add" has no negative terms/factors and doesn't overflow +static int stbi__mad3sizes_valid(int a, int b, int c, int add) +{ + return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) && + stbi__addsizes_valid(a*b*c, add); +} + +// returns 1 if "a*b*c*d + add" has no negative terms/factors and doesn't overflow +#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) || !defined(STBI_NO_PNM) +static int stbi__mad4sizes_valid(int a, int b, int c, int d, int add) +{ + return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) && + stbi__mul2sizes_valid(a*b*c, d) && stbi__addsizes_valid(a*b*c*d, add); +} +#endif + +#if !defined(STBI_NO_JPEG) || !defined(STBI_NO_PNG) || !defined(STBI_NO_TGA) || !defined(STBI_NO_HDR) +// mallocs with size overflow checking +static void *stbi__malloc_mad2(int a, int b, int add) +{ + if (!stbi__mad2sizes_valid(a, b, add)) return NULL; + return stbi__malloc(a*b + add); +} +#endif + +static void *stbi__malloc_mad3(int a, int b, int c, int add) +{ + if (!stbi__mad3sizes_valid(a, b, c, add)) return NULL; + return stbi__malloc(a*b*c + add); +} + +#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) || !defined(STBI_NO_PNM) +static void *stbi__malloc_mad4(int a, int b, int c, int d, int add) +{ + if (!stbi__mad4sizes_valid(a, b, c, d, add)) return NULL; + return stbi__malloc(a*b*c*d + add); +} +#endif + +// stbi__err - error +// stbi__errpf - error returning pointer to float +// stbi__errpuc - error returning pointer to unsigned char + +#ifdef STBI_NO_FAILURE_STRINGS + #define stbi__err(x,y) 0 +#elif defined(STBI_FAILURE_USERMSG) + #define stbi__err(x,y) stbi__err(y) +#else + #define stbi__err(x,y) stbi__err(x) +#endif + +#define stbi__errpf(x,y) ((float *)(size_t) (stbi__err(x,y)?NULL:NULL)) +#define stbi__errpuc(x,y) ((unsigned char *)(size_t) (stbi__err(x,y)?NULL:NULL)) + +STBIDEF void stbi_image_free(void *retval_from_stbi_load) +{ + STBI_FREE(retval_from_stbi_load); +} + +#ifndef STBI_NO_LINEAR +static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp); +#endif + +#ifndef STBI_NO_HDR +static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp); +#endif + +static int stbi__vertically_flip_on_load_global = 0; + +STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip) +{ + stbi__vertically_flip_on_load_global = flag_true_if_should_flip; +} + +#ifndef STBI_THREAD_LOCAL +#define stbi__vertically_flip_on_load stbi__vertically_flip_on_load_global +#else +static STBI_THREAD_LOCAL int stbi__vertically_flip_on_load_local, stbi__vertically_flip_on_load_set; + +STBIDEF void stbi_set_flip_vertically_on_load_thread(int flag_true_if_should_flip) +{ + stbi__vertically_flip_on_load_local = flag_true_if_should_flip; + stbi__vertically_flip_on_load_set = 1; +} + +#define stbi__vertically_flip_on_load (stbi__vertically_flip_on_load_set \ + ? stbi__vertically_flip_on_load_local \ + : stbi__vertically_flip_on_load_global) +#endif // STBI_THREAD_LOCAL + +static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc) +{ + memset(ri, 0, sizeof(*ri)); // make sure it's initialized if we add new fields + ri->bits_per_channel = 8; // default is 8 so most paths don't have to be changed + ri->channel_order = STBI_ORDER_RGB; // all current input & output are this, but this is here so we can add BGR order + ri->num_channels = 0; + + // test the formats with a very explicit header first (at least a FOURCC + // or distinctive magic number first) + #ifndef STBI_NO_PNG + if (stbi__png_test(s)) return stbi__png_load(s,x,y,comp,req_comp, ri); + #endif + #ifndef STBI_NO_BMP + if (stbi__bmp_test(s)) return stbi__bmp_load(s,x,y,comp,req_comp, ri); + #endif + #ifndef STBI_NO_GIF + if (stbi__gif_test(s)) return stbi__gif_load(s,x,y,comp,req_comp, ri); + #endif + #ifndef STBI_NO_PSD + if (stbi__psd_test(s)) return stbi__psd_load(s,x,y,comp,req_comp, ri, bpc); + #else + STBI_NOTUSED(bpc); + #endif + #ifndef STBI_NO_PIC + if (stbi__pic_test(s)) return stbi__pic_load(s,x,y,comp,req_comp, ri); + #endif + + // then the formats that can end up attempting to load with just 1 or 2 + // bytes matching expectations; these are prone to false positives, so + // try them later + #ifndef STBI_NO_JPEG + if (stbi__jpeg_test(s)) return stbi__jpeg_load(s,x,y,comp,req_comp, ri); + #endif + #ifndef STBI_NO_PNM + if (stbi__pnm_test(s)) return stbi__pnm_load(s,x,y,comp,req_comp, ri); + #endif + + #ifndef STBI_NO_HDR + if (stbi__hdr_test(s)) { + float *hdr = stbi__hdr_load(s, x,y,comp,req_comp, ri); + return stbi__hdr_to_ldr(hdr, *x, *y, req_comp ? req_comp : *comp); + } + #endif + + #ifndef STBI_NO_TGA + // test tga last because it's a crappy test! + if (stbi__tga_test(s)) + return stbi__tga_load(s,x,y,comp,req_comp, ri); + #endif + + return stbi__errpuc("unknown image type", "Image not of any known type, or corrupt"); +} + +static stbi_uc *stbi__convert_16_to_8(stbi__uint16 *orig, int w, int h, int channels) +{ + int i; + int img_len = w * h * channels; + stbi_uc *reduced; + + reduced = (stbi_uc *) stbi__malloc(img_len); + if (reduced == NULL) return stbi__errpuc("outofmem", "Out of memory"); + + for (i = 0; i < img_len; ++i) + reduced[i] = (stbi_uc)((orig[i] >> 8) & 0xFF); // top half of each byte is sufficient approx of 16->8 bit scaling + + STBI_FREE(orig); + return reduced; +} + +static stbi__uint16 *stbi__convert_8_to_16(stbi_uc *orig, int w, int h, int channels) +{ + int i; + int img_len = w * h * channels; + stbi__uint16 *enlarged; + + enlarged = (stbi__uint16 *) stbi__malloc(img_len*2); + if (enlarged == NULL) return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory"); + + for (i = 0; i < img_len; ++i) + enlarged[i] = (stbi__uint16)((orig[i] << 8) + orig[i]); // replicate to high and low byte, maps 0->0, 255->0xffff + + STBI_FREE(orig); + return enlarged; +} + +static void stbi__vertical_flip(void *image, int w, int h, int bytes_per_pixel) +{ + int row; + size_t bytes_per_row = (size_t)w * bytes_per_pixel; + stbi_uc temp[2048]; + stbi_uc *bytes = (stbi_uc *)image; + + for (row = 0; row < (h>>1); row++) { + stbi_uc *row0 = bytes + row*bytes_per_row; + stbi_uc *row1 = bytes + (h - row - 1)*bytes_per_row; + // swap row0 with row1 + size_t bytes_left = bytes_per_row; + while (bytes_left) { + size_t bytes_copy = (bytes_left < sizeof(temp)) ? bytes_left : sizeof(temp); + memcpy(temp, row0, bytes_copy); + memcpy(row0, row1, bytes_copy); + memcpy(row1, temp, bytes_copy); + row0 += bytes_copy; + row1 += bytes_copy; + bytes_left -= bytes_copy; + } + } +} + +#ifndef STBI_NO_GIF +static void stbi__vertical_flip_slices(void *image, int w, int h, int z, int bytes_per_pixel) +{ + int slice; + int slice_size = w * h * bytes_per_pixel; + + stbi_uc *bytes = (stbi_uc *)image; + for (slice = 0; slice < z; ++slice) { + stbi__vertical_flip(bytes, w, h, bytes_per_pixel); + bytes += slice_size; + } +} +#endif + +static unsigned char *stbi__load_and_postprocess_8bit(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi__result_info ri; + void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 8); + + if (result == NULL) + return NULL; + + // it is the responsibility of the loaders to make sure we get either 8 or 16 bit. + STBI_ASSERT(ri.bits_per_channel == 8 || ri.bits_per_channel == 16); + + if (ri.bits_per_channel != 8) { + result = stbi__convert_16_to_8((stbi__uint16 *) result, *x, *y, req_comp == 0 ? *comp : req_comp); + ri.bits_per_channel = 8; + } + + // @TODO: move stbi__convert_format to here + + if (stbi__vertically_flip_on_load) { + int channels = req_comp ? req_comp : *comp; + stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi_uc)); + } + + return (unsigned char *) result; +} + +static stbi__uint16 *stbi__load_and_postprocess_16bit(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi__result_info ri; + void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 16); + + if (result == NULL) + return NULL; + + // it is the responsibility of the loaders to make sure we get either 8 or 16 bit. + STBI_ASSERT(ri.bits_per_channel == 8 || ri.bits_per_channel == 16); + + if (ri.bits_per_channel != 16) { + result = stbi__convert_8_to_16((stbi_uc *) result, *x, *y, req_comp == 0 ? *comp : req_comp); + ri.bits_per_channel = 16; + } + + // @TODO: move stbi__convert_format16 to here + // @TODO: special case RGB-to-Y (and RGBA-to-YA) for 8-bit-to-16-bit case to keep more precision + + if (stbi__vertically_flip_on_load) { + int channels = req_comp ? req_comp : *comp; + stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi__uint16)); + } + + return (stbi__uint16 *) result; +} + +#if !defined(STBI_NO_HDR) && !defined(STBI_NO_LINEAR) +static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, int req_comp) +{ + if (stbi__vertically_flip_on_load && result != NULL) { + int channels = req_comp ? req_comp : *comp; + stbi__vertical_flip(result, *x, *y, channels * sizeof(float)); + } +} +#endif + +#ifndef STBI_NO_STDIO + +#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8) +STBI_EXTERN __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int cp, unsigned long flags, const char *str, int cbmb, wchar_t *widestr, int cchwide); +STBI_EXTERN __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned int cp, unsigned long flags, const wchar_t *widestr, int cchwide, char *str, int cbmb, const char *defchar, int *used_default); +#endif + +#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8) +STBIDEF int stbi_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input) +{ + return WideCharToMultiByte(65001 /* UTF8 */, 0, input, -1, buffer, (int) bufferlen, NULL, NULL); +} +#endif + +static FILE *stbi__fopen(char const *filename, char const *mode) +{ + FILE *f; +#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8) + wchar_t wMode[64]; + wchar_t wFilename[1024]; + if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, filename, -1, wFilename, sizeof(wFilename)/sizeof(*wFilename))) + return 0; + + if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, mode, -1, wMode, sizeof(wMode)/sizeof(*wMode))) + return 0; + +#if defined(_MSC_VER) && _MSC_VER >= 1400 + if (0 != _wfopen_s(&f, wFilename, wMode)) + f = 0; +#else + f = _wfopen(wFilename, wMode); +#endif + +#elif defined(_MSC_VER) && _MSC_VER >= 1400 + if (0 != fopen_s(&f, filename, mode)) + f=0; +#else + f = fopen(filename, mode); +#endif + return f; +} + + +STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *comp, int req_comp) +{ + FILE *f = stbi__fopen(filename, "rb"); + unsigned char *result; + if (!f) return stbi__errpuc("can't fopen", "Unable to open file"); + result = stbi_load_from_file(f,x,y,comp,req_comp); + fclose(f); + return result; +} + +STBIDEF stbi_uc *stbi_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) +{ + unsigned char *result; + stbi__context s; + stbi__start_file(&s,f); + result = stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp); + if (result) { + // need to 'unget' all the characters in the IO buffer + fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR); + } + return result; +} + +STBIDEF stbi__uint16 *stbi_load_from_file_16(FILE *f, int *x, int *y, int *comp, int req_comp) +{ + stbi__uint16 *result; + stbi__context s; + stbi__start_file(&s,f); + result = stbi__load_and_postprocess_16bit(&s,x,y,comp,req_comp); + if (result) { + // need to 'unget' all the characters in the IO buffer + fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR); + } + return result; +} + +STBIDEF stbi_us *stbi_load_16(char const *filename, int *x, int *y, int *comp, int req_comp) +{ + FILE *f = stbi__fopen(filename, "rb"); + stbi__uint16 *result; + if (!f) return (stbi_us *) stbi__errpuc("can't fopen", "Unable to open file"); + result = stbi_load_from_file_16(f,x,y,comp,req_comp); + fclose(f); + return result; +} + + +#endif //!STBI_NO_STDIO + +STBIDEF stbi_us *stbi_load_16_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels); +} + +STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *)clbk, user); + return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels); +} + +STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp); +} + +STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); + return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp); +} + +#ifndef STBI_NO_GIF +STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp) +{ + unsigned char *result; + stbi__context s; + stbi__start_mem(&s,buffer,len); + + result = (unsigned char*) stbi__load_gif_main(&s, delays, x, y, z, comp, req_comp); + if (stbi__vertically_flip_on_load) { + stbi__vertical_flip_slices( result, *x, *y, *z, *comp ); + } + + return result; +} +#endif + +#ifndef STBI_NO_LINEAR +static float *stbi__loadf_main(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + unsigned char *data; + #ifndef STBI_NO_HDR + if (stbi__hdr_test(s)) { + stbi__result_info ri; + float *hdr_data = stbi__hdr_load(s,x,y,comp,req_comp, &ri); + if (hdr_data) + stbi__float_postprocess(hdr_data,x,y,comp,req_comp); + return hdr_data; + } + #endif + data = stbi__load_and_postprocess_8bit(s, x, y, comp, req_comp); + if (data) + return stbi__ldr_to_hdr(data, *x, *y, req_comp ? req_comp : *comp); + return stbi__errpf("unknown image type", "Image not of any known type, or corrupt"); +} + +STBIDEF float *stbi_loadf_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__loadf_main(&s,x,y,comp,req_comp); +} + +STBIDEF float *stbi_loadf_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); + return stbi__loadf_main(&s,x,y,comp,req_comp); +} + +#ifndef STBI_NO_STDIO +STBIDEF float *stbi_loadf(char const *filename, int *x, int *y, int *comp, int req_comp) +{ + float *result; + FILE *f = stbi__fopen(filename, "rb"); + if (!f) return stbi__errpf("can't fopen", "Unable to open file"); + result = stbi_loadf_from_file(f,x,y,comp,req_comp); + fclose(f); + return result; +} + +STBIDEF float *stbi_loadf_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_file(&s,f); + return stbi__loadf_main(&s,x,y,comp,req_comp); +} +#endif // !STBI_NO_STDIO + +#endif // !STBI_NO_LINEAR + +// these is-hdr-or-not is defined independent of whether STBI_NO_LINEAR is +// defined, for API simplicity; if STBI_NO_LINEAR is defined, it always +// reports false! + +STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len) +{ + #ifndef STBI_NO_HDR + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__hdr_test(&s); + #else + STBI_NOTUSED(buffer); + STBI_NOTUSED(len); + return 0; + #endif +} + +#ifndef STBI_NO_STDIO +STBIDEF int stbi_is_hdr (char const *filename) +{ + FILE *f = stbi__fopen(filename, "rb"); + int result=0; + if (f) { + result = stbi_is_hdr_from_file(f); + fclose(f); + } + return result; +} + +STBIDEF int stbi_is_hdr_from_file(FILE *f) +{ + #ifndef STBI_NO_HDR + long pos = ftell(f); + int res; + stbi__context s; + stbi__start_file(&s,f); + res = stbi__hdr_test(&s); + fseek(f, pos, SEEK_SET); + return res; + #else + STBI_NOTUSED(f); + return 0; + #endif +} +#endif // !STBI_NO_STDIO + +STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user) +{ + #ifndef STBI_NO_HDR + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); + return stbi__hdr_test(&s); + #else + STBI_NOTUSED(clbk); + STBI_NOTUSED(user); + return 0; + #endif +} + +#ifndef STBI_NO_LINEAR +static float stbi__l2h_gamma=2.2f, stbi__l2h_scale=1.0f; + +STBIDEF void stbi_ldr_to_hdr_gamma(float gamma) { stbi__l2h_gamma = gamma; } +STBIDEF void stbi_ldr_to_hdr_scale(float scale) { stbi__l2h_scale = scale; } +#endif + +static float stbi__h2l_gamma_i=1.0f/2.2f, stbi__h2l_scale_i=1.0f; + +STBIDEF void stbi_hdr_to_ldr_gamma(float gamma) { stbi__h2l_gamma_i = 1/gamma; } +STBIDEF void stbi_hdr_to_ldr_scale(float scale) { stbi__h2l_scale_i = 1/scale; } + + +////////////////////////////////////////////////////////////////////////////// +// +// Common code used by all image loaders +// + +enum +{ + STBI__SCAN_load=0, + STBI__SCAN_type, + STBI__SCAN_header +}; + +static void stbi__refill_buffer(stbi__context *s) +{ + int n = (s->io.read)(s->io_user_data,(char*)s->buffer_start,s->buflen); + s->callback_already_read += (int) (s->img_buffer - s->img_buffer_original); + if (n == 0) { + // at end of file, treat same as if from memory, but need to handle case + // where s->img_buffer isn't pointing to safe memory, e.g. 0-byte file + s->read_from_callbacks = 0; + s->img_buffer = s->buffer_start; + s->img_buffer_end = s->buffer_start+1; + *s->img_buffer = 0; + } else { + s->img_buffer = s->buffer_start; + s->img_buffer_end = s->buffer_start + n; + } +} + +stbi_inline static stbi_uc stbi__get8(stbi__context *s) +{ + if (s->img_buffer < s->img_buffer_end) + return *s->img_buffer++; + if (s->read_from_callbacks) { + stbi__refill_buffer(s); + return *s->img_buffer++; + } + return 0; +} + +#if defined(STBI_NO_JPEG) && defined(STBI_NO_HDR) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM) +// nothing +#else +stbi_inline static int stbi__at_eof(stbi__context *s) +{ + if (s->io.read) { + if (!(s->io.eof)(s->io_user_data)) return 0; + // if feof() is true, check if buffer = end + // special case: we've only got the special 0 character at the end + if (s->read_from_callbacks == 0) return 1; + } + + return s->img_buffer >= s->img_buffer_end; +} +#endif + +#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) +// nothing +#else +static void stbi__skip(stbi__context *s, int n) +{ + if (n == 0) return; // already there! + if (n < 0) { + s->img_buffer = s->img_buffer_end; + return; + } + if (s->io.read) { + int blen = (int) (s->img_buffer_end - s->img_buffer); + if (blen < n) { + s->img_buffer = s->img_buffer_end; + (s->io.skip)(s->io_user_data, n - blen); + return; + } + } + s->img_buffer += n; +} +#endif + +#if defined(STBI_NO_PNG) && defined(STBI_NO_TGA) && defined(STBI_NO_HDR) && defined(STBI_NO_PNM) +// nothing +#else +static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n) +{ + if (s->io.read) { + int blen = (int) (s->img_buffer_end - s->img_buffer); + if (blen < n) { + int res, count; + + memcpy(buffer, s->img_buffer, blen); + + count = (s->io.read)(s->io_user_data, (char*) buffer + blen, n - blen); + res = (count == (n-blen)); + s->img_buffer = s->img_buffer_end; + return res; + } + } + + if (s->img_buffer+n <= s->img_buffer_end) { + memcpy(buffer, s->img_buffer, n); + s->img_buffer += n; + return 1; + } else + return 0; +} +#endif + +#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_PSD) && defined(STBI_NO_PIC) +// nothing +#else +static int stbi__get16be(stbi__context *s) +{ + int z = stbi__get8(s); + return (z << 8) + stbi__get8(s); +} +#endif + +#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) && defined(STBI_NO_PIC) +// nothing +#else +static stbi__uint32 stbi__get32be(stbi__context *s) +{ + stbi__uint32 z = stbi__get16be(s); + return (z << 16) + stbi__get16be(s); +} +#endif + +#if defined(STBI_NO_BMP) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) +// nothing +#else +static int stbi__get16le(stbi__context *s) +{ + int z = stbi__get8(s); + return z + (stbi__get8(s) << 8); +} +#endif + +#ifndef STBI_NO_BMP +static stbi__uint32 stbi__get32le(stbi__context *s) +{ + stbi__uint32 z = stbi__get16le(s); + z += (stbi__uint32)stbi__get16le(s) << 16; + return z; +} +#endif + +#define STBI__BYTECAST(x) ((stbi_uc) ((x) & 255)) // truncate int to byte without warnings + +#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM) +// nothing +#else +////////////////////////////////////////////////////////////////////////////// +// +// generic converter from built-in img_n to req_comp +// individual types do this automatically as much as possible (e.g. jpeg +// does all cases internally since it needs to colorspace convert anyway, +// and it never has alpha, so very few cases ). png can automatically +// interleave an alpha=255 channel, but falls back to this for other cases +// +// assume data buffer is malloced, so malloc a new one and free that one +// only failure mode is malloc failing + +static stbi_uc stbi__compute_y(int r, int g, int b) +{ + return (stbi_uc) (((r*77) + (g*150) + (29*b)) >> 8); +} +#endif + +#if defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM) +// nothing +#else +static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int req_comp, unsigned int x, unsigned int y) +{ + int i,j; + unsigned char *good; + + if (req_comp == img_n) return data; + STBI_ASSERT(req_comp >= 1 && req_comp <= 4); + + good = (unsigned char *) stbi__malloc_mad3(req_comp, x, y, 0); + if (good == NULL) { + STBI_FREE(data); + return stbi__errpuc("outofmem", "Out of memory"); + } + + for (j=0; j < (int) y; ++j) { + unsigned char *src = data + j * x * img_n ; + unsigned char *dest = good + j * x * req_comp; + + #define STBI__COMBO(a,b) ((a)*8+(b)) + #define STBI__CASE(a,b) case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b) + // convert source image with img_n components to one with req_comp components; + // avoid switch per pixel, so use switch per scanline and massive macros + switch (STBI__COMBO(img_n, req_comp)) { + STBI__CASE(1,2) { dest[0]=src[0]; dest[1]=255; } break; + STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; + STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=255; } break; + STBI__CASE(2,1) { dest[0]=src[0]; } break; + STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; + STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=src[1]; } break; + STBI__CASE(3,4) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];dest[3]=255; } break; + STBI__CASE(3,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); } break; + STBI__CASE(3,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); dest[1] = 255; } break; + STBI__CASE(4,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); } break; + STBI__CASE(4,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); dest[1] = src[3]; } break; + STBI__CASE(4,3) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2]; } break; + default: STBI_ASSERT(0); STBI_FREE(data); STBI_FREE(good); return stbi__errpuc("unsupported", "Unsupported format conversion"); + } + #undef STBI__CASE + } + + STBI_FREE(data); + return good; +} +#endif + +#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) +// nothing +#else +static stbi__uint16 stbi__compute_y_16(int r, int g, int b) +{ + return (stbi__uint16) (((r*77) + (g*150) + (29*b)) >> 8); +} +#endif + +#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) +// nothing +#else +static stbi__uint16 *stbi__convert_format16(stbi__uint16 *data, int img_n, int req_comp, unsigned int x, unsigned int y) +{ + int i,j; + stbi__uint16 *good; + + if (req_comp == img_n) return data; + STBI_ASSERT(req_comp >= 1 && req_comp <= 4); + + good = (stbi__uint16 *) stbi__malloc(req_comp * x * y * 2); + if (good == NULL) { + STBI_FREE(data); + return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory"); + } + + for (j=0; j < (int) y; ++j) { + stbi__uint16 *src = data + j * x * img_n ; + stbi__uint16 *dest = good + j * x * req_comp; + + #define STBI__COMBO(a,b) ((a)*8+(b)) + #define STBI__CASE(a,b) case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b) + // convert source image with img_n components to one with req_comp components; + // avoid switch per pixel, so use switch per scanline and massive macros + switch (STBI__COMBO(img_n, req_comp)) { + STBI__CASE(1,2) { dest[0]=src[0]; dest[1]=0xffff; } break; + STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; + STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=0xffff; } break; + STBI__CASE(2,1) { dest[0]=src[0]; } break; + STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; + STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=src[1]; } break; + STBI__CASE(3,4) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];dest[3]=0xffff; } break; + STBI__CASE(3,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); } break; + STBI__CASE(3,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); dest[1] = 0xffff; } break; + STBI__CASE(4,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); } break; + STBI__CASE(4,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); dest[1] = src[3]; } break; + STBI__CASE(4,3) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2]; } break; + default: STBI_ASSERT(0); STBI_FREE(data); STBI_FREE(good); return (stbi__uint16*) stbi__errpuc("unsupported", "Unsupported format conversion"); + } + #undef STBI__CASE + } + + STBI_FREE(data); + return good; +} +#endif + +#ifndef STBI_NO_LINEAR +static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp) +{ + int i,k,n; + float *output; + if (!data) return NULL; + output = (float *) stbi__malloc_mad4(x, y, comp, sizeof(float), 0); + if (output == NULL) { STBI_FREE(data); return stbi__errpf("outofmem", "Out of memory"); } + // compute number of non-alpha components + if (comp & 1) n = comp; else n = comp-1; + for (i=0; i < x*y; ++i) { + for (k=0; k < n; ++k) { + output[i*comp + k] = (float) (pow(data[i*comp+k]/255.0f, stbi__l2h_gamma) * stbi__l2h_scale); + } + } + if (n < comp) { + for (i=0; i < x*y; ++i) { + output[i*comp + n] = data[i*comp + n]/255.0f; + } + } + STBI_FREE(data); + return output; +} +#endif + +#ifndef STBI_NO_HDR +#define stbi__float2int(x) ((int) (x)) +static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp) +{ + int i,k,n; + stbi_uc *output; + if (!data) return NULL; + output = (stbi_uc *) stbi__malloc_mad3(x, y, comp, 0); + if (output == NULL) { STBI_FREE(data); return stbi__errpuc("outofmem", "Out of memory"); } + // compute number of non-alpha components + if (comp & 1) n = comp; else n = comp-1; + for (i=0; i < x*y; ++i) { + for (k=0; k < n; ++k) { + float z = (float) pow(data[i*comp+k]*stbi__h2l_scale_i, stbi__h2l_gamma_i) * 255 + 0.5f; + if (z < 0) z = 0; + if (z > 255) z = 255; + output[i*comp + k] = (stbi_uc) stbi__float2int(z); + } + if (k < comp) { + float z = data[i*comp+k] * 255 + 0.5f; + if (z < 0) z = 0; + if (z > 255) z = 255; + output[i*comp + k] = (stbi_uc) stbi__float2int(z); + } + } + STBI_FREE(data); + return output; +} +#endif + +////////////////////////////////////////////////////////////////////////////// +// +// "baseline" JPEG/JFIF decoder +// +// simple implementation +// - doesn't support delayed output of y-dimension +// - simple interface (only one output format: 8-bit interleaved RGB) +// - doesn't try to recover corrupt jpegs +// - doesn't allow partial loading, loading multiple at once +// - still fast on x86 (copying globals into locals doesn't help x86) +// - allocates lots of intermediate memory (full size of all components) +// - non-interleaved case requires this anyway +// - allows good upsampling (see next) +// high-quality +// - upsampled channels are bilinearly interpolated, even across blocks +// - quality integer IDCT derived from IJG's 'slow' +// performance +// - fast huffman; reasonable integer IDCT +// - some SIMD kernels for common paths on targets with SSE2/NEON +// - uses a lot of intermediate memory, could cache poorly + +#ifndef STBI_NO_JPEG + +// huffman decoding acceleration +#define FAST_BITS 9 // larger handles more cases; smaller stomps less cache + +typedef struct +{ + stbi_uc fast[1 << FAST_BITS]; + // weirdly, repacking this into AoS is a 10% speed loss, instead of a win + stbi__uint16 code[256]; + stbi_uc values[256]; + stbi_uc size[257]; + unsigned int maxcode[18]; + int delta[17]; // old 'firstsymbol' - old 'firstcode' +} stbi__huffman; + +typedef struct +{ + stbi__context *s; + stbi__huffman huff_dc[4]; + stbi__huffman huff_ac[4]; + stbi__uint16 dequant[4][64]; + stbi__int16 fast_ac[4][1 << FAST_BITS]; + +// sizes for components, interleaved MCUs + int img_h_max, img_v_max; + int img_mcu_x, img_mcu_y; + int img_mcu_w, img_mcu_h; + +// definition of jpeg image component + struct + { + int id; + int h,v; + int tq; + int hd,ha; + int dc_pred; + + int x,y,w2,h2; + stbi_uc *data; + void *raw_data, *raw_coeff; + stbi_uc *linebuf; + short *coeff; // progressive only + int coeff_w, coeff_h; // number of 8x8 coefficient blocks + } img_comp[4]; + + stbi__uint32 code_buffer; // jpeg entropy-coded buffer + int code_bits; // number of valid bits + unsigned char marker; // marker seen while filling entropy buffer + int nomore; // flag if we saw a marker so must stop + + int progressive; + int spec_start; + int spec_end; + int succ_high; + int succ_low; + int eob_run; + int jfif; + int app14_color_transform; // Adobe APP14 tag + int rgb; + + int scan_n, order[4]; + int restart_interval, todo; + +// kernels + void (*idct_block_kernel)(stbi_uc *out, int out_stride, short data[64]); + void (*YCbCr_to_RGB_kernel)(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step); + stbi_uc *(*resample_row_hv_2_kernel)(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs); +} stbi__jpeg; + +static int stbi__build_huffman(stbi__huffman *h, int *count) +{ + int i,j,k=0; + unsigned int code; + // build size list for each symbol (from JPEG spec) + for (i=0; i < 16; ++i) + for (j=0; j < count[i]; ++j) + h->size[k++] = (stbi_uc) (i+1); + h->size[k] = 0; + + // compute actual symbols (from jpeg spec) + code = 0; + k = 0; + for(j=1; j <= 16; ++j) { + // compute delta to add to code to compute symbol id + h->delta[j] = k - code; + if (h->size[k] == j) { + while (h->size[k] == j) + h->code[k++] = (stbi__uint16) (code++); + if (code-1 >= (1u << j)) return stbi__err("bad code lengths","Corrupt JPEG"); + } + // compute largest code + 1 for this size, preshifted as needed later + h->maxcode[j] = code << (16-j); + code <<= 1; + } + h->maxcode[j] = 0xffffffff; + + // build non-spec acceleration table; 255 is flag for not-accelerated + memset(h->fast, 255, 1 << FAST_BITS); + for (i=0; i < k; ++i) { + int s = h->size[i]; + if (s <= FAST_BITS) { + int c = h->code[i] << (FAST_BITS-s); + int m = 1 << (FAST_BITS-s); + for (j=0; j < m; ++j) { + h->fast[c+j] = (stbi_uc) i; + } + } + } + return 1; +} + +// build a table that decodes both magnitude and value of small ACs in +// one go. +static void stbi__build_fast_ac(stbi__int16 *fast_ac, stbi__huffman *h) +{ + int i; + for (i=0; i < (1 << FAST_BITS); ++i) { + stbi_uc fast = h->fast[i]; + fast_ac[i] = 0; + if (fast < 255) { + int rs = h->values[fast]; + int run = (rs >> 4) & 15; + int magbits = rs & 15; + int len = h->size[fast]; + + if (magbits && len + magbits <= FAST_BITS) { + // magnitude code followed by receive_extend code + int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits); + int m = 1 << (magbits - 1); + if (k < m) k += (~0U << magbits) + 1; + // if the result is small enough, we can fit it in fast_ac table + if (k >= -128 && k <= 127) + fast_ac[i] = (stbi__int16) ((k * 256) + (run * 16) + (len + magbits)); + } + } + } +} + +static void stbi__grow_buffer_unsafe(stbi__jpeg *j) +{ + do { + unsigned int b = j->nomore ? 0 : stbi__get8(j->s); + if (b == 0xff) { + int c = stbi__get8(j->s); + while (c == 0xff) c = stbi__get8(j->s); // consume fill bytes + if (c != 0) { + j->marker = (unsigned char) c; + j->nomore = 1; + return; + } + } + j->code_buffer |= b << (24 - j->code_bits); + j->code_bits += 8; + } while (j->code_bits <= 24); +} + +// (1 << n) - 1 +static const stbi__uint32 stbi__bmask[17]={0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535}; + +// decode a jpeg huffman value from the bitstream +stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h) +{ + unsigned int temp; + int c,k; + + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + + // look at the top FAST_BITS and determine what symbol ID it is, + // if the code is <= FAST_BITS + c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); + k = h->fast[c]; + if (k < 255) { + int s = h->size[k]; + if (s > j->code_bits) + return -1; + j->code_buffer <<= s; + j->code_bits -= s; + return h->values[k]; + } + + // naive test is to shift the code_buffer down so k bits are + // valid, then test against maxcode. To speed this up, we've + // preshifted maxcode left so that it has (16-k) 0s at the + // end; in other words, regardless of the number of bits, it + // wants to be compared against something shifted to have 16; + // that way we don't need to shift inside the loop. + temp = j->code_buffer >> 16; + for (k=FAST_BITS+1 ; ; ++k) + if (temp < h->maxcode[k]) + break; + if (k == 17) { + // error! code not found + j->code_bits -= 16; + return -1; + } + + if (k > j->code_bits) + return -1; + + // convert the huffman code to the symbol id + c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k]; + STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]); + + // convert the id to a symbol + j->code_bits -= k; + j->code_buffer <<= k; + return h->values[c]; +} + +// bias[n] = (-1<code_bits < n) stbi__grow_buffer_unsafe(j); + + sgn = j->code_buffer >> 31; // sign bit always in MSB; 0 if MSB clear (positive), 1 if MSB set (negative) + k = stbi_lrot(j->code_buffer, n); + j->code_buffer = k & ~stbi__bmask[n]; + k &= stbi__bmask[n]; + j->code_bits -= n; + return k + (stbi__jbias[n] & (sgn - 1)); +} + +// get some unsigned bits +stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n) +{ + unsigned int k; + if (j->code_bits < n) stbi__grow_buffer_unsafe(j); + k = stbi_lrot(j->code_buffer, n); + j->code_buffer = k & ~stbi__bmask[n]; + k &= stbi__bmask[n]; + j->code_bits -= n; + return k; +} + +stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j) +{ + unsigned int k; + if (j->code_bits < 1) stbi__grow_buffer_unsafe(j); + k = j->code_buffer; + j->code_buffer <<= 1; + --j->code_bits; + return k & 0x80000000; +} + +// given a value that's at position X in the zigzag stream, +// where does it appear in the 8x8 matrix coded as row-major? +static const stbi_uc stbi__jpeg_dezigzag[64+15] = +{ + 0, 1, 8, 16, 9, 2, 3, 10, + 17, 24, 32, 25, 18, 11, 4, 5, + 12, 19, 26, 33, 40, 48, 41, 34, + 27, 20, 13, 6, 7, 14, 21, 28, + 35, 42, 49, 56, 57, 50, 43, 36, + 29, 22, 15, 23, 30, 37, 44, 51, + 58, 59, 52, 45, 38, 31, 39, 46, + 53, 60, 61, 54, 47, 55, 62, 63, + // let corrupt input sample past end + 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63 +}; + +// decode one 64-entry block-- +static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman *hdc, stbi__huffman *hac, stbi__int16 *fac, int b, stbi__uint16 *dequant) +{ + int diff,dc,k; + int t; + + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + t = stbi__jpeg_huff_decode(j, hdc); + if (t < 0 || t > 15) return stbi__err("bad huffman code","Corrupt JPEG"); + + // 0 all the ac values now so we can do it 32-bits at a time + memset(data,0,64*sizeof(data[0])); + + diff = t ? stbi__extend_receive(j, t) : 0; + dc = j->img_comp[b].dc_pred + diff; + j->img_comp[b].dc_pred = dc; + data[0] = (short) (dc * dequant[0]); + + // decode AC components, see JPEG spec + k = 1; + do { + unsigned int zig; + int c,r,s; + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); + r = fac[c]; + if (r) { // fast-AC path + k += (r >> 4) & 15; // run + s = r & 15; // combined length + j->code_buffer <<= s; + j->code_bits -= s; + // decode into unzigzag'd location + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) ((r >> 8) * dequant[zig]); + } else { + int rs = stbi__jpeg_huff_decode(j, hac); + if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + s = rs & 15; + r = rs >> 4; + if (s == 0) { + if (rs != 0xf0) break; // end block + k += 16; + } else { + k += r; + // decode into unzigzag'd location + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) (stbi__extend_receive(j,s) * dequant[zig]); + } + } + } while (k < 64); + return 1; +} + +static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__huffman *hdc, int b) +{ + int diff,dc; + int t; + if (j->spec_end != 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + + if (j->succ_high == 0) { + // first scan for DC coefficient, must be first + memset(data,0,64*sizeof(data[0])); // 0 all the ac values now + t = stbi__jpeg_huff_decode(j, hdc); + if (t < 0 || t > 15) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + diff = t ? stbi__extend_receive(j, t) : 0; + + dc = j->img_comp[b].dc_pred + diff; + j->img_comp[b].dc_pred = dc; + data[0] = (short) (dc * (1 << j->succ_low)); + } else { + // refinement scan for DC coefficient + if (stbi__jpeg_get_bit(j)) + data[0] += (short) (1 << j->succ_low); + } + return 1; +} + +// @OPTIMIZE: store non-zigzagged during the decode passes, +// and only de-zigzag when dequantizing +static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__huffman *hac, stbi__int16 *fac) +{ + int k; + if (j->spec_start == 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + + if (j->succ_high == 0) { + int shift = j->succ_low; + + if (j->eob_run) { + --j->eob_run; + return 1; + } + + k = j->spec_start; + do { + unsigned int zig; + int c,r,s; + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); + r = fac[c]; + if (r) { // fast-AC path + k += (r >> 4) & 15; // run + s = r & 15; // combined length + j->code_buffer <<= s; + j->code_bits -= s; + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) ((r >> 8) * (1 << shift)); + } else { + int rs = stbi__jpeg_huff_decode(j, hac); + if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + s = rs & 15; + r = rs >> 4; + if (s == 0) { + if (r < 15) { + j->eob_run = (1 << r); + if (r) + j->eob_run += stbi__jpeg_get_bits(j, r); + --j->eob_run; + break; + } + k += 16; + } else { + k += r; + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) (stbi__extend_receive(j,s) * (1 << shift)); + } + } + } while (k <= j->spec_end); + } else { + // refinement scan for these AC coefficients + + short bit = (short) (1 << j->succ_low); + + if (j->eob_run) { + --j->eob_run; + for (k = j->spec_start; k <= j->spec_end; ++k) { + short *p = &data[stbi__jpeg_dezigzag[k]]; + if (*p != 0) + if (stbi__jpeg_get_bit(j)) + if ((*p & bit)==0) { + if (*p > 0) + *p += bit; + else + *p -= bit; + } + } + } else { + k = j->spec_start; + do { + int r,s; + int rs = stbi__jpeg_huff_decode(j, hac); // @OPTIMIZE see if we can use the fast path here, advance-by-r is so slow, eh + if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + s = rs & 15; + r = rs >> 4; + if (s == 0) { + if (r < 15) { + j->eob_run = (1 << r) - 1; + if (r) + j->eob_run += stbi__jpeg_get_bits(j, r); + r = 64; // force end of block + } else { + // r=15 s=0 should write 16 0s, so we just do + // a run of 15 0s and then write s (which is 0), + // so we don't have to do anything special here + } + } else { + if (s != 1) return stbi__err("bad huffman code", "Corrupt JPEG"); + // sign bit + if (stbi__jpeg_get_bit(j)) + s = bit; + else + s = -bit; + } + + // advance by r + while (k <= j->spec_end) { + short *p = &data[stbi__jpeg_dezigzag[k++]]; + if (*p != 0) { + if (stbi__jpeg_get_bit(j)) + if ((*p & bit)==0) { + if (*p > 0) + *p += bit; + else + *p -= bit; + } + } else { + if (r == 0) { + *p = (short) s; + break; + } + --r; + } + } + } while (k <= j->spec_end); + } + } + return 1; +} + +// take a -128..127 value and stbi__clamp it and convert to 0..255 +stbi_inline static stbi_uc stbi__clamp(int x) +{ + // trick to use a single test to catch both cases + if ((unsigned int) x > 255) { + if (x < 0) return 0; + if (x > 255) return 255; + } + return (stbi_uc) x; +} + +#define stbi__f2f(x) ((int) (((x) * 4096 + 0.5))) +#define stbi__fsh(x) ((x) * 4096) + +// derived from jidctint -- DCT_ISLOW +#define STBI__IDCT_1D(s0,s1,s2,s3,s4,s5,s6,s7) \ + int t0,t1,t2,t3,p1,p2,p3,p4,p5,x0,x1,x2,x3; \ + p2 = s2; \ + p3 = s6; \ + p1 = (p2+p3) * stbi__f2f(0.5411961f); \ + t2 = p1 + p3*stbi__f2f(-1.847759065f); \ + t3 = p1 + p2*stbi__f2f( 0.765366865f); \ + p2 = s0; \ + p3 = s4; \ + t0 = stbi__fsh(p2+p3); \ + t1 = stbi__fsh(p2-p3); \ + x0 = t0+t3; \ + x3 = t0-t3; \ + x1 = t1+t2; \ + x2 = t1-t2; \ + t0 = s7; \ + t1 = s5; \ + t2 = s3; \ + t3 = s1; \ + p3 = t0+t2; \ + p4 = t1+t3; \ + p1 = t0+t3; \ + p2 = t1+t2; \ + p5 = (p3+p4)*stbi__f2f( 1.175875602f); \ + t0 = t0*stbi__f2f( 0.298631336f); \ + t1 = t1*stbi__f2f( 2.053119869f); \ + t2 = t2*stbi__f2f( 3.072711026f); \ + t3 = t3*stbi__f2f( 1.501321110f); \ + p1 = p5 + p1*stbi__f2f(-0.899976223f); \ + p2 = p5 + p2*stbi__f2f(-2.562915447f); \ + p3 = p3*stbi__f2f(-1.961570560f); \ + p4 = p4*stbi__f2f(-0.390180644f); \ + t3 += p1+p4; \ + t2 += p2+p3; \ + t1 += p2+p4; \ + t0 += p1+p3; + +static void stbi__idct_block(stbi_uc *out, int out_stride, short data[64]) +{ + int i,val[64],*v=val; + stbi_uc *o; + short *d = data; + + // columns + for (i=0; i < 8; ++i,++d, ++v) { + // if all zeroes, shortcut -- this avoids dequantizing 0s and IDCTing + if (d[ 8]==0 && d[16]==0 && d[24]==0 && d[32]==0 + && d[40]==0 && d[48]==0 && d[56]==0) { + // no shortcut 0 seconds + // (1|2|3|4|5|6|7)==0 0 seconds + // all separate -0.047 seconds + // 1 && 2|3 && 4|5 && 6|7: -0.047 seconds + int dcterm = d[0]*4; + v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm; + } else { + STBI__IDCT_1D(d[ 0],d[ 8],d[16],d[24],d[32],d[40],d[48],d[56]) + // constants scaled things up by 1<<12; let's bring them back + // down, but keep 2 extra bits of precision + x0 += 512; x1 += 512; x2 += 512; x3 += 512; + v[ 0] = (x0+t3) >> 10; + v[56] = (x0-t3) >> 10; + v[ 8] = (x1+t2) >> 10; + v[48] = (x1-t2) >> 10; + v[16] = (x2+t1) >> 10; + v[40] = (x2-t1) >> 10; + v[24] = (x3+t0) >> 10; + v[32] = (x3-t0) >> 10; + } + } + + for (i=0, v=val, o=out; i < 8; ++i,v+=8,o+=out_stride) { + // no fast case since the first 1D IDCT spread components out + STBI__IDCT_1D(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7]) + // constants scaled things up by 1<<12, plus we had 1<<2 from first + // loop, plus horizontal and vertical each scale by sqrt(8) so together + // we've got an extra 1<<3, so 1<<17 total we need to remove. + // so we want to round that, which means adding 0.5 * 1<<17, + // aka 65536. Also, we'll end up with -128 to 127 that we want + // to encode as 0..255 by adding 128, so we'll add that before the shift + x0 += 65536 + (128<<17); + x1 += 65536 + (128<<17); + x2 += 65536 + (128<<17); + x3 += 65536 + (128<<17); + // tried computing the shifts into temps, or'ing the temps to see + // if any were out of range, but that was slower + o[0] = stbi__clamp((x0+t3) >> 17); + o[7] = stbi__clamp((x0-t3) >> 17); + o[1] = stbi__clamp((x1+t2) >> 17); + o[6] = stbi__clamp((x1-t2) >> 17); + o[2] = stbi__clamp((x2+t1) >> 17); + o[5] = stbi__clamp((x2-t1) >> 17); + o[3] = stbi__clamp((x3+t0) >> 17); + o[4] = stbi__clamp((x3-t0) >> 17); + } +} + +#ifdef STBI_SSE2 +// sse2 integer IDCT. not the fastest possible implementation but it +// produces bit-identical results to the generic C version so it's +// fully "transparent". +static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) +{ + // This is constructed to match our regular (generic) integer IDCT exactly. + __m128i row0, row1, row2, row3, row4, row5, row6, row7; + __m128i tmp; + + // dot product constant: even elems=x, odd elems=y + #define dct_const(x,y) _mm_setr_epi16((x),(y),(x),(y),(x),(y),(x),(y)) + + // out(0) = c0[even]*x + c0[odd]*y (c0, x, y 16-bit, out 32-bit) + // out(1) = c1[even]*x + c1[odd]*y + #define dct_rot(out0,out1, x,y,c0,c1) \ + __m128i c0##lo = _mm_unpacklo_epi16((x),(y)); \ + __m128i c0##hi = _mm_unpackhi_epi16((x),(y)); \ + __m128i out0##_l = _mm_madd_epi16(c0##lo, c0); \ + __m128i out0##_h = _mm_madd_epi16(c0##hi, c0); \ + __m128i out1##_l = _mm_madd_epi16(c0##lo, c1); \ + __m128i out1##_h = _mm_madd_epi16(c0##hi, c1) + + // out = in << 12 (in 16-bit, out 32-bit) + #define dct_widen(out, in) \ + __m128i out##_l = _mm_srai_epi32(_mm_unpacklo_epi16(_mm_setzero_si128(), (in)), 4); \ + __m128i out##_h = _mm_srai_epi32(_mm_unpackhi_epi16(_mm_setzero_si128(), (in)), 4) + + // wide add + #define dct_wadd(out, a, b) \ + __m128i out##_l = _mm_add_epi32(a##_l, b##_l); \ + __m128i out##_h = _mm_add_epi32(a##_h, b##_h) + + // wide sub + #define dct_wsub(out, a, b) \ + __m128i out##_l = _mm_sub_epi32(a##_l, b##_l); \ + __m128i out##_h = _mm_sub_epi32(a##_h, b##_h) + + // butterfly a/b, add bias, then shift by "s" and pack + #define dct_bfly32o(out0, out1, a,b,bias,s) \ + { \ + __m128i abiased_l = _mm_add_epi32(a##_l, bias); \ + __m128i abiased_h = _mm_add_epi32(a##_h, bias); \ + dct_wadd(sum, abiased, b); \ + dct_wsub(dif, abiased, b); \ + out0 = _mm_packs_epi32(_mm_srai_epi32(sum_l, s), _mm_srai_epi32(sum_h, s)); \ + out1 = _mm_packs_epi32(_mm_srai_epi32(dif_l, s), _mm_srai_epi32(dif_h, s)); \ + } + + // 8-bit interleave step (for transposes) + #define dct_interleave8(a, b) \ + tmp = a; \ + a = _mm_unpacklo_epi8(a, b); \ + b = _mm_unpackhi_epi8(tmp, b) + + // 16-bit interleave step (for transposes) + #define dct_interleave16(a, b) \ + tmp = a; \ + a = _mm_unpacklo_epi16(a, b); \ + b = _mm_unpackhi_epi16(tmp, b) + + #define dct_pass(bias,shift) \ + { \ + /* even part */ \ + dct_rot(t2e,t3e, row2,row6, rot0_0,rot0_1); \ + __m128i sum04 = _mm_add_epi16(row0, row4); \ + __m128i dif04 = _mm_sub_epi16(row0, row4); \ + dct_widen(t0e, sum04); \ + dct_widen(t1e, dif04); \ + dct_wadd(x0, t0e, t3e); \ + dct_wsub(x3, t0e, t3e); \ + dct_wadd(x1, t1e, t2e); \ + dct_wsub(x2, t1e, t2e); \ + /* odd part */ \ + dct_rot(y0o,y2o, row7,row3, rot2_0,rot2_1); \ + dct_rot(y1o,y3o, row5,row1, rot3_0,rot3_1); \ + __m128i sum17 = _mm_add_epi16(row1, row7); \ + __m128i sum35 = _mm_add_epi16(row3, row5); \ + dct_rot(y4o,y5o, sum17,sum35, rot1_0,rot1_1); \ + dct_wadd(x4, y0o, y4o); \ + dct_wadd(x5, y1o, y5o); \ + dct_wadd(x6, y2o, y5o); \ + dct_wadd(x7, y3o, y4o); \ + dct_bfly32o(row0,row7, x0,x7,bias,shift); \ + dct_bfly32o(row1,row6, x1,x6,bias,shift); \ + dct_bfly32o(row2,row5, x2,x5,bias,shift); \ + dct_bfly32o(row3,row4, x3,x4,bias,shift); \ + } + + __m128i rot0_0 = dct_const(stbi__f2f(0.5411961f), stbi__f2f(0.5411961f) + stbi__f2f(-1.847759065f)); + __m128i rot0_1 = dct_const(stbi__f2f(0.5411961f) + stbi__f2f( 0.765366865f), stbi__f2f(0.5411961f)); + __m128i rot1_0 = dct_const(stbi__f2f(1.175875602f) + stbi__f2f(-0.899976223f), stbi__f2f(1.175875602f)); + __m128i rot1_1 = dct_const(stbi__f2f(1.175875602f), stbi__f2f(1.175875602f) + stbi__f2f(-2.562915447f)); + __m128i rot2_0 = dct_const(stbi__f2f(-1.961570560f) + stbi__f2f( 0.298631336f), stbi__f2f(-1.961570560f)); + __m128i rot2_1 = dct_const(stbi__f2f(-1.961570560f), stbi__f2f(-1.961570560f) + stbi__f2f( 3.072711026f)); + __m128i rot3_0 = dct_const(stbi__f2f(-0.390180644f) + stbi__f2f( 2.053119869f), stbi__f2f(-0.390180644f)); + __m128i rot3_1 = dct_const(stbi__f2f(-0.390180644f), stbi__f2f(-0.390180644f) + stbi__f2f( 1.501321110f)); + + // rounding biases in column/row passes, see stbi__idct_block for explanation. + __m128i bias_0 = _mm_set1_epi32(512); + __m128i bias_1 = _mm_set1_epi32(65536 + (128<<17)); + + // load + row0 = _mm_load_si128((const __m128i *) (data + 0*8)); + row1 = _mm_load_si128((const __m128i *) (data + 1*8)); + row2 = _mm_load_si128((const __m128i *) (data + 2*8)); + row3 = _mm_load_si128((const __m128i *) (data + 3*8)); + row4 = _mm_load_si128((const __m128i *) (data + 4*8)); + row5 = _mm_load_si128((const __m128i *) (data + 5*8)); + row6 = _mm_load_si128((const __m128i *) (data + 6*8)); + row7 = _mm_load_si128((const __m128i *) (data + 7*8)); + + // column pass + dct_pass(bias_0, 10); + + { + // 16bit 8x8 transpose pass 1 + dct_interleave16(row0, row4); + dct_interleave16(row1, row5); + dct_interleave16(row2, row6); + dct_interleave16(row3, row7); + + // transpose pass 2 + dct_interleave16(row0, row2); + dct_interleave16(row1, row3); + dct_interleave16(row4, row6); + dct_interleave16(row5, row7); + + // transpose pass 3 + dct_interleave16(row0, row1); + dct_interleave16(row2, row3); + dct_interleave16(row4, row5); + dct_interleave16(row6, row7); + } + + // row pass + dct_pass(bias_1, 17); + + { + // pack + __m128i p0 = _mm_packus_epi16(row0, row1); // a0a1a2a3...a7b0b1b2b3...b7 + __m128i p1 = _mm_packus_epi16(row2, row3); + __m128i p2 = _mm_packus_epi16(row4, row5); + __m128i p3 = _mm_packus_epi16(row6, row7); + + // 8bit 8x8 transpose pass 1 + dct_interleave8(p0, p2); // a0e0a1e1... + dct_interleave8(p1, p3); // c0g0c1g1... + + // transpose pass 2 + dct_interleave8(p0, p1); // a0c0e0g0... + dct_interleave8(p2, p3); // b0d0f0h0... + + // transpose pass 3 + dct_interleave8(p0, p2); // a0b0c0d0... + dct_interleave8(p1, p3); // a4b4c4d4... + + // store + _mm_storel_epi64((__m128i *) out, p0); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p0, 0x4e)); out += out_stride; + _mm_storel_epi64((__m128i *) out, p2); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p2, 0x4e)); out += out_stride; + _mm_storel_epi64((__m128i *) out, p1); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p1, 0x4e)); out += out_stride; + _mm_storel_epi64((__m128i *) out, p3); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p3, 0x4e)); + } + +#undef dct_const +#undef dct_rot +#undef dct_widen +#undef dct_wadd +#undef dct_wsub +#undef dct_bfly32o +#undef dct_interleave8 +#undef dct_interleave16 +#undef dct_pass +} + +#endif // STBI_SSE2 + +#ifdef STBI_NEON + +// NEON integer IDCT. should produce bit-identical +// results to the generic C version. +static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) +{ + int16x8_t row0, row1, row2, row3, row4, row5, row6, row7; + + int16x4_t rot0_0 = vdup_n_s16(stbi__f2f(0.5411961f)); + int16x4_t rot0_1 = vdup_n_s16(stbi__f2f(-1.847759065f)); + int16x4_t rot0_2 = vdup_n_s16(stbi__f2f( 0.765366865f)); + int16x4_t rot1_0 = vdup_n_s16(stbi__f2f( 1.175875602f)); + int16x4_t rot1_1 = vdup_n_s16(stbi__f2f(-0.899976223f)); + int16x4_t rot1_2 = vdup_n_s16(stbi__f2f(-2.562915447f)); + int16x4_t rot2_0 = vdup_n_s16(stbi__f2f(-1.961570560f)); + int16x4_t rot2_1 = vdup_n_s16(stbi__f2f(-0.390180644f)); + int16x4_t rot3_0 = vdup_n_s16(stbi__f2f( 0.298631336f)); + int16x4_t rot3_1 = vdup_n_s16(stbi__f2f( 2.053119869f)); + int16x4_t rot3_2 = vdup_n_s16(stbi__f2f( 3.072711026f)); + int16x4_t rot3_3 = vdup_n_s16(stbi__f2f( 1.501321110f)); + +#define dct_long_mul(out, inq, coeff) \ + int32x4_t out##_l = vmull_s16(vget_low_s16(inq), coeff); \ + int32x4_t out##_h = vmull_s16(vget_high_s16(inq), coeff) + +#define dct_long_mac(out, acc, inq, coeff) \ + int32x4_t out##_l = vmlal_s16(acc##_l, vget_low_s16(inq), coeff); \ + int32x4_t out##_h = vmlal_s16(acc##_h, vget_high_s16(inq), coeff) + +#define dct_widen(out, inq) \ + int32x4_t out##_l = vshll_n_s16(vget_low_s16(inq), 12); \ + int32x4_t out##_h = vshll_n_s16(vget_high_s16(inq), 12) + +// wide add +#define dct_wadd(out, a, b) \ + int32x4_t out##_l = vaddq_s32(a##_l, b##_l); \ + int32x4_t out##_h = vaddq_s32(a##_h, b##_h) + +// wide sub +#define dct_wsub(out, a, b) \ + int32x4_t out##_l = vsubq_s32(a##_l, b##_l); \ + int32x4_t out##_h = vsubq_s32(a##_h, b##_h) + +// butterfly a/b, then shift using "shiftop" by "s" and pack +#define dct_bfly32o(out0,out1, a,b,shiftop,s) \ + { \ + dct_wadd(sum, a, b); \ + dct_wsub(dif, a, b); \ + out0 = vcombine_s16(shiftop(sum_l, s), shiftop(sum_h, s)); \ + out1 = vcombine_s16(shiftop(dif_l, s), shiftop(dif_h, s)); \ + } + +#define dct_pass(shiftop, shift) \ + { \ + /* even part */ \ + int16x8_t sum26 = vaddq_s16(row2, row6); \ + dct_long_mul(p1e, sum26, rot0_0); \ + dct_long_mac(t2e, p1e, row6, rot0_1); \ + dct_long_mac(t3e, p1e, row2, rot0_2); \ + int16x8_t sum04 = vaddq_s16(row0, row4); \ + int16x8_t dif04 = vsubq_s16(row0, row4); \ + dct_widen(t0e, sum04); \ + dct_widen(t1e, dif04); \ + dct_wadd(x0, t0e, t3e); \ + dct_wsub(x3, t0e, t3e); \ + dct_wadd(x1, t1e, t2e); \ + dct_wsub(x2, t1e, t2e); \ + /* odd part */ \ + int16x8_t sum15 = vaddq_s16(row1, row5); \ + int16x8_t sum17 = vaddq_s16(row1, row7); \ + int16x8_t sum35 = vaddq_s16(row3, row5); \ + int16x8_t sum37 = vaddq_s16(row3, row7); \ + int16x8_t sumodd = vaddq_s16(sum17, sum35); \ + dct_long_mul(p5o, sumodd, rot1_0); \ + dct_long_mac(p1o, p5o, sum17, rot1_1); \ + dct_long_mac(p2o, p5o, sum35, rot1_2); \ + dct_long_mul(p3o, sum37, rot2_0); \ + dct_long_mul(p4o, sum15, rot2_1); \ + dct_wadd(sump13o, p1o, p3o); \ + dct_wadd(sump24o, p2o, p4o); \ + dct_wadd(sump23o, p2o, p3o); \ + dct_wadd(sump14o, p1o, p4o); \ + dct_long_mac(x4, sump13o, row7, rot3_0); \ + dct_long_mac(x5, sump24o, row5, rot3_1); \ + dct_long_mac(x6, sump23o, row3, rot3_2); \ + dct_long_mac(x7, sump14o, row1, rot3_3); \ + dct_bfly32o(row0,row7, x0,x7,shiftop,shift); \ + dct_bfly32o(row1,row6, x1,x6,shiftop,shift); \ + dct_bfly32o(row2,row5, x2,x5,shiftop,shift); \ + dct_bfly32o(row3,row4, x3,x4,shiftop,shift); \ + } + + // load + row0 = vld1q_s16(data + 0*8); + row1 = vld1q_s16(data + 1*8); + row2 = vld1q_s16(data + 2*8); + row3 = vld1q_s16(data + 3*8); + row4 = vld1q_s16(data + 4*8); + row5 = vld1q_s16(data + 5*8); + row6 = vld1q_s16(data + 6*8); + row7 = vld1q_s16(data + 7*8); + + // add DC bias + row0 = vaddq_s16(row0, vsetq_lane_s16(1024, vdupq_n_s16(0), 0)); + + // column pass + dct_pass(vrshrn_n_s32, 10); + + // 16bit 8x8 transpose + { +// these three map to a single VTRN.16, VTRN.32, and VSWP, respectively. +// whether compilers actually get this is another story, sadly. +#define dct_trn16(x, y) { int16x8x2_t t = vtrnq_s16(x, y); x = t.val[0]; y = t.val[1]; } +#define dct_trn32(x, y) { int32x4x2_t t = vtrnq_s32(vreinterpretq_s32_s16(x), vreinterpretq_s32_s16(y)); x = vreinterpretq_s16_s32(t.val[0]); y = vreinterpretq_s16_s32(t.val[1]); } +#define dct_trn64(x, y) { int16x8_t x0 = x; int16x8_t y0 = y; x = vcombine_s16(vget_low_s16(x0), vget_low_s16(y0)); y = vcombine_s16(vget_high_s16(x0), vget_high_s16(y0)); } + + // pass 1 + dct_trn16(row0, row1); // a0b0a2b2a4b4a6b6 + dct_trn16(row2, row3); + dct_trn16(row4, row5); + dct_trn16(row6, row7); + + // pass 2 + dct_trn32(row0, row2); // a0b0c0d0a4b4c4d4 + dct_trn32(row1, row3); + dct_trn32(row4, row6); + dct_trn32(row5, row7); + + // pass 3 + dct_trn64(row0, row4); // a0b0c0d0e0f0g0h0 + dct_trn64(row1, row5); + dct_trn64(row2, row6); + dct_trn64(row3, row7); + +#undef dct_trn16 +#undef dct_trn32 +#undef dct_trn64 + } + + // row pass + // vrshrn_n_s32 only supports shifts up to 16, we need + // 17. so do a non-rounding shift of 16 first then follow + // up with a rounding shift by 1. + dct_pass(vshrn_n_s32, 16); + + { + // pack and round + uint8x8_t p0 = vqrshrun_n_s16(row0, 1); + uint8x8_t p1 = vqrshrun_n_s16(row1, 1); + uint8x8_t p2 = vqrshrun_n_s16(row2, 1); + uint8x8_t p3 = vqrshrun_n_s16(row3, 1); + uint8x8_t p4 = vqrshrun_n_s16(row4, 1); + uint8x8_t p5 = vqrshrun_n_s16(row5, 1); + uint8x8_t p6 = vqrshrun_n_s16(row6, 1); + uint8x8_t p7 = vqrshrun_n_s16(row7, 1); + + // again, these can translate into one instruction, but often don't. +#define dct_trn8_8(x, y) { uint8x8x2_t t = vtrn_u8(x, y); x = t.val[0]; y = t.val[1]; } +#define dct_trn8_16(x, y) { uint16x4x2_t t = vtrn_u16(vreinterpret_u16_u8(x), vreinterpret_u16_u8(y)); x = vreinterpret_u8_u16(t.val[0]); y = vreinterpret_u8_u16(t.val[1]); } +#define dct_trn8_32(x, y) { uint32x2x2_t t = vtrn_u32(vreinterpret_u32_u8(x), vreinterpret_u32_u8(y)); x = vreinterpret_u8_u32(t.val[0]); y = vreinterpret_u8_u32(t.val[1]); } + + // sadly can't use interleaved stores here since we only write + // 8 bytes to each scan line! + + // 8x8 8-bit transpose pass 1 + dct_trn8_8(p0, p1); + dct_trn8_8(p2, p3); + dct_trn8_8(p4, p5); + dct_trn8_8(p6, p7); + + // pass 2 + dct_trn8_16(p0, p2); + dct_trn8_16(p1, p3); + dct_trn8_16(p4, p6); + dct_trn8_16(p5, p7); + + // pass 3 + dct_trn8_32(p0, p4); + dct_trn8_32(p1, p5); + dct_trn8_32(p2, p6); + dct_trn8_32(p3, p7); + + // store + vst1_u8(out, p0); out += out_stride; + vst1_u8(out, p1); out += out_stride; + vst1_u8(out, p2); out += out_stride; + vst1_u8(out, p3); out += out_stride; + vst1_u8(out, p4); out += out_stride; + vst1_u8(out, p5); out += out_stride; + vst1_u8(out, p6); out += out_stride; + vst1_u8(out, p7); + +#undef dct_trn8_8 +#undef dct_trn8_16 +#undef dct_trn8_32 + } + +#undef dct_long_mul +#undef dct_long_mac +#undef dct_widen +#undef dct_wadd +#undef dct_wsub +#undef dct_bfly32o +#undef dct_pass +} + +#endif // STBI_NEON + +#define STBI__MARKER_none 0xff +// if there's a pending marker from the entropy stream, return that +// otherwise, fetch from the stream and get a marker. if there's no +// marker, return 0xff, which is never a valid marker value +static stbi_uc stbi__get_marker(stbi__jpeg *j) +{ + stbi_uc x; + if (j->marker != STBI__MARKER_none) { x = j->marker; j->marker = STBI__MARKER_none; return x; } + x = stbi__get8(j->s); + if (x != 0xff) return STBI__MARKER_none; + while (x == 0xff) + x = stbi__get8(j->s); // consume repeated 0xff fill bytes + return x; +} + +// in each scan, we'll have scan_n components, and the order +// of the components is specified by order[] +#define STBI__RESTART(x) ((x) >= 0xd0 && (x) <= 0xd7) + +// after a restart interval, stbi__jpeg_reset the entropy decoder and +// the dc prediction +static void stbi__jpeg_reset(stbi__jpeg *j) +{ + j->code_bits = 0; + j->code_buffer = 0; + j->nomore = 0; + j->img_comp[0].dc_pred = j->img_comp[1].dc_pred = j->img_comp[2].dc_pred = j->img_comp[3].dc_pred = 0; + j->marker = STBI__MARKER_none; + j->todo = j->restart_interval ? j->restart_interval : 0x7fffffff; + j->eob_run = 0; + // no more than 1<<31 MCUs if no restart_interal? that's plenty safe, + // since we don't even allow 1<<30 pixels +} + +static int stbi__parse_entropy_coded_data(stbi__jpeg *z) +{ + stbi__jpeg_reset(z); + if (!z->progressive) { + if (z->scan_n == 1) { + int i,j; + STBI_SIMD_ALIGN(short, data[64]); + int n = z->order[0]; + // non-interleaved data, we just need to process one block at a time, + // in trivial scanline order + // number of blocks to do just depends on how many actual "pixels" this + // component has, independent of interleaved MCU blocking and such + int w = (z->img_comp[n].x+7) >> 3; + int h = (z->img_comp[n].y+7) >> 3; + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) { + int ha = z->img_comp[n].ha; + if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0; + z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data); + // every data block is an MCU, so countdown the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + // if it's NOT a restart, then just bail, so we get corrupt data + // rather than no data + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } else { // interleaved + int i,j,k,x,y; + STBI_SIMD_ALIGN(short, data[64]); + for (j=0; j < z->img_mcu_y; ++j) { + for (i=0; i < z->img_mcu_x; ++i) { + // scan an interleaved mcu... process scan_n components in order + for (k=0; k < z->scan_n; ++k) { + int n = z->order[k]; + // scan out an mcu's worth of this component; that's just determined + // by the basic H and V specified for the component + for (y=0; y < z->img_comp[n].v; ++y) { + for (x=0; x < z->img_comp[n].h; ++x) { + int x2 = (i*z->img_comp[n].h + x)*8; + int y2 = (j*z->img_comp[n].v + y)*8; + int ha = z->img_comp[n].ha; + if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0; + z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*y2+x2, z->img_comp[n].w2, data); + } + } + } + // after all interleaved components, that's an interleaved MCU, + // so now count down the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } + } else { + if (z->scan_n == 1) { + int i,j; + int n = z->order[0]; + // non-interleaved data, we just need to process one block at a time, + // in trivial scanline order + // number of blocks to do just depends on how many actual "pixels" this + // component has, independent of interleaved MCU blocking and such + int w = (z->img_comp[n].x+7) >> 3; + int h = (z->img_comp[n].y+7) >> 3; + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) { + short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); + if (z->spec_start == 0) { + if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) + return 0; + } else { + int ha = z->img_comp[n].ha; + if (!stbi__jpeg_decode_block_prog_ac(z, data, &z->huff_ac[ha], z->fast_ac[ha])) + return 0; + } + // every data block is an MCU, so countdown the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } else { // interleaved + int i,j,k,x,y; + for (j=0; j < z->img_mcu_y; ++j) { + for (i=0; i < z->img_mcu_x; ++i) { + // scan an interleaved mcu... process scan_n components in order + for (k=0; k < z->scan_n; ++k) { + int n = z->order[k]; + // scan out an mcu's worth of this component; that's just determined + // by the basic H and V specified for the component + for (y=0; y < z->img_comp[n].v; ++y) { + for (x=0; x < z->img_comp[n].h; ++x) { + int x2 = (i*z->img_comp[n].h + x); + int y2 = (j*z->img_comp[n].v + y); + short *data = z->img_comp[n].coeff + 64 * (x2 + y2 * z->img_comp[n].coeff_w); + if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) + return 0; + } + } + } + // after all interleaved components, that's an interleaved MCU, + // so now count down the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } + } +} + +static void stbi__jpeg_dequantize(short *data, stbi__uint16 *dequant) +{ + int i; + for (i=0; i < 64; ++i) + data[i] *= dequant[i]; +} + +static void stbi__jpeg_finish(stbi__jpeg *z) +{ + if (z->progressive) { + // dequantize and idct the data + int i,j,n; + for (n=0; n < z->s->img_n; ++n) { + int w = (z->img_comp[n].x+7) >> 3; + int h = (z->img_comp[n].y+7) >> 3; + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) { + short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); + stbi__jpeg_dequantize(data, z->dequant[z->img_comp[n].tq]); + z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data); + } + } + } + } +} + +static int stbi__process_marker(stbi__jpeg *z, int m) +{ + int L; + switch (m) { + case STBI__MARKER_none: // no marker found + return stbi__err("expected marker","Corrupt JPEG"); + + case 0xDD: // DRI - specify restart interval + if (stbi__get16be(z->s) != 4) return stbi__err("bad DRI len","Corrupt JPEG"); + z->restart_interval = stbi__get16be(z->s); + return 1; + + case 0xDB: // DQT - define quantization table + L = stbi__get16be(z->s)-2; + while (L > 0) { + int q = stbi__get8(z->s); + int p = q >> 4, sixteen = (p != 0); + int t = q & 15,i; + if (p != 0 && p != 1) return stbi__err("bad DQT type","Corrupt JPEG"); + if (t > 3) return stbi__err("bad DQT table","Corrupt JPEG"); + + for (i=0; i < 64; ++i) + z->dequant[t][stbi__jpeg_dezigzag[i]] = (stbi__uint16)(sixteen ? stbi__get16be(z->s) : stbi__get8(z->s)); + L -= (sixteen ? 129 : 65); + } + return L==0; + + case 0xC4: // DHT - define huffman table + L = stbi__get16be(z->s)-2; + while (L > 0) { + stbi_uc *v; + int sizes[16],i,n=0; + int q = stbi__get8(z->s); + int tc = q >> 4; + int th = q & 15; + if (tc > 1 || th > 3) return stbi__err("bad DHT header","Corrupt JPEG"); + for (i=0; i < 16; ++i) { + sizes[i] = stbi__get8(z->s); + n += sizes[i]; + } + L -= 17; + if (tc == 0) { + if (!stbi__build_huffman(z->huff_dc+th, sizes)) return 0; + v = z->huff_dc[th].values; + } else { + if (!stbi__build_huffman(z->huff_ac+th, sizes)) return 0; + v = z->huff_ac[th].values; + } + for (i=0; i < n; ++i) + v[i] = stbi__get8(z->s); + if (tc != 0) + stbi__build_fast_ac(z->fast_ac[th], z->huff_ac + th); + L -= n; + } + return L==0; + } + + // check for comment block or APP blocks + if ((m >= 0xE0 && m <= 0xEF) || m == 0xFE) { + L = stbi__get16be(z->s); + if (L < 2) { + if (m == 0xFE) + return stbi__err("bad COM len","Corrupt JPEG"); + else + return stbi__err("bad APP len","Corrupt JPEG"); + } + L -= 2; + + if (m == 0xE0 && L >= 5) { // JFIF APP0 segment + static const unsigned char tag[5] = {'J','F','I','F','\0'}; + int ok = 1; + int i; + for (i=0; i < 5; ++i) + if (stbi__get8(z->s) != tag[i]) + ok = 0; + L -= 5; + if (ok) + z->jfif = 1; + } else if (m == 0xEE && L >= 12) { // Adobe APP14 segment + static const unsigned char tag[6] = {'A','d','o','b','e','\0'}; + int ok = 1; + int i; + for (i=0; i < 6; ++i) + if (stbi__get8(z->s) != tag[i]) + ok = 0; + L -= 6; + if (ok) { + stbi__get8(z->s); // version + stbi__get16be(z->s); // flags0 + stbi__get16be(z->s); // flags1 + z->app14_color_transform = stbi__get8(z->s); // color transform + L -= 6; + } + } + + stbi__skip(z->s, L); + return 1; + } + + return stbi__err("unknown marker","Corrupt JPEG"); +} + +// after we see SOS +static int stbi__process_scan_header(stbi__jpeg *z) +{ + int i; + int Ls = stbi__get16be(z->s); + z->scan_n = stbi__get8(z->s); + if (z->scan_n < 1 || z->scan_n > 4 || z->scan_n > (int) z->s->img_n) return stbi__err("bad SOS component count","Corrupt JPEG"); + if (Ls != 6+2*z->scan_n) return stbi__err("bad SOS len","Corrupt JPEG"); + for (i=0; i < z->scan_n; ++i) { + int id = stbi__get8(z->s), which; + int q = stbi__get8(z->s); + for (which = 0; which < z->s->img_n; ++which) + if (z->img_comp[which].id == id) + break; + if (which == z->s->img_n) return 0; // no match + z->img_comp[which].hd = q >> 4; if (z->img_comp[which].hd > 3) return stbi__err("bad DC huff","Corrupt JPEG"); + z->img_comp[which].ha = q & 15; if (z->img_comp[which].ha > 3) return stbi__err("bad AC huff","Corrupt JPEG"); + z->order[i] = which; + } + + { + int aa; + z->spec_start = stbi__get8(z->s); + z->spec_end = stbi__get8(z->s); // should be 63, but might be 0 + aa = stbi__get8(z->s); + z->succ_high = (aa >> 4); + z->succ_low = (aa & 15); + if (z->progressive) { + if (z->spec_start > 63 || z->spec_end > 63 || z->spec_start > z->spec_end || z->succ_high > 13 || z->succ_low > 13) + return stbi__err("bad SOS", "Corrupt JPEG"); + } else { + if (z->spec_start != 0) return stbi__err("bad SOS","Corrupt JPEG"); + if (z->succ_high != 0 || z->succ_low != 0) return stbi__err("bad SOS","Corrupt JPEG"); + z->spec_end = 63; + } + } + + return 1; +} + +static int stbi__free_jpeg_components(stbi__jpeg *z, int ncomp, int why) +{ + int i; + for (i=0; i < ncomp; ++i) { + if (z->img_comp[i].raw_data) { + STBI_FREE(z->img_comp[i].raw_data); + z->img_comp[i].raw_data = NULL; + z->img_comp[i].data = NULL; + } + if (z->img_comp[i].raw_coeff) { + STBI_FREE(z->img_comp[i].raw_coeff); + z->img_comp[i].raw_coeff = 0; + z->img_comp[i].coeff = 0; + } + if (z->img_comp[i].linebuf) { + STBI_FREE(z->img_comp[i].linebuf); + z->img_comp[i].linebuf = NULL; + } + } + return why; +} + +static int stbi__process_frame_header(stbi__jpeg *z, int scan) +{ + stbi__context *s = z->s; + int Lf,p,i,q, h_max=1,v_max=1,c; + Lf = stbi__get16be(s); if (Lf < 11) return stbi__err("bad SOF len","Corrupt JPEG"); // JPEG + p = stbi__get8(s); if (p != 8) return stbi__err("only 8-bit","JPEG format not supported: 8-bit only"); // JPEG baseline + s->img_y = stbi__get16be(s); if (s->img_y == 0) return stbi__err("no header height", "JPEG format not supported: delayed height"); // Legal, but we don't handle it--but neither does IJG + s->img_x = stbi__get16be(s); if (s->img_x == 0) return stbi__err("0 width","Corrupt JPEG"); // JPEG requires + if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); + if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); + c = stbi__get8(s); + if (c != 3 && c != 1 && c != 4) return stbi__err("bad component count","Corrupt JPEG"); + s->img_n = c; + for (i=0; i < c; ++i) { + z->img_comp[i].data = NULL; + z->img_comp[i].linebuf = NULL; + } + + if (Lf != 8+3*s->img_n) return stbi__err("bad SOF len","Corrupt JPEG"); + + z->rgb = 0; + for (i=0; i < s->img_n; ++i) { + static const unsigned char rgb[3] = { 'R', 'G', 'B' }; + z->img_comp[i].id = stbi__get8(s); + if (s->img_n == 3 && z->img_comp[i].id == rgb[i]) + ++z->rgb; + q = stbi__get8(s); + z->img_comp[i].h = (q >> 4); if (!z->img_comp[i].h || z->img_comp[i].h > 4) return stbi__err("bad H","Corrupt JPEG"); + z->img_comp[i].v = q & 15; if (!z->img_comp[i].v || z->img_comp[i].v > 4) return stbi__err("bad V","Corrupt JPEG"); + z->img_comp[i].tq = stbi__get8(s); if (z->img_comp[i].tq > 3) return stbi__err("bad TQ","Corrupt JPEG"); + } + + if (scan != STBI__SCAN_load) return 1; + + if (!stbi__mad3sizes_valid(s->img_x, s->img_y, s->img_n, 0)) return stbi__err("too large", "Image too large to decode"); + + for (i=0; i < s->img_n; ++i) { + if (z->img_comp[i].h > h_max) h_max = z->img_comp[i].h; + if (z->img_comp[i].v > v_max) v_max = z->img_comp[i].v; + } + + // check that plane subsampling factors are integer ratios; our resamplers can't deal with fractional ratios + // and I've never seen a non-corrupted JPEG file actually use them + for (i=0; i < s->img_n; ++i) { + if (h_max % z->img_comp[i].h != 0) return stbi__err("bad H","Corrupt JPEG"); + if (v_max % z->img_comp[i].v != 0) return stbi__err("bad V","Corrupt JPEG"); + } + + // compute interleaved mcu info + z->img_h_max = h_max; + z->img_v_max = v_max; + z->img_mcu_w = h_max * 8; + z->img_mcu_h = v_max * 8; + // these sizes can't be more than 17 bits + z->img_mcu_x = (s->img_x + z->img_mcu_w-1) / z->img_mcu_w; + z->img_mcu_y = (s->img_y + z->img_mcu_h-1) / z->img_mcu_h; + + for (i=0; i < s->img_n; ++i) { + // number of effective pixels (e.g. for non-interleaved MCU) + z->img_comp[i].x = (s->img_x * z->img_comp[i].h + h_max-1) / h_max; + z->img_comp[i].y = (s->img_y * z->img_comp[i].v + v_max-1) / v_max; + // to simplify generation, we'll allocate enough memory to decode + // the bogus oversized data from using interleaved MCUs and their + // big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't + // discard the extra data until colorspace conversion + // + // img_mcu_x, img_mcu_y: <=17 bits; comp[i].h and .v are <=4 (checked earlier) + // so these muls can't overflow with 32-bit ints (which we require) + z->img_comp[i].w2 = z->img_mcu_x * z->img_comp[i].h * 8; + z->img_comp[i].h2 = z->img_mcu_y * z->img_comp[i].v * 8; + z->img_comp[i].coeff = 0; + z->img_comp[i].raw_coeff = 0; + z->img_comp[i].linebuf = NULL; + z->img_comp[i].raw_data = stbi__malloc_mad2(z->img_comp[i].w2, z->img_comp[i].h2, 15); + if (z->img_comp[i].raw_data == NULL) + return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory")); + // align blocks for idct using mmx/sse + z->img_comp[i].data = (stbi_uc*) (((size_t) z->img_comp[i].raw_data + 15) & ~15); + if (z->progressive) { + // w2, h2 are multiples of 8 (see above) + z->img_comp[i].coeff_w = z->img_comp[i].w2 / 8; + z->img_comp[i].coeff_h = z->img_comp[i].h2 / 8; + z->img_comp[i].raw_coeff = stbi__malloc_mad3(z->img_comp[i].w2, z->img_comp[i].h2, sizeof(short), 15); + if (z->img_comp[i].raw_coeff == NULL) + return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory")); + z->img_comp[i].coeff = (short*) (((size_t) z->img_comp[i].raw_coeff + 15) & ~15); + } + } + + return 1; +} + +// use comparisons since in some cases we handle more than one case (e.g. SOF) +#define stbi__DNL(x) ((x) == 0xdc) +#define stbi__SOI(x) ((x) == 0xd8) +#define stbi__EOI(x) ((x) == 0xd9) +#define stbi__SOF(x) ((x) == 0xc0 || (x) == 0xc1 || (x) == 0xc2) +#define stbi__SOS(x) ((x) == 0xda) + +#define stbi__SOF_progressive(x) ((x) == 0xc2) + +static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan) +{ + int m; + z->jfif = 0; + z->app14_color_transform = -1; // valid values are 0,1,2 + z->marker = STBI__MARKER_none; // initialize cached marker to empty + m = stbi__get_marker(z); + if (!stbi__SOI(m)) return stbi__err("no SOI","Corrupt JPEG"); + if (scan == STBI__SCAN_type) return 1; + m = stbi__get_marker(z); + while (!stbi__SOF(m)) { + if (!stbi__process_marker(z,m)) return 0; + m = stbi__get_marker(z); + while (m == STBI__MARKER_none) { + // some files have extra padding after their blocks, so ok, we'll scan + if (stbi__at_eof(z->s)) return stbi__err("no SOF", "Corrupt JPEG"); + m = stbi__get_marker(z); + } + } + z->progressive = stbi__SOF_progressive(m); + if (!stbi__process_frame_header(z, scan)) return 0; + return 1; +} + +// decode image to YCbCr format +static int stbi__decode_jpeg_image(stbi__jpeg *j) +{ + int m; + for (m = 0; m < 4; m++) { + j->img_comp[m].raw_data = NULL; + j->img_comp[m].raw_coeff = NULL; + } + j->restart_interval = 0; + if (!stbi__decode_jpeg_header(j, STBI__SCAN_load)) return 0; + m = stbi__get_marker(j); + while (!stbi__EOI(m)) { + if (stbi__SOS(m)) { + if (!stbi__process_scan_header(j)) return 0; + if (!stbi__parse_entropy_coded_data(j)) return 0; + if (j->marker == STBI__MARKER_none ) { + // handle 0s at the end of image data from IP Kamera 9060 + while (!stbi__at_eof(j->s)) { + int x = stbi__get8(j->s); + if (x == 255) { + j->marker = stbi__get8(j->s); + break; + } + } + // if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0 + } + } else if (stbi__DNL(m)) { + int Ld = stbi__get16be(j->s); + stbi__uint32 NL = stbi__get16be(j->s); + if (Ld != 4) return stbi__err("bad DNL len", "Corrupt JPEG"); + if (NL != j->s->img_y) return stbi__err("bad DNL height", "Corrupt JPEG"); + } else { + if (!stbi__process_marker(j, m)) return 0; + } + m = stbi__get_marker(j); + } + if (j->progressive) + stbi__jpeg_finish(j); + return 1; +} + +// static jfif-centered resampling (across block boundaries) + +typedef stbi_uc *(*resample_row_func)(stbi_uc *out, stbi_uc *in0, stbi_uc *in1, + int w, int hs); + +#define stbi__div4(x) ((stbi_uc) ((x) >> 2)) + +static stbi_uc *resample_row_1(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + STBI_NOTUSED(out); + STBI_NOTUSED(in_far); + STBI_NOTUSED(w); + STBI_NOTUSED(hs); + return in_near; +} + +static stbi_uc* stbi__resample_row_v_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate two samples vertically for every one in input + int i; + STBI_NOTUSED(hs); + for (i=0; i < w; ++i) + out[i] = stbi__div4(3*in_near[i] + in_far[i] + 2); + return out; +} + +static stbi_uc* stbi__resample_row_h_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate two samples horizontally for every one in input + int i; + stbi_uc *input = in_near; + + if (w == 1) { + // if only one sample, can't do any interpolation + out[0] = out[1] = input[0]; + return out; + } + + out[0] = input[0]; + out[1] = stbi__div4(input[0]*3 + input[1] + 2); + for (i=1; i < w-1; ++i) { + int n = 3*input[i]+2; + out[i*2+0] = stbi__div4(n+input[i-1]); + out[i*2+1] = stbi__div4(n+input[i+1]); + } + out[i*2+0] = stbi__div4(input[w-2]*3 + input[w-1] + 2); + out[i*2+1] = input[w-1]; + + STBI_NOTUSED(in_far); + STBI_NOTUSED(hs); + + return out; +} + +#define stbi__div16(x) ((stbi_uc) ((x) >> 4)) + +static stbi_uc *stbi__resample_row_hv_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate 2x2 samples for every one in input + int i,t0,t1; + if (w == 1) { + out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2); + return out; + } + + t1 = 3*in_near[0] + in_far[0]; + out[0] = stbi__div4(t1+2); + for (i=1; i < w; ++i) { + t0 = t1; + t1 = 3*in_near[i]+in_far[i]; + out[i*2-1] = stbi__div16(3*t0 + t1 + 8); + out[i*2 ] = stbi__div16(3*t1 + t0 + 8); + } + out[w*2-1] = stbi__div4(t1+2); + + STBI_NOTUSED(hs); + + return out; +} + +#if defined(STBI_SSE2) || defined(STBI_NEON) +static stbi_uc *stbi__resample_row_hv_2_simd(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate 2x2 samples for every one in input + int i=0,t0,t1; + + if (w == 1) { + out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2); + return out; + } + + t1 = 3*in_near[0] + in_far[0]; + // process groups of 8 pixels for as long as we can. + // note we can't handle the last pixel in a row in this loop + // because we need to handle the filter boundary conditions. + for (; i < ((w-1) & ~7); i += 8) { +#if defined(STBI_SSE2) + // load and perform the vertical filtering pass + // this uses 3*x + y = 4*x + (y - x) + __m128i zero = _mm_setzero_si128(); + __m128i farb = _mm_loadl_epi64((__m128i *) (in_far + i)); + __m128i nearb = _mm_loadl_epi64((__m128i *) (in_near + i)); + __m128i farw = _mm_unpacklo_epi8(farb, zero); + __m128i nearw = _mm_unpacklo_epi8(nearb, zero); + __m128i diff = _mm_sub_epi16(farw, nearw); + __m128i nears = _mm_slli_epi16(nearw, 2); + __m128i curr = _mm_add_epi16(nears, diff); // current row + + // horizontal filter works the same based on shifted vers of current + // row. "prev" is current row shifted right by 1 pixel; we need to + // insert the previous pixel value (from t1). + // "next" is current row shifted left by 1 pixel, with first pixel + // of next block of 8 pixels added in. + __m128i prv0 = _mm_slli_si128(curr, 2); + __m128i nxt0 = _mm_srli_si128(curr, 2); + __m128i prev = _mm_insert_epi16(prv0, t1, 0); + __m128i next = _mm_insert_epi16(nxt0, 3*in_near[i+8] + in_far[i+8], 7); + + // horizontal filter, polyphase implementation since it's convenient: + // even pixels = 3*cur + prev = cur*4 + (prev - cur) + // odd pixels = 3*cur + next = cur*4 + (next - cur) + // note the shared term. + __m128i bias = _mm_set1_epi16(8); + __m128i curs = _mm_slli_epi16(curr, 2); + __m128i prvd = _mm_sub_epi16(prev, curr); + __m128i nxtd = _mm_sub_epi16(next, curr); + __m128i curb = _mm_add_epi16(curs, bias); + __m128i even = _mm_add_epi16(prvd, curb); + __m128i odd = _mm_add_epi16(nxtd, curb); + + // interleave even and odd pixels, then undo scaling. + __m128i int0 = _mm_unpacklo_epi16(even, odd); + __m128i int1 = _mm_unpackhi_epi16(even, odd); + __m128i de0 = _mm_srli_epi16(int0, 4); + __m128i de1 = _mm_srli_epi16(int1, 4); + + // pack and write output + __m128i outv = _mm_packus_epi16(de0, de1); + _mm_storeu_si128((__m128i *) (out + i*2), outv); +#elif defined(STBI_NEON) + // load and perform the vertical filtering pass + // this uses 3*x + y = 4*x + (y - x) + uint8x8_t farb = vld1_u8(in_far + i); + uint8x8_t nearb = vld1_u8(in_near + i); + int16x8_t diff = vreinterpretq_s16_u16(vsubl_u8(farb, nearb)); + int16x8_t nears = vreinterpretq_s16_u16(vshll_n_u8(nearb, 2)); + int16x8_t curr = vaddq_s16(nears, diff); // current row + + // horizontal filter works the same based on shifted vers of current + // row. "prev" is current row shifted right by 1 pixel; we need to + // insert the previous pixel value (from t1). + // "next" is current row shifted left by 1 pixel, with first pixel + // of next block of 8 pixels added in. + int16x8_t prv0 = vextq_s16(curr, curr, 7); + int16x8_t nxt0 = vextq_s16(curr, curr, 1); + int16x8_t prev = vsetq_lane_s16(t1, prv0, 0); + int16x8_t next = vsetq_lane_s16(3*in_near[i+8] + in_far[i+8], nxt0, 7); + + // horizontal filter, polyphase implementation since it's convenient: + // even pixels = 3*cur + prev = cur*4 + (prev - cur) + // odd pixels = 3*cur + next = cur*4 + (next - cur) + // note the shared term. + int16x8_t curs = vshlq_n_s16(curr, 2); + int16x8_t prvd = vsubq_s16(prev, curr); + int16x8_t nxtd = vsubq_s16(next, curr); + int16x8_t even = vaddq_s16(curs, prvd); + int16x8_t odd = vaddq_s16(curs, nxtd); + + // undo scaling and round, then store with even/odd phases interleaved + uint8x8x2_t o; + o.val[0] = vqrshrun_n_s16(even, 4); + o.val[1] = vqrshrun_n_s16(odd, 4); + vst2_u8(out + i*2, o); +#endif + + // "previous" value for next iter + t1 = 3*in_near[i+7] + in_far[i+7]; + } + + t0 = t1; + t1 = 3*in_near[i] + in_far[i]; + out[i*2] = stbi__div16(3*t1 + t0 + 8); + + for (++i; i < w; ++i) { + t0 = t1; + t1 = 3*in_near[i]+in_far[i]; + out[i*2-1] = stbi__div16(3*t0 + t1 + 8); + out[i*2 ] = stbi__div16(3*t1 + t0 + 8); + } + out[w*2-1] = stbi__div4(t1+2); + + STBI_NOTUSED(hs); + + return out; +} +#endif + +static stbi_uc *stbi__resample_row_generic(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // resample with nearest-neighbor + int i,j; + STBI_NOTUSED(in_far); + for (i=0; i < w; ++i) + for (j=0; j < hs; ++j) + out[i*hs+j] = in_near[i]; + return out; +} + +// this is a reduced-precision calculation of YCbCr-to-RGB introduced +// to make sure the code produces the same results in both SIMD and scalar +#define stbi__float2fixed(x) (((int) ((x) * 4096.0f + 0.5f)) << 8) +static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step) +{ + int i; + for (i=0; i < count; ++i) { + int y_fixed = (y[i] << 20) + (1<<19); // rounding + int r,g,b; + int cr = pcr[i] - 128; + int cb = pcb[i] - 128; + r = y_fixed + cr* stbi__float2fixed(1.40200f); + g = y_fixed + (cr*-stbi__float2fixed(0.71414f)) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000); + b = y_fixed + cb* stbi__float2fixed(1.77200f); + r >>= 20; + g >>= 20; + b >>= 20; + if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } + if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } + if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } + out[0] = (stbi_uc)r; + out[1] = (stbi_uc)g; + out[2] = (stbi_uc)b; + out[3] = 255; + out += step; + } +} + +#if defined(STBI_SSE2) || defined(STBI_NEON) +static void stbi__YCbCr_to_RGB_simd(stbi_uc *out, stbi_uc const *y, stbi_uc const *pcb, stbi_uc const *pcr, int count, int step) +{ + int i = 0; + +#ifdef STBI_SSE2 + // step == 3 is pretty ugly on the final interleave, and i'm not convinced + // it's useful in practice (you wouldn't use it for textures, for example). + // so just accelerate step == 4 case. + if (step == 4) { + // this is a fairly straightforward implementation and not super-optimized. + __m128i signflip = _mm_set1_epi8(-0x80); + __m128i cr_const0 = _mm_set1_epi16( (short) ( 1.40200f*4096.0f+0.5f)); + __m128i cr_const1 = _mm_set1_epi16( - (short) ( 0.71414f*4096.0f+0.5f)); + __m128i cb_const0 = _mm_set1_epi16( - (short) ( 0.34414f*4096.0f+0.5f)); + __m128i cb_const1 = _mm_set1_epi16( (short) ( 1.77200f*4096.0f+0.5f)); + __m128i y_bias = _mm_set1_epi8((char) (unsigned char) 128); + __m128i xw = _mm_set1_epi16(255); // alpha channel + + for (; i+7 < count; i += 8) { + // load + __m128i y_bytes = _mm_loadl_epi64((__m128i *) (y+i)); + __m128i cr_bytes = _mm_loadl_epi64((__m128i *) (pcr+i)); + __m128i cb_bytes = _mm_loadl_epi64((__m128i *) (pcb+i)); + __m128i cr_biased = _mm_xor_si128(cr_bytes, signflip); // -128 + __m128i cb_biased = _mm_xor_si128(cb_bytes, signflip); // -128 + + // unpack to short (and left-shift cr, cb by 8) + __m128i yw = _mm_unpacklo_epi8(y_bias, y_bytes); + __m128i crw = _mm_unpacklo_epi8(_mm_setzero_si128(), cr_biased); + __m128i cbw = _mm_unpacklo_epi8(_mm_setzero_si128(), cb_biased); + + // color transform + __m128i yws = _mm_srli_epi16(yw, 4); + __m128i cr0 = _mm_mulhi_epi16(cr_const0, crw); + __m128i cb0 = _mm_mulhi_epi16(cb_const0, cbw); + __m128i cb1 = _mm_mulhi_epi16(cbw, cb_const1); + __m128i cr1 = _mm_mulhi_epi16(crw, cr_const1); + __m128i rws = _mm_add_epi16(cr0, yws); + __m128i gwt = _mm_add_epi16(cb0, yws); + __m128i bws = _mm_add_epi16(yws, cb1); + __m128i gws = _mm_add_epi16(gwt, cr1); + + // descale + __m128i rw = _mm_srai_epi16(rws, 4); + __m128i bw = _mm_srai_epi16(bws, 4); + __m128i gw = _mm_srai_epi16(gws, 4); + + // back to byte, set up for transpose + __m128i brb = _mm_packus_epi16(rw, bw); + __m128i gxb = _mm_packus_epi16(gw, xw); + + // transpose to interleave channels + __m128i t0 = _mm_unpacklo_epi8(brb, gxb); + __m128i t1 = _mm_unpackhi_epi8(brb, gxb); + __m128i o0 = _mm_unpacklo_epi16(t0, t1); + __m128i o1 = _mm_unpackhi_epi16(t0, t1); + + // store + _mm_storeu_si128((__m128i *) (out + 0), o0); + _mm_storeu_si128((__m128i *) (out + 16), o1); + out += 32; + } + } +#endif + +#ifdef STBI_NEON + // in this version, step=3 support would be easy to add. but is there demand? + if (step == 4) { + // this is a fairly straightforward implementation and not super-optimized. + uint8x8_t signflip = vdup_n_u8(0x80); + int16x8_t cr_const0 = vdupq_n_s16( (short) ( 1.40200f*4096.0f+0.5f)); + int16x8_t cr_const1 = vdupq_n_s16( - (short) ( 0.71414f*4096.0f+0.5f)); + int16x8_t cb_const0 = vdupq_n_s16( - (short) ( 0.34414f*4096.0f+0.5f)); + int16x8_t cb_const1 = vdupq_n_s16( (short) ( 1.77200f*4096.0f+0.5f)); + + for (; i+7 < count; i += 8) { + // load + uint8x8_t y_bytes = vld1_u8(y + i); + uint8x8_t cr_bytes = vld1_u8(pcr + i); + uint8x8_t cb_bytes = vld1_u8(pcb + i); + int8x8_t cr_biased = vreinterpret_s8_u8(vsub_u8(cr_bytes, signflip)); + int8x8_t cb_biased = vreinterpret_s8_u8(vsub_u8(cb_bytes, signflip)); + + // expand to s16 + int16x8_t yws = vreinterpretq_s16_u16(vshll_n_u8(y_bytes, 4)); + int16x8_t crw = vshll_n_s8(cr_biased, 7); + int16x8_t cbw = vshll_n_s8(cb_biased, 7); + + // color transform + int16x8_t cr0 = vqdmulhq_s16(crw, cr_const0); + int16x8_t cb0 = vqdmulhq_s16(cbw, cb_const0); + int16x8_t cr1 = vqdmulhq_s16(crw, cr_const1); + int16x8_t cb1 = vqdmulhq_s16(cbw, cb_const1); + int16x8_t rws = vaddq_s16(yws, cr0); + int16x8_t gws = vaddq_s16(vaddq_s16(yws, cb0), cr1); + int16x8_t bws = vaddq_s16(yws, cb1); + + // undo scaling, round, convert to byte + uint8x8x4_t o; + o.val[0] = vqrshrun_n_s16(rws, 4); + o.val[1] = vqrshrun_n_s16(gws, 4); + o.val[2] = vqrshrun_n_s16(bws, 4); + o.val[3] = vdup_n_u8(255); + + // store, interleaving r/g/b/a + vst4_u8(out, o); + out += 8*4; + } + } +#endif + + for (; i < count; ++i) { + int y_fixed = (y[i] << 20) + (1<<19); // rounding + int r,g,b; + int cr = pcr[i] - 128; + int cb = pcb[i] - 128; + r = y_fixed + cr* stbi__float2fixed(1.40200f); + g = y_fixed + cr*-stbi__float2fixed(0.71414f) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000); + b = y_fixed + cb* stbi__float2fixed(1.77200f); + r >>= 20; + g >>= 20; + b >>= 20; + if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } + if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } + if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } + out[0] = (stbi_uc)r; + out[1] = (stbi_uc)g; + out[2] = (stbi_uc)b; + out[3] = 255; + out += step; + } +} +#endif + +// set up the kernels +static void stbi__setup_jpeg(stbi__jpeg *j) +{ + j->idct_block_kernel = stbi__idct_block; + j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_row; + j->resample_row_hv_2_kernel = stbi__resample_row_hv_2; + +#ifdef STBI_SSE2 + if (stbi__sse2_available()) { + j->idct_block_kernel = stbi__idct_simd; + j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; + j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; + } +#endif + +#ifdef STBI_NEON + j->idct_block_kernel = stbi__idct_simd; + j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; + j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; +#endif +} + +// clean up the temporary component buffers +static void stbi__cleanup_jpeg(stbi__jpeg *j) +{ + stbi__free_jpeg_components(j, j->s->img_n, 0); +} + +typedef struct +{ + resample_row_func resample; + stbi_uc *line0,*line1; + int hs,vs; // expansion factor in each axis + int w_lores; // horizontal pixels pre-expansion + int ystep; // how far through vertical expansion we are + int ypos; // which pre-expansion row we're on +} stbi__resample; + +// fast 0..255 * 0..255 => 0..255 rounded multiplication +static stbi_uc stbi__blinn_8x8(stbi_uc x, stbi_uc y) +{ + unsigned int t = x*y + 128; + return (stbi_uc) ((t + (t >>8)) >> 8); +} + +static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp, int req_comp) +{ + int n, decode_n, is_rgb; + z->s->img_n = 0; // make stbi__cleanup_jpeg safe + + // validate req_comp + if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); + + // load a jpeg image from whichever source, but leave in YCbCr format + if (!stbi__decode_jpeg_image(z)) { stbi__cleanup_jpeg(z); return NULL; } + + // determine actual number of components to generate + n = req_comp ? req_comp : z->s->img_n >= 3 ? 3 : 1; + + is_rgb = z->s->img_n == 3 && (z->rgb == 3 || (z->app14_color_transform == 0 && !z->jfif)); + + if (z->s->img_n == 3 && n < 3 && !is_rgb) + decode_n = 1; + else + decode_n = z->s->img_n; + + // nothing to do if no components requested; check this now to avoid + // accessing uninitialized coutput[0] later + if (decode_n <= 0) { stbi__cleanup_jpeg(z); return NULL; } + + // resample and color-convert + { + int k; + unsigned int i,j; + stbi_uc *output; + stbi_uc *coutput[4] = { NULL, NULL, NULL, NULL }; + + stbi__resample res_comp[4]; + + for (k=0; k < decode_n; ++k) { + stbi__resample *r = &res_comp[k]; + + // allocate line buffer big enough for upsampling off the edges + // with upsample factor of 4 + z->img_comp[k].linebuf = (stbi_uc *) stbi__malloc(z->s->img_x + 3); + if (!z->img_comp[k].linebuf) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); } + + r->hs = z->img_h_max / z->img_comp[k].h; + r->vs = z->img_v_max / z->img_comp[k].v; + r->ystep = r->vs >> 1; + r->w_lores = (z->s->img_x + r->hs-1) / r->hs; + r->ypos = 0; + r->line0 = r->line1 = z->img_comp[k].data; + + if (r->hs == 1 && r->vs == 1) r->resample = resample_row_1; + else if (r->hs == 1 && r->vs == 2) r->resample = stbi__resample_row_v_2; + else if (r->hs == 2 && r->vs == 1) r->resample = stbi__resample_row_h_2; + else if (r->hs == 2 && r->vs == 2) r->resample = z->resample_row_hv_2_kernel; + else r->resample = stbi__resample_row_generic; + } + + // can't error after this so, this is safe + output = (stbi_uc *) stbi__malloc_mad3(n, z->s->img_x, z->s->img_y, 1); + if (!output) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); } + + // now go ahead and resample + for (j=0; j < z->s->img_y; ++j) { + stbi_uc *out = output + n * z->s->img_x * j; + for (k=0; k < decode_n; ++k) { + stbi__resample *r = &res_comp[k]; + int y_bot = r->ystep >= (r->vs >> 1); + coutput[k] = r->resample(z->img_comp[k].linebuf, + y_bot ? r->line1 : r->line0, + y_bot ? r->line0 : r->line1, + r->w_lores, r->hs); + if (++r->ystep >= r->vs) { + r->ystep = 0; + r->line0 = r->line1; + if (++r->ypos < z->img_comp[k].y) + r->line1 += z->img_comp[k].w2; + } + } + if (n >= 3) { + stbi_uc *y = coutput[0]; + if (z->s->img_n == 3) { + if (is_rgb) { + for (i=0; i < z->s->img_x; ++i) { + out[0] = y[i]; + out[1] = coutput[1][i]; + out[2] = coutput[2][i]; + out[3] = 255; + out += n; + } + } else { + z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); + } + } else if (z->s->img_n == 4) { + if (z->app14_color_transform == 0) { // CMYK + for (i=0; i < z->s->img_x; ++i) { + stbi_uc m = coutput[3][i]; + out[0] = stbi__blinn_8x8(coutput[0][i], m); + out[1] = stbi__blinn_8x8(coutput[1][i], m); + out[2] = stbi__blinn_8x8(coutput[2][i], m); + out[3] = 255; + out += n; + } + } else if (z->app14_color_transform == 2) { // YCCK + z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); + for (i=0; i < z->s->img_x; ++i) { + stbi_uc m = coutput[3][i]; + out[0] = stbi__blinn_8x8(255 - out[0], m); + out[1] = stbi__blinn_8x8(255 - out[1], m); + out[2] = stbi__blinn_8x8(255 - out[2], m); + out += n; + } + } else { // YCbCr + alpha? Ignore the fourth channel for now + z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); + } + } else + for (i=0; i < z->s->img_x; ++i) { + out[0] = out[1] = out[2] = y[i]; + out[3] = 255; // not used if n==3 + out += n; + } + } else { + if (is_rgb) { + if (n == 1) + for (i=0; i < z->s->img_x; ++i) + *out++ = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]); + else { + for (i=0; i < z->s->img_x; ++i, out += 2) { + out[0] = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]); + out[1] = 255; + } + } + } else if (z->s->img_n == 4 && z->app14_color_transform == 0) { + for (i=0; i < z->s->img_x; ++i) { + stbi_uc m = coutput[3][i]; + stbi_uc r = stbi__blinn_8x8(coutput[0][i], m); + stbi_uc g = stbi__blinn_8x8(coutput[1][i], m); + stbi_uc b = stbi__blinn_8x8(coutput[2][i], m); + out[0] = stbi__compute_y(r, g, b); + out[1] = 255; + out += n; + } + } else if (z->s->img_n == 4 && z->app14_color_transform == 2) { + for (i=0; i < z->s->img_x; ++i) { + out[0] = stbi__blinn_8x8(255 - coutput[0][i], coutput[3][i]); + out[1] = 255; + out += n; + } + } else { + stbi_uc *y = coutput[0]; + if (n == 1) + for (i=0; i < z->s->img_x; ++i) out[i] = y[i]; + else + for (i=0; i < z->s->img_x; ++i) { *out++ = y[i]; *out++ = 255; } + } + } + } + stbi__cleanup_jpeg(z); + *out_x = z->s->img_x; + *out_y = z->s->img_y; + if (comp) *comp = z->s->img_n >= 3 ? 3 : 1; // report original components, not output + return output; + } +} + +static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + unsigned char* result; + stbi__jpeg* j = (stbi__jpeg*) stbi__malloc(sizeof(stbi__jpeg)); + if (!j) return stbi__errpuc("outofmem", "Out of memory"); + STBI_NOTUSED(ri); + j->s = s; + stbi__setup_jpeg(j); + result = load_jpeg_image(j, x,y,comp,req_comp); + STBI_FREE(j); + return result; +} + +static int stbi__jpeg_test(stbi__context *s) +{ + int r; + stbi__jpeg* j = (stbi__jpeg*)stbi__malloc(sizeof(stbi__jpeg)); + if (!j) return stbi__err("outofmem", "Out of memory"); + j->s = s; + stbi__setup_jpeg(j); + r = stbi__decode_jpeg_header(j, STBI__SCAN_type); + stbi__rewind(s); + STBI_FREE(j); + return r; +} + +static int stbi__jpeg_info_raw(stbi__jpeg *j, int *x, int *y, int *comp) +{ + if (!stbi__decode_jpeg_header(j, STBI__SCAN_header)) { + stbi__rewind( j->s ); + return 0; + } + if (x) *x = j->s->img_x; + if (y) *y = j->s->img_y; + if (comp) *comp = j->s->img_n >= 3 ? 3 : 1; + return 1; +} + +static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp) +{ + int result; + stbi__jpeg* j = (stbi__jpeg*) (stbi__malloc(sizeof(stbi__jpeg))); + if (!j) return stbi__err("outofmem", "Out of memory"); + j->s = s; + result = stbi__jpeg_info_raw(j, x, y, comp); + STBI_FREE(j); + return result; +} +#endif + +// public domain zlib decode v0.2 Sean Barrett 2006-11-18 +// simple implementation +// - all input must be provided in an upfront buffer +// - all output is written to a single output buffer (can malloc/realloc) +// performance +// - fast huffman + +#ifndef STBI_NO_ZLIB + +// fast-way is faster to check than jpeg huffman, but slow way is slower +#define STBI__ZFAST_BITS 9 // accelerate all cases in default tables +#define STBI__ZFAST_MASK ((1 << STBI__ZFAST_BITS) - 1) +#define STBI__ZNSYMS 288 // number of symbols in literal/length alphabet + +// zlib-style huffman encoding +// (jpegs packs from left, zlib from right, so can't share code) +typedef struct +{ + stbi__uint16 fast[1 << STBI__ZFAST_BITS]; + stbi__uint16 firstcode[16]; + int maxcode[17]; + stbi__uint16 firstsymbol[16]; + stbi_uc size[STBI__ZNSYMS]; + stbi__uint16 value[STBI__ZNSYMS]; +} stbi__zhuffman; + +stbi_inline static int stbi__bitreverse16(int n) +{ + n = ((n & 0xAAAA) >> 1) | ((n & 0x5555) << 1); + n = ((n & 0xCCCC) >> 2) | ((n & 0x3333) << 2); + n = ((n & 0xF0F0) >> 4) | ((n & 0x0F0F) << 4); + n = ((n & 0xFF00) >> 8) | ((n & 0x00FF) << 8); + return n; +} + +stbi_inline static int stbi__bit_reverse(int v, int bits) +{ + STBI_ASSERT(bits <= 16); + // to bit reverse n bits, reverse 16 and shift + // e.g. 11 bits, bit reverse and shift away 5 + return stbi__bitreverse16(v) >> (16-bits); +} + +static int stbi__zbuild_huffman(stbi__zhuffman *z, const stbi_uc *sizelist, int num) +{ + int i,k=0; + int code, next_code[16], sizes[17]; + + // DEFLATE spec for generating codes + memset(sizes, 0, sizeof(sizes)); + memset(z->fast, 0, sizeof(z->fast)); + for (i=0; i < num; ++i) + ++sizes[sizelist[i]]; + sizes[0] = 0; + for (i=1; i < 16; ++i) + if (sizes[i] > (1 << i)) + return stbi__err("bad sizes", "Corrupt PNG"); + code = 0; + for (i=1; i < 16; ++i) { + next_code[i] = code; + z->firstcode[i] = (stbi__uint16) code; + z->firstsymbol[i] = (stbi__uint16) k; + code = (code + sizes[i]); + if (sizes[i]) + if (code-1 >= (1 << i)) return stbi__err("bad codelengths","Corrupt PNG"); + z->maxcode[i] = code << (16-i); // preshift for inner loop + code <<= 1; + k += sizes[i]; + } + z->maxcode[16] = 0x10000; // sentinel + for (i=0; i < num; ++i) { + int s = sizelist[i]; + if (s) { + int c = next_code[s] - z->firstcode[s] + z->firstsymbol[s]; + stbi__uint16 fastv = (stbi__uint16) ((s << 9) | i); + z->size [c] = (stbi_uc ) s; + z->value[c] = (stbi__uint16) i; + if (s <= STBI__ZFAST_BITS) { + int j = stbi__bit_reverse(next_code[s],s); + while (j < (1 << STBI__ZFAST_BITS)) { + z->fast[j] = fastv; + j += (1 << s); + } + } + ++next_code[s]; + } + } + return 1; +} + +// zlib-from-memory implementation for PNG reading +// because PNG allows splitting the zlib stream arbitrarily, +// and it's annoying structurally to have PNG call ZLIB call PNG, +// we require PNG read all the IDATs and combine them into a single +// memory buffer + +typedef struct +{ + stbi_uc *zbuffer, *zbuffer_end; + int num_bits; + stbi__uint32 code_buffer; + + char *zout; + char *zout_start; + char *zout_end; + int z_expandable; + + stbi__zhuffman z_length, z_distance; +} stbi__zbuf; + +stbi_inline static int stbi__zeof(stbi__zbuf *z) +{ + return (z->zbuffer >= z->zbuffer_end); +} + +stbi_inline static stbi_uc stbi__zget8(stbi__zbuf *z) +{ + return stbi__zeof(z) ? 0 : *z->zbuffer++; +} + +static void stbi__fill_bits(stbi__zbuf *z) +{ + do { + if (z->code_buffer >= (1U << z->num_bits)) { + z->zbuffer = z->zbuffer_end; /* treat this as EOF so we fail. */ + return; + } + z->code_buffer |= (unsigned int) stbi__zget8(z) << z->num_bits; + z->num_bits += 8; + } while (z->num_bits <= 24); +} + +stbi_inline static unsigned int stbi__zreceive(stbi__zbuf *z, int n) +{ + unsigned int k; + if (z->num_bits < n) stbi__fill_bits(z); + k = z->code_buffer & ((1 << n) - 1); + z->code_buffer >>= n; + z->num_bits -= n; + return k; +} + +static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z) +{ + int b,s,k; + // not resolved by fast table, so compute it the slow way + // use jpeg approach, which requires MSbits at top + k = stbi__bit_reverse(a->code_buffer, 16); + for (s=STBI__ZFAST_BITS+1; ; ++s) + if (k < z->maxcode[s]) + break; + if (s >= 16) return -1; // invalid code! + // code size is s, so: + b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s]; + if (b >= STBI__ZNSYMS) return -1; // some data was corrupt somewhere! + if (z->size[b] != s) return -1; // was originally an assert, but report failure instead. + a->code_buffer >>= s; + a->num_bits -= s; + return z->value[b]; +} + +stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z) +{ + int b,s; + if (a->num_bits < 16) { + if (stbi__zeof(a)) { + return -1; /* report error for unexpected end of data. */ + } + stbi__fill_bits(a); + } + b = z->fast[a->code_buffer & STBI__ZFAST_MASK]; + if (b) { + s = b >> 9; + a->code_buffer >>= s; + a->num_bits -= s; + return b & 511; + } + return stbi__zhuffman_decode_slowpath(a, z); +} + +static int stbi__zexpand(stbi__zbuf *z, char *zout, int n) // need to make room for n bytes +{ + char *q; + unsigned int cur, limit, old_limit; + z->zout = zout; + if (!z->z_expandable) return stbi__err("output buffer limit","Corrupt PNG"); + cur = (unsigned int) (z->zout - z->zout_start); + limit = old_limit = (unsigned) (z->zout_end - z->zout_start); + if (UINT_MAX - cur < (unsigned) n) return stbi__err("outofmem", "Out of memory"); + while (cur + n > limit) { + if(limit > UINT_MAX / 2) return stbi__err("outofmem", "Out of memory"); + limit *= 2; + } + q = (char *) STBI_REALLOC_SIZED(z->zout_start, old_limit, limit); + STBI_NOTUSED(old_limit); + if (q == NULL) return stbi__err("outofmem", "Out of memory"); + z->zout_start = q; + z->zout = q + cur; + z->zout_end = q + limit; + return 1; +} + +static const int stbi__zlength_base[31] = { + 3,4,5,6,7,8,9,10,11,13, + 15,17,19,23,27,31,35,43,51,59, + 67,83,99,115,131,163,195,227,258,0,0 }; + +static const int stbi__zlength_extra[31]= +{ 0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 }; + +static const int stbi__zdist_base[32] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193, +257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0}; + +static const int stbi__zdist_extra[32] = +{ 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; + +static int stbi__parse_huffman_block(stbi__zbuf *a) +{ + char *zout = a->zout; + for(;;) { + int z = stbi__zhuffman_decode(a, &a->z_length); + if (z < 256) { + if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); // error in huffman codes + if (zout >= a->zout_end) { + if (!stbi__zexpand(a, zout, 1)) return 0; + zout = a->zout; + } + *zout++ = (char) z; + } else { + stbi_uc *p; + int len,dist; + if (z == 256) { + a->zout = zout; + return 1; + } + z -= 257; + len = stbi__zlength_base[z]; + if (stbi__zlength_extra[z]) len += stbi__zreceive(a, stbi__zlength_extra[z]); + z = stbi__zhuffman_decode(a, &a->z_distance); + if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); + dist = stbi__zdist_base[z]; + if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]); + if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG"); + if (zout + len > a->zout_end) { + if (!stbi__zexpand(a, zout, len)) return 0; + zout = a->zout; + } + p = (stbi_uc *) (zout - dist); + if (dist == 1) { // run of one byte; common in images. + stbi_uc v = *p; + if (len) { do *zout++ = v; while (--len); } + } else { + if (len) { do *zout++ = *p++; while (--len); } + } + } + } +} + +static int stbi__compute_huffman_codes(stbi__zbuf *a) +{ + static const stbi_uc length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 }; + stbi__zhuffman z_codelength; + stbi_uc lencodes[286+32+137];//padding for maximum single op + stbi_uc codelength_sizes[19]; + int i,n; + + int hlit = stbi__zreceive(a,5) + 257; + int hdist = stbi__zreceive(a,5) + 1; + int hclen = stbi__zreceive(a,4) + 4; + int ntot = hlit + hdist; + + memset(codelength_sizes, 0, sizeof(codelength_sizes)); + for (i=0; i < hclen; ++i) { + int s = stbi__zreceive(a,3); + codelength_sizes[length_dezigzag[i]] = (stbi_uc) s; + } + if (!stbi__zbuild_huffman(&z_codelength, codelength_sizes, 19)) return 0; + + n = 0; + while (n < ntot) { + int c = stbi__zhuffman_decode(a, &z_codelength); + if (c < 0 || c >= 19) return stbi__err("bad codelengths", "Corrupt PNG"); + if (c < 16) + lencodes[n++] = (stbi_uc) c; + else { + stbi_uc fill = 0; + if (c == 16) { + c = stbi__zreceive(a,2)+3; + if (n == 0) return stbi__err("bad codelengths", "Corrupt PNG"); + fill = lencodes[n-1]; + } else if (c == 17) { + c = stbi__zreceive(a,3)+3; + } else if (c == 18) { + c = stbi__zreceive(a,7)+11; + } else { + return stbi__err("bad codelengths", "Corrupt PNG"); + } + if (ntot - n < c) return stbi__err("bad codelengths", "Corrupt PNG"); + memset(lencodes+n, fill, c); + n += c; + } + } + if (n != ntot) return stbi__err("bad codelengths","Corrupt PNG"); + if (!stbi__zbuild_huffman(&a->z_length, lencodes, hlit)) return 0; + if (!stbi__zbuild_huffman(&a->z_distance, lencodes+hlit, hdist)) return 0; + return 1; +} + +static int stbi__parse_uncompressed_block(stbi__zbuf *a) +{ + stbi_uc header[4]; + int len,nlen,k; + if (a->num_bits & 7) + stbi__zreceive(a, a->num_bits & 7); // discard + // drain the bit-packed data into header + k = 0; + while (a->num_bits > 0) { + header[k++] = (stbi_uc) (a->code_buffer & 255); // suppress MSVC run-time check + a->code_buffer >>= 8; + a->num_bits -= 8; + } + if (a->num_bits < 0) return stbi__err("zlib corrupt","Corrupt PNG"); + // now fill header the normal way + while (k < 4) + header[k++] = stbi__zget8(a); + len = header[1] * 256 + header[0]; + nlen = header[3] * 256 + header[2]; + if (nlen != (len ^ 0xffff)) return stbi__err("zlib corrupt","Corrupt PNG"); + if (a->zbuffer + len > a->zbuffer_end) return stbi__err("read past buffer","Corrupt PNG"); + if (a->zout + len > a->zout_end) + if (!stbi__zexpand(a, a->zout, len)) return 0; + memcpy(a->zout, a->zbuffer, len); + a->zbuffer += len; + a->zout += len; + return 1; +} + +static int stbi__parse_zlib_header(stbi__zbuf *a) +{ + int cmf = stbi__zget8(a); + int cm = cmf & 15; + /* int cinfo = cmf >> 4; */ + int flg = stbi__zget8(a); + if (stbi__zeof(a)) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec + if ((cmf*256+flg) % 31 != 0) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec + if (flg & 32) return stbi__err("no preset dict","Corrupt PNG"); // preset dictionary not allowed in png + if (cm != 8) return stbi__err("bad compression","Corrupt PNG"); // DEFLATE required for png + // window = 1 << (8 + cinfo)... but who cares, we fully buffer output + return 1; +} + +static const stbi_uc stbi__zdefault_length[STBI__ZNSYMS] = +{ + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, + 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, + 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, + 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, 7,7,7,7,7,7,7,7,8,8,8,8,8,8,8,8 +}; +static const stbi_uc stbi__zdefault_distance[32] = +{ + 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +}; +/* +Init algorithm: +{ + int i; // use <= to match clearly with spec + for (i=0; i <= 143; ++i) stbi__zdefault_length[i] = 8; + for ( ; i <= 255; ++i) stbi__zdefault_length[i] = 9; + for ( ; i <= 279; ++i) stbi__zdefault_length[i] = 7; + for ( ; i <= 287; ++i) stbi__zdefault_length[i] = 8; + + for (i=0; i <= 31; ++i) stbi__zdefault_distance[i] = 5; +} +*/ + +static int stbi__parse_zlib(stbi__zbuf *a, int parse_header) +{ + int final, type; + if (parse_header) + if (!stbi__parse_zlib_header(a)) return 0; + a->num_bits = 0; + a->code_buffer = 0; + do { + final = stbi__zreceive(a,1); + type = stbi__zreceive(a,2); + if (type == 0) { + if (!stbi__parse_uncompressed_block(a)) return 0; + } else if (type == 3) { + return 0; + } else { + if (type == 1) { + // use fixed code lengths + if (!stbi__zbuild_huffman(&a->z_length , stbi__zdefault_length , STBI__ZNSYMS)) return 0; + if (!stbi__zbuild_huffman(&a->z_distance, stbi__zdefault_distance, 32)) return 0; + } else { + if (!stbi__compute_huffman_codes(a)) return 0; + } + if (!stbi__parse_huffman_block(a)) return 0; + } + } while (!final); + return 1; +} + +static int stbi__do_zlib(stbi__zbuf *a, char *obuf, int olen, int exp, int parse_header) +{ + a->zout_start = obuf; + a->zout = obuf; + a->zout_end = obuf + olen; + a->z_expandable = exp; + + return stbi__parse_zlib(a, parse_header); +} + +STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen) +{ + stbi__zbuf a; + char *p = (char *) stbi__malloc(initial_size); + if (p == NULL) return NULL; + a.zbuffer = (stbi_uc *) buffer; + a.zbuffer_end = (stbi_uc *) buffer + len; + if (stbi__do_zlib(&a, p, initial_size, 1, 1)) { + if (outlen) *outlen = (int) (a.zout - a.zout_start); + return a.zout_start; + } else { + STBI_FREE(a.zout_start); + return NULL; + } +} + +STBIDEF char *stbi_zlib_decode_malloc(char const *buffer, int len, int *outlen) +{ + return stbi_zlib_decode_malloc_guesssize(buffer, len, 16384, outlen); +} + +STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header) +{ + stbi__zbuf a; + char *p = (char *) stbi__malloc(initial_size); + if (p == NULL) return NULL; + a.zbuffer = (stbi_uc *) buffer; + a.zbuffer_end = (stbi_uc *) buffer + len; + if (stbi__do_zlib(&a, p, initial_size, 1, parse_header)) { + if (outlen) *outlen = (int) (a.zout - a.zout_start); + return a.zout_start; + } else { + STBI_FREE(a.zout_start); + return NULL; + } +} + +STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, char const *ibuffer, int ilen) +{ + stbi__zbuf a; + a.zbuffer = (stbi_uc *) ibuffer; + a.zbuffer_end = (stbi_uc *) ibuffer + ilen; + if (stbi__do_zlib(&a, obuffer, olen, 0, 1)) + return (int) (a.zout - a.zout_start); + else + return -1; +} + +STBIDEF char *stbi_zlib_decode_noheader_malloc(char const *buffer, int len, int *outlen) +{ + stbi__zbuf a; + char *p = (char *) stbi__malloc(16384); + if (p == NULL) return NULL; + a.zbuffer = (stbi_uc *) buffer; + a.zbuffer_end = (stbi_uc *) buffer+len; + if (stbi__do_zlib(&a, p, 16384, 1, 0)) { + if (outlen) *outlen = (int) (a.zout - a.zout_start); + return a.zout_start; + } else { + STBI_FREE(a.zout_start); + return NULL; + } +} + +STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen) +{ + stbi__zbuf a; + a.zbuffer = (stbi_uc *) ibuffer; + a.zbuffer_end = (stbi_uc *) ibuffer + ilen; + if (stbi__do_zlib(&a, obuffer, olen, 0, 0)) + return (int) (a.zout - a.zout_start); + else + return -1; +} +#endif + +// public domain "baseline" PNG decoder v0.10 Sean Barrett 2006-11-18 +// simple implementation +// - only 8-bit samples +// - no CRC checking +// - allocates lots of intermediate memory +// - avoids problem of streaming data between subsystems +// - avoids explicit window management +// performance +// - uses stb_zlib, a PD zlib implementation with fast huffman decoding + +#ifndef STBI_NO_PNG +typedef struct +{ + stbi__uint32 length; + stbi__uint32 type; +} stbi__pngchunk; + +static stbi__pngchunk stbi__get_chunk_header(stbi__context *s) +{ + stbi__pngchunk c; + c.length = stbi__get32be(s); + c.type = stbi__get32be(s); + return c; +} + +static int stbi__check_png_header(stbi__context *s) +{ + static const stbi_uc png_sig[8] = { 137,80,78,71,13,10,26,10 }; + int i; + for (i=0; i < 8; ++i) + if (stbi__get8(s) != png_sig[i]) return stbi__err("bad png sig","Not a PNG"); + return 1; +} + +typedef struct +{ + stbi__context *s; + stbi_uc *idata, *expanded, *out; + int depth; +} stbi__png; + + +enum { + STBI__F_none=0, + STBI__F_sub=1, + STBI__F_up=2, + STBI__F_avg=3, + STBI__F_paeth=4, + // synthetic filters used for first scanline to avoid needing a dummy row of 0s + STBI__F_avg_first, + STBI__F_paeth_first +}; + +static stbi_uc first_row_filter[5] = +{ + STBI__F_none, + STBI__F_sub, + STBI__F_none, + STBI__F_avg_first, + STBI__F_paeth_first +}; + +static int stbi__paeth(int a, int b, int c) +{ + int p = a + b - c; + int pa = abs(p-a); + int pb = abs(p-b); + int pc = abs(p-c); + if (pa <= pb && pa <= pc) return a; + if (pb <= pc) return b; + return c; +} + +static const stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 }; + +// create the png data from post-deflated data +static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color) +{ + int bytes = (depth == 16? 2 : 1); + stbi__context *s = a->s; + stbi__uint32 i,j,stride = x*out_n*bytes; + stbi__uint32 img_len, img_width_bytes; + int k; + int img_n = s->img_n; // copy it into a local for later + + int output_bytes = out_n*bytes; + int filter_bytes = img_n*bytes; + int width = x; + + STBI_ASSERT(out_n == s->img_n || out_n == s->img_n+1); + a->out = (stbi_uc *) stbi__malloc_mad3(x, y, output_bytes, 0); // extra bytes to write off the end into + if (!a->out) return stbi__err("outofmem", "Out of memory"); + + if (!stbi__mad3sizes_valid(img_n, x, depth, 7)) return stbi__err("too large", "Corrupt PNG"); + img_width_bytes = (((img_n * x * depth) + 7) >> 3); + img_len = (img_width_bytes + 1) * y; + + // we used to check for exact match between raw_len and img_len on non-interlaced PNGs, + // but issue #276 reported a PNG in the wild that had extra data at the end (all zeros), + // so just check for raw_len < img_len always. + if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG"); + + for (j=0; j < y; ++j) { + stbi_uc *cur = a->out + stride*j; + stbi_uc *prior; + int filter = *raw++; + + if (filter > 4) + return stbi__err("invalid filter","Corrupt PNG"); + + if (depth < 8) { + if (img_width_bytes > x) return stbi__err("invalid width","Corrupt PNG"); + cur += x*out_n - img_width_bytes; // store output to the rightmost img_len bytes, so we can decode in place + filter_bytes = 1; + width = img_width_bytes; + } + prior = cur - stride; // bugfix: need to compute this after 'cur +=' computation above + + // if first row, use special filter that doesn't sample previous row + if (j == 0) filter = first_row_filter[filter]; + + // handle first byte explicitly + for (k=0; k < filter_bytes; ++k) { + switch (filter) { + case STBI__F_none : cur[k] = raw[k]; break; + case STBI__F_sub : cur[k] = raw[k]; break; + case STBI__F_up : cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break; + case STBI__F_avg : cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1)); break; + case STBI__F_paeth : cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(0,prior[k],0)); break; + case STBI__F_avg_first : cur[k] = raw[k]; break; + case STBI__F_paeth_first: cur[k] = raw[k]; break; + } + } + + if (depth == 8) { + if (img_n != out_n) + cur[img_n] = 255; // first pixel + raw += img_n; + cur += out_n; + prior += out_n; + } else if (depth == 16) { + if (img_n != out_n) { + cur[filter_bytes] = 255; // first pixel top byte + cur[filter_bytes+1] = 255; // first pixel bottom byte + } + raw += filter_bytes; + cur += output_bytes; + prior += output_bytes; + } else { + raw += 1; + cur += 1; + prior += 1; + } + + // this is a little gross, so that we don't switch per-pixel or per-component + if (depth < 8 || img_n == out_n) { + int nk = (width - 1)*filter_bytes; + #define STBI__CASE(f) \ + case f: \ + for (k=0; k < nk; ++k) + switch (filter) { + // "none" filter turns into a memcpy here; make that explicit. + case STBI__F_none: memcpy(cur, raw, nk); break; + STBI__CASE(STBI__F_sub) { cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); } break; + STBI__CASE(STBI__F_up) { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break; + STBI__CASE(STBI__F_avg) { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); } break; + STBI__CASE(STBI__F_paeth) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],prior[k],prior[k-filter_bytes])); } break; + STBI__CASE(STBI__F_avg_first) { cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); } break; + STBI__CASE(STBI__F_paeth_first) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],0,0)); } break; + } + #undef STBI__CASE + raw += nk; + } else { + STBI_ASSERT(img_n+1 == out_n); + #define STBI__CASE(f) \ + case f: \ + for (i=x-1; i >= 1; --i, cur[filter_bytes]=255,raw+=filter_bytes,cur+=output_bytes,prior+=output_bytes) \ + for (k=0; k < filter_bytes; ++k) + switch (filter) { + STBI__CASE(STBI__F_none) { cur[k] = raw[k]; } break; + STBI__CASE(STBI__F_sub) { cur[k] = STBI__BYTECAST(raw[k] + cur[k- output_bytes]); } break; + STBI__CASE(STBI__F_up) { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break; + STBI__CASE(STBI__F_avg) { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k- output_bytes])>>1)); } break; + STBI__CASE(STBI__F_paeth) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],prior[k],prior[k- output_bytes])); } break; + STBI__CASE(STBI__F_avg_first) { cur[k] = STBI__BYTECAST(raw[k] + (cur[k- output_bytes] >> 1)); } break; + STBI__CASE(STBI__F_paeth_first) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],0,0)); } break; + } + #undef STBI__CASE + + // the loop above sets the high byte of the pixels' alpha, but for + // 16 bit png files we also need the low byte set. we'll do that here. + if (depth == 16) { + cur = a->out + stride*j; // start at the beginning of the row again + for (i=0; i < x; ++i,cur+=output_bytes) { + cur[filter_bytes+1] = 255; + } + } + } + } + + // we make a separate pass to expand bits to pixels; for performance, + // this could run two scanlines behind the above code, so it won't + // intefere with filtering but will still be in the cache. + if (depth < 8) { + for (j=0; j < y; ++j) { + stbi_uc *cur = a->out + stride*j; + stbi_uc *in = a->out + stride*j + x*out_n - img_width_bytes; + // unpack 1/2/4-bit into a 8-bit buffer. allows us to keep the common 8-bit path optimal at minimal cost for 1/2/4-bit + // png guarante byte alignment, if width is not multiple of 8/4/2 we'll decode dummy trailing data that will be skipped in the later loop + stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range + + // note that the final byte might overshoot and write more data than desired. + // we can allocate enough data that this never writes out of memory, but it + // could also overwrite the next scanline. can it overwrite non-empty data + // on the next scanline? yes, consider 1-pixel-wide scanlines with 1-bit-per-pixel. + // so we need to explicitly clamp the final ones + + if (depth == 4) { + for (k=x*img_n; k >= 2; k-=2, ++in) { + *cur++ = scale * ((*in >> 4) ); + *cur++ = scale * ((*in ) & 0x0f); + } + if (k > 0) *cur++ = scale * ((*in >> 4) ); + } else if (depth == 2) { + for (k=x*img_n; k >= 4; k-=4, ++in) { + *cur++ = scale * ((*in >> 6) ); + *cur++ = scale * ((*in >> 4) & 0x03); + *cur++ = scale * ((*in >> 2) & 0x03); + *cur++ = scale * ((*in ) & 0x03); + } + if (k > 0) *cur++ = scale * ((*in >> 6) ); + if (k > 1) *cur++ = scale * ((*in >> 4) & 0x03); + if (k > 2) *cur++ = scale * ((*in >> 2) & 0x03); + } else if (depth == 1) { + for (k=x*img_n; k >= 8; k-=8, ++in) { + *cur++ = scale * ((*in >> 7) ); + *cur++ = scale * ((*in >> 6) & 0x01); + *cur++ = scale * ((*in >> 5) & 0x01); + *cur++ = scale * ((*in >> 4) & 0x01); + *cur++ = scale * ((*in >> 3) & 0x01); + *cur++ = scale * ((*in >> 2) & 0x01); + *cur++ = scale * ((*in >> 1) & 0x01); + *cur++ = scale * ((*in ) & 0x01); + } + if (k > 0) *cur++ = scale * ((*in >> 7) ); + if (k > 1) *cur++ = scale * ((*in >> 6) & 0x01); + if (k > 2) *cur++ = scale * ((*in >> 5) & 0x01); + if (k > 3) *cur++ = scale * ((*in >> 4) & 0x01); + if (k > 4) *cur++ = scale * ((*in >> 3) & 0x01); + if (k > 5) *cur++ = scale * ((*in >> 2) & 0x01); + if (k > 6) *cur++ = scale * ((*in >> 1) & 0x01); + } + if (img_n != out_n) { + int q; + // insert alpha = 255 + cur = a->out + stride*j; + if (img_n == 1) { + for (q=x-1; q >= 0; --q) { + cur[q*2+1] = 255; + cur[q*2+0] = cur[q]; + } + } else { + STBI_ASSERT(img_n == 3); + for (q=x-1; q >= 0; --q) { + cur[q*4+3] = 255; + cur[q*4+2] = cur[q*3+2]; + cur[q*4+1] = cur[q*3+1]; + cur[q*4+0] = cur[q*3+0]; + } + } + } + } + } else if (depth == 16) { + // force the image data from big-endian to platform-native. + // this is done in a separate pass due to the decoding relying + // on the data being untouched, but could probably be done + // per-line during decode if care is taken. + stbi_uc *cur = a->out; + stbi__uint16 *cur16 = (stbi__uint16*)cur; + + for(i=0; i < x*y*out_n; ++i,cur16++,cur+=2) { + *cur16 = (cur[0] << 8) | cur[1]; + } + } + + return 1; +} + +static int stbi__create_png_image(stbi__png *a, stbi_uc *image_data, stbi__uint32 image_data_len, int out_n, int depth, int color, int interlaced) +{ + int bytes = (depth == 16 ? 2 : 1); + int out_bytes = out_n * bytes; + stbi_uc *final; + int p; + if (!interlaced) + return stbi__create_png_image_raw(a, image_data, image_data_len, out_n, a->s->img_x, a->s->img_y, depth, color); + + // de-interlacing + final = (stbi_uc *) stbi__malloc_mad3(a->s->img_x, a->s->img_y, out_bytes, 0); + if (!final) return stbi__err("outofmem", "Out of memory"); + for (p=0; p < 7; ++p) { + int xorig[] = { 0,4,0,2,0,1,0 }; + int yorig[] = { 0,0,4,0,2,0,1 }; + int xspc[] = { 8,8,4,4,2,2,1 }; + int yspc[] = { 8,8,8,4,4,2,2 }; + int i,j,x,y; + // pass1_x[4] = 0, pass1_x[5] = 1, pass1_x[12] = 1 + x = (a->s->img_x - xorig[p] + xspc[p]-1) / xspc[p]; + y = (a->s->img_y - yorig[p] + yspc[p]-1) / yspc[p]; + if (x && y) { + stbi__uint32 img_len = ((((a->s->img_n * x * depth) + 7) >> 3) + 1) * y; + if (!stbi__create_png_image_raw(a, image_data, image_data_len, out_n, x, y, depth, color)) { + STBI_FREE(final); + return 0; + } + for (j=0; j < y; ++j) { + for (i=0; i < x; ++i) { + int out_y = j*yspc[p]+yorig[p]; + int out_x = i*xspc[p]+xorig[p]; + memcpy(final + out_y*a->s->img_x*out_bytes + out_x*out_bytes, + a->out + (j*x+i)*out_bytes, out_bytes); + } + } + STBI_FREE(a->out); + image_data += img_len; + image_data_len -= img_len; + } + } + a->out = final; + + return 1; +} + +static int stbi__compute_transparency(stbi__png *z, stbi_uc tc[3], int out_n) +{ + stbi__context *s = z->s; + stbi__uint32 i, pixel_count = s->img_x * s->img_y; + stbi_uc *p = z->out; + + // compute color-based transparency, assuming we've + // already got 255 as the alpha value in the output + STBI_ASSERT(out_n == 2 || out_n == 4); + + if (out_n == 2) { + for (i=0; i < pixel_count; ++i) { + p[1] = (p[0] == tc[0] ? 0 : 255); + p += 2; + } + } else { + for (i=0; i < pixel_count; ++i) { + if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2]) + p[3] = 0; + p += 4; + } + } + return 1; +} + +static int stbi__compute_transparency16(stbi__png *z, stbi__uint16 tc[3], int out_n) +{ + stbi__context *s = z->s; + stbi__uint32 i, pixel_count = s->img_x * s->img_y; + stbi__uint16 *p = (stbi__uint16*) z->out; + + // compute color-based transparency, assuming we've + // already got 65535 as the alpha value in the output + STBI_ASSERT(out_n == 2 || out_n == 4); + + if (out_n == 2) { + for (i = 0; i < pixel_count; ++i) { + p[1] = (p[0] == tc[0] ? 0 : 65535); + p += 2; + } + } else { + for (i = 0; i < pixel_count; ++i) { + if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2]) + p[3] = 0; + p += 4; + } + } + return 1; +} + +static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int pal_img_n) +{ + stbi__uint32 i, pixel_count = a->s->img_x * a->s->img_y; + stbi_uc *p, *temp_out, *orig = a->out; + + p = (stbi_uc *) stbi__malloc_mad2(pixel_count, pal_img_n, 0); + if (p == NULL) return stbi__err("outofmem", "Out of memory"); + + // between here and free(out) below, exitting would leak + temp_out = p; + + if (pal_img_n == 3) { + for (i=0; i < pixel_count; ++i) { + int n = orig[i]*4; + p[0] = palette[n ]; + p[1] = palette[n+1]; + p[2] = palette[n+2]; + p += 3; + } + } else { + for (i=0; i < pixel_count; ++i) { + int n = orig[i]*4; + p[0] = palette[n ]; + p[1] = palette[n+1]; + p[2] = palette[n+2]; + p[3] = palette[n+3]; + p += 4; + } + } + STBI_FREE(a->out); + a->out = temp_out; + + STBI_NOTUSED(len); + + return 1; +} + +static int stbi__unpremultiply_on_load_global = 0; +static int stbi__de_iphone_flag_global = 0; + +STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply) +{ + stbi__unpremultiply_on_load_global = flag_true_if_should_unpremultiply; +} + +STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert) +{ + stbi__de_iphone_flag_global = flag_true_if_should_convert; +} + +#ifndef STBI_THREAD_LOCAL +#define stbi__unpremultiply_on_load stbi__unpremultiply_on_load_global +#define stbi__de_iphone_flag stbi__de_iphone_flag_global +#else +static STBI_THREAD_LOCAL int stbi__unpremultiply_on_load_local, stbi__unpremultiply_on_load_set; +static STBI_THREAD_LOCAL int stbi__de_iphone_flag_local, stbi__de_iphone_flag_set; + +STBIDEF void stbi__unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply) +{ + stbi__unpremultiply_on_load_local = flag_true_if_should_unpremultiply; + stbi__unpremultiply_on_load_set = 1; +} + +STBIDEF void stbi_convert_iphone_png_to_rgb_thread(int flag_true_if_should_convert) +{ + stbi__de_iphone_flag_local = flag_true_if_should_convert; + stbi__de_iphone_flag_set = 1; +} + +#define stbi__unpremultiply_on_load (stbi__unpremultiply_on_load_set \ + ? stbi__unpremultiply_on_load_local \ + : stbi__unpremultiply_on_load_global) +#define stbi__de_iphone_flag (stbi__de_iphone_flag_set \ + ? stbi__de_iphone_flag_local \ + : stbi__de_iphone_flag_global) +#endif // STBI_THREAD_LOCAL + +static void stbi__de_iphone(stbi__png *z) +{ + stbi__context *s = z->s; + stbi__uint32 i, pixel_count = s->img_x * s->img_y; + stbi_uc *p = z->out; + + if (s->img_out_n == 3) { // convert bgr to rgb + for (i=0; i < pixel_count; ++i) { + stbi_uc t = p[0]; + p[0] = p[2]; + p[2] = t; + p += 3; + } + } else { + STBI_ASSERT(s->img_out_n == 4); + if (stbi__unpremultiply_on_load) { + // convert bgr to rgb and unpremultiply + for (i=0; i < pixel_count; ++i) { + stbi_uc a = p[3]; + stbi_uc t = p[0]; + if (a) { + stbi_uc half = a / 2; + p[0] = (p[2] * 255 + half) / a; + p[1] = (p[1] * 255 + half) / a; + p[2] = ( t * 255 + half) / a; + } else { + p[0] = p[2]; + p[2] = t; + } + p += 4; + } + } else { + // convert bgr to rgb + for (i=0; i < pixel_count; ++i) { + stbi_uc t = p[0]; + p[0] = p[2]; + p[2] = t; + p += 4; + } + } + } +} + +#define STBI__PNG_TYPE(a,b,c,d) (((unsigned) (a) << 24) + ((unsigned) (b) << 16) + ((unsigned) (c) << 8) + (unsigned) (d)) + +static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp) +{ + stbi_uc palette[1024], pal_img_n=0; + stbi_uc has_trans=0, tc[3]={0}; + stbi__uint16 tc16[3]; + stbi__uint32 ioff=0, idata_limit=0, i, pal_len=0; + int first=1,k,interlace=0, color=0, is_iphone=0; + stbi__context *s = z->s; + + z->expanded = NULL; + z->idata = NULL; + z->out = NULL; + + if (!stbi__check_png_header(s)) return 0; + + if (scan == STBI__SCAN_type) return 1; + + for (;;) { + stbi__pngchunk c = stbi__get_chunk_header(s); + switch (c.type) { + case STBI__PNG_TYPE('C','g','B','I'): + is_iphone = 1; + stbi__skip(s, c.length); + break; + case STBI__PNG_TYPE('I','H','D','R'): { + int comp,filter; + if (!first) return stbi__err("multiple IHDR","Corrupt PNG"); + first = 0; + if (c.length != 13) return stbi__err("bad IHDR len","Corrupt PNG"); + s->img_x = stbi__get32be(s); + s->img_y = stbi__get32be(s); + if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); + if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); + z->depth = stbi__get8(s); if (z->depth != 1 && z->depth != 2 && z->depth != 4 && z->depth != 8 && z->depth != 16) return stbi__err("1/2/4/8/16-bit only","PNG not supported: 1/2/4/8/16-bit only"); + color = stbi__get8(s); if (color > 6) return stbi__err("bad ctype","Corrupt PNG"); + if (color == 3 && z->depth == 16) return stbi__err("bad ctype","Corrupt PNG"); + if (color == 3) pal_img_n = 3; else if (color & 1) return stbi__err("bad ctype","Corrupt PNG"); + comp = stbi__get8(s); if (comp) return stbi__err("bad comp method","Corrupt PNG"); + filter= stbi__get8(s); if (filter) return stbi__err("bad filter method","Corrupt PNG"); + interlace = stbi__get8(s); if (interlace>1) return stbi__err("bad interlace method","Corrupt PNG"); + if (!s->img_x || !s->img_y) return stbi__err("0-pixel image","Corrupt PNG"); + if (!pal_img_n) { + s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0); + if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode"); + if (scan == STBI__SCAN_header) return 1; + } else { + // if paletted, then pal_n is our final components, and + // img_n is # components to decompress/filter. + s->img_n = 1; + if ((1 << 30) / s->img_x / 4 < s->img_y) return stbi__err("too large","Corrupt PNG"); + // if SCAN_header, have to scan to see if we have a tRNS + } + break; + } + + case STBI__PNG_TYPE('P','L','T','E'): { + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (c.length > 256*3) return stbi__err("invalid PLTE","Corrupt PNG"); + pal_len = c.length / 3; + if (pal_len * 3 != c.length) return stbi__err("invalid PLTE","Corrupt PNG"); + for (i=0; i < pal_len; ++i) { + palette[i*4+0] = stbi__get8(s); + palette[i*4+1] = stbi__get8(s); + palette[i*4+2] = stbi__get8(s); + palette[i*4+3] = 255; + } + break; + } + + case STBI__PNG_TYPE('t','R','N','S'): { + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (z->idata) return stbi__err("tRNS after IDAT","Corrupt PNG"); + if (pal_img_n) { + if (scan == STBI__SCAN_header) { s->img_n = 4; return 1; } + if (pal_len == 0) return stbi__err("tRNS before PLTE","Corrupt PNG"); + if (c.length > pal_len) return stbi__err("bad tRNS len","Corrupt PNG"); + pal_img_n = 4; + for (i=0; i < c.length; ++i) + palette[i*4+3] = stbi__get8(s); + } else { + if (!(s->img_n & 1)) return stbi__err("tRNS with alpha","Corrupt PNG"); + if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG"); + has_trans = 1; + if (z->depth == 16) { + for (k = 0; k < s->img_n; ++k) tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is + } else { + for (k = 0; k < s->img_n; ++k) tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger + } + } + break; + } + + case STBI__PNG_TYPE('I','D','A','T'): { + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG"); + if (scan == STBI__SCAN_header) { s->img_n = pal_img_n; return 1; } + if ((int)(ioff + c.length) < (int)ioff) return 0; + if (ioff + c.length > idata_limit) { + stbi__uint32 idata_limit_old = idata_limit; + stbi_uc *p; + if (idata_limit == 0) idata_limit = c.length > 4096 ? c.length : 4096; + while (ioff + c.length > idata_limit) + idata_limit *= 2; + STBI_NOTUSED(idata_limit_old); + p = (stbi_uc *) STBI_REALLOC_SIZED(z->idata, idata_limit_old, idata_limit); if (p == NULL) return stbi__err("outofmem", "Out of memory"); + z->idata = p; + } + if (!stbi__getn(s, z->idata+ioff,c.length)) return stbi__err("outofdata","Corrupt PNG"); + ioff += c.length; + break; + } + + case STBI__PNG_TYPE('I','E','N','D'): { + stbi__uint32 raw_len, bpl; + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (scan != STBI__SCAN_load) return 1; + if (z->idata == NULL) return stbi__err("no IDAT","Corrupt PNG"); + // initial guess for decoded data size to avoid unnecessary reallocs + bpl = (s->img_x * z->depth + 7) / 8; // bytes per line, per component + raw_len = bpl * s->img_y * s->img_n /* pixels */ + s->img_y /* filter mode per row */; + z->expanded = (stbi_uc *) stbi_zlib_decode_malloc_guesssize_headerflag((char *) z->idata, ioff, raw_len, (int *) &raw_len, !is_iphone); + if (z->expanded == NULL) return 0; // zlib should set error + STBI_FREE(z->idata); z->idata = NULL; + if ((req_comp == s->img_n+1 && req_comp != 3 && !pal_img_n) || has_trans) + s->img_out_n = s->img_n+1; + else + s->img_out_n = s->img_n; + if (!stbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, z->depth, color, interlace)) return 0; + if (has_trans) { + if (z->depth == 16) { + if (!stbi__compute_transparency16(z, tc16, s->img_out_n)) return 0; + } else { + if (!stbi__compute_transparency(z, tc, s->img_out_n)) return 0; + } + } + if (is_iphone && stbi__de_iphone_flag && s->img_out_n > 2) + stbi__de_iphone(z); + if (pal_img_n) { + // pal_img_n == 3 or 4 + s->img_n = pal_img_n; // record the actual colors we had + s->img_out_n = pal_img_n; + if (req_comp >= 3) s->img_out_n = req_comp; + if (!stbi__expand_png_palette(z, palette, pal_len, s->img_out_n)) + return 0; + } else if (has_trans) { + // non-paletted image with tRNS -> source image has (constant) alpha + ++s->img_n; + } + STBI_FREE(z->expanded); z->expanded = NULL; + // end of PNG chunk, read and skip CRC + stbi__get32be(s); + return 1; + } + + default: + // if critical, fail + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if ((c.type & (1 << 29)) == 0) { + #ifndef STBI_NO_FAILURE_STRINGS + // not threadsafe + static char invalid_chunk[] = "XXXX PNG chunk not known"; + invalid_chunk[0] = STBI__BYTECAST(c.type >> 24); + invalid_chunk[1] = STBI__BYTECAST(c.type >> 16); + invalid_chunk[2] = STBI__BYTECAST(c.type >> 8); + invalid_chunk[3] = STBI__BYTECAST(c.type >> 0); + #endif + return stbi__err(invalid_chunk, "PNG not supported: unknown PNG chunk type"); + } + stbi__skip(s, c.length); + break; + } + // end of PNG chunk, read and skip CRC + stbi__get32be(s); + } +} + +static void *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req_comp, stbi__result_info *ri) +{ + void *result=NULL; + if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); + if (stbi__parse_png_file(p, STBI__SCAN_load, req_comp)) { + if (p->depth <= 8) + ri->bits_per_channel = 8; + else if (p->depth == 16) + ri->bits_per_channel = 16; + else + return stbi__errpuc("bad bits_per_channel", "PNG not supported: unsupported color depth"); + result = p->out; + p->out = NULL; + if (req_comp && req_comp != p->s->img_out_n) { + if (ri->bits_per_channel == 8) + result = stbi__convert_format((unsigned char *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y); + else + result = stbi__convert_format16((stbi__uint16 *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y); + p->s->img_out_n = req_comp; + if (result == NULL) return result; + } + *x = p->s->img_x; + *y = p->s->img_y; + if (n) *n = p->s->img_n; + } + STBI_FREE(p->out); p->out = NULL; + STBI_FREE(p->expanded); p->expanded = NULL; + STBI_FREE(p->idata); p->idata = NULL; + + return result; +} + +static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + stbi__png p; + p.s = s; + return stbi__do_png(&p, x,y,comp,req_comp, ri); +} + +static int stbi__png_test(stbi__context *s) +{ + int r; + r = stbi__check_png_header(s); + stbi__rewind(s); + return r; +} + +static int stbi__png_info_raw(stbi__png *p, int *x, int *y, int *comp) +{ + if (!stbi__parse_png_file(p, STBI__SCAN_header, 0)) { + stbi__rewind( p->s ); + return 0; + } + if (x) *x = p->s->img_x; + if (y) *y = p->s->img_y; + if (comp) *comp = p->s->img_n; + return 1; +} + +static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp) +{ + stbi__png p; + p.s = s; + return stbi__png_info_raw(&p, x, y, comp); +} + +static int stbi__png_is16(stbi__context *s) +{ + stbi__png p; + p.s = s; + if (!stbi__png_info_raw(&p, NULL, NULL, NULL)) + return 0; + if (p.depth != 16) { + stbi__rewind(p.s); + return 0; + } + return 1; +} +#endif + +// Microsoft/Windows BMP image + +#ifndef STBI_NO_BMP +static int stbi__bmp_test_raw(stbi__context *s) +{ + int r; + int sz; + if (stbi__get8(s) != 'B') return 0; + if (stbi__get8(s) != 'M') return 0; + stbi__get32le(s); // discard filesize + stbi__get16le(s); // discard reserved + stbi__get16le(s); // discard reserved + stbi__get32le(s); // discard data offset + sz = stbi__get32le(s); + r = (sz == 12 || sz == 40 || sz == 56 || sz == 108 || sz == 124); + return r; +} + +static int stbi__bmp_test(stbi__context *s) +{ + int r = stbi__bmp_test_raw(s); + stbi__rewind(s); + return r; +} + + +// returns 0..31 for the highest set bit +static int stbi__high_bit(unsigned int z) +{ + int n=0; + if (z == 0) return -1; + if (z >= 0x10000) { n += 16; z >>= 16; } + if (z >= 0x00100) { n += 8; z >>= 8; } + if (z >= 0x00010) { n += 4; z >>= 4; } + if (z >= 0x00004) { n += 2; z >>= 2; } + if (z >= 0x00002) { n += 1;/* >>= 1;*/ } + return n; +} + +static int stbi__bitcount(unsigned int a) +{ + a = (a & 0x55555555) + ((a >> 1) & 0x55555555); // max 2 + a = (a & 0x33333333) + ((a >> 2) & 0x33333333); // max 4 + a = (a + (a >> 4)) & 0x0f0f0f0f; // max 8 per 4, now 8 bits + a = (a + (a >> 8)); // max 16 per 8 bits + a = (a + (a >> 16)); // max 32 per 8 bits + return a & 0xff; +} + +// extract an arbitrarily-aligned N-bit value (N=bits) +// from v, and then make it 8-bits long and fractionally +// extend it to full full range. +static int stbi__shiftsigned(unsigned int v, int shift, int bits) +{ + static unsigned int mul_table[9] = { + 0, + 0xff/*0b11111111*/, 0x55/*0b01010101*/, 0x49/*0b01001001*/, 0x11/*0b00010001*/, + 0x21/*0b00100001*/, 0x41/*0b01000001*/, 0x81/*0b10000001*/, 0x01/*0b00000001*/, + }; + static unsigned int shift_table[9] = { + 0, 0,0,1,0,2,4,6,0, + }; + if (shift < 0) + v <<= -shift; + else + v >>= shift; + STBI_ASSERT(v < 256); + v >>= (8-bits); + STBI_ASSERT(bits >= 0 && bits <= 8); + return (int) ((unsigned) v * mul_table[bits]) >> shift_table[bits]; +} + +typedef struct +{ + int bpp, offset, hsz; + unsigned int mr,mg,mb,ma, all_a; + int extra_read; +} stbi__bmp_data; + +static int stbi__bmp_set_mask_defaults(stbi__bmp_data *info, int compress) +{ + // BI_BITFIELDS specifies masks explicitly, don't override + if (compress == 3) + return 1; + + if (compress == 0) { + if (info->bpp == 16) { + info->mr = 31u << 10; + info->mg = 31u << 5; + info->mb = 31u << 0; + } else if (info->bpp == 32) { + info->mr = 0xffu << 16; + info->mg = 0xffu << 8; + info->mb = 0xffu << 0; + info->ma = 0xffu << 24; + info->all_a = 0; // if all_a is 0 at end, then we loaded alpha channel but it was all 0 + } else { + // otherwise, use defaults, which is all-0 + info->mr = info->mg = info->mb = info->ma = 0; + } + return 1; + } + return 0; // error +} + +static void *stbi__bmp_parse_header(stbi__context *s, stbi__bmp_data *info) +{ + int hsz; + if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') return stbi__errpuc("not BMP", "Corrupt BMP"); + stbi__get32le(s); // discard filesize + stbi__get16le(s); // discard reserved + stbi__get16le(s); // discard reserved + info->offset = stbi__get32le(s); + info->hsz = hsz = stbi__get32le(s); + info->mr = info->mg = info->mb = info->ma = 0; + info->extra_read = 14; + + if (info->offset < 0) return stbi__errpuc("bad BMP", "bad BMP"); + + if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) return stbi__errpuc("unknown BMP", "BMP type not supported: unknown"); + if (hsz == 12) { + s->img_x = stbi__get16le(s); + s->img_y = stbi__get16le(s); + } else { + s->img_x = stbi__get32le(s); + s->img_y = stbi__get32le(s); + } + if (stbi__get16le(s) != 1) return stbi__errpuc("bad BMP", "bad BMP"); + info->bpp = stbi__get16le(s); + if (hsz != 12) { + int compress = stbi__get32le(s); + if (compress == 1 || compress == 2) return stbi__errpuc("BMP RLE", "BMP type not supported: RLE"); + if (compress >= 4) return stbi__errpuc("BMP JPEG/PNG", "BMP type not supported: unsupported compression"); // this includes PNG/JPEG modes + if (compress == 3 && info->bpp != 16 && info->bpp != 32) return stbi__errpuc("bad BMP", "bad BMP"); // bitfields requires 16 or 32 bits/pixel + stbi__get32le(s); // discard sizeof + stbi__get32le(s); // discard hres + stbi__get32le(s); // discard vres + stbi__get32le(s); // discard colorsused + stbi__get32le(s); // discard max important + if (hsz == 40 || hsz == 56) { + if (hsz == 56) { + stbi__get32le(s); + stbi__get32le(s); + stbi__get32le(s); + stbi__get32le(s); + } + if (info->bpp == 16 || info->bpp == 32) { + if (compress == 0) { + stbi__bmp_set_mask_defaults(info, compress); + } else if (compress == 3) { + info->mr = stbi__get32le(s); + info->mg = stbi__get32le(s); + info->mb = stbi__get32le(s); + info->extra_read += 12; + // not documented, but generated by photoshop and handled by mspaint + if (info->mr == info->mg && info->mg == info->mb) { + // ?!?!? + return stbi__errpuc("bad BMP", "bad BMP"); + } + } else + return stbi__errpuc("bad BMP", "bad BMP"); + } + } else { + // V4/V5 header + int i; + if (hsz != 108 && hsz != 124) + return stbi__errpuc("bad BMP", "bad BMP"); + info->mr = stbi__get32le(s); + info->mg = stbi__get32le(s); + info->mb = stbi__get32le(s); + info->ma = stbi__get32le(s); + if (compress != 3) // override mr/mg/mb unless in BI_BITFIELDS mode, as per docs + stbi__bmp_set_mask_defaults(info, compress); + stbi__get32le(s); // discard color space + for (i=0; i < 12; ++i) + stbi__get32le(s); // discard color space parameters + if (hsz == 124) { + stbi__get32le(s); // discard rendering intent + stbi__get32le(s); // discard offset of profile data + stbi__get32le(s); // discard size of profile data + stbi__get32le(s); // discard reserved + } + } + } + return (void *) 1; +} + + +static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + stbi_uc *out; + unsigned int mr=0,mg=0,mb=0,ma=0, all_a; + stbi_uc pal[256][4]; + int psize=0,i,j,width; + int flip_vertically, pad, target; + stbi__bmp_data info; + STBI_NOTUSED(ri); + + info.all_a = 255; + if (stbi__bmp_parse_header(s, &info) == NULL) + return NULL; // error code already set + + flip_vertically = ((int) s->img_y) > 0; + s->img_y = abs((int) s->img_y); + + if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + + mr = info.mr; + mg = info.mg; + mb = info.mb; + ma = info.ma; + all_a = info.all_a; + + if (info.hsz == 12) { + if (info.bpp < 24) + psize = (info.offset - info.extra_read - 24) / 3; + } else { + if (info.bpp < 16) + psize = (info.offset - info.extra_read - info.hsz) >> 2; + } + if (psize == 0) { + if (info.offset != s->callback_already_read + (s->img_buffer - s->img_buffer_original)) { + return stbi__errpuc("bad offset", "Corrupt BMP"); + } + } + + if (info.bpp == 24 && ma == 0xff000000) + s->img_n = 3; + else + s->img_n = ma ? 4 : 3; + if (req_comp && req_comp >= 3) // we can directly decode 3 or 4 + target = req_comp; + else + target = s->img_n; // if they want monochrome, we'll post-convert + + // sanity-check size + if (!stbi__mad3sizes_valid(target, s->img_x, s->img_y, 0)) + return stbi__errpuc("too large", "Corrupt BMP"); + + out = (stbi_uc *) stbi__malloc_mad3(target, s->img_x, s->img_y, 0); + if (!out) return stbi__errpuc("outofmem", "Out of memory"); + if (info.bpp < 16) { + int z=0; + if (psize == 0 || psize > 256) { STBI_FREE(out); return stbi__errpuc("invalid", "Corrupt BMP"); } + for (i=0; i < psize; ++i) { + pal[i][2] = stbi__get8(s); + pal[i][1] = stbi__get8(s); + pal[i][0] = stbi__get8(s); + if (info.hsz != 12) stbi__get8(s); + pal[i][3] = 255; + } + stbi__skip(s, info.offset - info.extra_read - info.hsz - psize * (info.hsz == 12 ? 3 : 4)); + if (info.bpp == 1) width = (s->img_x + 7) >> 3; + else if (info.bpp == 4) width = (s->img_x + 1) >> 1; + else if (info.bpp == 8) width = s->img_x; + else { STBI_FREE(out); return stbi__errpuc("bad bpp", "Corrupt BMP"); } + pad = (-width)&3; + if (info.bpp == 1) { + for (j=0; j < (int) s->img_y; ++j) { + int bit_offset = 7, v = stbi__get8(s); + for (i=0; i < (int) s->img_x; ++i) { + int color = (v>>bit_offset)&0x1; + out[z++] = pal[color][0]; + out[z++] = pal[color][1]; + out[z++] = pal[color][2]; + if (target == 4) out[z++] = 255; + if (i+1 == (int) s->img_x) break; + if((--bit_offset) < 0) { + bit_offset = 7; + v = stbi__get8(s); + } + } + stbi__skip(s, pad); + } + } else { + for (j=0; j < (int) s->img_y; ++j) { + for (i=0; i < (int) s->img_x; i += 2) { + int v=stbi__get8(s),v2=0; + if (info.bpp == 4) { + v2 = v & 15; + v >>= 4; + } + out[z++] = pal[v][0]; + out[z++] = pal[v][1]; + out[z++] = pal[v][2]; + if (target == 4) out[z++] = 255; + if (i+1 == (int) s->img_x) break; + v = (info.bpp == 8) ? stbi__get8(s) : v2; + out[z++] = pal[v][0]; + out[z++] = pal[v][1]; + out[z++] = pal[v][2]; + if (target == 4) out[z++] = 255; + } + stbi__skip(s, pad); + } + } + } else { + int rshift=0,gshift=0,bshift=0,ashift=0,rcount=0,gcount=0,bcount=0,acount=0; + int z = 0; + int easy=0; + stbi__skip(s, info.offset - info.extra_read - info.hsz); + if (info.bpp == 24) width = 3 * s->img_x; + else if (info.bpp == 16) width = 2*s->img_x; + else /* bpp = 32 and pad = 0 */ width=0; + pad = (-width) & 3; + if (info.bpp == 24) { + easy = 1; + } else if (info.bpp == 32) { + if (mb == 0xff && mg == 0xff00 && mr == 0x00ff0000 && ma == 0xff000000) + easy = 2; + } + if (!easy) { + if (!mr || !mg || !mb) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); } + // right shift amt to put high bit in position #7 + rshift = stbi__high_bit(mr)-7; rcount = stbi__bitcount(mr); + gshift = stbi__high_bit(mg)-7; gcount = stbi__bitcount(mg); + bshift = stbi__high_bit(mb)-7; bcount = stbi__bitcount(mb); + ashift = stbi__high_bit(ma)-7; acount = stbi__bitcount(ma); + if (rcount > 8 || gcount > 8 || bcount > 8 || acount > 8) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); } + } + for (j=0; j < (int) s->img_y; ++j) { + if (easy) { + for (i=0; i < (int) s->img_x; ++i) { + unsigned char a; + out[z+2] = stbi__get8(s); + out[z+1] = stbi__get8(s); + out[z+0] = stbi__get8(s); + z += 3; + a = (easy == 2 ? stbi__get8(s) : 255); + all_a |= a; + if (target == 4) out[z++] = a; + } + } else { + int bpp = info.bpp; + for (i=0; i < (int) s->img_x; ++i) { + stbi__uint32 v = (bpp == 16 ? (stbi__uint32) stbi__get16le(s) : stbi__get32le(s)); + unsigned int a; + out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mr, rshift, rcount)); + out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mg, gshift, gcount)); + out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mb, bshift, bcount)); + a = (ma ? stbi__shiftsigned(v & ma, ashift, acount) : 255); + all_a |= a; + if (target == 4) out[z++] = STBI__BYTECAST(a); + } + } + stbi__skip(s, pad); + } + } + + // if alpha channel is all 0s, replace with all 255s + if (target == 4 && all_a == 0) + for (i=4*s->img_x*s->img_y-1; i >= 0; i -= 4) + out[i] = 255; + + if (flip_vertically) { + stbi_uc t; + for (j=0; j < (int) s->img_y>>1; ++j) { + stbi_uc *p1 = out + j *s->img_x*target; + stbi_uc *p2 = out + (s->img_y-1-j)*s->img_x*target; + for (i=0; i < (int) s->img_x*target; ++i) { + t = p1[i]; p1[i] = p2[i]; p2[i] = t; + } + } + } + + if (req_comp && req_comp != target) { + out = stbi__convert_format(out, target, req_comp, s->img_x, s->img_y); + if (out == NULL) return out; // stbi__convert_format frees input on failure + } + + *x = s->img_x; + *y = s->img_y; + if (comp) *comp = s->img_n; + return out; +} +#endif + +// Targa Truevision - TGA +// by Jonathan Dummer +#ifndef STBI_NO_TGA +// returns STBI_rgb or whatever, 0 on error +static int stbi__tga_get_comp(int bits_per_pixel, int is_grey, int* is_rgb16) +{ + // only RGB or RGBA (incl. 16bit) or grey allowed + if (is_rgb16) *is_rgb16 = 0; + switch(bits_per_pixel) { + case 8: return STBI_grey; + case 16: if(is_grey) return STBI_grey_alpha; + // fallthrough + case 15: if(is_rgb16) *is_rgb16 = 1; + return STBI_rgb; + case 24: // fallthrough + case 32: return bits_per_pixel/8; + default: return 0; + } +} + +static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp) +{ + int tga_w, tga_h, tga_comp, tga_image_type, tga_bits_per_pixel, tga_colormap_bpp; + int sz, tga_colormap_type; + stbi__get8(s); // discard Offset + tga_colormap_type = stbi__get8(s); // colormap type + if( tga_colormap_type > 1 ) { + stbi__rewind(s); + return 0; // only RGB or indexed allowed + } + tga_image_type = stbi__get8(s); // image type + if ( tga_colormap_type == 1 ) { // colormapped (paletted) image + if (tga_image_type != 1 && tga_image_type != 9) { + stbi__rewind(s); + return 0; + } + stbi__skip(s,4); // skip index of first colormap entry and number of entries + sz = stbi__get8(s); // check bits per palette color entry + if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) { + stbi__rewind(s); + return 0; + } + stbi__skip(s,4); // skip image x and y origin + tga_colormap_bpp = sz; + } else { // "normal" image w/o colormap - only RGB or grey allowed, +/- RLE + if ( (tga_image_type != 2) && (tga_image_type != 3) && (tga_image_type != 10) && (tga_image_type != 11) ) { + stbi__rewind(s); + return 0; // only RGB or grey allowed, +/- RLE + } + stbi__skip(s,9); // skip colormap specification and image x/y origin + tga_colormap_bpp = 0; + } + tga_w = stbi__get16le(s); + if( tga_w < 1 ) { + stbi__rewind(s); + return 0; // test width + } + tga_h = stbi__get16le(s); + if( tga_h < 1 ) { + stbi__rewind(s); + return 0; // test height + } + tga_bits_per_pixel = stbi__get8(s); // bits per pixel + stbi__get8(s); // ignore alpha bits + if (tga_colormap_bpp != 0) { + if((tga_bits_per_pixel != 8) && (tga_bits_per_pixel != 16)) { + // when using a colormap, tga_bits_per_pixel is the size of the indexes + // I don't think anything but 8 or 16bit indexes makes sense + stbi__rewind(s); + return 0; + } + tga_comp = stbi__tga_get_comp(tga_colormap_bpp, 0, NULL); + } else { + tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3) || (tga_image_type == 11), NULL); + } + if(!tga_comp) { + stbi__rewind(s); + return 0; + } + if (x) *x = tga_w; + if (y) *y = tga_h; + if (comp) *comp = tga_comp; + return 1; // seems to have passed everything +} + +static int stbi__tga_test(stbi__context *s) +{ + int res = 0; + int sz, tga_color_type; + stbi__get8(s); // discard Offset + tga_color_type = stbi__get8(s); // color type + if ( tga_color_type > 1 ) goto errorEnd; // only RGB or indexed allowed + sz = stbi__get8(s); // image type + if ( tga_color_type == 1 ) { // colormapped (paletted) image + if (sz != 1 && sz != 9) goto errorEnd; // colortype 1 demands image type 1 or 9 + stbi__skip(s,4); // skip index of first colormap entry and number of entries + sz = stbi__get8(s); // check bits per palette color entry + if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd; + stbi__skip(s,4); // skip image x and y origin + } else { // "normal" image w/o colormap + if ( (sz != 2) && (sz != 3) && (sz != 10) && (sz != 11) ) goto errorEnd; // only RGB or grey allowed, +/- RLE + stbi__skip(s,9); // skip colormap specification and image x/y origin + } + if ( stbi__get16le(s) < 1 ) goto errorEnd; // test width + if ( stbi__get16le(s) < 1 ) goto errorEnd; // test height + sz = stbi__get8(s); // bits per pixel + if ( (tga_color_type == 1) && (sz != 8) && (sz != 16) ) goto errorEnd; // for colormapped images, bpp is size of an index + if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd; + + res = 1; // if we got this far, everything's good and we can return 1 instead of 0 + +errorEnd: + stbi__rewind(s); + return res; +} + +// read 16bit value and convert to 24bit RGB +static void stbi__tga_read_rgb16(stbi__context *s, stbi_uc* out) +{ + stbi__uint16 px = (stbi__uint16)stbi__get16le(s); + stbi__uint16 fiveBitMask = 31; + // we have 3 channels with 5bits each + int r = (px >> 10) & fiveBitMask; + int g = (px >> 5) & fiveBitMask; + int b = px & fiveBitMask; + // Note that this saves the data in RGB(A) order, so it doesn't need to be swapped later + out[0] = (stbi_uc)((r * 255)/31); + out[1] = (stbi_uc)((g * 255)/31); + out[2] = (stbi_uc)((b * 255)/31); + + // some people claim that the most significant bit might be used for alpha + // (possibly if an alpha-bit is set in the "image descriptor byte") + // but that only made 16bit test images completely translucent.. + // so let's treat all 15 and 16bit TGAs as RGB with no alpha. +} + +static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + // read in the TGA header stuff + int tga_offset = stbi__get8(s); + int tga_indexed = stbi__get8(s); + int tga_image_type = stbi__get8(s); + int tga_is_RLE = 0; + int tga_palette_start = stbi__get16le(s); + int tga_palette_len = stbi__get16le(s); + int tga_palette_bits = stbi__get8(s); + int tga_x_origin = stbi__get16le(s); + int tga_y_origin = stbi__get16le(s); + int tga_width = stbi__get16le(s); + int tga_height = stbi__get16le(s); + int tga_bits_per_pixel = stbi__get8(s); + int tga_comp, tga_rgb16=0; + int tga_inverted = stbi__get8(s); + // int tga_alpha_bits = tga_inverted & 15; // the 4 lowest bits - unused (useless?) + // image data + unsigned char *tga_data; + unsigned char *tga_palette = NULL; + int i, j; + unsigned char raw_data[4] = {0}; + int RLE_count = 0; + int RLE_repeating = 0; + int read_next_pixel = 1; + STBI_NOTUSED(ri); + STBI_NOTUSED(tga_x_origin); // @TODO + STBI_NOTUSED(tga_y_origin); // @TODO + + if (tga_height > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + if (tga_width > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + + // do a tiny bit of precessing + if ( tga_image_type >= 8 ) + { + tga_image_type -= 8; + tga_is_RLE = 1; + } + tga_inverted = 1 - ((tga_inverted >> 5) & 1); + + // If I'm paletted, then I'll use the number of bits from the palette + if ( tga_indexed ) tga_comp = stbi__tga_get_comp(tga_palette_bits, 0, &tga_rgb16); + else tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3), &tga_rgb16); + + if(!tga_comp) // shouldn't really happen, stbi__tga_test() should have ensured basic consistency + return stbi__errpuc("bad format", "Can't find out TGA pixelformat"); + + // tga info + *x = tga_width; + *y = tga_height; + if (comp) *comp = tga_comp; + + if (!stbi__mad3sizes_valid(tga_width, tga_height, tga_comp, 0)) + return stbi__errpuc("too large", "Corrupt TGA"); + + tga_data = (unsigned char*)stbi__malloc_mad3(tga_width, tga_height, tga_comp, 0); + if (!tga_data) return stbi__errpuc("outofmem", "Out of memory"); + + // skip to the data's starting position (offset usually = 0) + stbi__skip(s, tga_offset ); + + if ( !tga_indexed && !tga_is_RLE && !tga_rgb16 ) { + for (i=0; i < tga_height; ++i) { + int row = tga_inverted ? tga_height -i - 1 : i; + stbi_uc *tga_row = tga_data + row*tga_width*tga_comp; + stbi__getn(s, tga_row, tga_width * tga_comp); + } + } else { + // do I need to load a palette? + if ( tga_indexed) + { + if (tga_palette_len == 0) { /* you have to have at least one entry! */ + STBI_FREE(tga_data); + return stbi__errpuc("bad palette", "Corrupt TGA"); + } + + // any data to skip? (offset usually = 0) + stbi__skip(s, tga_palette_start ); + // load the palette + tga_palette = (unsigned char*)stbi__malloc_mad2(tga_palette_len, tga_comp, 0); + if (!tga_palette) { + STBI_FREE(tga_data); + return stbi__errpuc("outofmem", "Out of memory"); + } + if (tga_rgb16) { + stbi_uc *pal_entry = tga_palette; + STBI_ASSERT(tga_comp == STBI_rgb); + for (i=0; i < tga_palette_len; ++i) { + stbi__tga_read_rgb16(s, pal_entry); + pal_entry += tga_comp; + } + } else if (!stbi__getn(s, tga_palette, tga_palette_len * tga_comp)) { + STBI_FREE(tga_data); + STBI_FREE(tga_palette); + return stbi__errpuc("bad palette", "Corrupt TGA"); + } + } + // load the data + for (i=0; i < tga_width * tga_height; ++i) + { + // if I'm in RLE mode, do I need to get a RLE stbi__pngchunk? + if ( tga_is_RLE ) + { + if ( RLE_count == 0 ) + { + // yep, get the next byte as a RLE command + int RLE_cmd = stbi__get8(s); + RLE_count = 1 + (RLE_cmd & 127); + RLE_repeating = RLE_cmd >> 7; + read_next_pixel = 1; + } else if ( !RLE_repeating ) + { + read_next_pixel = 1; + } + } else + { + read_next_pixel = 1; + } + // OK, if I need to read a pixel, do it now + if ( read_next_pixel ) + { + // load however much data we did have + if ( tga_indexed ) + { + // read in index, then perform the lookup + int pal_idx = (tga_bits_per_pixel == 8) ? stbi__get8(s) : stbi__get16le(s); + if ( pal_idx >= tga_palette_len ) { + // invalid index + pal_idx = 0; + } + pal_idx *= tga_comp; + for (j = 0; j < tga_comp; ++j) { + raw_data[j] = tga_palette[pal_idx+j]; + } + } else if(tga_rgb16) { + STBI_ASSERT(tga_comp == STBI_rgb); + stbi__tga_read_rgb16(s, raw_data); + } else { + // read in the data raw + for (j = 0; j < tga_comp; ++j) { + raw_data[j] = stbi__get8(s); + } + } + // clear the reading flag for the next pixel + read_next_pixel = 0; + } // end of reading a pixel + + // copy data + for (j = 0; j < tga_comp; ++j) + tga_data[i*tga_comp+j] = raw_data[j]; + + // in case we're in RLE mode, keep counting down + --RLE_count; + } + // do I need to invert the image? + if ( tga_inverted ) + { + for (j = 0; j*2 < tga_height; ++j) + { + int index1 = j * tga_width * tga_comp; + int index2 = (tga_height - 1 - j) * tga_width * tga_comp; + for (i = tga_width * tga_comp; i > 0; --i) + { + unsigned char temp = tga_data[index1]; + tga_data[index1] = tga_data[index2]; + tga_data[index2] = temp; + ++index1; + ++index2; + } + } + } + // clear my palette, if I had one + if ( tga_palette != NULL ) + { + STBI_FREE( tga_palette ); + } + } + + // swap RGB - if the source data was RGB16, it already is in the right order + if (tga_comp >= 3 && !tga_rgb16) + { + unsigned char* tga_pixel = tga_data; + for (i=0; i < tga_width * tga_height; ++i) + { + unsigned char temp = tga_pixel[0]; + tga_pixel[0] = tga_pixel[2]; + tga_pixel[2] = temp; + tga_pixel += tga_comp; + } + } + + // convert to target component count + if (req_comp && req_comp != tga_comp) + tga_data = stbi__convert_format(tga_data, tga_comp, req_comp, tga_width, tga_height); + + // the things I do to get rid of an error message, and yet keep + // Microsoft's C compilers happy... [8^( + tga_palette_start = tga_palette_len = tga_palette_bits = + tga_x_origin = tga_y_origin = 0; + STBI_NOTUSED(tga_palette_start); + // OK, done + return tga_data; +} +#endif + +// ************************************************************************************************* +// Photoshop PSD loader -- PD by Thatcher Ulrich, integration by Nicolas Schulz, tweaked by STB + +#ifndef STBI_NO_PSD +static int stbi__psd_test(stbi__context *s) +{ + int r = (stbi__get32be(s) == 0x38425053); + stbi__rewind(s); + return r; +} + +static int stbi__psd_decode_rle(stbi__context *s, stbi_uc *p, int pixelCount) +{ + int count, nleft, len; + + count = 0; + while ((nleft = pixelCount - count) > 0) { + len = stbi__get8(s); + if (len == 128) { + // No-op. + } else if (len < 128) { + // Copy next len+1 bytes literally. + len++; + if (len > nleft) return 0; // corrupt data + count += len; + while (len) { + *p = stbi__get8(s); + p += 4; + len--; + } + } else if (len > 128) { + stbi_uc val; + // Next -len+1 bytes in the dest are replicated from next source byte. + // (Interpret len as a negative 8-bit int.) + len = 257 - len; + if (len > nleft) return 0; // corrupt data + val = stbi__get8(s); + count += len; + while (len) { + *p = val; + p += 4; + len--; + } + } + } + + return 1; +} + +static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc) +{ + int pixelCount; + int channelCount, compression; + int channel, i; + int bitdepth; + int w,h; + stbi_uc *out; + STBI_NOTUSED(ri); + + // Check identifier + if (stbi__get32be(s) != 0x38425053) // "8BPS" + return stbi__errpuc("not PSD", "Corrupt PSD image"); + + // Check file type version. + if (stbi__get16be(s) != 1) + return stbi__errpuc("wrong version", "Unsupported version of PSD image"); + + // Skip 6 reserved bytes. + stbi__skip(s, 6 ); + + // Read the number of channels (R, G, B, A, etc). + channelCount = stbi__get16be(s); + if (channelCount < 0 || channelCount > 16) + return stbi__errpuc("wrong channel count", "Unsupported number of channels in PSD image"); + + // Read the rows and columns of the image. + h = stbi__get32be(s); + w = stbi__get32be(s); + + if (h > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + if (w > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + + // Make sure the depth is 8 bits. + bitdepth = stbi__get16be(s); + if (bitdepth != 8 && bitdepth != 16) + return stbi__errpuc("unsupported bit depth", "PSD bit depth is not 8 or 16 bit"); + + // Make sure the color mode is RGB. + // Valid options are: + // 0: Bitmap + // 1: Grayscale + // 2: Indexed color + // 3: RGB color + // 4: CMYK color + // 7: Multichannel + // 8: Duotone + // 9: Lab color + if (stbi__get16be(s) != 3) + return stbi__errpuc("wrong color format", "PSD is not in RGB color format"); + + // Skip the Mode Data. (It's the palette for indexed color; other info for other modes.) + stbi__skip(s,stbi__get32be(s) ); + + // Skip the image resources. (resolution, pen tool paths, etc) + stbi__skip(s, stbi__get32be(s) ); + + // Skip the reserved data. + stbi__skip(s, stbi__get32be(s) ); + + // Find out if the data is compressed. + // Known values: + // 0: no compression + // 1: RLE compressed + compression = stbi__get16be(s); + if (compression > 1) + return stbi__errpuc("bad compression", "PSD has an unknown compression format"); + + // Check size + if (!stbi__mad3sizes_valid(4, w, h, 0)) + return stbi__errpuc("too large", "Corrupt PSD"); + + // Create the destination image. + + if (!compression && bitdepth == 16 && bpc == 16) { + out = (stbi_uc *) stbi__malloc_mad3(8, w, h, 0); + ri->bits_per_channel = 16; + } else + out = (stbi_uc *) stbi__malloc(4 * w*h); + + if (!out) return stbi__errpuc("outofmem", "Out of memory"); + pixelCount = w*h; + + // Initialize the data to zero. + //memset( out, 0, pixelCount * 4 ); + + // Finally, the image data. + if (compression) { + // RLE as used by .PSD and .TIFF + // Loop until you get the number of unpacked bytes you are expecting: + // Read the next source byte into n. + // If n is between 0 and 127 inclusive, copy the next n+1 bytes literally. + // Else if n is between -127 and -1 inclusive, copy the next byte -n+1 times. + // Else if n is 128, noop. + // Endloop + + // The RLE-compressed data is preceded by a 2-byte data count for each row in the data, + // which we're going to just skip. + stbi__skip(s, h * channelCount * 2 ); + + // Read the RLE data by channel. + for (channel = 0; channel < 4; channel++) { + stbi_uc *p; + + p = out+channel; + if (channel >= channelCount) { + // Fill this channel with default data. + for (i = 0; i < pixelCount; i++, p += 4) + *p = (channel == 3 ? 255 : 0); + } else { + // Read the RLE data. + if (!stbi__psd_decode_rle(s, p, pixelCount)) { + STBI_FREE(out); + return stbi__errpuc("corrupt", "bad RLE data"); + } + } + } + + } else { + // We're at the raw image data. It's each channel in order (Red, Green, Blue, Alpha, ...) + // where each channel consists of an 8-bit (or 16-bit) value for each pixel in the image. + + // Read the data by channel. + for (channel = 0; channel < 4; channel++) { + if (channel >= channelCount) { + // Fill this channel with default data. + if (bitdepth == 16 && bpc == 16) { + stbi__uint16 *q = ((stbi__uint16 *) out) + channel; + stbi__uint16 val = channel == 3 ? 65535 : 0; + for (i = 0; i < pixelCount; i++, q += 4) + *q = val; + } else { + stbi_uc *p = out+channel; + stbi_uc val = channel == 3 ? 255 : 0; + for (i = 0; i < pixelCount; i++, p += 4) + *p = val; + } + } else { + if (ri->bits_per_channel == 16) { // output bpc + stbi__uint16 *q = ((stbi__uint16 *) out) + channel; + for (i = 0; i < pixelCount; i++, q += 4) + *q = (stbi__uint16) stbi__get16be(s); + } else { + stbi_uc *p = out+channel; + if (bitdepth == 16) { // input bpc + for (i = 0; i < pixelCount; i++, p += 4) + *p = (stbi_uc) (stbi__get16be(s) >> 8); + } else { + for (i = 0; i < pixelCount; i++, p += 4) + *p = stbi__get8(s); + } + } + } + } + } + + // remove weird white matte from PSD + if (channelCount >= 4) { + if (ri->bits_per_channel == 16) { + for (i=0; i < w*h; ++i) { + stbi__uint16 *pixel = (stbi__uint16 *) out + 4*i; + if (pixel[3] != 0 && pixel[3] != 65535) { + float a = pixel[3] / 65535.0f; + float ra = 1.0f / a; + float inv_a = 65535.0f * (1 - ra); + pixel[0] = (stbi__uint16) (pixel[0]*ra + inv_a); + pixel[1] = (stbi__uint16) (pixel[1]*ra + inv_a); + pixel[2] = (stbi__uint16) (pixel[2]*ra + inv_a); + } + } + } else { + for (i=0; i < w*h; ++i) { + unsigned char *pixel = out + 4*i; + if (pixel[3] != 0 && pixel[3] != 255) { + float a = pixel[3] / 255.0f; + float ra = 1.0f / a; + float inv_a = 255.0f * (1 - ra); + pixel[0] = (unsigned char) (pixel[0]*ra + inv_a); + pixel[1] = (unsigned char) (pixel[1]*ra + inv_a); + pixel[2] = (unsigned char) (pixel[2]*ra + inv_a); + } + } + } + } + + // convert to desired output format + if (req_comp && req_comp != 4) { + if (ri->bits_per_channel == 16) + out = (stbi_uc *) stbi__convert_format16((stbi__uint16 *) out, 4, req_comp, w, h); + else + out = stbi__convert_format(out, 4, req_comp, w, h); + if (out == NULL) return out; // stbi__convert_format frees input on failure + } + + if (comp) *comp = 4; + *y = h; + *x = w; + + return out; +} +#endif + +// ************************************************************************************************* +// Softimage PIC loader +// by Tom Seddon +// +// See http://softimage.wiki.softimage.com/index.php/INFO:_PIC_file_format +// See http://ozviz.wasp.uwa.edu.au/~pbourke/dataformats/softimagepic/ + +#ifndef STBI_NO_PIC +static int stbi__pic_is4(stbi__context *s,const char *str) +{ + int i; + for (i=0; i<4; ++i) + if (stbi__get8(s) != (stbi_uc)str[i]) + return 0; + + return 1; +} + +static int stbi__pic_test_core(stbi__context *s) +{ + int i; + + if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) + return 0; + + for(i=0;i<84;++i) + stbi__get8(s); + + if (!stbi__pic_is4(s,"PICT")) + return 0; + + return 1; +} + +typedef struct +{ + stbi_uc size,type,channel; +} stbi__pic_packet; + +static stbi_uc *stbi__readval(stbi__context *s, int channel, stbi_uc *dest) +{ + int mask=0x80, i; + + for (i=0; i<4; ++i, mask>>=1) { + if (channel & mask) { + if (stbi__at_eof(s)) return stbi__errpuc("bad file","PIC file too short"); + dest[i]=stbi__get8(s); + } + } + + return dest; +} + +static void stbi__copyval(int channel,stbi_uc *dest,const stbi_uc *src) +{ + int mask=0x80,i; + + for (i=0;i<4; ++i, mask>>=1) + if (channel&mask) + dest[i]=src[i]; +} + +static stbi_uc *stbi__pic_load_core(stbi__context *s,int width,int height,int *comp, stbi_uc *result) +{ + int act_comp=0,num_packets=0,y,chained; + stbi__pic_packet packets[10]; + + // this will (should...) cater for even some bizarre stuff like having data + // for the same channel in multiple packets. + do { + stbi__pic_packet *packet; + + if (num_packets==sizeof(packets)/sizeof(packets[0])) + return stbi__errpuc("bad format","too many packets"); + + packet = &packets[num_packets++]; + + chained = stbi__get8(s); + packet->size = stbi__get8(s); + packet->type = stbi__get8(s); + packet->channel = stbi__get8(s); + + act_comp |= packet->channel; + + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (reading packets)"); + if (packet->size != 8) return stbi__errpuc("bad format","packet isn't 8bpp"); + } while (chained); + + *comp = (act_comp & 0x10 ? 4 : 3); // has alpha channel? + + for(y=0; ytype) { + default: + return stbi__errpuc("bad format","packet has bad compression type"); + + case 0: {//uncompressed + int x; + + for(x=0;xchannel,dest)) + return 0; + break; + } + + case 1://Pure RLE + { + int left=width, i; + + while (left>0) { + stbi_uc count,value[4]; + + count=stbi__get8(s); + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pure read count)"); + + if (count > left) + count = (stbi_uc) left; + + if (!stbi__readval(s,packet->channel,value)) return 0; + + for(i=0; ichannel,dest,value); + left -= count; + } + } + break; + + case 2: {//Mixed RLE + int left=width; + while (left>0) { + int count = stbi__get8(s), i; + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (mixed read count)"); + + if (count >= 128) { // Repeated + stbi_uc value[4]; + + if (count==128) + count = stbi__get16be(s); + else + count -= 127; + if (count > left) + return stbi__errpuc("bad file","scanline overrun"); + + if (!stbi__readval(s,packet->channel,value)) + return 0; + + for(i=0;ichannel,dest,value); + } else { // Raw + ++count; + if (count>left) return stbi__errpuc("bad file","scanline overrun"); + + for(i=0;ichannel,dest)) + return 0; + } + left-=count; + } + break; + } + } + } + } + + return result; +} + +static void *stbi__pic_load(stbi__context *s,int *px,int *py,int *comp,int req_comp, stbi__result_info *ri) +{ + stbi_uc *result; + int i, x,y, internal_comp; + STBI_NOTUSED(ri); + + if (!comp) comp = &internal_comp; + + for (i=0; i<92; ++i) + stbi__get8(s); + + x = stbi__get16be(s); + y = stbi__get16be(s); + + if (y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + if (x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pic header)"); + if (!stbi__mad3sizes_valid(x, y, 4, 0)) return stbi__errpuc("too large", "PIC image too large to decode"); + + stbi__get32be(s); //skip `ratio' + stbi__get16be(s); //skip `fields' + stbi__get16be(s); //skip `pad' + + // intermediate buffer is RGBA + result = (stbi_uc *) stbi__malloc_mad3(x, y, 4, 0); + if (!result) return stbi__errpuc("outofmem", "Out of memory"); + memset(result, 0xff, x*y*4); + + if (!stbi__pic_load_core(s,x,y,comp, result)) { + STBI_FREE(result); + result=0; + } + *px = x; + *py = y; + if (req_comp == 0) req_comp = *comp; + result=stbi__convert_format(result,4,req_comp,x,y); + + return result; +} + +static int stbi__pic_test(stbi__context *s) +{ + int r = stbi__pic_test_core(s); + stbi__rewind(s); + return r; +} +#endif + +// ************************************************************************************************* +// GIF loader -- public domain by Jean-Marc Lienher -- simplified/shrunk by stb + +#ifndef STBI_NO_GIF +typedef struct +{ + stbi__int16 prefix; + stbi_uc first; + stbi_uc suffix; +} stbi__gif_lzw; + +typedef struct +{ + int w,h; + stbi_uc *out; // output buffer (always 4 components) + stbi_uc *background; // The current "background" as far as a gif is concerned + stbi_uc *history; + int flags, bgindex, ratio, transparent, eflags; + stbi_uc pal[256][4]; + stbi_uc lpal[256][4]; + stbi__gif_lzw codes[8192]; + stbi_uc *color_table; + int parse, step; + int lflags; + int start_x, start_y; + int max_x, max_y; + int cur_x, cur_y; + int line_size; + int delay; +} stbi__gif; + +static int stbi__gif_test_raw(stbi__context *s) +{ + int sz; + if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') return 0; + sz = stbi__get8(s); + if (sz != '9' && sz != '7') return 0; + if (stbi__get8(s) != 'a') return 0; + return 1; +} + +static int stbi__gif_test(stbi__context *s) +{ + int r = stbi__gif_test_raw(s); + stbi__rewind(s); + return r; +} + +static void stbi__gif_parse_colortable(stbi__context *s, stbi_uc pal[256][4], int num_entries, int transp) +{ + int i; + for (i=0; i < num_entries; ++i) { + pal[i][2] = stbi__get8(s); + pal[i][1] = stbi__get8(s); + pal[i][0] = stbi__get8(s); + pal[i][3] = transp == i ? 0 : 255; + } +} + +static int stbi__gif_header(stbi__context *s, stbi__gif *g, int *comp, int is_info) +{ + stbi_uc version; + if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') + return stbi__err("not GIF", "Corrupt GIF"); + + version = stbi__get8(s); + if (version != '7' && version != '9') return stbi__err("not GIF", "Corrupt GIF"); + if (stbi__get8(s) != 'a') return stbi__err("not GIF", "Corrupt GIF"); + + stbi__g_failure_reason = ""; + g->w = stbi__get16le(s); + g->h = stbi__get16le(s); + g->flags = stbi__get8(s); + g->bgindex = stbi__get8(s); + g->ratio = stbi__get8(s); + g->transparent = -1; + + if (g->w > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); + if (g->h > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); + + if (comp != 0) *comp = 4; // can't actually tell whether it's 3 or 4 until we parse the comments + + if (is_info) return 1; + + if (g->flags & 0x80) + stbi__gif_parse_colortable(s,g->pal, 2 << (g->flags & 7), -1); + + return 1; +} + +static int stbi__gif_info_raw(stbi__context *s, int *x, int *y, int *comp) +{ + stbi__gif* g = (stbi__gif*) stbi__malloc(sizeof(stbi__gif)); + if (!g) return stbi__err("outofmem", "Out of memory"); + if (!stbi__gif_header(s, g, comp, 1)) { + STBI_FREE(g); + stbi__rewind( s ); + return 0; + } + if (x) *x = g->w; + if (y) *y = g->h; + STBI_FREE(g); + return 1; +} + +static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code) +{ + stbi_uc *p, *c; + int idx; + + // recurse to decode the prefixes, since the linked-list is backwards, + // and working backwards through an interleaved image would be nasty + if (g->codes[code].prefix >= 0) + stbi__out_gif_code(g, g->codes[code].prefix); + + if (g->cur_y >= g->max_y) return; + + idx = g->cur_x + g->cur_y; + p = &g->out[idx]; + g->history[idx / 4] = 1; + + c = &g->color_table[g->codes[code].suffix * 4]; + if (c[3] > 128) { // don't render transparent pixels; + p[0] = c[2]; + p[1] = c[1]; + p[2] = c[0]; + p[3] = c[3]; + } + g->cur_x += 4; + + if (g->cur_x >= g->max_x) { + g->cur_x = g->start_x; + g->cur_y += g->step; + + while (g->cur_y >= g->max_y && g->parse > 0) { + g->step = (1 << g->parse) * g->line_size; + g->cur_y = g->start_y + (g->step >> 1); + --g->parse; + } + } +} + +static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g) +{ + stbi_uc lzw_cs; + stbi__int32 len, init_code; + stbi__uint32 first; + stbi__int32 codesize, codemask, avail, oldcode, bits, valid_bits, clear; + stbi__gif_lzw *p; + + lzw_cs = stbi__get8(s); + if (lzw_cs > 12) return NULL; + clear = 1 << lzw_cs; + first = 1; + codesize = lzw_cs + 1; + codemask = (1 << codesize) - 1; + bits = 0; + valid_bits = 0; + for (init_code = 0; init_code < clear; init_code++) { + g->codes[init_code].prefix = -1; + g->codes[init_code].first = (stbi_uc) init_code; + g->codes[init_code].suffix = (stbi_uc) init_code; + } + + // support no starting clear code + avail = clear+2; + oldcode = -1; + + len = 0; + for(;;) { + if (valid_bits < codesize) { + if (len == 0) { + len = stbi__get8(s); // start new block + if (len == 0) + return g->out; + } + --len; + bits |= (stbi__int32) stbi__get8(s) << valid_bits; + valid_bits += 8; + } else { + stbi__int32 code = bits & codemask; + bits >>= codesize; + valid_bits -= codesize; + // @OPTIMIZE: is there some way we can accelerate the non-clear path? + if (code == clear) { // clear code + codesize = lzw_cs + 1; + codemask = (1 << codesize) - 1; + avail = clear + 2; + oldcode = -1; + first = 0; + } else if (code == clear + 1) { // end of stream code + stbi__skip(s, len); + while ((len = stbi__get8(s)) > 0) + stbi__skip(s,len); + return g->out; + } else if (code <= avail) { + if (first) { + return stbi__errpuc("no clear code", "Corrupt GIF"); + } + + if (oldcode >= 0) { + p = &g->codes[avail++]; + if (avail > 8192) { + return stbi__errpuc("too many codes", "Corrupt GIF"); + } + + p->prefix = (stbi__int16) oldcode; + p->first = g->codes[oldcode].first; + p->suffix = (code == avail) ? p->first : g->codes[code].first; + } else if (code == avail) + return stbi__errpuc("illegal code in raster", "Corrupt GIF"); + + stbi__out_gif_code(g, (stbi__uint16) code); + + if ((avail & codemask) == 0 && avail <= 0x0FFF) { + codesize++; + codemask = (1 << codesize) - 1; + } + + oldcode = code; + } else { + return stbi__errpuc("illegal code in raster", "Corrupt GIF"); + } + } + } +} + +// this function is designed to support animated gifs, although stb_image doesn't support it +// two back is the image from two frames ago, used for a very specific disposal format +static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp, stbi_uc *two_back) +{ + int dispose; + int first_frame; + int pi; + int pcount; + STBI_NOTUSED(req_comp); + + // on first frame, any non-written pixels get the background colour (non-transparent) + first_frame = 0; + if (g->out == 0) { + if (!stbi__gif_header(s, g, comp,0)) return 0; // stbi__g_failure_reason set by stbi__gif_header + if (!stbi__mad3sizes_valid(4, g->w, g->h, 0)) + return stbi__errpuc("too large", "GIF image is too large"); + pcount = g->w * g->h; + g->out = (stbi_uc *) stbi__malloc(4 * pcount); + g->background = (stbi_uc *) stbi__malloc(4 * pcount); + g->history = (stbi_uc *) stbi__malloc(pcount); + if (!g->out || !g->background || !g->history) + return stbi__errpuc("outofmem", "Out of memory"); + + // image is treated as "transparent" at the start - ie, nothing overwrites the current background; + // background colour is only used for pixels that are not rendered first frame, after that "background" + // color refers to the color that was there the previous frame. + memset(g->out, 0x00, 4 * pcount); + memset(g->background, 0x00, 4 * pcount); // state of the background (starts transparent) + memset(g->history, 0x00, pcount); // pixels that were affected previous frame + first_frame = 1; + } else { + // second frame - how do we dispose of the previous one? + dispose = (g->eflags & 0x1C) >> 2; + pcount = g->w * g->h; + + if ((dispose == 3) && (two_back == 0)) { + dispose = 2; // if I don't have an image to revert back to, default to the old background + } + + if (dispose == 3) { // use previous graphic + for (pi = 0; pi < pcount; ++pi) { + if (g->history[pi]) { + memcpy( &g->out[pi * 4], &two_back[pi * 4], 4 ); + } + } + } else if (dispose == 2) { + // restore what was changed last frame to background before that frame; + for (pi = 0; pi < pcount; ++pi) { + if (g->history[pi]) { + memcpy( &g->out[pi * 4], &g->background[pi * 4], 4 ); + } + } + } else { + // This is a non-disposal case eithe way, so just + // leave the pixels as is, and they will become the new background + // 1: do not dispose + // 0: not specified. + } + + // background is what out is after the undoing of the previou frame; + memcpy( g->background, g->out, 4 * g->w * g->h ); + } + + // clear my history; + memset( g->history, 0x00, g->w * g->h ); // pixels that were affected previous frame + + for (;;) { + int tag = stbi__get8(s); + switch (tag) { + case 0x2C: /* Image Descriptor */ + { + stbi__int32 x, y, w, h; + stbi_uc *o; + + x = stbi__get16le(s); + y = stbi__get16le(s); + w = stbi__get16le(s); + h = stbi__get16le(s); + if (((x + w) > (g->w)) || ((y + h) > (g->h))) + return stbi__errpuc("bad Image Descriptor", "Corrupt GIF"); + + g->line_size = g->w * 4; + g->start_x = x * 4; + g->start_y = y * g->line_size; + g->max_x = g->start_x + w * 4; + g->max_y = g->start_y + h * g->line_size; + g->cur_x = g->start_x; + g->cur_y = g->start_y; + + // if the width of the specified rectangle is 0, that means + // we may not see *any* pixels or the image is malformed; + // to make sure this is caught, move the current y down to + // max_y (which is what out_gif_code checks). + if (w == 0) + g->cur_y = g->max_y; + + g->lflags = stbi__get8(s); + + if (g->lflags & 0x40) { + g->step = 8 * g->line_size; // first interlaced spacing + g->parse = 3; + } else { + g->step = g->line_size; + g->parse = 0; + } + + if (g->lflags & 0x80) { + stbi__gif_parse_colortable(s,g->lpal, 2 << (g->lflags & 7), g->eflags & 0x01 ? g->transparent : -1); + g->color_table = (stbi_uc *) g->lpal; + } else if (g->flags & 0x80) { + g->color_table = (stbi_uc *) g->pal; + } else + return stbi__errpuc("missing color table", "Corrupt GIF"); + + o = stbi__process_gif_raster(s, g); + if (!o) return NULL; + + // if this was the first frame, + pcount = g->w * g->h; + if (first_frame && (g->bgindex > 0)) { + // if first frame, any pixel not drawn to gets the background color + for (pi = 0; pi < pcount; ++pi) { + if (g->history[pi] == 0) { + g->pal[g->bgindex][3] = 255; // just in case it was made transparent, undo that; It will be reset next frame if need be; + memcpy( &g->out[pi * 4], &g->pal[g->bgindex], 4 ); + } + } + } + + return o; + } + + case 0x21: // Comment Extension. + { + int len; + int ext = stbi__get8(s); + if (ext == 0xF9) { // Graphic Control Extension. + len = stbi__get8(s); + if (len == 4) { + g->eflags = stbi__get8(s); + g->delay = 10 * stbi__get16le(s); // delay - 1/100th of a second, saving as 1/1000ths. + + // unset old transparent + if (g->transparent >= 0) { + g->pal[g->transparent][3] = 255; + } + if (g->eflags & 0x01) { + g->transparent = stbi__get8(s); + if (g->transparent >= 0) { + g->pal[g->transparent][3] = 0; + } + } else { + // don't need transparent + stbi__skip(s, 1); + g->transparent = -1; + } + } else { + stbi__skip(s, len); + break; + } + } + while ((len = stbi__get8(s)) != 0) { + stbi__skip(s, len); + } + break; + } + + case 0x3B: // gif stream termination code + return (stbi_uc *) s; // using '1' causes warning on some compilers + + default: + return stbi__errpuc("unknown code", "Corrupt GIF"); + } + } +} + +static void *stbi__load_gif_main_outofmem(stbi__gif *g, stbi_uc *out, int **delays) +{ + STBI_FREE(g->out); + STBI_FREE(g->history); + STBI_FREE(g->background); + + if (out) STBI_FREE(out); + if (delays && *delays) STBI_FREE(*delays); + return stbi__errpuc("outofmem", "Out of memory"); +} + +static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp) +{ + if (stbi__gif_test(s)) { + int layers = 0; + stbi_uc *u = 0; + stbi_uc *out = 0; + stbi_uc *two_back = 0; + stbi__gif g; + int stride; + int out_size = 0; + int delays_size = 0; + + STBI_NOTUSED(out_size); + STBI_NOTUSED(delays_size); + + memset(&g, 0, sizeof(g)); + if (delays) { + *delays = 0; + } + + do { + u = stbi__gif_load_next(s, &g, comp, req_comp, two_back); + if (u == (stbi_uc *) s) u = 0; // end of animated gif marker + + if (u) { + *x = g.w; + *y = g.h; + ++layers; + stride = g.w * g.h * 4; + + if (out) { + void *tmp = (stbi_uc*) STBI_REALLOC_SIZED( out, out_size, layers * stride ); + if (!tmp) + return stbi__load_gif_main_outofmem(&g, out, delays); + else { + out = (stbi_uc*) tmp; + out_size = layers * stride; + } + + if (delays) { + int *new_delays = (int*) STBI_REALLOC_SIZED( *delays, delays_size, sizeof(int) * layers ); + if (!new_delays) + return stbi__load_gif_main_outofmem(&g, out, delays); + *delays = new_delays; + delays_size = layers * sizeof(int); + } + } else { + out = (stbi_uc*)stbi__malloc( layers * stride ); + if (!out) + return stbi__load_gif_main_outofmem(&g, out, delays); + out_size = layers * stride; + if (delays) { + *delays = (int*) stbi__malloc( layers * sizeof(int) ); + if (!*delays) + return stbi__load_gif_main_outofmem(&g, out, delays); + delays_size = layers * sizeof(int); + } + } + memcpy( out + ((layers - 1) * stride), u, stride ); + if (layers >= 2) { + two_back = out - 2 * stride; + } + + if (delays) { + (*delays)[layers - 1U] = g.delay; + } + } + } while (u != 0); + + // free temp buffer; + STBI_FREE(g.out); + STBI_FREE(g.history); + STBI_FREE(g.background); + + // do the final conversion after loading everything; + if (req_comp && req_comp != 4) + out = stbi__convert_format(out, 4, req_comp, layers * g.w, g.h); + + *z = layers; + return out; + } else { + return stbi__errpuc("not GIF", "Image was not as a gif type."); + } +} + +static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + stbi_uc *u = 0; + stbi__gif g; + memset(&g, 0, sizeof(g)); + STBI_NOTUSED(ri); + + u = stbi__gif_load_next(s, &g, comp, req_comp, 0); + if (u == (stbi_uc *) s) u = 0; // end of animated gif marker + if (u) { + *x = g.w; + *y = g.h; + + // moved conversion to after successful load so that the same + // can be done for multiple frames. + if (req_comp && req_comp != 4) + u = stbi__convert_format(u, 4, req_comp, g.w, g.h); + } else if (g.out) { + // if there was an error and we allocated an image buffer, free it! + STBI_FREE(g.out); + } + + // free buffers needed for multiple frame loading; + STBI_FREE(g.history); + STBI_FREE(g.background); + + return u; +} + +static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp) +{ + return stbi__gif_info_raw(s,x,y,comp); +} +#endif + +// ************************************************************************************************* +// Radiance RGBE HDR loader +// originally by Nicolas Schulz +#ifndef STBI_NO_HDR +static int stbi__hdr_test_core(stbi__context *s, const char *signature) +{ + int i; + for (i=0; signature[i]; ++i) + if (stbi__get8(s) != signature[i]) + return 0; + stbi__rewind(s); + return 1; +} + +static int stbi__hdr_test(stbi__context* s) +{ + int r = stbi__hdr_test_core(s, "#?RADIANCE\n"); + stbi__rewind(s); + if(!r) { + r = stbi__hdr_test_core(s, "#?RGBE\n"); + stbi__rewind(s); + } + return r; +} + +#define STBI__HDR_BUFLEN 1024 +static char *stbi__hdr_gettoken(stbi__context *z, char *buffer) +{ + int len=0; + char c = '\0'; + + c = (char) stbi__get8(z); + + while (!stbi__at_eof(z) && c != '\n') { + buffer[len++] = c; + if (len == STBI__HDR_BUFLEN-1) { + // flush to end of line + while (!stbi__at_eof(z) && stbi__get8(z) != '\n') + ; + break; + } + c = (char) stbi__get8(z); + } + + buffer[len] = 0; + return buffer; +} + +static void stbi__hdr_convert(float *output, stbi_uc *input, int req_comp) +{ + if ( input[3] != 0 ) { + float f1; + // Exponent + f1 = (float) ldexp(1.0f, input[3] - (int)(128 + 8)); + if (req_comp <= 2) + output[0] = (input[0] + input[1] + input[2]) * f1 / 3; + else { + output[0] = input[0] * f1; + output[1] = input[1] * f1; + output[2] = input[2] * f1; + } + if (req_comp == 2) output[1] = 1; + if (req_comp == 4) output[3] = 1; + } else { + switch (req_comp) { + case 4: output[3] = 1; /* fallthrough */ + case 3: output[0] = output[1] = output[2] = 0; + break; + case 2: output[1] = 1; /* fallthrough */ + case 1: output[0] = 0; + break; + } + } +} + +static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + char buffer[STBI__HDR_BUFLEN]; + char *token; + int valid = 0; + int width, height; + stbi_uc *scanline; + float *hdr_data; + int len; + unsigned char count, value; + int i, j, k, c1,c2, z; + const char *headerToken; + STBI_NOTUSED(ri); + + // Check identifier + headerToken = stbi__hdr_gettoken(s,buffer); + if (strcmp(headerToken, "#?RADIANCE") != 0 && strcmp(headerToken, "#?RGBE") != 0) + return stbi__errpf("not HDR", "Corrupt HDR image"); + + // Parse header + for(;;) { + token = stbi__hdr_gettoken(s,buffer); + if (token[0] == 0) break; + if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; + } + + if (!valid) return stbi__errpf("unsupported format", "Unsupported HDR format"); + + // Parse width and height + // can't use sscanf() if we're not using stdio! + token = stbi__hdr_gettoken(s,buffer); + if (strncmp(token, "-Y ", 3)) return stbi__errpf("unsupported data layout", "Unsupported HDR format"); + token += 3; + height = (int) strtol(token, &token, 10); + while (*token == ' ') ++token; + if (strncmp(token, "+X ", 3)) return stbi__errpf("unsupported data layout", "Unsupported HDR format"); + token += 3; + width = (int) strtol(token, NULL, 10); + + if (height > STBI_MAX_DIMENSIONS) return stbi__errpf("too large","Very large image (corrupt?)"); + if (width > STBI_MAX_DIMENSIONS) return stbi__errpf("too large","Very large image (corrupt?)"); + + *x = width; + *y = height; + + if (comp) *comp = 3; + if (req_comp == 0) req_comp = 3; + + if (!stbi__mad4sizes_valid(width, height, req_comp, sizeof(float), 0)) + return stbi__errpf("too large", "HDR image is too large"); + + // Read data + hdr_data = (float *) stbi__malloc_mad4(width, height, req_comp, sizeof(float), 0); + if (!hdr_data) + return stbi__errpf("outofmem", "Out of memory"); + + // Load image data + // image data is stored as some number of sca + if ( width < 8 || width >= 32768) { + // Read flat data + for (j=0; j < height; ++j) { + for (i=0; i < width; ++i) { + stbi_uc rgbe[4]; + main_decode_loop: + stbi__getn(s, rgbe, 4); + stbi__hdr_convert(hdr_data + j * width * req_comp + i * req_comp, rgbe, req_comp); + } + } + } else { + // Read RLE-encoded data + scanline = NULL; + + for (j = 0; j < height; ++j) { + c1 = stbi__get8(s); + c2 = stbi__get8(s); + len = stbi__get8(s); + if (c1 != 2 || c2 != 2 || (len & 0x80)) { + // not run-length encoded, so we have to actually use THIS data as a decoded + // pixel (note this can't be a valid pixel--one of RGB must be >= 128) + stbi_uc rgbe[4]; + rgbe[0] = (stbi_uc) c1; + rgbe[1] = (stbi_uc) c2; + rgbe[2] = (stbi_uc) len; + rgbe[3] = (stbi_uc) stbi__get8(s); + stbi__hdr_convert(hdr_data, rgbe, req_comp); + i = 1; + j = 0; + STBI_FREE(scanline); + goto main_decode_loop; // yes, this makes no sense + } + len <<= 8; + len |= stbi__get8(s); + if (len != width) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("invalid decoded scanline length", "corrupt HDR"); } + if (scanline == NULL) { + scanline = (stbi_uc *) stbi__malloc_mad2(width, 4, 0); + if (!scanline) { + STBI_FREE(hdr_data); + return stbi__errpf("outofmem", "Out of memory"); + } + } + + for (k = 0; k < 4; ++k) { + int nleft; + i = 0; + while ((nleft = width - i) > 0) { + count = stbi__get8(s); + if (count > 128) { + // Run + value = stbi__get8(s); + count -= 128; + if (count > nleft) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); } + for (z = 0; z < count; ++z) + scanline[i++ * 4 + k] = value; + } else { + // Dump + if (count > nleft) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); } + for (z = 0; z < count; ++z) + scanline[i++ * 4 + k] = stbi__get8(s); + } + } + } + for (i=0; i < width; ++i) + stbi__hdr_convert(hdr_data+(j*width + i)*req_comp, scanline + i*4, req_comp); + } + if (scanline) + STBI_FREE(scanline); + } + + return hdr_data; +} + +static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp) +{ + char buffer[STBI__HDR_BUFLEN]; + char *token; + int valid = 0; + int dummy; + + if (!x) x = &dummy; + if (!y) y = &dummy; + if (!comp) comp = &dummy; + + if (stbi__hdr_test(s) == 0) { + stbi__rewind( s ); + return 0; + } + + for(;;) { + token = stbi__hdr_gettoken(s,buffer); + if (token[0] == 0) break; + if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; + } + + if (!valid) { + stbi__rewind( s ); + return 0; + } + token = stbi__hdr_gettoken(s,buffer); + if (strncmp(token, "-Y ", 3)) { + stbi__rewind( s ); + return 0; + } + token += 3; + *y = (int) strtol(token, &token, 10); + while (*token == ' ') ++token; + if (strncmp(token, "+X ", 3)) { + stbi__rewind( s ); + return 0; + } + token += 3; + *x = (int) strtol(token, NULL, 10); + *comp = 3; + return 1; +} +#endif // STBI_NO_HDR + +#ifndef STBI_NO_BMP +static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp) +{ + void *p; + stbi__bmp_data info; + + info.all_a = 255; + p = stbi__bmp_parse_header(s, &info); + if (p == NULL) { + stbi__rewind( s ); + return 0; + } + if (x) *x = s->img_x; + if (y) *y = s->img_y; + if (comp) { + if (info.bpp == 24 && info.ma == 0xff000000) + *comp = 3; + else + *comp = info.ma ? 4 : 3; + } + return 1; +} +#endif + +#ifndef STBI_NO_PSD +static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp) +{ + int channelCount, dummy, depth; + if (!x) x = &dummy; + if (!y) y = &dummy; + if (!comp) comp = &dummy; + if (stbi__get32be(s) != 0x38425053) { + stbi__rewind( s ); + return 0; + } + if (stbi__get16be(s) != 1) { + stbi__rewind( s ); + return 0; + } + stbi__skip(s, 6); + channelCount = stbi__get16be(s); + if (channelCount < 0 || channelCount > 16) { + stbi__rewind( s ); + return 0; + } + *y = stbi__get32be(s); + *x = stbi__get32be(s); + depth = stbi__get16be(s); + if (depth != 8 && depth != 16) { + stbi__rewind( s ); + return 0; + } + if (stbi__get16be(s) != 3) { + stbi__rewind( s ); + return 0; + } + *comp = 4; + return 1; +} + +static int stbi__psd_is16(stbi__context *s) +{ + int channelCount, depth; + if (stbi__get32be(s) != 0x38425053) { + stbi__rewind( s ); + return 0; + } + if (stbi__get16be(s) != 1) { + stbi__rewind( s ); + return 0; + } + stbi__skip(s, 6); + channelCount = stbi__get16be(s); + if (channelCount < 0 || channelCount > 16) { + stbi__rewind( s ); + return 0; + } + STBI_NOTUSED(stbi__get32be(s)); + STBI_NOTUSED(stbi__get32be(s)); + depth = stbi__get16be(s); + if (depth != 16) { + stbi__rewind( s ); + return 0; + } + return 1; +} +#endif + +#ifndef STBI_NO_PIC +static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp) +{ + int act_comp=0,num_packets=0,chained,dummy; + stbi__pic_packet packets[10]; + + if (!x) x = &dummy; + if (!y) y = &dummy; + if (!comp) comp = &dummy; + + if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) { + stbi__rewind(s); + return 0; + } + + stbi__skip(s, 88); + + *x = stbi__get16be(s); + *y = stbi__get16be(s); + if (stbi__at_eof(s)) { + stbi__rewind( s); + return 0; + } + if ( (*x) != 0 && (1 << 28) / (*x) < (*y)) { + stbi__rewind( s ); + return 0; + } + + stbi__skip(s, 8); + + do { + stbi__pic_packet *packet; + + if (num_packets==sizeof(packets)/sizeof(packets[0])) + return 0; + + packet = &packets[num_packets++]; + chained = stbi__get8(s); + packet->size = stbi__get8(s); + packet->type = stbi__get8(s); + packet->channel = stbi__get8(s); + act_comp |= packet->channel; + + if (stbi__at_eof(s)) { + stbi__rewind( s ); + return 0; + } + if (packet->size != 8) { + stbi__rewind( s ); + return 0; + } + } while (chained); + + *comp = (act_comp & 0x10 ? 4 : 3); + + return 1; +} +#endif + +// ************************************************************************************************* +// Portable Gray Map and Portable Pixel Map loader +// by Ken Miller +// +// PGM: http://netpbm.sourceforge.net/doc/pgm.html +// PPM: http://netpbm.sourceforge.net/doc/ppm.html +// +// Known limitations: +// Does not support comments in the header section +// Does not support ASCII image data (formats P2 and P3) + +#ifndef STBI_NO_PNM + +static int stbi__pnm_test(stbi__context *s) +{ + char p, t; + p = (char) stbi__get8(s); + t = (char) stbi__get8(s); + if (p != 'P' || (t != '5' && t != '6')) { + stbi__rewind( s ); + return 0; + } + return 1; +} + +static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + stbi_uc *out; + STBI_NOTUSED(ri); + + ri->bits_per_channel = stbi__pnm_info(s, (int *)&s->img_x, (int *)&s->img_y, (int *)&s->img_n); + if (ri->bits_per_channel == 0) + return 0; + + if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + + *x = s->img_x; + *y = s->img_y; + if (comp) *comp = s->img_n; + + if (!stbi__mad4sizes_valid(s->img_n, s->img_x, s->img_y, ri->bits_per_channel / 8, 0)) + return stbi__errpuc("too large", "PNM too large"); + + out = (stbi_uc *) stbi__malloc_mad4(s->img_n, s->img_x, s->img_y, ri->bits_per_channel / 8, 0); + if (!out) return stbi__errpuc("outofmem", "Out of memory"); + stbi__getn(s, out, s->img_n * s->img_x * s->img_y * (ri->bits_per_channel / 8)); + + if (req_comp && req_comp != s->img_n) { + out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y); + if (out == NULL) return out; // stbi__convert_format frees input on failure + } + return out; +} + +static int stbi__pnm_isspace(char c) +{ + return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r'; +} + +static void stbi__pnm_skip_whitespace(stbi__context *s, char *c) +{ + for (;;) { + while (!stbi__at_eof(s) && stbi__pnm_isspace(*c)) + *c = (char) stbi__get8(s); + + if (stbi__at_eof(s) || *c != '#') + break; + + while (!stbi__at_eof(s) && *c != '\n' && *c != '\r' ) + *c = (char) stbi__get8(s); + } +} + +static int stbi__pnm_isdigit(char c) +{ + return c >= '0' && c <= '9'; +} + +static int stbi__pnm_getinteger(stbi__context *s, char *c) +{ + int value = 0; + + while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) { + value = value*10 + (*c - '0'); + *c = (char) stbi__get8(s); + } + + return value; +} + +static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp) +{ + int maxv, dummy; + char c, p, t; + + if (!x) x = &dummy; + if (!y) y = &dummy; + if (!comp) comp = &dummy; + + stbi__rewind(s); + + // Get identifier + p = (char) stbi__get8(s); + t = (char) stbi__get8(s); + if (p != 'P' || (t != '5' && t != '6')) { + stbi__rewind(s); + return 0; + } + + *comp = (t == '6') ? 3 : 1; // '5' is 1-component .pgm; '6' is 3-component .ppm + + c = (char) stbi__get8(s); + stbi__pnm_skip_whitespace(s, &c); + + *x = stbi__pnm_getinteger(s, &c); // read width + stbi__pnm_skip_whitespace(s, &c); + + *y = stbi__pnm_getinteger(s, &c); // read height + stbi__pnm_skip_whitespace(s, &c); + + maxv = stbi__pnm_getinteger(s, &c); // read max value + if (maxv > 65535) + return stbi__err("max value > 65535", "PPM image supports only 8-bit and 16-bit images"); + else if (maxv > 255) + return 16; + else + return 8; +} + +static int stbi__pnm_is16(stbi__context *s) +{ + if (stbi__pnm_info(s, NULL, NULL, NULL) == 16) + return 1; + return 0; +} +#endif + +static int stbi__info_main(stbi__context *s, int *x, int *y, int *comp) +{ + #ifndef STBI_NO_JPEG + if (stbi__jpeg_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PNG + if (stbi__png_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_GIF + if (stbi__gif_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_BMP + if (stbi__bmp_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PSD + if (stbi__psd_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PIC + if (stbi__pic_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PNM + if (stbi__pnm_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_HDR + if (stbi__hdr_info(s, x, y, comp)) return 1; + #endif + + // test tga last because it's a crappy test! + #ifndef STBI_NO_TGA + if (stbi__tga_info(s, x, y, comp)) + return 1; + #endif + return stbi__err("unknown image type", "Image not of any known type, or corrupt"); +} + +static int stbi__is_16_main(stbi__context *s) +{ + #ifndef STBI_NO_PNG + if (stbi__png_is16(s)) return 1; + #endif + + #ifndef STBI_NO_PSD + if (stbi__psd_is16(s)) return 1; + #endif + + #ifndef STBI_NO_PNM + if (stbi__pnm_is16(s)) return 1; + #endif + return 0; +} + +#ifndef STBI_NO_STDIO +STBIDEF int stbi_info(char const *filename, int *x, int *y, int *comp) +{ + FILE *f = stbi__fopen(filename, "rb"); + int result; + if (!f) return stbi__err("can't fopen", "Unable to open file"); + result = stbi_info_from_file(f, x, y, comp); + fclose(f); + return result; +} + +STBIDEF int stbi_info_from_file(FILE *f, int *x, int *y, int *comp) +{ + int r; + stbi__context s; + long pos = ftell(f); + stbi__start_file(&s, f); + r = stbi__info_main(&s,x,y,comp); + fseek(f,pos,SEEK_SET); + return r; +} + +STBIDEF int stbi_is_16_bit(char const *filename) +{ + FILE *f = stbi__fopen(filename, "rb"); + int result; + if (!f) return stbi__err("can't fopen", "Unable to open file"); + result = stbi_is_16_bit_from_file(f); + fclose(f); + return result; +} + +STBIDEF int stbi_is_16_bit_from_file(FILE *f) +{ + int r; + stbi__context s; + long pos = ftell(f); + stbi__start_file(&s, f); + r = stbi__is_16_main(&s); + fseek(f,pos,SEEK_SET); + return r; +} +#endif // !STBI_NO_STDIO + +STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__info_main(&s,x,y,comp); +} + +STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int *x, int *y, int *comp) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user); + return stbi__info_main(&s,x,y,comp); +} + +STBIDEF int stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__is_16_main(&s); +} + +STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *c, void *user) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user); + return stbi__is_16_main(&s); +} + +#endif // STB_IMAGE_IMPLEMENTATION + +/* + revision history: + 2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs + 2.19 (2018-02-11) fix warning + 2.18 (2018-01-30) fix warnings + 2.17 (2018-01-29) change sbti__shiftsigned to avoid clang -O2 bug + 1-bit BMP + *_is_16_bit api + avoid warnings + 2.16 (2017-07-23) all functions have 16-bit variants; + STBI_NO_STDIO works again; + compilation fixes; + fix rounding in unpremultiply; + optimize vertical flip; + disable raw_len validation; + documentation fixes + 2.15 (2017-03-18) fix png-1,2,4 bug; now all Imagenet JPGs decode; + warning fixes; disable run-time SSE detection on gcc; + uniform handling of optional "return" values; + thread-safe initialization of zlib tables + 2.14 (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs + 2.13 (2016-11-29) add 16-bit API, only supported for PNG right now + 2.12 (2016-04-02) fix typo in 2.11 PSD fix that caused crashes + 2.11 (2016-04-02) allocate large structures on the stack + remove white matting for transparent PSD + fix reported channel count for PNG & BMP + re-enable SSE2 in non-gcc 64-bit + support RGB-formatted JPEG + read 16-bit PNGs (only as 8-bit) + 2.10 (2016-01-22) avoid warning introduced in 2.09 by STBI_REALLOC_SIZED + 2.09 (2016-01-16) allow comments in PNM files + 16-bit-per-pixel TGA (not bit-per-component) + info() for TGA could break due to .hdr handling + info() for BMP to shares code instead of sloppy parse + can use STBI_REALLOC_SIZED if allocator doesn't support realloc + code cleanup + 2.08 (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA + 2.07 (2015-09-13) fix compiler warnings + partial animated GIF support + limited 16-bpc PSD support + #ifdef unused functions + bug with < 92 byte PIC,PNM,HDR,TGA + 2.06 (2015-04-19) fix bug where PSD returns wrong '*comp' value + 2.05 (2015-04-19) fix bug in progressive JPEG handling, fix warning + 2.04 (2015-04-15) try to re-enable SIMD on MinGW 64-bit + 2.03 (2015-04-12) extra corruption checking (mmozeiko) + stbi_set_flip_vertically_on_load (nguillemot) + fix NEON support; fix mingw support + 2.02 (2015-01-19) fix incorrect assert, fix warning + 2.01 (2015-01-17) fix various warnings; suppress SIMD on gcc 32-bit without -msse2 + 2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG + 2.00 (2014-12-25) optimize JPG, including x86 SSE2 & NEON SIMD (ryg) + progressive JPEG (stb) + PGM/PPM support (Ken Miller) + STBI_MALLOC,STBI_REALLOC,STBI_FREE + GIF bugfix -- seemingly never worked + STBI_NO_*, STBI_ONLY_* + 1.48 (2014-12-14) fix incorrectly-named assert() + 1.47 (2014-12-14) 1/2/4-bit PNG support, both direct and paletted (Omar Cornut & stb) + optimize PNG (ryg) + fix bug in interlaced PNG with user-specified channel count (stb) + 1.46 (2014-08-26) + fix broken tRNS chunk (colorkey-style transparency) in non-paletted PNG + 1.45 (2014-08-16) + fix MSVC-ARM internal compiler error by wrapping malloc + 1.44 (2014-08-07) + various warning fixes from Ronny Chevalier + 1.43 (2014-07-15) + fix MSVC-only compiler problem in code changed in 1.42 + 1.42 (2014-07-09) + don't define _CRT_SECURE_NO_WARNINGS (affects user code) + fixes to stbi__cleanup_jpeg path + added STBI_ASSERT to avoid requiring assert.h + 1.41 (2014-06-25) + fix search&replace from 1.36 that messed up comments/error messages + 1.40 (2014-06-22) + fix gcc struct-initialization warning + 1.39 (2014-06-15) + fix to TGA optimization when req_comp != number of components in TGA; + fix to GIF loading because BMP wasn't rewinding (whoops, no GIFs in my test suite) + add support for BMP version 5 (more ignored fields) + 1.38 (2014-06-06) + suppress MSVC warnings on integer casts truncating values + fix accidental rename of 'skip' field of I/O + 1.37 (2014-06-04) + remove duplicate typedef + 1.36 (2014-06-03) + convert to header file single-file library + if de-iphone isn't set, load iphone images color-swapped instead of returning NULL + 1.35 (2014-05-27) + various warnings + fix broken STBI_SIMD path + fix bug where stbi_load_from_file no longer left file pointer in correct place + fix broken non-easy path for 32-bit BMP (possibly never used) + TGA optimization by Arseny Kapoulkine + 1.34 (unknown) + use STBI_NOTUSED in stbi__resample_row_generic(), fix one more leak in tga failure case + 1.33 (2011-07-14) + make stbi_is_hdr work in STBI_NO_HDR (as specified), minor compiler-friendly improvements + 1.32 (2011-07-13) + support for "info" function for all supported filetypes (SpartanJ) + 1.31 (2011-06-20) + a few more leak fixes, bug in PNG handling (SpartanJ) + 1.30 (2011-06-11) + added ability to load files via callbacks to accomidate custom input streams (Ben Wenger) + removed deprecated format-specific test/load functions + removed support for installable file formats (stbi_loader) -- would have been broken for IO callbacks anyway + error cases in bmp and tga give messages and don't leak (Raymond Barbiero, grisha) + fix inefficiency in decoding 32-bit BMP (David Woo) + 1.29 (2010-08-16) + various warning fixes from Aurelien Pocheville + 1.28 (2010-08-01) + fix bug in GIF palette transparency (SpartanJ) + 1.27 (2010-08-01) + cast-to-stbi_uc to fix warnings + 1.26 (2010-07-24) + fix bug in file buffering for PNG reported by SpartanJ + 1.25 (2010-07-17) + refix trans_data warning (Won Chun) + 1.24 (2010-07-12) + perf improvements reading from files on platforms with lock-heavy fgetc() + minor perf improvements for jpeg + deprecated type-specific functions so we'll get feedback if they're needed + attempt to fix trans_data warning (Won Chun) + 1.23 fixed bug in iPhone support + 1.22 (2010-07-10) + removed image *writing* support + stbi_info support from Jetro Lauha + GIF support from Jean-Marc Lienher + iPhone PNG-extensions from James Brown + warning-fixes from Nicolas Schulz and Janez Zemva (i.stbi__err. Janez (U+017D)emva) + 1.21 fix use of 'stbi_uc' in header (reported by jon blow) + 1.20 added support for Softimage PIC, by Tom Seddon + 1.19 bug in interlaced PNG corruption check (found by ryg) + 1.18 (2008-08-02) + fix a threading bug (local mutable static) + 1.17 support interlaced PNG + 1.16 major bugfix - stbi__convert_format converted one too many pixels + 1.15 initialize some fields for thread safety + 1.14 fix threadsafe conversion bug + header-file-only version (#define STBI_HEADER_FILE_ONLY before including) + 1.13 threadsafe + 1.12 const qualifiers in the API + 1.11 Support installable IDCT, colorspace conversion routines + 1.10 Fixes for 64-bit (don't use "unsigned long") + optimized upsampling by Fabian "ryg" Giesen + 1.09 Fix format-conversion for PSD code (bad global variables!) + 1.08 Thatcher Ulrich's PSD code integrated by Nicolas Schulz + 1.07 attempt to fix C++ warning/errors again + 1.06 attempt to fix C++ warning/errors again + 1.05 fix TGA loading to return correct *comp and use good luminance calc + 1.04 default float alpha is 1, not 255; use 'void *' for stbi_image_free + 1.03 bugfixes to STBI_NO_STDIO, STBI_NO_HDR + 1.02 support for (subset of) HDR files, float interface for preferred access to them + 1.01 fix bug: possible bug in handling right-side up bmps... not sure + fix bug: the stbi__bmp_load() and stbi__tga_load() functions didn't work at all + 1.00 interface to zlib that skips zlib header + 0.99 correct handling of alpha in palette + 0.98 TGA loader by lonesock; dynamically add loaders (untested) + 0.97 jpeg errors on too large a file; also catch another malloc failure + 0.96 fix detection of invalid v value - particleman@mollyrocket forum + 0.95 during header scan, seek to markers in case of padding + 0.94 STBI_NO_STDIO to disable stdio usage; rename all #defines the same + 0.93 handle jpegtran output; verbose errors + 0.92 read 4,8,16,24,32-bit BMP files of several formats + 0.91 output 24-bit Windows 3.0 BMP files + 0.90 fix a few more warnings; bump version number to approach 1.0 + 0.61 bugfixes due to Marc LeBlanc, Christopher Lloyd + 0.60 fix compiling as c++ + 0.59 fix warnings: merge Dave Moore's -Wall fixes + 0.58 fix bug: zlib uncompressed mode len/nlen was wrong endian + 0.57 fix bug: jpg last huffman symbol before marker was >9 bits but less than 16 available + 0.56 fix bug: zlib uncompressed mode len vs. nlen + 0.55 fix bug: restart_interval not initialized to 0 + 0.54 allow NULL for 'int *comp' + 0.53 fix bug in png 3->4; speedup png decoding + 0.52 png handles req_comp=3,4 directly; minor cleanup; jpeg comments + 0.51 obey req_comp requests, 1-component jpegs return as 1-component, + on 'test' only check type, not whether we support this variant + 0.50 (2006-11-19) + first released version +*/ + + +/* +------------------------------------------------------------------------------ +This software is available under 2 licenses -- choose whichever you prefer. +------------------------------------------------------------------------------ +ALTERNATIVE A - MIT License +Copyright (c) 2017 Sean Barrett +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +------------------------------------------------------------------------------ +ALTERNATIVE B - Public Domain (www.unlicense.org) +This is free and unencumbered software released into the public domain. +Anyone is free to copy, modify, publish, use, compile, sell, or distribute this +software, either in source code form or as a compiled binary, for any purpose, +commercial or non-commercial, and by any means. +In jurisdictions that recognize copyright laws, the author or authors of this +software dedicate any and all copyright interest in the software to the public +domain. We make this dedication for the benefit of the public at large and to +the detriment of our heirs and successors. We intend this dedication to be an +overt act of relinquishment in perpetuity of all present and future rights to +this software under copyright law. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +------------------------------------------------------------------------------ +*/ diff --git a/src/android/app/src/main/java/info/cemu/Cemu/AudioSettingsFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/AudioSettingsFragment.java new file mode 100644 index 00000000..c4e5bd03 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/AudioSettingsFragment.java @@ -0,0 +1,79 @@ +package info.cemu.Cemu; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; + +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import info.cemu.Cemu.databinding.FragmentAudioSettingsBinding; + +public class AudioSettingsFragment extends Fragment { + + @Override + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + FragmentAudioSettingsBinding binding = FragmentAudioSettingsBinding.inflate(inflater, container, false); + + GenericRecyclerViewAdapter genericRecyclerViewAdapter = new GenericRecyclerViewAdapter(); + + CheckboxRecyclerViewItem tvDeviceCheckbox = new CheckboxRecyclerViewItem(getString(R.string.tv), + getString(R.string.tv_audio_description), NativeLibrary.getAudioDeviceEnabled(true), + checked -> NativeLibrary.setAudioDeviceEnabled(checked, true)); + genericRecyclerViewAdapter.addRecyclerViewItem(tvDeviceCheckbox); + + var tvChannelsChoices = Stream.of(NativeLibrary.AUDIO_CHANNELS_MONO, NativeLibrary.AUDIO_CHANNELS_STEREO, NativeLibrary.AUDIO_CHANNELS_SURROUND) + .map(channels -> new SelectionAdapter.ChoiceItem<>(NativeLibrary.channelsToResourceNameId(channels), channels)) + .collect(Collectors.toList()); + int tvChannels = NativeLibrary.getAudioDeviceChannels(true); + SelectionAdapter tvChannelsSelectionAdapter = new SelectionAdapter<>(tvChannelsChoices, tvChannels); + SingleSelectionRecyclerViewItem tvChannelsModeSelection = new SingleSelectionRecyclerViewItem<>(getString(R.string.tv_channels), + getString(NativeLibrary.channelsToResourceNameId(tvChannels)), tvChannelsSelectionAdapter, + (channels, selectionRecyclerViewItem) -> { + NativeLibrary.setAudioDeviceChannels(channels, true); + selectionRecyclerViewItem.setDescription(getString(NativeLibrary.channelsToResourceNameId(channels))); + }); + genericRecyclerViewAdapter.addRecyclerViewItem(tvChannelsModeSelection); + + SliderRecyclerViewItem tvVolumeSlider = new SliderRecyclerViewItem(getString(R.string.tv_volume), + NativeLibrary.AUDIO_MIN_VOLUME, + NativeLibrary.AUDIO_MAX_VOLUME, + NativeLibrary.getAudioDeviceVolume(true), + value -> NativeLibrary.setAudioDeviceVolume((int) value, true), + value -> (int) value + "%"); + genericRecyclerViewAdapter.addRecyclerViewItem(tvVolumeSlider); + + CheckboxRecyclerViewItem padDeviceCheckbox = new CheckboxRecyclerViewItem(getString(R.string.gamepad), + getString(R.string.gamepad_audio_description), NativeLibrary.getAudioDeviceEnabled(true), + checked -> NativeLibrary.setAudioDeviceEnabled(checked, true)); + genericRecyclerViewAdapter.addRecyclerViewItem(padDeviceCheckbox); + + var gamepadChannelsChoices = List.of(new SelectionAdapter.ChoiceItem<>(NativeLibrary.channelsToResourceNameId(NativeLibrary.AUDIO_CHANNELS_STEREO), NativeLibrary.AUDIO_CHANNELS_STEREO)); + int gamepadChannels = NativeLibrary.getAudioDeviceChannels(false); + SelectionAdapter gamepadChannelsSelectionAdapter = new SelectionAdapter<>(gamepadChannelsChoices, gamepadChannels); + SingleSelectionRecyclerViewItem gamepadChannelsModeSelection = new SingleSelectionRecyclerViewItem<>(getString(R.string.gamepad_channels), + getString(NativeLibrary.channelsToResourceNameId(gamepadChannels)), gamepadChannelsSelectionAdapter, + (channels, selectionRecyclerViewItem) -> { + NativeLibrary.setAudioDeviceChannels(channels, false); + selectionRecyclerViewItem.setDescription(getString(NativeLibrary.channelsToResourceNameId(channels))); + }); + genericRecyclerViewAdapter.addRecyclerViewItem(gamepadChannelsModeSelection); + + SliderRecyclerViewItem padVolumeSlider = new SliderRecyclerViewItem(getString(R.string.pad_volume), + NativeLibrary.AUDIO_MIN_VOLUME, + NativeLibrary.AUDIO_MAX_VOLUME, + NativeLibrary.getAudioDeviceVolume(false), + value -> NativeLibrary.setAudioDeviceVolume((int) value, false), + value -> (int) value + "%"); + genericRecyclerViewAdapter.addRecyclerViewItem(padVolumeSlider); + + binding.audioSettingsRecyclerView.setAdapter(genericRecyclerViewAdapter); + + return binding.getRoot(); + } +} \ No newline at end of file diff --git a/src/android/app/src/main/java/info/cemu/Cemu/ButtonRecyclerViewItem.java b/src/android/app/src/main/java/info/cemu/Cemu/ButtonRecyclerViewItem.java new file mode 100644 index 00000000..4ccb0345 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/ButtonRecyclerViewItem.java @@ -0,0 +1,51 @@ +package info.cemu.Cemu; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.recyclerview.widget.RecyclerView; + +public class ButtonRecyclerViewItem implements RecyclerViewItem { + public interface OnButtonClickListener { + void onButtonClick(); + } + + private static class ButtonViewHolder extends RecyclerView.ViewHolder { + TextView text; + TextView description; + + public ButtonViewHolder(View itemView) { + super(itemView); + text = itemView.findViewById(R.id.button_text); + description = itemView.findViewById(R.id.button_description); + } + } + + private final OnButtonClickListener onButtonClickListener; + private final String text; + private final String description; + + public ButtonRecyclerViewItem(String text, String description, OnButtonClickListener onButtonClickListener) { + this.text = text; + this.description = description; + this.onButtonClickListener = onButtonClickListener; + } + + @Override + public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent) { + return new ButtonViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_button, parent, false)); + } + + @Override + public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, RecyclerView.Adapter adapter) { + ButtonViewHolder buttonViewHolder = (ButtonViewHolder) viewHolder; + buttonViewHolder.text.setText(text); + buttonViewHolder.description.setText(description); + buttonViewHolder.itemView.setOnClickListener(view -> { + if (onButtonClickListener != null) + onButtonClickListener.onButtonClick(); + }); + } +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/CemuApplication.java b/src/android/app/src/main/java/info/cemu/Cemu/CemuApplication.java new file mode 100644 index 00000000..efa63959 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/CemuApplication.java @@ -0,0 +1,16 @@ +package info.cemu.Cemu; + +import android.app.Application; +import android.util.DisplayMetrics; + +public class CemuApplication extends Application { + @Override + public void onCreate() { + super.onCreate(); + DisplayMetrics displayMetrics = getResources().getDisplayMetrics(); + NativeLibrary.setDPI(displayMetrics.density); + FileUtil.setCemuApplication(this); + NativeLibrary.initializeActiveSettings(getExternalFilesDir(null).getAbsoluteFile().toString(), getExternalFilesDir(null).getAbsoluteFile().toString()); + NativeLibrary.initializeEmulation(); + } +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/CemuPreferences.java b/src/android/app/src/main/java/info/cemu/Cemu/CemuPreferences.java new file mode 100644 index 00000000..1167ff0f --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/CemuPreferences.java @@ -0,0 +1,6 @@ +package info.cemu.Cemu; + +public class CemuPreferences { + public static final String PREFERENCES_NAME = "CEMU_PREFERENCES"; + public static final String GAMES_PATH_KEY = "GAME_PATHS_KEY"; +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/CheckboxRecyclerViewItem.java b/src/android/app/src/main/java/info/cemu/Cemu/CheckboxRecyclerViewItem.java new file mode 100644 index 00000000..4747f296 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/CheckboxRecyclerViewItem.java @@ -0,0 +1,59 @@ +package info.cemu.Cemu; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.checkbox.MaterialCheckBox; + +public class CheckboxRecyclerViewItem implements RecyclerViewItem { + public interface OnCheckedChangeListener { + void onCheckChanged(boolean checked); + } + + private static class CheckBoxViewHolder extends RecyclerView.ViewHolder { + TextView label; + TextView description; + MaterialCheckBox checkBox; + + public CheckBoxViewHolder(View itemView) { + super(itemView); + label = itemView.findViewById(R.id.checkbox_label); + description = itemView.findViewById(R.id.checkbox_description); + checkBox = itemView.findViewById(R.id.checkbox); + } + } + + private final String label; + private final String description; + private boolean checked; + private final OnCheckedChangeListener onCheckedChangeListener; + + public CheckboxRecyclerViewItem(String label, String description, boolean checked, OnCheckedChangeListener onCheckedChangeListener) { + this.label = label; + this.description = description; + this.checked = checked; + this.onCheckedChangeListener = onCheckedChangeListener; + } + + @Override + public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent) { + return new CheckBoxViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_checkbox, parent, false)); + } + + @Override + public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, RecyclerView.Adapter adapter) { + CheckBoxViewHolder checkBoxViewHolder = (CheckBoxViewHolder) viewHolder; + checkBoxViewHolder.label.setText(label); + checkBoxViewHolder.description.setText(description); + checkBoxViewHolder.checkBox.setChecked(checked); + checkBoxViewHolder.itemView.setOnClickListener(view -> { + checked = !checkBoxViewHolder.checkBox.isChecked(); + checkBoxViewHolder.checkBox.setChecked(checked); + if (onCheckedChangeListener != null) onCheckedChangeListener.onCheckChanged(checked); + }); + } +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/ControllerInputsDataProvider.java b/src/android/app/src/main/java/info/cemu/Cemu/ControllerInputsDataProvider.java new file mode 100644 index 00000000..950f7994 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/ControllerInputsDataProvider.java @@ -0,0 +1,185 @@ +package info.cemu.Cemu; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +public class ControllerInputsDataProvider { + private int getButtonResourceIdName(int controllerType, int buttonId) { + if (controllerType == NativeLibrary.EMULATED_CONTROLLER_TYPE_VPAD) { + return switch (buttonId) { + case NativeLibrary.VPAD_BUTTON_A -> R.string.button_a; + case NativeLibrary.VPAD_BUTTON_B -> R.string.button_b; + case NativeLibrary.VPAD_BUTTON_X -> R.string.button_x; + case NativeLibrary.VPAD_BUTTON_Y -> R.string.button_y; + case NativeLibrary.VPAD_BUTTON_L -> R.string.button_l; + case NativeLibrary.VPAD_BUTTON_R -> R.string.button_r; + case NativeLibrary.VPAD_BUTTON_ZL -> R.string.button_zl; + case NativeLibrary.VPAD_BUTTON_ZR -> R.string.button_zr; + case NativeLibrary.VPAD_BUTTON_PLUS -> R.string.button_plus; + case NativeLibrary.VPAD_BUTTON_MINUS -> R.string.button_minus; + case NativeLibrary.VPAD_BUTTON_UP -> R.string.button_up; + case NativeLibrary.VPAD_BUTTON_DOWN -> R.string.button_down; + case NativeLibrary.VPAD_BUTTON_LEFT -> R.string.button_left; + case NativeLibrary.VPAD_BUTTON_RIGHT -> R.string.button_right; + case NativeLibrary.VPAD_BUTTON_STICKL -> R.string.button_stickl; + case NativeLibrary.VPAD_BUTTON_STICKR -> R.string.button_stickr; + case NativeLibrary.VPAD_BUTTON_STICKL_UP -> R.string.button_stickl_up; + case NativeLibrary.VPAD_BUTTON_STICKL_DOWN -> R.string.button_stickl_down; + case NativeLibrary.VPAD_BUTTON_STICKL_LEFT -> R.string.button_stickl_left; + case NativeLibrary.VPAD_BUTTON_STICKL_RIGHT -> R.string.button_stickl_right; + case NativeLibrary.VPAD_BUTTON_STICKR_UP -> R.string.button_stickr_up; + case NativeLibrary.VPAD_BUTTON_STICKR_DOWN -> R.string.button_stickr_down; + case NativeLibrary.VPAD_BUTTON_STICKR_LEFT -> R.string.button_stickr_left; + case NativeLibrary.VPAD_BUTTON_STICKR_RIGHT -> R.string.button_stickr_right; + case NativeLibrary.VPAD_BUTTON_MIC -> R.string.button_mic; + case NativeLibrary.VPAD_BUTTON_SCREEN -> R.string.button_screen; + case NativeLibrary.VPAD_BUTTON_HOME -> R.string.button_home; + default -> + throw new RuntimeException("Invalid buttonId " + buttonId + " for controllerType " + controllerType); + }; + } + if (controllerType == NativeLibrary.EMULATED_CONTROLLER_TYPE_PRO) { + return switch (buttonId) { + case NativeLibrary.PRO_BUTTON_A -> R.string.button_a; + case NativeLibrary.PRO_BUTTON_B -> R.string.button_b; + case NativeLibrary.PRO_BUTTON_X -> R.string.button_x; + case NativeLibrary.PRO_BUTTON_Y -> R.string.button_y; + case NativeLibrary.PRO_BUTTON_L -> R.string.button_l; + case NativeLibrary.PRO_BUTTON_R -> R.string.button_r; + case NativeLibrary.PRO_BUTTON_ZL -> R.string.button_zl; + case NativeLibrary.PRO_BUTTON_ZR -> R.string.button_zr; + case NativeLibrary.PRO_BUTTON_PLUS -> R.string.button_plus; + case NativeLibrary.PRO_BUTTON_MINUS -> R.string.button_minus; + case NativeLibrary.PRO_BUTTON_HOME -> R.string.button_home; + case NativeLibrary.PRO_BUTTON_UP -> R.string.button_up; + case NativeLibrary.PRO_BUTTON_DOWN -> R.string.button_down; + case NativeLibrary.PRO_BUTTON_LEFT -> R.string.button_left; + case NativeLibrary.PRO_BUTTON_RIGHT -> R.string.button_right; + case NativeLibrary.PRO_BUTTON_STICKL -> R.string.button_stickl; + case NativeLibrary.PRO_BUTTON_STICKR -> R.string.button_stickr; + case NativeLibrary.PRO_BUTTON_STICKL_UP -> R.string.button_stickl_up; + case NativeLibrary.PRO_BUTTON_STICKL_DOWN -> R.string.button_stickl_down; + case NativeLibrary.PRO_BUTTON_STICKL_LEFT -> R.string.button_stickl_left; + case NativeLibrary.PRO_BUTTON_STICKL_RIGHT -> R.string.button_stickl_right; + case NativeLibrary.PRO_BUTTON_STICKR_UP -> R.string.button_stickr_up; + case NativeLibrary.PRO_BUTTON_STICKR_DOWN -> R.string.button_stickr_down; + case NativeLibrary.PRO_BUTTON_STICKR_LEFT -> R.string.button_stickr_left; + case NativeLibrary.PRO_BUTTON_STICKR_RIGHT -> R.string.button_stickr_right; + default -> + throw new RuntimeException("Invalid buttonId " + buttonId + " for controllerType " + controllerType); + }; + } + if (controllerType == NativeLibrary.EMULATED_CONTROLLER_TYPE_CLASSIC) { + return switch (buttonId) { + case NativeLibrary.CLASSIC_BUTTON_A -> R.string.button_a; + case NativeLibrary.CLASSIC_BUTTON_B -> R.string.button_b; + case NativeLibrary.CLASSIC_BUTTON_X -> R.string.button_x; + case NativeLibrary.CLASSIC_BUTTON_Y -> R.string.button_y; + case NativeLibrary.CLASSIC_BUTTON_L -> R.string.button_l; + case NativeLibrary.CLASSIC_BUTTON_R -> R.string.button_r; + case NativeLibrary.CLASSIC_BUTTON_ZL -> R.string.button_zl; + case NativeLibrary.CLASSIC_BUTTON_ZR -> R.string.button_zr; + case NativeLibrary.CLASSIC_BUTTON_PLUS -> R.string.button_plus; + case NativeLibrary.CLASSIC_BUTTON_MINUS -> R.string.button_minus; + case NativeLibrary.CLASSIC_BUTTON_HOME -> R.string.button_home; + case NativeLibrary.CLASSIC_BUTTON_UP -> R.string.button_up; + case NativeLibrary.CLASSIC_BUTTON_DOWN -> R.string.button_down; + case NativeLibrary.CLASSIC_BUTTON_LEFT -> R.string.button_left; + case NativeLibrary.CLASSIC_BUTTON_RIGHT -> R.string.button_right; + case NativeLibrary.CLASSIC_BUTTON_STICKL_UP -> R.string.button_stickl_up; + case NativeLibrary.CLASSIC_BUTTON_STICKL_DOWN -> R.string.button_stickl_down; + case NativeLibrary.CLASSIC_BUTTON_STICKL_LEFT -> R.string.button_stickl_left; + case NativeLibrary.CLASSIC_BUTTON_STICKL_RIGHT -> R.string.button_stickl_right; + case NativeLibrary.CLASSIC_BUTTON_STICKR_UP -> R.string.button_stickr_up; + case NativeLibrary.CLASSIC_BUTTON_STICKR_DOWN -> R.string.button_stickr_down; + case NativeLibrary.CLASSIC_BUTTON_STICKR_LEFT -> R.string.button_stickr_left; + case NativeLibrary.CLASSIC_BUTTON_STICKR_RIGHT -> R.string.button_stickr_right; + default -> + throw new RuntimeException("Invalid buttonId " + buttonId + " for controllerType " + controllerType); + }; + } + if (controllerType == NativeLibrary.EMULATED_CONTROLLER_TYPE_WIIMOTE) { + return switch (buttonId) { + case NativeLibrary.WIIMOTE_BUTTON_A -> R.string.button_a; + case NativeLibrary.WIIMOTE_BUTTON_B -> R.string.button_b; + case NativeLibrary.WIIMOTE_BUTTON_1 -> R.string.button_1; + case NativeLibrary.WIIMOTE_BUTTON_2 -> R.string.button_2; + case NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_Z -> R.string.button_nunchuck_z; + case NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_C -> R.string.button_nunchuck_c; + case NativeLibrary.WIIMOTE_BUTTON_PLUS -> R.string.button_plus; + case NativeLibrary.WIIMOTE_BUTTON_MINUS -> R.string.button_minus; + case NativeLibrary.WIIMOTE_BUTTON_UP -> R.string.button_up; + case NativeLibrary.WIIMOTE_BUTTON_DOWN -> R.string.button_down; + case NativeLibrary.WIIMOTE_BUTTON_LEFT -> R.string.button_left; + case NativeLibrary.WIIMOTE_BUTTON_RIGHT -> R.string.button_right; + case NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_UP -> R.string.button_nunchuck_up; + case NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_DOWN -> R.string.button_nunchuck_down; + case NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_LEFT -> R.string.button_nunchuck_left; + case NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_RIGHT -> R.string.button_nunchuck_right; + case NativeLibrary.WIIMOTE_BUTTON_HOME -> R.string.button_home; + default -> + throw new RuntimeException("Invalid buttonId " + buttonId + " for controllerType " + controllerType); + }; + } + throw new RuntimeException("Invalid controllerType " + controllerType); + } + + public static class ControllerInput { + public int buttonResourceIdName; + public int buttonId; + public String boundInput; + + public ControllerInput(int buttonResourceIdName, int buttonId, String boundInput) { + this.boundInput = boundInput; + this.buttonId = buttonId; + this.buttonResourceIdName = buttonResourceIdName; + } + } + + public static class ControllerInputGroup { + public int groupResourceIdName; + public List inputs; + + public ControllerInputGroup(int groupResourceIdName, List inputs) { + this.groupResourceIdName = groupResourceIdName; + this.inputs = inputs; + } + } + + private void addControllerInputsGroup(List controllerInputItems, int groupResourceIdName, int controllerType, List buttons, Map inputs) { + List controllerInputs = buttons.stream().map(buttonId -> new ControllerInput(getButtonResourceIdName(controllerType, buttonId), buttonId, inputs.getOrDefault(buttonId, ""))).collect(Collectors.toList()); + controllerInputItems.add(new ControllerInputGroup(groupResourceIdName, controllerInputs)); + } + + public List getControllerInputs(int controllerType, Map inputs) { + List controllerInputItems = new ArrayList<>(); + if (controllerType == NativeLibrary.EMULATED_CONTROLLER_TYPE_VPAD) { + addControllerInputsGroup(controllerInputItems, R.string.buttons, controllerType, List.of(NativeLibrary.VPAD_BUTTON_A, NativeLibrary.VPAD_BUTTON_B, NativeLibrary.VPAD_BUTTON_X, NativeLibrary.VPAD_BUTTON_Y, NativeLibrary.VPAD_BUTTON_L, NativeLibrary.VPAD_BUTTON_R, NativeLibrary.VPAD_BUTTON_ZL, NativeLibrary.VPAD_BUTTON_ZR, NativeLibrary.VPAD_BUTTON_PLUS, NativeLibrary.VPAD_BUTTON_MINUS), inputs); + addControllerInputsGroup(controllerInputItems, R.string.d_pad, controllerType, List.of(NativeLibrary.VPAD_BUTTON_UP, NativeLibrary.VPAD_BUTTON_DOWN, NativeLibrary.VPAD_BUTTON_LEFT, NativeLibrary.VPAD_BUTTON_RIGHT), inputs); + addControllerInputsGroup(controllerInputItems, R.string.left_axis, controllerType, List.of(NativeLibrary.VPAD_BUTTON_STICKL, NativeLibrary.VPAD_BUTTON_STICKL_UP, NativeLibrary.VPAD_BUTTON_STICKL_DOWN, NativeLibrary.VPAD_BUTTON_STICKL_LEFT, NativeLibrary.VPAD_BUTTON_STICKL_RIGHT), inputs); + addControllerInputsGroup(controllerInputItems, R.string.right_axis, controllerType, List.of(NativeLibrary.VPAD_BUTTON_STICKR, NativeLibrary.VPAD_BUTTON_STICKR_UP, NativeLibrary.VPAD_BUTTON_STICKR_DOWN, NativeLibrary.VPAD_BUTTON_STICKR_LEFT, NativeLibrary.VPAD_BUTTON_STICKR_RIGHT), inputs); + addControllerInputsGroup(controllerInputItems, R.string.extra, controllerType, List.of(NativeLibrary.VPAD_BUTTON_MIC, NativeLibrary.VPAD_BUTTON_SCREEN, NativeLibrary.VPAD_BUTTON_HOME), inputs); + } + if (controllerType == NativeLibrary.EMULATED_CONTROLLER_TYPE_PRO) { + addControllerInputsGroup(controllerInputItems, R.string.buttons, controllerType, List.of(NativeLibrary.PRO_BUTTON_A, NativeLibrary.PRO_BUTTON_B, NativeLibrary.PRO_BUTTON_X, NativeLibrary.PRO_BUTTON_Y, NativeLibrary.PRO_BUTTON_L, NativeLibrary.PRO_BUTTON_R, NativeLibrary.PRO_BUTTON_ZL, NativeLibrary.PRO_BUTTON_ZR, NativeLibrary.PRO_BUTTON_PLUS, NativeLibrary.PRO_BUTTON_MINUS, NativeLibrary.PRO_BUTTON_HOME), inputs); + addControllerInputsGroup(controllerInputItems, R.string.left_axis, controllerType, List.of(NativeLibrary.PRO_BUTTON_STICKL, NativeLibrary.PRO_BUTTON_STICKL_UP, NativeLibrary.PRO_BUTTON_STICKL_DOWN, NativeLibrary.PRO_BUTTON_STICKL_LEFT, NativeLibrary.PRO_BUTTON_STICKL_RIGHT), inputs); + addControllerInputsGroup(controllerInputItems, R.string.right_axis, controllerType, List.of(NativeLibrary.PRO_BUTTON_STICKR, NativeLibrary.PRO_BUTTON_STICKR_UP, NativeLibrary.PRO_BUTTON_STICKR_DOWN, NativeLibrary.PRO_BUTTON_STICKR_LEFT, NativeLibrary.PRO_BUTTON_STICKR_RIGHT), inputs); + addControllerInputsGroup(controllerInputItems, R.string.d_pad, controllerType, List.of(NativeLibrary.PRO_BUTTON_UP, NativeLibrary.PRO_BUTTON_DOWN, NativeLibrary.PRO_BUTTON_LEFT, NativeLibrary.PRO_BUTTON_RIGHT), inputs); + } + if (controllerType == NativeLibrary.EMULATED_CONTROLLER_TYPE_CLASSIC) { + addControllerInputsGroup(controllerInputItems, R.string.buttons, controllerType, List.of(NativeLibrary.CLASSIC_BUTTON_A, NativeLibrary.CLASSIC_BUTTON_B, NativeLibrary.CLASSIC_BUTTON_X, NativeLibrary.CLASSIC_BUTTON_Y, NativeLibrary.CLASSIC_BUTTON_L, NativeLibrary.CLASSIC_BUTTON_R, NativeLibrary.CLASSIC_BUTTON_ZL, NativeLibrary.CLASSIC_BUTTON_ZR, NativeLibrary.CLASSIC_BUTTON_PLUS, NativeLibrary.CLASSIC_BUTTON_MINUS, NativeLibrary.CLASSIC_BUTTON_HOME), inputs); + addControllerInputsGroup(controllerInputItems, R.string.left_axis, controllerType, List.of(NativeLibrary.CLASSIC_BUTTON_STICKL_UP, NativeLibrary.CLASSIC_BUTTON_STICKL_DOWN, NativeLibrary.CLASSIC_BUTTON_STICKL_LEFT, NativeLibrary.CLASSIC_BUTTON_STICKL_RIGHT), inputs); + addControllerInputsGroup(controllerInputItems, R.string.right_axis, controllerType, List.of(NativeLibrary.CLASSIC_BUTTON_STICKR_UP, NativeLibrary.CLASSIC_BUTTON_STICKR_DOWN, NativeLibrary.CLASSIC_BUTTON_STICKR_LEFT, NativeLibrary.CLASSIC_BUTTON_STICKR_RIGHT), inputs); + addControllerInputsGroup(controllerInputItems, R.string.d_pad, controllerType, List.of(NativeLibrary.CLASSIC_BUTTON_UP, NativeLibrary.CLASSIC_BUTTON_DOWN, NativeLibrary.CLASSIC_BUTTON_LEFT, NativeLibrary.CLASSIC_BUTTON_RIGHT), inputs); + } + if (controllerType == NativeLibrary.EMULATED_CONTROLLER_TYPE_WIIMOTE) { + addControllerInputsGroup(controllerInputItems, R.string.buttons, controllerType, List.of(NativeLibrary.WIIMOTE_BUTTON_A, NativeLibrary.WIIMOTE_BUTTON_B, NativeLibrary.WIIMOTE_BUTTON_1, NativeLibrary.WIIMOTE_BUTTON_2, NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_Z, NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_C, NativeLibrary.WIIMOTE_BUTTON_PLUS, NativeLibrary.WIIMOTE_BUTTON_MINUS, NativeLibrary.WIIMOTE_BUTTON_HOME), inputs); + addControllerInputsGroup(controllerInputItems, R.string.d_pad, controllerType, List.of(NativeLibrary.WIIMOTE_BUTTON_UP, NativeLibrary.WIIMOTE_BUTTON_DOWN, NativeLibrary.WIIMOTE_BUTTON_LEFT, NativeLibrary.WIIMOTE_BUTTON_RIGHT), inputs); + addControllerInputsGroup(controllerInputItems, R.string.nunchuck, controllerType, List.of(NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_UP, NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_DOWN, NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_LEFT, NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_RIGHT), inputs); + } + return controllerInputItems; + } + +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/ControllerInputsFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/ControllerInputsFragment.java new file mode 100644 index 00000000..d7a53292 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/ControllerInputsFragment.java @@ -0,0 +1,102 @@ +package info.cemu.Cemu; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.Fragment; + +import java.util.HashMap; +import java.util.Map; + +import info.cemu.Cemu.databinding.FragmentControllerInputsBinding; + +public class ControllerInputsFragment extends Fragment { + public static final String CONTROLLER_INDEX = "ControllerIndex"; + private int controllerIndex; + private int controllerType; + private final InputManager inputManager = new InputManager(); + private final ControllerInputsDataProvider controllerInputsDataProvider = new ControllerInputsDataProvider(); + private final GenericRecyclerViewAdapter genericRecyclerViewAdapter = new GenericRecyclerViewAdapter(); + private final EmulatedControllerTypeAdapter emulatedControllerTypeAdapter = new EmulatedControllerTypeAdapter(); + + private void onTypeChanged(int controllerType) { + if (this.controllerType == controllerType) return; + this.controllerType = controllerType; + NativeLibrary.setControllerType(controllerIndex, controllerType); + genericRecyclerViewAdapter.clearRecyclerViewItems(); + setControllerInputs(new HashMap<>()); + } + + private void setControllerInputs(Map inputs) { + emulatedControllerTypeAdapter.setSelectedValue(controllerType); + emulatedControllerTypeAdapter.setControllerTypeCounts(NativeLibrary.getVPADControllersCount(), NativeLibrary.getWPADControllersCount()); + String controllerTypeName = getString(NativeLibrary.controllerTypeToResourceNameId(controllerType)); + + SingleSelectionRecyclerViewItem emulatedControllerSelection = new SingleSelectionRecyclerViewItem<>(getString(R.string.emulated_controller_label), + getString(R.string.emulated_controller_selection_description, controllerTypeName), + emulatedControllerTypeAdapter, + (controllerType, selectionRecyclerViewItem) -> onTypeChanged(controllerType)); + genericRecyclerViewAdapter.addRecyclerViewItem(emulatedControllerSelection); + for (var controllerInputsGroups : controllerInputsDataProvider.getControllerInputs(controllerType, inputs)) { + genericRecyclerViewAdapter.addRecyclerViewItem(new HeaderRecyclerViewItem(controllerInputsGroups.groupResourceIdName)); + for (var controllerInput : controllerInputsGroups.inputs) { + int buttonId = controllerInput.buttonId; + int buttonResourceIdName = controllerInput.buttonResourceIdName; + InputRecyclerViewItem inputRecyclerViewItem = new InputRecyclerViewItem(controllerInput.buttonResourceIdName, controllerInput.boundInput, inputItem -> { + MotionDialog inputDialog = new MotionDialog(getContext()); + inputDialog.setOnKeyListener((dialog, keyCode, keyEvent) -> { + if (inputManager.mapKeyEventToMappingId(controllerIndex, buttonId, keyEvent)) { + inputItem.setBoundInput(NativeLibrary.getControllerMapping(controllerIndex, buttonId)); + inputDialog.dismiss(); + } + return true; + }); + inputDialog.setOnMotionListener(motionEvent -> { + if (inputManager.mapMotionEventToMappingId(controllerIndex, buttonId, motionEvent)) { + inputItem.setBoundInput(NativeLibrary.getControllerMapping(controllerIndex, buttonId)); + inputDialog.dismiss(); + } + return true; + }); + inputDialog.setMessage(getString(R.string.inputBindingDialogMessage, getString(buttonResourceIdName))); + inputDialog.setButton(AlertDialog.BUTTON_NEUTRAL, getString(R.string.clear), (dialogInterface, i) -> { + NativeLibrary.clearControllerMapping(controllerIndex, buttonId); + inputItem.clearBoundInput(); + dialogInterface.dismiss(); + }); + inputDialog.setButton(AlertDialog.BUTTON_NEGATIVE, getString(R.string.cancel), (dialogInterface, i) -> dialogInterface.dismiss()); + inputDialog.setTitle(R.string.inputBindingDialogTitle); + inputDialog.show(); + }); + genericRecyclerViewAdapter.addRecyclerViewItem(inputRecyclerViewItem); + } + } + } + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + controllerIndex = requireArguments().getInt(CONTROLLER_INDEX); + ActionBar actionBar = ((AppCompatActivity) requireActivity()).getSupportActionBar(); + if (actionBar != null) + actionBar.setTitle(getString(R.string.controller_numbered, controllerIndex + 1)); + if (NativeLibrary.isControllerDisabled(controllerIndex)) + controllerType = NativeLibrary.EMULATED_CONTROLLER_TYPE_DISABLED; + else controllerType = NativeLibrary.getControllerType(controllerIndex); + + setControllerInputs(NativeLibrary.getControllerMappings(controllerIndex)); + + FragmentControllerInputsBinding binding = FragmentControllerInputsBinding.inflate(inflater, container, false); + binding.controllerInputsRecyclerView.setAdapter(genericRecyclerViewAdapter); + + return binding.getRoot(); + } +} \ No newline at end of file diff --git a/src/android/app/src/main/java/info/cemu/Cemu/EmulatedControllerTypeAdapter.java b/src/android/app/src/main/java/info/cemu/Cemu/EmulatedControllerTypeAdapter.java new file mode 100644 index 00000000..3ede0c71 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/EmulatedControllerTypeAdapter.java @@ -0,0 +1,39 @@ +package info.cemu.Cemu; + + +import java.util.stream.Collectors; +import java.util.stream.Stream; + +public class EmulatedControllerTypeAdapter extends SelectionAdapter { + private int vpadCount = 0; + private int wpadCount = 0; + + public EmulatedControllerTypeAdapter() { + choiceItems = Stream.of(NativeLibrary.EMULATED_CONTROLLER_TYPE_DISABLED, + NativeLibrary.EMULATED_CONTROLLER_TYPE_VPAD, + NativeLibrary.EMULATED_CONTROLLER_TYPE_PRO, + NativeLibrary.EMULATED_CONTROLLER_TYPE_CLASSIC, + NativeLibrary.EMULATED_CONTROLLER_TYPE_WIIMOTE) + .map(type -> new ChoiceItem<>(NativeLibrary.controllerTypeToResourceNameId(type), type)) + .collect(Collectors.toList()); + setSelectedValue(NativeLibrary.EMULATED_CONTROLLER_TYPE_DISABLED); + } + + public void setControllerTypeCounts(int vpadCount, int wpadCount) { + this.vpadCount = vpadCount; + this.wpadCount = wpadCount; + notifyDataSetChanged(); + } + + @Override + public boolean isEnabled(int position) { + int currentControllerType = getItem(selectedPosition); + int type = getItem(position); + if (type == NativeLibrary.EMULATED_CONTROLLER_TYPE_DISABLED) + return true; + if (type == NativeLibrary.EMULATED_CONTROLLER_TYPE_VPAD) + return currentControllerType == NativeLibrary.EMULATED_CONTROLLER_TYPE_VPAD || vpadCount < NativeLibrary.MAX_VPAD_CONTROLLERS; + boolean isWPAD = currentControllerType != NativeLibrary.EMULATED_CONTROLLER_TYPE_VPAD && currentControllerType != NativeLibrary.EMULATED_CONTROLLER_TYPE_DISABLED; + return isWPAD || wpadCount < NativeLibrary.MAX_WPAD_CONTROLLERS; + } +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/EmulationActivity.java b/src/android/app/src/main/java/info/cemu/Cemu/EmulationActivity.java new file mode 100644 index 00000000..d0a5e1a5 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/EmulationActivity.java @@ -0,0 +1,85 @@ +package info.cemu.Cemu; + +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.view.WindowCompat; +import androidx.core.view.WindowInsetsAnimationCompat; +import androidx.core.view.WindowInsetsCompat; +import androidx.core.view.WindowInsetsControllerCompat; + +import android.content.DialogInterface; +import android.os.Bundle; +import android.view.KeyEvent; +import android.view.MotionEvent; + +import com.google.android.material.dialog.MaterialAlertDialogBuilder; + +import info.cemu.Cemu.databinding.ActivityEmulationBinding; +import info.cemu.Cemu.databinding.ActivityMainBinding; + +public class EmulationActivity extends AppCompatActivity { + + public static final String GAME_TITLE_ID = "GameTitleId"; + private long gameTitleId; + private ActivityEmulationBinding binding; + private EmulationFragment emulationFragment; + private final InputManager inputManager = new InputManager(); + + @Override + public boolean onGenericMotionEvent(MotionEvent event) { + if (inputManager.onMotionEvent(event)) + return true; + return super.onGenericMotionEvent(event); + } + + @Override + public boolean dispatchKeyEvent(KeyEvent event) { + if (inputManager.onKeyEvent(event)) + return true; + return super.dispatchKeyEvent(event); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + Bundle extras = getIntent().getExtras(); + if (extras != null) { + gameTitleId = extras.getLong(GAME_TITLE_ID); + } + setFullscreen(); + binding = ActivityEmulationBinding.inflate(getLayoutInflater()); + setContentView(binding.getRoot()); + emulationFragment = (EmulationFragment) getSupportFragmentManager().findFragmentById(R.id.emulation_frame); + if (emulationFragment == null) { + emulationFragment = new EmulationFragment(gameTitleId); + getSupportFragmentManager() + .beginTransaction() + .add(R.id.emulation_frame, emulationFragment) + .commit(); + } + } + + @Override + public void onBackPressed() { + showExitConfirmationDialog(); + } + + private void showExitConfirmationDialog() { + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this); + builder.setTitle(R.string.exit_confirmation_title) + .setMessage(R.string.exit_confirm_message) + .setPositiveButton(R.string.yes, (dialog, which) -> { + finishAffinity(); + System.exit(0); + }).setNegativeButton(R.string.no, (dialog, which) -> dialog.cancel()) + .create() + .show(); + } + + private void setFullscreen() { + WindowCompat.setDecorFitsSystemWindows(getWindow(), false); + WindowInsetsControllerCompat controller = new WindowInsetsControllerCompat(getWindow(), getWindow().getDecorView()); + controller.hide(WindowInsetsCompat.Type.systemBars()); + controller.setSystemBarsBehavior(WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE); + } +} \ No newline at end of file diff --git a/src/android/app/src/main/java/info/cemu/Cemu/EmulationFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/EmulationFragment.java new file mode 100644 index 00000000..ed81ef3e --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/EmulationFragment.java @@ -0,0 +1,60 @@ +package info.cemu.Cemu; + +import android.os.Bundle; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.SurfaceHolder; +import android.view.SurfaceView; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; + +import info.cemu.Cemu.databinding.FragmentEmulationBinding; + +public class EmulationFragment extends Fragment implements SurfaceHolder.Callback { + private final long gameTitleId; + private boolean isGameRunning; + private SurfaceHolder mainCanvasSurfaceHolder; + + public EmulationFragment(long gameTitleId) { + this.gameTitleId = gameTitleId; + } + + @Override + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + FragmentEmulationBinding binding = FragmentEmulationBinding.inflate(inflater, container, false); + SurfaceView mainCanvas = binding.mainCanvas; + mainCanvas.getHolder().addCallback(this); + return binding.getRoot(); + } + + @Override + public void surfaceCreated(@NonNull SurfaceHolder surfaceHolder) { + mainCanvasSurfaceHolder = surfaceHolder; + } + + @Override + public void surfaceChanged(@NonNull SurfaceHolder surfaceHolder, int format, int width, int height) { + NativeLibrary.setSurfaceSize(width, height, true); + if (!isGameRunning) { + isGameRunning = true; + NativeLibrary.setSurface(surfaceHolder.getSurface(), true); + NativeLibrary.initializerRenderer(); + NativeLibrary.initializeRendererSurface(true); + NativeLibrary.startGame(gameTitleId); + } else { + if (mainCanvasSurfaceHolder == surfaceHolder) + return; + NativeLibrary.setSurface(surfaceHolder.getSurface(), true); + NativeLibrary.recreateRenderSurface(true); + } + } + + @Override + public void surfaceDestroyed(@NonNull SurfaceHolder surfaceHolder) { + mainCanvasSurfaceHolder = null; + NativeLibrary.clearSurface(true); + } +} \ No newline at end of file diff --git a/src/android/app/src/main/java/info/cemu/Cemu/FileUtil.java b/src/android/app/src/main/java/info/cemu/Cemu/FileUtil.java new file mode 100644 index 00000000..575a138c --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/FileUtil.java @@ -0,0 +1,91 @@ +package info.cemu.Cemu; + +import android.content.Context; +import android.database.Cursor; +import android.net.Uri; +import android.os.ParcelFileDescriptor; +import android.provider.DocumentsContract; +import android.util.Log; + +import androidx.documentfile.provider.DocumentFile; + +import java.io.File; +import java.util.ArrayList; +import java.util.Objects; + +public class FileUtil { + private static final String PATH_SEPARATOR_ENCODED = "%2F"; + private static final String PATH_SEPARATOR_DECODED = "/"; + private static final String COLON_ENCODED = "%3A"; + private static final String MODE = "r"; + + private static CemuApplication cemuApplication; + + public static void setCemuApplication(CemuApplication cemuApplication) { + FileUtil.cemuApplication = cemuApplication; + } + + private static String toCppPath(Uri uri) { + String uriPath = uri.toString(); + int delimiterPos = uriPath.lastIndexOf(COLON_ENCODED); + return uriPath.substring(0, delimiterPos) + uriPath.substring(delimiterPos).replace(PATH_SEPARATOR_ENCODED, PATH_SEPARATOR_DECODED); + } + + private static Uri fromCppPath(String cppPath) { + int delimiterPos = cppPath.lastIndexOf(COLON_ENCODED); + return Uri.parse(cppPath.substring(0, delimiterPos) + cppPath.substring(delimiterPos).replace(PATH_SEPARATOR_DECODED, PATH_SEPARATOR_ENCODED)); + } + + public static int openContentUri(String uri) { + try { + if (!exists(uri)) { + return -1; + } + ParcelFileDescriptor parcelFileDescriptor = cemuApplication.getApplicationContext().getContentResolver().openFileDescriptor(fromCppPath(uri), MODE); + if (parcelFileDescriptor != null) { + int fd = parcelFileDescriptor.detachFd(); + parcelFileDescriptor.close(); + return fd; + } + } catch (Exception e) { + Log.e("FileUtil", "Cannot open content uri, error: " + e.getMessage()); + } + return -1; + } + + public static String[] listFiles(String uri) { + ArrayList files = new ArrayList<>(); + Uri directoryUri = fromCppPath(uri); + Uri childrenUri = DocumentsContract.buildChildDocumentsUriUsingTree(directoryUri, DocumentsContract.getDocumentId(directoryUri)); + try (Cursor cursor = cemuApplication.getApplicationContext().getContentResolver().query(childrenUri, new String[]{DocumentsContract.Document.COLUMN_DOCUMENT_ID}, null, null, null)) { + while (cursor != null && cursor.moveToNext()) { + String documentId = cursor.getString(0); + Uri documentUri = DocumentsContract.buildDocumentUriUsingTree(directoryUri, documentId); + files.add(toCppPath(documentUri)); + } + } catch (Exception e) { + Log.e("FileUtil", "Cannot list files: " + e.getMessage()); + } + String[] filesArray = new String[files.size()]; + filesArray = files.toArray(filesArray); + return filesArray; + } + + public static boolean isDirectory(String uri) { + String mimeType = cemuApplication.getApplicationContext().getContentResolver().getType(fromCppPath(uri)); + return DocumentsContract.Document.MIME_TYPE_DIR.equals(mimeType); + } + + public static boolean isFile(String uri) { + return !isDirectory(uri); + } + + public static boolean exists(String uri) { + try (Cursor cursor = cemuApplication.getApplicationContext().getContentResolver().query(fromCppPath(uri), null, null, null, null)) { + return cursor != null && cursor.moveToFirst(); + } catch (Exception e) { + Log.e("FileUtil", "Failed checking if file exists: " + e.getMessage()); + return false; + } + } +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/Game.java b/src/android/app/src/main/java/info/cemu/Cemu/Game.java new file mode 100644 index 00000000..c699be7c --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/Game.java @@ -0,0 +1,30 @@ +package info.cemu.Cemu; + +import android.graphics.Bitmap; + +public class Game { + Long titleId; + String title; + Bitmap icon; + + public Game(Long titleId, String title) { + this.titleId = titleId; + this.title = title; + } + + public void setIconData(Bitmap icon) { + this.icon = icon; + } + + public Bitmap getIcon() { + return icon; + } + + public Long getTitleId() { + return titleId; + } + + public String getTitle() { + return title; + } +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/GameAdapter.java b/src/android/app/src/main/java/info/cemu/Cemu/GameAdapter.java new file mode 100644 index 00000000..6605b9ca --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/GameAdapter.java @@ -0,0 +1,122 @@ +package info.cemu.Cemu; + +import android.graphics.Bitmap; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Filter; +import android.widget.Filterable; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +public class GameAdapter extends RecyclerView.Adapter implements Filterable { + private final Map gameInfoMap; + private final List gameTitleIds; + private List filteredGameTitleIds; + private final GameTitleClickAction gameTitleClickAction; + + @Override + public Filter getFilter() { + return new Filter() { + @Override + protected FilterResults performFiltering(CharSequence charSequence) { + String gameTitle = charSequence.toString(); + if (gameTitle.isEmpty()) + filteredGameTitleIds = gameTitleIds; + else + filteredGameTitleIds = gameTitleIds.stream() + .filter(titleId -> gameInfoMap.get(titleId).title.toLowerCase().contains(gameTitle.toLowerCase())) + .collect(Collectors.toList()); + FilterResults filterResults = new FilterResults(); + filterResults.values = filteredGameTitleIds; + return filterResults; + } + + @Override + protected void publishResults(CharSequence charSequence, FilterResults filterResults) { + filteredGameTitleIds = (List) filterResults.values; + notifyDataSetChanged(); + } + }; + } + + + public interface GameTitleClickAction { + void action(long titleId); + } + + public GameAdapter(GameTitleClickAction gameTitleClickAction) { + super(); + this.gameTitleClickAction = gameTitleClickAction; + gameTitleIds = new ArrayList<>(); + filteredGameTitleIds = new ArrayList<>(); + gameInfoMap = new HashMap<>(); + } + + @NonNull + @Override + public GameAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_game, parent, false); + return new ViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull GameAdapter.ViewHolder holder, int position) { + Game game = gameInfoMap.get(filteredGameTitleIds.get(position)); + if (game != null) { + holder.icon.setImageBitmap(game.getIcon()); + holder.text.setText(game.getTitle()); + holder.itemView.setOnClickListener(v -> { + long titleId = game.titleId; + gameTitleClickAction.action(titleId); + }); + } + } + + @Override + public int getItemCount() { + return filteredGameTitleIds.size(); + } + + void clear() { + notifyDataSetChanged(); + gameInfoMap.clear(); + gameTitleIds.clear(); + filteredGameTitleIds.clear(); + } + + void addGameInfo(long titleId, String title) { + gameTitleIds.add(titleId); + gameInfoMap.put(titleId, new Game(titleId, title)); + filteredGameTitleIds = gameTitleIds; + notifyDataSetChanged(); + } + + void setGameIcon(long titleId, Bitmap icon) { + Game game = gameInfoMap.get(titleId); + if (game != null) { + game.setIconData(icon); + notifyDataSetChanged(); + } + } + + public static class ViewHolder extends RecyclerView.ViewHolder { + ImageView icon; + TextView text; + + public ViewHolder(View itemView) { + super(itemView); + icon = itemView.findViewById(R.id.game_icon); + text = itemView.findViewById(R.id.game_title); + } + } +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/GamesFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/GamesFragment.java new file mode 100644 index 00000000..150885e5 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/GamesFragment.java @@ -0,0 +1,102 @@ +package info.cemu.Cemu; + +import android.content.Context; +import android.content.Intent; +import android.content.SharedPreferences; +import android.graphics.Bitmap; +import android.os.Bundle; +import android.text.Editable; +import android.text.TextWatcher; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.Toolbar; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import info.cemu.Cemu.databinding.FragmentGamesBinding; + +public class GamesFragment extends Fragment { + FragmentGamesBinding binding; + GameAdapter gameAdapter; + + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + binding = FragmentGamesBinding.inflate(inflater, container, false); + + SharedPreferences cemuPreferences = requireActivity().getSharedPreferences(CemuPreferences.PREFERENCES_NAME, Context.MODE_PRIVATE); + String gamesPath = cemuPreferences.getString(CemuPreferences.GAMES_PATH_KEY, null); + if (gamesPath != null) + NativeLibrary.addGamePath(gamesPath); + RecyclerView recyclerView = binding.gamesRecyclerView; + recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); + View rootView = binding.getRoot(); + gameAdapter = new GameAdapter(titleId -> { + Intent intent = new Intent(getContext(), EmulationActivity.class); + intent.putExtra(EmulationActivity.GAME_TITLE_ID, titleId); + startActivity(intent); + }); + gameAdapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() { + @Override + public void onChanged() { + if (gameAdapter.getItemCount() == 0) { + if (!binding.searchText.getText().toString().isEmpty()) + binding.gamesListMessage.setText(R.string.no_games_found); + binding.gamesListMessage.setVisibility(View.VISIBLE); + + } else { + binding.gamesListMessage.setVisibility(View.GONE); + } + } + }); + binding.gamesSwipeRefresh.setOnRefreshListener(() -> { + gameAdapter.clear(); + NativeLibrary.reloadGameTitles(); + binding.gamesSwipeRefresh.setRefreshing(false); + }); + recyclerView.setAdapter(gameAdapter); + NativeLibrary.setGameTitleLoadedCallback((titleId, title) -> { + requireActivity().runOnUiThread(() -> { + gameAdapter.addGameInfo(titleId, title); + NativeLibrary.requestGameIcon(titleId); + }); + }); + NativeLibrary.setGameIconLoadedCallback((titleId, colors, width, height) -> { + Bitmap icon = Bitmap.createBitmap(colors, width, height, Bitmap.Config.ARGB_8888); + requireActivity().runOnUiThread(() -> gameAdapter.setGameIcon(titleId, icon)); + }); + NativeLibrary.reloadGameTitles(); + + binding.searchText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + Log.i("TextChanged", charSequence.toString()); + gameAdapter.getFilter().filter(charSequence.toString()); + } + + @Override + public void afterTextChanged(Editable editable) { + + } + }); + + return rootView; + } + +} \ No newline at end of file diff --git a/src/android/app/src/main/java/info/cemu/Cemu/GenericRecyclerViewAdapter.java b/src/android/app/src/main/java/info/cemu/Cemu/GenericRecyclerViewAdapter.java new file mode 100644 index 00000000..5f51331c --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/GenericRecyclerViewAdapter.java @@ -0,0 +1,46 @@ +package info.cemu.Cemu; + +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import java.util.ArrayList; +import java.util.List; + +public class GenericRecyclerViewAdapter extends RecyclerView.Adapter { + + private final List recyclerViewItems = new ArrayList<>(); + + public void addRecyclerViewItem(RecyclerViewItem recyclerViewItem) { + recyclerViewItems.add(recyclerViewItem); + notifyItemInserted(recyclerViewItems.size() - 1); + } + + public void clearRecyclerViewItems() { + int itemsCount = recyclerViewItems.size(); + recyclerViewItems.clear(); + notifyItemRangeRemoved(0, itemsCount); + } + + @NonNull + @Override + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int position) { + return recyclerViewItems.get(position).onCreateViewHolder(parent); + } + + @Override + public int getItemViewType(int position) { + return position; + } + + @Override + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { + recyclerViewItems.get(position).onBindViewHolder(holder, this); + } + + @Override + public int getItemCount() { + return recyclerViewItems.size(); + } +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/GraphicsSettingsFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/GraphicsSettingsFragment.java new file mode 100644 index 00000000..5ce7b96e --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/GraphicsSettingsFragment.java @@ -0,0 +1,46 @@ +package info.cemu.Cemu; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; + +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import info.cemu.Cemu.databinding.FragmentGraphicsSettingsBinding; + +public class GraphicsSettingsFragment extends Fragment { + + @Override + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + FragmentGraphicsSettingsBinding binding = FragmentGraphicsSettingsBinding.inflate(inflater, container, false); + + GenericRecyclerViewAdapter genericRecyclerViewAdapter = new GenericRecyclerViewAdapter(); + + CheckboxRecyclerViewItem asyncShaderCheckbox = new CheckboxRecyclerViewItem(getString(R.string.async_shader_compile), getString(R.string.async_shader_compile_description), NativeLibrary.getAsyncShaderCompile(), NativeLibrary::setAsyncShaderCompile); + genericRecyclerViewAdapter.addRecyclerViewItem(asyncShaderCheckbox); + + int vsyncMode = NativeLibrary.getVSyncMode(); + var vsyncChoices = Stream.of(NativeLibrary.VSYNC_MODE_OFF, NativeLibrary.VSYNC_MODE_DOUBLE_BUFFERING, NativeLibrary.VSYNC_MODE_TRIPLE_BUFFERING) + .map(vsync -> new SelectionAdapter.ChoiceItem<>(NativeLibrary.vsyncModeToResourceNameId(vsync), vsync)) + .collect(Collectors.toList()); + SelectionAdapter vsyncSelectionAdapter = new SelectionAdapter<>(vsyncChoices, vsyncMode); + SingleSelectionRecyclerViewItem vsyncModeSelection = new SingleSelectionRecyclerViewItem<>(getString(R.string.vsync), + getString(NativeLibrary.vsyncModeToResourceNameId(vsyncMode)), vsyncSelectionAdapter, + (vsync, selectionRecyclerViewItem) -> { + NativeLibrary.setVSyncMode(vsync); + selectionRecyclerViewItem.setDescription(getString(NativeLibrary.vsyncModeToResourceNameId(vsync))); + }); + genericRecyclerViewAdapter.addRecyclerViewItem(vsyncModeSelection); + + CheckboxRecyclerViewItem accurateBarriersCheckbox = new CheckboxRecyclerViewItem(getString(R.string.accurate_barriers), getString(R.string.accurate_barriers_description), NativeLibrary.getAccurateBarriers(), NativeLibrary::setAccurateBarriers); + genericRecyclerViewAdapter.addRecyclerViewItem(accurateBarriersCheckbox); + + binding.graphicsSettingsRecyclerView.setAdapter(genericRecyclerViewAdapter); + return binding.getRoot(); + } +} \ No newline at end of file diff --git a/src/android/app/src/main/java/info/cemu/Cemu/HeaderRecyclerViewItem.java b/src/android/app/src/main/java/info/cemu/Cemu/HeaderRecyclerViewItem.java new file mode 100644 index 00000000..95f5c610 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/HeaderRecyclerViewItem.java @@ -0,0 +1,37 @@ +package info.cemu.Cemu; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.recyclerview.widget.RecyclerView; + +public class HeaderRecyclerViewItem implements RecyclerViewItem { + + private static class HeaderViewHolder extends RecyclerView.ViewHolder { + TextView header; + + public HeaderViewHolder(View itemView) { + super(itemView); + header = itemView.findViewById(R.id.textview_header); + } + } + + private final int headerResourceIdText; + + public HeaderRecyclerViewItem(int headerResourceIdText) { + this.headerResourceIdText = headerResourceIdText; + } + + @Override + public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent) { + return new HeaderViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_header, parent, false)); + } + + @Override + public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, RecyclerView.Adapter adapter) { + HeaderViewHolder headerViewHolder = (HeaderViewHolder) viewHolder; + headerViewHolder.header.setText(headerResourceIdText); + } +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/InputManager.java b/src/android/app/src/main/java/info/cemu/Cemu/InputManager.java new file mode 100644 index 00000000..8c34daee --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/InputManager.java @@ -0,0 +1,122 @@ +package info.cemu.Cemu; + +import android.util.Log; +import android.view.InputDevice; +import android.view.KeyEvent; +import android.view.MotionEvent; + +public class InputManager { + private static class InvalidAxisException extends Exception { + public InvalidAxisException(int axis) { + super("Invalid axis " + axis); + } + } + + private int getNativeAxisKey(int axis, boolean isPositive) throws InvalidAxisException { + if (isPositive) { + return switch (axis) { + case MotionEvent.AXIS_X -> NativeLibrary.AXIS_X_POS; + case MotionEvent.AXIS_Y -> NativeLibrary.AXIS_Y_POS; + case MotionEvent.AXIS_RX, MotionEvent.AXIS_Z -> NativeLibrary.ROTATION_X_POS; + case MotionEvent.AXIS_RY, MotionEvent.AXIS_RZ -> NativeLibrary.ROTATION_Y_POS; + case MotionEvent.AXIS_LTRIGGER -> NativeLibrary.TRIGGER_X_POS; + case MotionEvent.AXIS_RTRIGGER -> NativeLibrary.TRIGGER_Y_POS; + case MotionEvent.AXIS_HAT_X -> NativeLibrary.DPAD_RIGHT; + case MotionEvent.AXIS_HAT_Y -> NativeLibrary.DPAD_DOWN; + default -> throw new InvalidAxisException(axis); + }; + } else { + return switch (axis) { + case MotionEvent.AXIS_X -> NativeLibrary.AXIS_X_NEG; + case MotionEvent.AXIS_Y -> NativeLibrary.AXIS_Y_NEG; + case MotionEvent.AXIS_RX, MotionEvent.AXIS_Z -> NativeLibrary.ROTATION_X_NEG; + case MotionEvent.AXIS_RY, MotionEvent.AXIS_RZ -> NativeLibrary.ROTATION_Y_NEG; + case MotionEvent.AXIS_HAT_X -> NativeLibrary.DPAD_LEFT; + case MotionEvent.AXIS_HAT_Y -> NativeLibrary.DPAD_UP; + default -> throw new InvalidAxisException(axis); + }; + } + } + + private boolean isMotionEventFromJoystick(MotionEvent event) { + return (event.getSource() & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK && event.getAction() == MotionEvent.ACTION_MOVE; + } + + public boolean mapMotionEventToMappingId(int controllerIndex, int mappingId, MotionEvent event) { + if (isMotionEventFromJoystick(event)) { + InputDevice device = event.getDevice(); + float maxAbsAxisValue = 0.0f; + int maxAxis = -1; + int actionPointerIndex = event.getActionIndex(); + for (InputDevice.MotionRange motionRange : device.getMotionRanges()) { + float axisValue = event.getAxisValue(motionRange.getAxis(), actionPointerIndex); + int axis; + try { + axis = getNativeAxisKey(motionRange.getAxis(), axisValue > 0); + } catch (InvalidAxisException e) { + continue; + } + if (Math.abs(axisValue) > maxAbsAxisValue) { + maxAxis = axis; + maxAbsAxisValue = Math.abs(axisValue); + } + } + float MIN_ABS_AXIS_VALUE = 0.33f; + if (maxAbsAxisValue > MIN_ABS_AXIS_VALUE) { + NativeLibrary.setControllerMapping(device.getDescriptor(), device.getName(), controllerIndex, mappingId, maxAxis); + return true; + } + } + return false; + } + + private boolean isSpecialKey(KeyEvent event) { + int keyCode = event.getKeyCode(); + return keyCode == KeyEvent.KEYCODE_VOLUME_DOWN || + keyCode == KeyEvent.KEYCODE_VOLUME_UP || + keyCode == KeyEvent.KEYCODE_CAMERA || + keyCode == KeyEvent.KEYCODE_ZOOM_IN || + keyCode == KeyEvent.KEYCODE_ZOOM_OUT; + } + + private boolean isController(InputDevice inputDevice) { + + int sources = inputDevice.getSources(); + return (sources & InputDevice.SOURCE_CLASS_JOYSTICK) != 0 || + ((sources & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD) || + ((sources & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD); + } + + public boolean onKeyEvent(KeyEvent event) { + if (isSpecialKey(event)) + return false; + if (event.getDeviceId() < 0) + return false; + InputDevice device = event.getDevice(); + if (!isController(device)) + return false; + NativeLibrary.onNativeKey(device.getDescriptor(), device.getName(), event.getKeyCode(), event.getAction() == KeyEvent.ACTION_DOWN); + return true; + } + + public boolean onMotionEvent(MotionEvent event) { + if (!isMotionEventFromJoystick(event)) + return false; + InputDevice device = event.getDevice(); + int actionPointerIndex = event.getActionIndex(); + for (InputDevice.MotionRange motionRange : device.getMotionRanges()) { + float axisValue = event.getAxisValue(motionRange.getAxis(), actionPointerIndex); + int axis = motionRange.getAxis(); + NativeLibrary.onNativeAxis(device.getDescriptor(), device.getName(), axis, axisValue); + Log.i(getClass().getName(), "Axis: " + axis + " value: " + axisValue); + } + return true; + } + + public boolean mapKeyEventToMappingId(int controllerIndex, int mappingId, KeyEvent event) { + Log.i(getClass().getName(), event.toString()); + InputDevice device = event.getDevice(); + NativeLibrary.setControllerMapping(device.getDescriptor(), device.getName(), controllerIndex, mappingId, event.getKeyCode()); + return true; + } +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/InputRecyclerViewItem.java b/src/android/app/src/main/java/info/cemu/Cemu/InputRecyclerViewItem.java new file mode 100644 index 00000000..e026330a --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/InputRecyclerViewItem.java @@ -0,0 +1,61 @@ +package info.cemu.Cemu; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.recyclerview.widget.RecyclerView; + +public class InputRecyclerViewItem implements RecyclerViewItem { + public interface OnInputClickListener { + void onInputClick(InputRecyclerViewItem inputRecyclerViewItem); + } + + private static class InputViewHolder extends RecyclerView.ViewHolder { + TextView inputName; + TextView boundInput; + + public InputViewHolder(View itemView) { + super(itemView); + inputName = itemView.findViewById(R.id.controller_input_name); + boundInput = itemView.findViewById(R.id.controller_button_name); + } + } + + private final int inputNameResourceId; + private String boundInput; + private final OnInputClickListener onInputClickListener; + private RecyclerView.Adapter recyclerViewAdapter; + private InputViewHolder inputViewHolder; + + public InputRecyclerViewItem(int inputNameResourceId, String boundInput, OnInputClickListener onInputClickListener) { + this.inputNameResourceId = inputNameResourceId; + this.boundInput = boundInput; + this.onInputClickListener = onInputClickListener; + + } + + public void clearBoundInput() { + setBoundInput(""); + } + + public void setBoundInput(String boundInput) { + this.boundInput = boundInput; + recyclerViewAdapter.notifyItemChanged(inputViewHolder.getAdapterPosition()); + } + + @Override + public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent) { + return new InputViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_controller_input, parent, false)); + } + + @Override + public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, RecyclerView.Adapter adapter) { + inputViewHolder = (InputViewHolder) viewHolder; + recyclerViewAdapter = adapter; + inputViewHolder.itemView.setOnClickListener(view -> onInputClickListener.onInputClick(this)); + inputViewHolder.inputName.setText(inputNameResourceId); + inputViewHolder.boundInput.setText(boundInput); + } +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/InputSettingsFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/InputSettingsFragment.java new file mode 100644 index 00000000..8c6c6629 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/InputSettingsFragment.java @@ -0,0 +1,40 @@ +package info.cemu.Cemu; + + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.navigation.fragment.NavHostFragment; + +import info.cemu.Cemu.databinding.FragmentInputSettingsBinding; + +public class InputSettingsFragment extends Fragment { + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + + FragmentInputSettingsBinding binding = FragmentInputSettingsBinding.inflate(inflater, container, false); + GenericRecyclerViewAdapter genericRecyclerViewAdapter = new GenericRecyclerViewAdapter(); + for (int index = 0; index < NativeLibrary.MAX_CONTROLLERS; index++) { + int controllerIndex = index; + int controllerType = NativeLibrary.isControllerDisabled(controllerIndex) ? NativeLibrary.EMULATED_CONTROLLER_TYPE_DISABLED : NativeLibrary.getControllerType(controllerIndex); + ButtonRecyclerViewItem buttonRecyclerViewItem = new ButtonRecyclerViewItem( + getString(R.string.controller_numbered, controllerIndex + 1), + getString(R.string.emulated_controller_with_type, getString(NativeLibrary.controllerTypeToResourceNameId(controllerType))), + () -> { + Bundle bundle = new Bundle(); + bundle.putInt(ControllerInputsFragment.CONTROLLER_INDEX, controllerIndex); + NavHostFragment.findNavController(InputSettingsFragment.this).navigate(R.id.action_inputSettingsFragment_to_controllerInputsFragment, bundle); + }); + genericRecyclerViewAdapter.addRecyclerViewItem(buttonRecyclerViewItem); + } + binding.inputSettingsRecyclerView.setAdapter(genericRecyclerViewAdapter); + return binding.getRoot(); + } +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/MainActivity.java b/src/android/app/src/main/java/info/cemu/Cemu/MainActivity.java new file mode 100644 index 00000000..8b5ae856 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/MainActivity.java @@ -0,0 +1,24 @@ +package info.cemu.Cemu; + +import android.content.Intent; +import android.os.Bundle; + +import androidx.appcompat.app.AppCompatActivity; + +import info.cemu.Cemu.databinding.ActivityMainBinding; + + +public class MainActivity extends AppCompatActivity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + ActivityMainBinding binding = ActivityMainBinding.inflate(getLayoutInflater()); + setContentView(binding.getRoot()); + binding.fab.setOnClickListener( + view -> { + Intent intent = new Intent(this, SettingsActivity.class); + startActivity(intent); + } + ); + } +} \ No newline at end of file diff --git a/src/android/app/src/main/java/info/cemu/Cemu/MotionDialog.java b/src/android/app/src/main/java/info/cemu/Cemu/MotionDialog.java new file mode 100644 index 00000000..a20bc4c4 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/MotionDialog.java @@ -0,0 +1,33 @@ +package info.cemu.Cemu; + +import android.app.AlertDialog; +import android.content.Context; +import android.view.MotionEvent; +import android.view.View; + +import androidx.annotation.NonNull; + +public class MotionDialog extends AlertDialog { + public static interface OnMotionListener { + boolean onMotion(MotionEvent ev); + } + + private OnMotionListener onMotionListener; + + protected MotionDialog(Context context) { + super(context); + } + + public void setOnMotionListener(OnMotionListener onMotionListener) { + this.onMotionListener = onMotionListener; + } + + @Override + public boolean onGenericMotionEvent(@NonNull MotionEvent event) { + if (onMotionListener != null && onMotionListener.onMotion(event)) { + return true; + } + return super.onGenericMotionEvent(event); + } +} + diff --git a/src/android/app/src/main/java/info/cemu/Cemu/NativeLibrary.java b/src/android/app/src/main/java/info/cemu/Cemu/NativeLibrary.java new file mode 100644 index 00000000..f8174763 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/NativeLibrary.java @@ -0,0 +1,287 @@ +package info.cemu.Cemu; + +import android.graphics.Bitmap; +import android.view.KeyEvent; +import android.view.Surface; + +import java.util.ArrayList; +import java.util.Map; + +public class NativeLibrary { + static { + System.loadLibrary("CemuAndroid"); + } + + public interface FileSystemCallbacks { + int openContentUri(String uri); + + String[] listFiles(String uri); + + boolean isDirectory(String uri); + + boolean isFile(String uri); + + boolean exists(String uri); + } + + public static native void setFileSystemCallbacks(FileSystemCallbacks fileSystemCallbacks); + + public static native void setDPI(float dpi); + + public static native void setSurface(Surface surface, boolean isMainCanvas); + + public static native void clearSurface(boolean isMainCanvas); + + public static native void setSurfaceSize(int width, int height, boolean isMainCanvas); + + public static native void initializerRenderer(); + + public static native void initializeRendererSurface(boolean isMainCanvas); + + public static native void startGame(long titleId); + + public static native void recreateRenderSurface(boolean isMainCanvas); + + + public interface GameTitleLoadedCallback { + void onGameTitleLoaded(long titleId, String title); + } + + public static native void setGameTitleLoadedCallback(GameTitleLoadedCallback gameTitleLoadedCallback); + + public interface GameIconLoadedCallback { + void onGameIconLoaded(long titleId, int[] colors, int width, int height); + } + + public static native void setGameIconLoadedCallback(GameIconLoadedCallback gameIconLoadedCallback); + + public static native void requestGameIcon(long titleId); + + public static native void reloadGameTitles(); + + public static native void initializeActiveSettings(String dataPath, String cachePath); + + public static native void initializeEmulation(); + + public static native void addGamePath(String uri); + + public static native void onNativeKey(String deviceDescriptor, String deviceName, int key, boolean isPressed); + + public static native void onNativeAxis(String deviceDescriptor, String deviceName, int axis, float value); + + static final int VPAD_BUTTON_NONE = 0; + static final int VPAD_BUTTON_A = 1; + static final int VPAD_BUTTON_B = 2; + static final int VPAD_BUTTON_X = 3; + static final int VPAD_BUTTON_Y = 4; + static final int VPAD_BUTTON_L = 5; + static final int VPAD_BUTTON_R = 6; + static final int VPAD_BUTTON_ZL = 7; + static final int VPAD_BUTTON_ZR = 8; + static final int VPAD_BUTTON_PLUS = 9; + static final int VPAD_BUTTON_MINUS = 10; + static final int VPAD_BUTTON_UP = 11; + static final int VPAD_BUTTON_DOWN = 12; + static final int VPAD_BUTTON_LEFT = 13; + static final int VPAD_BUTTON_RIGHT = 14; + static final int VPAD_BUTTON_STICKL = 15; + static final int VPAD_BUTTON_STICKR = 16; + static final int VPAD_BUTTON_STICKL_UP = 17; + static final int VPAD_BUTTON_STICKL_DOWN = 18; + static final int VPAD_BUTTON_STICKL_LEFT = 19; + static final int VPAD_BUTTON_STICKL_RIGHT = 20; + static final int VPAD_BUTTON_STICKR_UP = 21; + static final int VPAD_BUTTON_STICKR_DOWN = 22; + static final int VPAD_BUTTON_STICKR_LEFT = 23; + static final int VPAD_BUTTON_STICKR_RIGHT = 24; + static final int VPAD_BUTTON_MIC = 25; + static final int VPAD_BUTTON_SCREEN = 26; + static final int VPAD_BUTTON_HOME = 27; + static final int VPAD_BUTTON_MAX = 28; + + static final int PRO_BUTTON_NONE = 0; + static final int PRO_BUTTON_A = 1; + static final int PRO_BUTTON_B = 2; + static final int PRO_BUTTON_X = 3; + static final int PRO_BUTTON_Y = 4; + static final int PRO_BUTTON_L = 5; + static final int PRO_BUTTON_R = 6; + static final int PRO_BUTTON_ZL = 7; + static final int PRO_BUTTON_ZR = 8; + static final int PRO_BUTTON_PLUS = 9; + static final int PRO_BUTTON_MINUS = 10; + static final int PRO_BUTTON_HOME = 11; + static final int PRO_BUTTON_UP = 12; + static final int PRO_BUTTON_DOWN = 13; + static final int PRO_BUTTON_LEFT = 14; + static final int PRO_BUTTON_RIGHT = 15; + static final int PRO_BUTTON_STICKL = 16; + static final int PRO_BUTTON_STICKR = 17; + static final int PRO_BUTTON_STICKL_UP = 18; + static final int PRO_BUTTON_STICKL_DOWN = 19; + static final int PRO_BUTTON_STICKL_LEFT = 20; + static final int PRO_BUTTON_STICKL_RIGHT = 21; + static final int PRO_BUTTON_STICKR_UP = 22; + static final int PRO_BUTTON_STICKR_DOWN = 23; + static final int PRO_BUTTON_STICKR_LEFT = 24; + static final int PRO_BUTTON_STICKR_RIGHT = 25; + static final int PRO_BUTTON_MAX = 26; + + static final int CLASSIC_BUTTON_NONE = 0; + static final int CLASSIC_BUTTON_A = 1; + static final int CLASSIC_BUTTON_B = 2; + static final int CLASSIC_BUTTON_X = 3; + static final int CLASSIC_BUTTON_Y = 4; + static final int CLASSIC_BUTTON_L = 5; + static final int CLASSIC_BUTTON_R = 6; + static final int CLASSIC_BUTTON_ZL = 7; + static final int CLASSIC_BUTTON_ZR = 8; + static final int CLASSIC_BUTTON_PLUS = 9; + static final int CLASSIC_BUTTON_MINUS = 10; + static final int CLASSIC_BUTTON_HOME = 11; + static final int CLASSIC_BUTTON_UP = 12; + static final int CLASSIC_BUTTON_DOWN = 13; + static final int CLASSIC_BUTTON_LEFT = 14; + static final int CLASSIC_BUTTON_RIGHT = 15; + static final int CLASSIC_BUTTON_STICKL_UP = 16; + static final int CLASSIC_BUTTON_STICKL_DOWN = 17; + static final int CLASSIC_BUTTON_STICKL_LEFT = 18; + static final int CLASSIC_BUTTON_STICKL_RIGHT = 19; + static final int CLASSIC_BUTTON_STICKR_UP = 20; + static final int CLASSIC_BUTTON_STICKR_DOWN = 21; + static final int CLASSIC_BUTTON_STICKR_LEFT = 22; + static final int CLASSIC_BUTTON_STICKR_RIGHT = 23; + static final int CLASSIC_BUTTON_MAX = 24; + + static final int WIIMOTE_BUTTON_NONE = 0; + static final int WIIMOTE_BUTTON_A = 1; + static final int WIIMOTE_BUTTON_B = 2; + static final int WIIMOTE_BUTTON_1 = 3; + static final int WIIMOTE_BUTTON_2 = 4; + static final int WIIMOTE_BUTTON_NUNCHUCK_Z = 5; + static final int WIIMOTE_BUTTON_NUNCHUCK_C = 6; + static final int WIIMOTE_BUTTON_PLUS = 7; + static final int WIIMOTE_BUTTON_MINUS = 8; + static final int WIIMOTE_BUTTON_UP = 9; + static final int WIIMOTE_BUTTON_DOWN = 10; + static final int WIIMOTE_BUTTON_LEFT = 11; + static final int WIIMOTE_BUTTON_RIGHT = 12; + static final int WIIMOTE_BUTTON_NUNCHUCK_UP = 13; + static final int WIIMOTE_BUTTON_NUNCHUCK_DOWN = 14; + static final int WIIMOTE_BUTTON_NUNCHUCK_LEFT = 15; + static final int WIIMOTE_BUTTON_NUNCHUCK_RIGHT = 16; + static final int WIIMOTE_BUTTON_HOME = 17; + static final int WIIMOTE_BUTTON_MAX = 18; + + static final int EMULATED_CONTROLLER_TYPE_VPAD = 0; + static final int EMULATED_CONTROLLER_TYPE_PRO = 1; + static final int EMULATED_CONTROLLER_TYPE_CLASSIC = 2; + static final int EMULATED_CONTROLLER_TYPE_WIIMOTE = 3; + static final int EMULATED_CONTROLLER_TYPE_DISABLED = -1; + + static final int DPAD_UP = 34; + static final int DPAD_DOWN = 35; + static final int DPAD_LEFT = 36; + static final int DPAD_RIGHT = 37; + static final int AXIS_X_POS = 38; + static final int AXIS_Y_POS = 39; + static final int ROTATION_X_POS = 40; + static final int ROTATION_Y_POS = 41; + static final int TRIGGER_X_POS = 42; + static final int TRIGGER_Y_POS = 43; + static final int AXIS_X_NEG = 44; + static final int AXIS_Y_NEG = 45; + static final int ROTATION_X_NEG = 46; + static final int ROTATION_Y_NEG = 47; + + static final int MAX_CONTROLLERS = 8; + static final int MAX_VPAD_CONTROLLERS = 2; + static final int MAX_WPAD_CONTROLLERS = 7; + + public static int controllerTypeToResourceNameId(int type) { + return switch (type) { + case EMULATED_CONTROLLER_TYPE_DISABLED -> R.string.disabled; + case EMULATED_CONTROLLER_TYPE_VPAD -> R.string.vpad_controller; + case EMULATED_CONTROLLER_TYPE_PRO -> R.string.pro_controller; + case EMULATED_CONTROLLER_TYPE_WIIMOTE -> R.string.wiimote_controller; + case EMULATED_CONTROLLER_TYPE_CLASSIC -> R.string.classic_controller; + default -> throw new RuntimeException("Invalid controller type: " + type); + }; + } + + public static native void setControllerType(int index, int emulatedControllerType); + + public static native boolean isControllerDisabled(int index); + + public static native int getControllerType(int index); + + public static native int getWPADControllersCount(); + + public static native int getVPADControllersCount(); + + public static native void setControllerMapping(String deviceDescriptor, String deviceName, int index, int mappingId, int buttonId); + + public static native void clearControllerMapping(int index, int mappingId); + + public static native String getControllerMapping(int index, int mappingId); + + public static native Map getControllerMappings(int index); + + public static native void onKeyEvent(String deviceDescriptor, String deviceName, int keyCode, boolean isPressed); + + public static native void onAxisEvent(String deviceDescriptor, String deviceName, int axisCode, float value); + + public static native boolean getAsyncShaderCompile(); + + public static native void setAsyncShaderCompile(boolean enabled); + + static final int VSYNC_MODE_OFF = 0; + static final int VSYNC_MODE_DOUBLE_BUFFERING = 1; + static final int VSYNC_MODE_TRIPLE_BUFFERING = 2; + + public static int vsyncModeToResourceNameId(int vsyncMode) { + return switch (vsyncMode) { + case VSYNC_MODE_OFF -> R.string.off; + case VSYNC_MODE_DOUBLE_BUFFERING -> R.string.double_buffering; + case VSYNC_MODE_TRIPLE_BUFFERING -> R.string.triple_buffering; + default -> throw new RuntimeException("Invalid vsync mode: " + vsyncMode); + }; + } + + public static native int getVSyncMode(); + + public static native void setVSyncMode(int vsyncMode); + + public static native boolean getAccurateBarriers(); + + public static native void setAccurateBarriers(boolean enabled); + + public static native boolean getAudioDeviceEnabled(boolean tv); + + public static native void setAudioDeviceEnabled(boolean enabled, boolean tv); + + static final int AUDIO_CHANNELS_MONO = 0; + static final int AUDIO_CHANNELS_STEREO = 1; + static final int AUDIO_CHANNELS_SURROUND = 2; + + public static int channelsToResourceNameId(int channels) { + return switch (channels) { + case AUDIO_CHANNELS_MONO -> R.string.mono; + case AUDIO_CHANNELS_STEREO -> R.string.stereo; + case AUDIO_CHANNELS_SURROUND -> R.string.surround; + default -> throw new RuntimeException("Invalid channels type: " + channels); + }; + } + + public static native void setAudioDeviceChannels(int channels, boolean tv); + + public static native int getAudioDeviceChannels(boolean tv); + + static final int AUDIO_MIN_VOLUME = 0; + static final int AUDIO_MAX_VOLUME = 100; + + public static native void setAudioDeviceVolume(int volume, boolean tv); + + public static native int getAudioDeviceVolume(boolean tv); + +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/OptionsFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/OptionsFragment.java new file mode 100644 index 00000000..1f83f181 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/OptionsFragment.java @@ -0,0 +1,58 @@ +package info.cemu.Cemu; + +import static android.app.Activity.RESULT_OK; + +import android.content.Context; +import android.content.Intent; +import android.content.SharedPreferences; +import android.net.Uri; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContracts; +import androidx.annotation.NonNull; +import androidx.documentfile.provider.DocumentFile; +import androidx.fragment.app.Fragment; +import androidx.navigation.fragment.NavHostFragment; + +import info.cemu.Cemu.databinding.FragmentOptionsBinding; + +public class OptionsFragment extends Fragment { + private ActivityResultLauncher folderSelectionLauncher; + + @Override + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + FragmentOptionsBinding binding = FragmentOptionsBinding.inflate(inflater, container, false); + GenericRecyclerViewAdapter genericRecyclerViewAdapter = new GenericRecyclerViewAdapter(); + folderSelectionLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> { + if (result.getResultCode() == RESULT_OK) { + Intent data = result.getData(); + if (data != null) { + Uri uri = data.getData(); + requireActivity().getContentResolver().takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION); + DocumentFile documentFile = DocumentFile.fromTreeUri(requireContext(), uri); + if (documentFile == null) return; + String gamePath = documentFile.getUri().toString(); + NativeLibrary.addGamePath(gamePath); + SharedPreferences.Editor preferencesEditor = requireActivity().getSharedPreferences(CemuPreferences.PREFERENCES_NAME, Context.MODE_PRIVATE).edit(); + preferencesEditor.putString(CemuPreferences.GAMES_PATH_KEY, gamePath); + preferencesEditor.apply(); + } + } + }); + + genericRecyclerViewAdapter.addRecyclerViewItem(new ButtonRecyclerViewItem(getString(R.string.games_folder_label), getString(R.string.games_folder_description), () -> { + Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE); + folderSelectionLauncher.launch(intent); + })); + genericRecyclerViewAdapter.addRecyclerViewItem(new SimpleButtonRecyclerViewItem(getString(R.string.input_settings), () -> NavHostFragment.findNavController(OptionsFragment.this).navigate(R.id.action_optionsFragment_to_inputSettingsFragment))); + genericRecyclerViewAdapter.addRecyclerViewItem(new SimpleButtonRecyclerViewItem(getString(R.string.graphics_settings), () -> NavHostFragment.findNavController(OptionsFragment.this).navigate(R.id.action_optionsFragment_to_graphicSettingsFragment))); + genericRecyclerViewAdapter.addRecyclerViewItem(new SimpleButtonRecyclerViewItem(getString(R.string.audio_settings), () -> NavHostFragment.findNavController(OptionsFragment.this).navigate(R.id.action_optionsFragment_to_audioSettingsFragment))); + binding.optionsRecyclerView.setAdapter(genericRecyclerViewAdapter); + + return binding.getRoot(); + } +} \ No newline at end of file diff --git a/src/android/app/src/main/java/info/cemu/Cemu/RecyclerViewItem.java b/src/android/app/src/main/java/info/cemu/Cemu/RecyclerViewItem.java new file mode 100644 index 00000000..a2fa95c3 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/RecyclerViewItem.java @@ -0,0 +1,11 @@ +package info.cemu.Cemu; + +import android.view.ViewGroup; + +import androidx.recyclerview.widget.RecyclerView; + +public interface RecyclerViewItem { + RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent); + + void onBindViewHolder(RecyclerView.ViewHolder viewHolder, RecyclerView.Adapter adapter); +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/SelectionAdapter.java b/src/android/app/src/main/java/info/cemu/Cemu/SelectionAdapter.java new file mode 100644 index 00000000..20cb21a0 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/SelectionAdapter.java @@ -0,0 +1,75 @@ +package info.cemu.Cemu; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; + +import com.google.android.material.radiobutton.MaterialRadioButton; + +import java.util.ArrayList; +import java.util.List; +import java.util.OptionalInt; +import java.util.stream.IntStream; + +public class SelectionAdapter extends BaseAdapter { + public static class ChoiceItem { + int choiceTextResourceId; + T choiceValue; + + public ChoiceItem(int choiceTextResourceId, T choiceValue) { + this.choiceTextResourceId = choiceTextResourceId; + this.choiceValue = choiceValue; + } + } + + protected List> choiceItems = new ArrayList<>(); + protected int selectedPosition = 0; + + public SelectionAdapter() { + super(); + } + + public SelectionAdapter(List> choiceItems, T selectedValue) { + super(); + this.choiceItems = choiceItems; + setSelectedValue(selectedValue); + } + + public void setSelectedValue(T selectedValue) { + selectedPosition = getPositionOf(selectedValue); + } + + public int getPositionOf(T value) { + OptionalInt optionalInt = IntStream.range(0, choiceItems.size()).filter(position -> choiceItems.get(position).choiceValue.equals(value)).findFirst(); + if (!optionalInt.isPresent()) + throw new RuntimeException("value " + value + " was not found in the list of choiceItems"); + return optionalInt.getAsInt(); + } + + @Override + public int getCount() { + return choiceItems.size(); + } + + @Override + public T getItem(int position) { + return choiceItems.get(position).choiceValue; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public View getView(int position, View view, ViewGroup viewGroup) { + if (view == null) + view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.layout_single_selection_item, viewGroup, false); + MaterialRadioButton radioButton = view.findViewById(R.id.single_selection_item_radio_button); + radioButton.setEnabled(isEnabled(position)); + radioButton.setText(choiceItems.get(position).choiceTextResourceId); + radioButton.setChecked(position == selectedPosition); + return view; + } +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/SettingsActivity.java b/src/android/app/src/main/java/info/cemu/Cemu/SettingsActivity.java new file mode 100644 index 00000000..c28c595f --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/SettingsActivity.java @@ -0,0 +1,35 @@ +package info.cemu.Cemu; + +import android.os.Bundle; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.navigation.NavController; +import androidx.navigation.Navigation; +import androidx.navigation.ui.AppBarConfiguration; +import androidx.navigation.ui.NavigationUI; + +import info.cemu.Cemu.databinding.ActivitySettingsBinding; + +public class SettingsActivity extends AppCompatActivity { + private AppBarConfiguration appBarConfiguration; + private ActivitySettingsBinding binding; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + binding = ActivitySettingsBinding.inflate(getLayoutInflater()); + setContentView(binding.getRoot()); + + setSupportActionBar(binding.toolbarSettings); + NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_settings); + appBarConfiguration = new AppBarConfiguration.Builder(navController.getGraph()).build(); + NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration); + } + + @Override + public boolean onSupportNavigateUp() { + NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_settings); + return NavigationUI.navigateUp(navController, appBarConfiguration) + || super.onSupportNavigateUp(); + } +} \ No newline at end of file diff --git a/src/android/app/src/main/java/info/cemu/Cemu/SimpleButtonRecyclerViewItem.java b/src/android/app/src/main/java/info/cemu/Cemu/SimpleButtonRecyclerViewItem.java new file mode 100644 index 00000000..16fb8607 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/SimpleButtonRecyclerViewItem.java @@ -0,0 +1,46 @@ +package info.cemu.Cemu; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.recyclerview.widget.RecyclerView; + +public class SimpleButtonRecyclerViewItem implements RecyclerViewItem { + public interface OnButtonClickListener { + void onButtonClick(); + } + + private static class SimpleButtonViewHolder extends RecyclerView.ViewHolder { + TextView text; + + public SimpleButtonViewHolder(View itemView) { + super(itemView); + text = itemView.findViewById(R.id.simple_button_text); + } + } + + private final SimpleButtonRecyclerViewItem.OnButtonClickListener onButtonClickListener; + private final String text; + + public SimpleButtonRecyclerViewItem(String text, OnButtonClickListener onButtonClickListener) { + this.text = text; + this.onButtonClickListener = onButtonClickListener; + } + + @Override + public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent) { + return new SimpleButtonRecyclerViewItem.SimpleButtonViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_simple_button, parent, false)); + } + + @Override + public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, RecyclerView.Adapter adapter) { + SimpleButtonRecyclerViewItem.SimpleButtonViewHolder buttonViewHolder = (SimpleButtonRecyclerViewItem.SimpleButtonViewHolder) viewHolder; + buttonViewHolder.text.setText(text); + buttonViewHolder.itemView.setOnClickListener(view -> { + if (onButtonClickListener != null) + onButtonClickListener.onButtonClick(); + }); + } +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/SingleSelectionRecyclerViewItem.java b/src/android/app/src/main/java/info/cemu/Cemu/SingleSelectionRecyclerViewItem.java new file mode 100644 index 00000000..32ca3b17 --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/SingleSelectionRecyclerViewItem.java @@ -0,0 +1,71 @@ +package info.cemu.Cemu; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.dialog.MaterialAlertDialogBuilder; + +public class SingleSelectionRecyclerViewItem implements RecyclerViewItem { + private static class SingleSelectionViewHolder extends RecyclerView.ViewHolder { + TextView label; + TextView description; + + public SingleSelectionViewHolder(View itemView) { + super(itemView); + label = itemView.findViewById(R.id.selection_label); + description = itemView.findViewById(R.id.selection_description); + } + } + + public interface OnItemSelectedListener { + void onItemSelected(T selectedValue, SingleSelectionRecyclerViewItem selectionRecyclerViewItem); + } + + private final SelectionAdapter selectionAdapter; + private final String label; + private String description; + private final OnItemSelectedListener onItemSelectedListener; + private SingleSelectionViewHolder singleSelectionViewHolder; + private RecyclerView.Adapter recyclerViewAdapter; + + public SingleSelectionRecyclerViewItem(String label, String description, SelectionAdapter selectionAdapter, OnItemSelectedListener onItemSelectedListener) { + this.label = label; + this.description = description; + this.selectionAdapter = selectionAdapter; + this.onItemSelectedListener = onItemSelectedListener; + } + + public void setDescription(String description) { + this.description = description; + recyclerViewAdapter.notifyItemChanged(singleSelectionViewHolder.getAdapterPosition()); + } + + @Override + public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent) { + return new SingleSelectionViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_single_selection, parent, false)); + } + + @Override + public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, RecyclerView.Adapter recyclerViewAdapter) { + this.recyclerViewAdapter = recyclerViewAdapter; + singleSelectionViewHolder = (SingleSelectionViewHolder) viewHolder; + singleSelectionViewHolder.label.setText(label); + singleSelectionViewHolder.description.setText(description); + singleSelectionViewHolder.itemView.setOnClickListener(view -> { + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(viewHolder.itemView.getContext()); + builder.setTitle(label).setAdapter(selectionAdapter, (dialogInterface, position) -> { + if (!selectionAdapter.isEnabled(position)) + return; + T selectedValue = selectionAdapter.getItem(position); + selectionAdapter.setSelectedValue(selectedValue); + if (onItemSelectedListener != null) + onItemSelectedListener.onItemSelected(selectedValue, SingleSelectionRecyclerViewItem.this); + + }).setNegativeButton(R.string.cancel, (dialogInterface, i) -> dialogInterface.dismiss()).show(); + }); + } +} diff --git a/src/android/app/src/main/java/info/cemu/Cemu/SliderRecyclerViewItem.java b/src/android/app/src/main/java/info/cemu/Cemu/SliderRecyclerViewItem.java new file mode 100644 index 00000000..3d3703ef --- /dev/null +++ b/src/android/app/src/main/java/info/cemu/Cemu/SliderRecyclerViewItem.java @@ -0,0 +1,73 @@ +package info.cemu.Cemu; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.slider.LabelFormatter; +import com.google.android.material.slider.Slider; + +public class SliderRecyclerViewItem implements RecyclerViewItem { + public interface OnChangeListener { + void onChange(float value); + } + + private static class SliderViewHolder extends RecyclerView.ViewHolder { + TextView label; + Slider slider; + + public SliderViewHolder(View itemView) { + super(itemView); + label = itemView.findViewById(R.id.slider_label); + slider = itemView.findViewById(R.id.slider); + } + } + + private final String label; + private final float valueFrom; + private final float valueTo; + private float currentValue; + private final OnChangeListener onChangeListener; + private LabelFormatter labelFormatter; + + public SliderRecyclerViewItem(String label, float valueFrom, float valueTo, float currentValue, OnChangeListener onChangeListener, LabelFormatter labelFormatter) { + this.label = label; + this.valueFrom = valueFrom; + this.valueTo = valueTo; + this.currentValue = currentValue; + this.onChangeListener = onChangeListener; + this.labelFormatter = labelFormatter; + } + + public SliderRecyclerViewItem(String label, float valueFrom, float valueTo, float currentValue, OnChangeListener onChangeListener) { + this.label = label; + this.valueFrom = valueFrom; + this.valueTo = valueTo; + this.currentValue = currentValue; + this.onChangeListener = onChangeListener; + } + + @Override + public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent) { + return new SliderViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_slider, parent, false)); + } + + @Override + public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, RecyclerView.Adapter adapter) { + SliderViewHolder sliderViewHolder = (SliderViewHolder) viewHolder; + sliderViewHolder.label.setText(label); + if (labelFormatter != null) sliderViewHolder.slider.setLabelFormatter(labelFormatter); + sliderViewHolder.slider.setValueFrom(valueFrom); + sliderViewHolder.slider.setValueTo(valueTo); + float stepSize = 1.0f; + sliderViewHolder.slider.setStepSize(stepSize); + sliderViewHolder.slider.setValue(currentValue); + sliderViewHolder.slider.addOnChangeListener((slider, value, fromUser) -> { + currentValue = value; + if (onChangeListener != null) onChangeListener.onChange(currentValue); + }); + } +} diff --git a/src/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/src/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 00000000..2b068d11 --- /dev/null +++ b/src/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/drawable/ic_launcher_background.xml b/src/android/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..07d5da9c --- /dev/null +++ b/src/android/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/android/app/src/main/res/drawable/ic_search.xml b/src/android/app/src/main/res/drawable/ic_search.xml new file mode 100644 index 00000000..852066ce --- /dev/null +++ b/src/android/app/src/main/res/drawable/ic_search.xml @@ -0,0 +1,10 @@ + + + diff --git a/src/android/app/src/main/res/drawable/ic_settings.xml b/src/android/app/src/main/res/drawable/ic_settings.xml new file mode 100644 index 00000000..f112c1d1 --- /dev/null +++ b/src/android/app/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,10 @@ + + + diff --git a/src/android/app/src/main/res/layout/activity_emulation.xml b/src/android/app/src/main/res/layout/activity_emulation.xml new file mode 100644 index 00000000..7d630bff --- /dev/null +++ b/src/android/app/src/main/res/layout/activity_emulation.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/android/app/src/main/res/layout/activity_main.xml b/src/android/app/src/main/res/layout/activity_main.xml new file mode 100644 index 00000000..0e5dc3c2 --- /dev/null +++ b/src/android/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,28 @@ + + + + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/activity_settings.xml b/src/android/app/src/main/res/layout/activity_settings.xml new file mode 100644 index 00000000..c8f1f585 --- /dev/null +++ b/src/android/app/src/main/res/layout/activity_settings.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/fragment_audio_settings.xml b/src/android/app/src/main/res/layout/fragment_audio_settings.xml new file mode 100644 index 00000000..6acf8b84 --- /dev/null +++ b/src/android/app/src/main/res/layout/fragment_audio_settings.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/fragment_controller_inputs.xml b/src/android/app/src/main/res/layout/fragment_controller_inputs.xml new file mode 100644 index 00000000..121f790a --- /dev/null +++ b/src/android/app/src/main/res/layout/fragment_controller_inputs.xml @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/fragment_emulation.xml b/src/android/app/src/main/res/layout/fragment_emulation.xml new file mode 100644 index 00000000..ca69352a --- /dev/null +++ b/src/android/app/src/main/res/layout/fragment_emulation.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/fragment_games.xml b/src/android/app/src/main/res/layout/fragment_games.xml new file mode 100644 index 00000000..f010ae43 --- /dev/null +++ b/src/android/app/src/main/res/layout/fragment_games.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/android/app/src/main/res/layout/fragment_graphics_settings.xml b/src/android/app/src/main/res/layout/fragment_graphics_settings.xml new file mode 100644 index 00000000..877deeae --- /dev/null +++ b/src/android/app/src/main/res/layout/fragment_graphics_settings.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/fragment_input_settings.xml b/src/android/app/src/main/res/layout/fragment_input_settings.xml new file mode 100644 index 00000000..fe660172 --- /dev/null +++ b/src/android/app/src/main/res/layout/fragment_input_settings.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/fragment_options.xml b/src/android/app/src/main/res/layout/fragment_options.xml new file mode 100644 index 00000000..5929f81d --- /dev/null +++ b/src/android/app/src/main/res/layout/fragment_options.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/layout_button.xml b/src/android/app/src/main/res/layout/layout_button.xml new file mode 100644 index 00000000..d60ac3cb --- /dev/null +++ b/src/android/app/src/main/res/layout/layout_button.xml @@ -0,0 +1,36 @@ + + + + + + + + + + diff --git a/src/android/app/src/main/res/layout/layout_checkbox.xml b/src/android/app/src/main/res/layout/layout_checkbox.xml new file mode 100644 index 00000000..ca21b29c --- /dev/null +++ b/src/android/app/src/main/res/layout/layout_checkbox.xml @@ -0,0 +1,47 @@ + + + + + + + + + + diff --git a/src/android/app/src/main/res/layout/layout_choice.xml b/src/android/app/src/main/res/layout/layout_choice.xml new file mode 100644 index 00000000..605b86e8 --- /dev/null +++ b/src/android/app/src/main/res/layout/layout_choice.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/layout_controller_input.xml b/src/android/app/src/main/res/layout/layout_controller_input.xml new file mode 100644 index 00000000..455aef79 --- /dev/null +++ b/src/android/app/src/main/res/layout/layout_controller_input.xml @@ -0,0 +1,23 @@ + + + + + + + diff --git a/src/android/app/src/main/res/layout/layout_game.xml b/src/android/app/src/main/res/layout/layout_game.xml new file mode 100644 index 00000000..e1125c09 --- /dev/null +++ b/src/android/app/src/main/res/layout/layout_game.xml @@ -0,0 +1,23 @@ + + + + + + + diff --git a/src/android/app/src/main/res/layout/layout_header.xml b/src/android/app/src/main/res/layout/layout_header.xml new file mode 100644 index 00000000..81b16820 --- /dev/null +++ b/src/android/app/src/main/res/layout/layout_header.xml @@ -0,0 +1,9 @@ + diff --git a/src/android/app/src/main/res/layout/layout_simple_button.xml b/src/android/app/src/main/res/layout/layout_simple_button.xml new file mode 100644 index 00000000..e0f23783 --- /dev/null +++ b/src/android/app/src/main/res/layout/layout_simple_button.xml @@ -0,0 +1,20 @@ + + + + + diff --git a/src/android/app/src/main/res/layout/layout_single_selection.xml b/src/android/app/src/main/res/layout/layout_single_selection.xml new file mode 100644 index 00000000..9a61b79a --- /dev/null +++ b/src/android/app/src/main/res/layout/layout_single_selection.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/src/android/app/src/main/res/layout/layout_single_selection_item.xml b/src/android/app/src/main/res/layout/layout_single_selection_item.xml new file mode 100644 index 00000000..d117a543 --- /dev/null +++ b/src/android/app/src/main/res/layout/layout_single_selection_item.xml @@ -0,0 +1,10 @@ + + \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/layout_slider.xml b/src/android/app/src/main/res/layout/layout_slider.xml new file mode 100644 index 00000000..cbf47ceb --- /dev/null +++ b/src/android/app/src/main/res/layout/layout_slider.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/src/android/app/src/main/res/menu/menu_main.xml b/src/android/app/src/main/res/menu/menu_main.xml new file mode 100644 index 00000000..076de2d3 --- /dev/null +++ b/src/android/app/src/main/res/menu/menu_main.xml @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/src/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..6f3b755b --- /dev/null +++ b/src/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/src/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..6f3b755b --- /dev/null +++ b/src/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/src/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 00000000..c209e78e Binary files /dev/null and b/src/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/src/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/src/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 00000000..b2dfe3d1 Binary files /dev/null and b/src/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/src/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/src/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 00000000..4f0f1d64 Binary files /dev/null and b/src/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/src/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/src/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 00000000..62b611da Binary files /dev/null and b/src/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/src/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/src/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 00000000..948a3070 Binary files /dev/null and b/src/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/src/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/src/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..1b9a6956 Binary files /dev/null and b/src/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/src/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/src/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 00000000..28d4b77f Binary files /dev/null and b/src/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/src/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/src/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..9287f508 Binary files /dev/null and b/src/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/src/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/src/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 00000000..aa7d6427 Binary files /dev/null and b/src/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/src/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/src/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..9126ae37 Binary files /dev/null and b/src/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/src/android/app/src/main/res/navigation/nav_graph.xml b/src/android/app/src/main/res/navigation/nav_graph.xml new file mode 100644 index 00000000..843e307c --- /dev/null +++ b/src/android/app/src/main/res/navigation/nav_graph.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/navigation/nav_settings_graph.xml b/src/android/app/src/main/res/navigation/nav_settings_graph.xml new file mode 100644 index 00000000..6565d182 --- /dev/null +++ b/src/android/app/src/main/res/navigation/nav_settings_graph.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/values-land/dimens.xml b/src/android/app/src/main/res/values-land/dimens.xml new file mode 100644 index 00000000..65c04647 --- /dev/null +++ b/src/android/app/src/main/res/values-land/dimens.xml @@ -0,0 +1,3 @@ + + 48dp + \ No newline at end of file diff --git a/src/android/app/src/main/res/values-night/themes.xml b/src/android/app/src/main/res/values-night/themes.xml new file mode 100644 index 00000000..642d9d7c --- /dev/null +++ b/src/android/app/src/main/res/values-night/themes.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/values-v23/themes.xml b/src/android/app/src/main/res/values-v23/themes.xml new file mode 100644 index 00000000..17852cdf --- /dev/null +++ b/src/android/app/src/main/res/values-v23/themes.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/values-w1240dp/dimens.xml b/src/android/app/src/main/res/values-w1240dp/dimens.xml new file mode 100644 index 00000000..63f5808e --- /dev/null +++ b/src/android/app/src/main/res/values-w1240dp/dimens.xml @@ -0,0 +1,3 @@ + + 200dp + \ No newline at end of file diff --git a/src/android/app/src/main/res/values-w600dp/dimens.xml b/src/android/app/src/main/res/values-w600dp/dimens.xml new file mode 100644 index 00000000..65c04647 --- /dev/null +++ b/src/android/app/src/main/res/values-w600dp/dimens.xml @@ -0,0 +1,3 @@ + + 48dp + \ No newline at end of file diff --git a/src/android/app/src/main/res/values/colors.xml b/src/android/app/src/main/res/values/colors.xml new file mode 100644 index 00000000..c8524cd9 --- /dev/null +++ b/src/android/app/src/main/res/values/colors.xml @@ -0,0 +1,5 @@ + + + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/src/android/app/src/main/res/values/dimens.xml b/src/android/app/src/main/res/values/dimens.xml new file mode 100644 index 00000000..0bb1f4f2 --- /dev/null +++ b/src/android/app/src/main/res/values/dimens.xml @@ -0,0 +1,3 @@ + + 16dp + \ No newline at end of file diff --git a/src/android/app/src/main/res/values/refs.xml b/src/android/app/src/main/res/values/refs.xml new file mode 100644 index 00000000..a6b3daec --- /dev/null +++ b/src/android/app/src/main/res/values/refs.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml new file mode 100644 index 00000000..edc3f375 --- /dev/null +++ b/src/android/app/src/main/res/values/strings.xml @@ -0,0 +1,96 @@ + + Cemu + Settings + Settings + Game Icon + Select controller + Controller\'s settings + Emulated controller + Clear + Disabled + Wii U GamePad + Wii U Pro Controller + Wiimote + Wii U Classic Controller + A + B + X + Y + L + R + ZL + ZR + Plus + Minus + Up + Down + Left + Right + Click + Up + Down + Left + Right + Click + Up + Down + Left + Right + Blow Mic + Show Screen + Home + 1 + 2 + Z + C + Up + Down + Left + Right + Input binding + Trigger an input to bind it to %1$s + Clear + Cancel + Controller %1d + Input Settings + Emulated controller + Emulated controller: %1s + Are you sure you want to exit? + Exit Confirmation + Yes + No + Buttons + D-Pad + Left Axis + Right Axis + Extra + Nunchuck + Add the games path to scan for games displayed in the game list + No games folder selected + Set games folder + Options + Selected controller: %1s + Async shader compile + Enables async shader and pipeline compilation. Reduces stutter at the cost of objects not rendering for a short time + Graphics settings + Off + Double buffering + Triple buffering + VSync + Accurate barriers + Disabling the accurate barriers option will lead to flickering graphics but may improve performance. It is highly recommended to leave it turned on + TV + Enable audio output for the Wii U TV + Gamepad + Enable audio output for for the Wii U Gamepad + Audio settings + Mono + Stereo + Surround + TV channels + Gamepad channels + TV volume + Gamepad volume + Search games + No games were found + \ No newline at end of file diff --git a/src/android/app/src/main/res/values/themes.xml b/src/android/app/src/main/res/values/themes.xml new file mode 100644 index 00000000..4356ebeb --- /dev/null +++ b/src/android/app/src/main/res/values/themes.xml @@ -0,0 +1,9 @@ + + + + +