Port libpngdec to libpng (shadps4-emu#1555)

* intial try to include libpng

* fixing libpng cmake

* cleanup structs and error codes

* building libpng , destroying pkg ;/

* fixed pkg with zlib_comp mode

* attemp to fix ci

* rewrote png encoder with libpng

* small corrections

* clang fix

* clang-fix?

* take alpha value from decode parameters

* more cleanup

* fix stride calculation

* libpng: avoid unnecessary allocation in decoding

* libpng: interlaced support

* libpng: lowered log level

* revert wrong merge

---------

Co-authored-by: Vinicius Rangel <[email protected]>

.gitmodules

@@ -102,3 +102,6 @@
 [submodule "externals/LibAtrac9"]
 	path = externals/LibAtrac9
 	url = https://github.com/shadps4-emu/ext-LibAtrac9.git
+[submodule "externals/libpng"]
+	path = externals/libpng
+	url = https://github.com/pnggroup/libpng

CMakeLists.txt

@@ -830,7 +830,7 @@ endif()
 
 create_target_directory_groups(shadps4)
 
-target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 tsl::robin_map xbyak::xbyak Tracy::TracyClient RenderDoc::API FFmpeg::ffmpeg Dear_ImGui gcn half::half)
+target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 tsl::robin_map xbyak::xbyak Tracy::TracyClient RenderDoc::API FFmpeg::ffmpeg Dear_ImGui gcn half::half zlib-ng::zlib png_static)
 target_link_libraries(shadps4 PRIVATE Boost::headers GPUOpen::VulkanMemoryAllocator LibAtrac9 sirit Vulkan::Headers xxHash::xxhash Zydis::Zydis glslang::SPIRV glslang::glslang SDL3::SDL3 pugixml::pugixml)
 
 target_compile_definitions(shadps4 PRIVATE IMGUI_USER_CONFIG="imgui/imgui_config.h")
@@ -860,9 +860,9 @@ if (NOT ENABLE_QT_GUI)
 endif()
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND MSVC)
-    target_link_libraries(shadps4 PRIVATE cryptoppwin zlib-ng::zlib)
+    target_link_libraries(shadps4 PRIVATE cryptoppwin)
 else()
-    target_link_libraries(shadps4 PRIVATE cryptopp::cryptopp zlib-ng::zlib)
+    target_link_libraries(shadps4 PRIVATE cryptopp::cryptopp)
 endif()
 
 if (ENABLE_QT_GUI)

externals/CMakeLists.txt

@@ -58,8 +58,10 @@ if (NOT TARGET zlib-ng::zlib)
     set(WITH_GTEST OFF)
     set(WITH_NEW_STRATEGIES ON)
     set(WITH_NATIVE_INSTRUCTIONS ON)
+    set(ZLIB_COMPAT ON CACHE BOOL "" FORCE)
     add_subdirectory(zlib-ng)
     add_library(zlib-ng::zlib ALIAS zlib)
+    add_library(ZLIB::ZLIB ALIAS zlib)
 endif()
 
 # SDL3
@@ -153,6 +155,17 @@ if (NOT TARGET half::half)
     add_library(half::half ALIAS half)
 endif()
 
+# libpng
+set(PNG_SHARED OFF CACHE BOOL "" FORCE)
+set(PNG_STATIC ON CACHE BOOL "" FORCE)
+set(PNG_TESTS OFF CACHE BOOL "" FORCE) 
+set(PNG_TOOLS OFF CACHE BOOL "" FORCE) 
+set(SKIP_INSTALL_ALL OFF CACHE BOOL "" FORCE)
+set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/zlib-ng" CACHE STRING "" FORCE)
+set(ZLIB_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/zlib-ng/zlibstatic-ngd" CACHE STRING "" FORCE)
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libpng/zlib.h" "#include \"../zlib-ng/zlib.h\"")
+add_subdirectory(libpng)
+
 if (APPLE)
     # date
     if (NOT TARGET date::date-tz)

src/core/file_format/pkg.cpp

@@ -1,31 +1,30 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <zlib-ng.h>
+#include <zlib.h>
 #include "common/io_file.h"
 #include "common/logging/formatter.h"
 #include "core/file_format/pkg.h"
 #include "core/file_format/pkg_type.h"
 
-static void DecompressPFSC(std::span<const char> compressed_data,
-                           std::span<char> decompressed_data) {
-    zng_stream decompressStream;
+static void DecompressPFSC(std::span<char> compressed_data, std::span<char> decompressed_data) {
+    z_stream decompressStream;
     decompressStream.zalloc = Z_NULL;
     decompressStream.zfree = Z_NULL;
     decompressStream.opaque = Z_NULL;
 
-    if (zng_inflateInit(&decompressStream) != Z_OK) {
+    if (inflateInit(&decompressStream) != Z_OK) {
         // std::cerr << "Error initializing zlib for deflation." << std::endl;
     }
 
     decompressStream.avail_in = compressed_data.size();
-    decompressStream.next_in = reinterpret_cast<const Bytef*>(compressed_data.data());
+    decompressStream.next_in = reinterpret_cast<unsigned char*>(compressed_data.data());
     decompressStream.avail_out = decompressed_data.size();
-    decompressStream.next_out = reinterpret_cast<Bytef*>(decompressed_data.data());
+    decompressStream.next_out = reinterpret_cast<unsigned char*>(decompressed_data.data());
 
-    if (zng_inflate(&decompressStream, Z_FINISH)) {
+    if (inflate(&decompressStream, Z_FINISH)) {
     }
-    if (zng_inflateEnd(&decompressStream) != Z_OK) {
+    if (inflateEnd(&decompressStream) != Z_OK) {
         // std::cerr << "Error ending zlib inflate" << std::endl;
     }
 }

src/core/libraries/error_codes.h

@@ -593,7 +593,6 @@ constexpr int ORBIS_VIDEODEC2_ERROR_INVALID_SEQUENCE = 0x811D0303;
 constexpr int ORBIS_VIDEODEC2_ERROR_FATAL_STREAM = 0x811D0304;
 
 // Videodec library
-
 constexpr int ORBIS_VIDEODEC_ERROR_API_FAIL = 0x80C10000;
 constexpr int ORBIS_VIDEODEC_ERROR_CODEC_TYPE = 0x80C10001;
 constexpr int ORBIS_VIDEODEC_ERROR_STRUCT_SIZE = 0x80C10002;
@@ -616,3 +615,14 @@ constexpr int ORBIS_VIDEODEC_ERROR_MISMATCH_SPEC = 0x80C10012;
 constexpr int ORBIS_VIDEODEC_ERROR_INVALID_SEQUENCE = 0x80C10013;
 constexpr int ORBIS_VIDEODEC_ERROR_FATAL_STREAM = 0x80C10014;
 constexpr int ORBIS_VIDEODEC_ERROR_FATAL_STATE = 0x80C10015;
+
+// PngDec library
+constexpr int ORBIS_PNG_DEC_ERROR_INVALID_ADDR = 0x80690001;
+constexpr int ORBIS_PNG_DEC_ERROR_INVALID_SIZE = 0x80690002;
+constexpr int ORBIS_PNG_DEC_ERROR_INVALID_PARAM = 0x80690003;
+constexpr int ORBIS_PNG_DEC_ERROR_INVALID_HANDLE = 0x80690004;
+constexpr int ORBIS_PNG_DEC_ERROR_INVALID_WORK_MEMORY = 0x80690005;
+constexpr int ORBIS_PNG_DEC_ERROR_INVALID_DATA = 0x80690010;
+constexpr int ORBIS_PNG_DEC_ERROR_UNSUPPORT_DATA = 0x80690011;
+constexpr int ORBIS_PNG_DEC_ERROR_DECODE_ERROR = 0x80690012;
+constexpr int ORBIS_PNG_DEC_ERROR_FATAL = 0x80690020;