ReverseBox 0.35.7__tar.gz → 0.37.1__tar.gz

{reversebox-0.35.7 → reversebox-0.37.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ReverseBox
-Version: 0.35.7
+Version: 0.37.1
 Summary: A set of functions useful in reverse engineering.
 Home-page: https://github.com/bartlomiejduda/ReverseBox
 Author: Bartlomiej Duda
@@ -186,13 +186,13 @@ or software researchers).
   - Decode N64_IA8 ✔️
   - Decode N64_RGBA32 ✔️
   - Decode N64_CMPR ✔️
-  - Decode BC1/DXT1 ✔️
-  - Decode BC2/DXT3 ✔️
-  - Decode BC3/DXT5 ✔️
-  - Decode BC4 ✔️
-  - Decode BC5 ✔️
-  - Decode BC6 ✔️
-  - Decode BC7 ✔️
+  - Decode/Encode BC1/DXT1 ✔️
+  - Decode/Encode BC2/DXT3 ✔️
+  - Decode/Encode BC3/DXT5 ✔️
+  - Decode/Encode BC4 ✔️
+  - Decode/Encode BC5 ✔️
+  - Decode/Encode BC6 ✔️
+  - Decode/Encode BC7 ✔️
   - Decode GST121 ✔️
   - Decode GST221 ✔️
   - Decode GST421 ✔️

{reversebox-0.35.7 → reversebox-0.37.1}/README.md

@@ -149,13 +149,13 @@ or software researchers).
   - Decode N64_IA8 ✔️
   - Decode N64_RGBA32 ✔️
   - Decode N64_CMPR ✔️
-  - Decode BC1/DXT1 ✔️
-  - Decode BC2/DXT3 ✔️
-  - Decode BC3/DXT5 ✔️
-  - Decode BC4 ✔️
-  - Decode BC5 ✔️
-  - Decode BC6 ✔️
-  - Decode BC7 ✔️
+  - Decode/Encode BC1/DXT1 ✔️
+  - Decode/Encode BC2/DXT3 ✔️
+  - Decode/Encode BC3/DXT5 ✔️
+  - Decode/Encode BC4 ✔️
+  - Decode/Encode BC5 ✔️
+  - Decode/Encode BC6 ✔️
+  - Decode/Encode BC7 ✔️
   - Decode GST121 ✔️
   - Decode GST221 ✔️
   - Decode GST421 ✔️

{reversebox-0.35.7 → reversebox-0.37.1}/ReverseBox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ReverseBox
-Version: 0.35.7
+Version: 0.37.1
 Summary: A set of functions useful in reverse engineering.
 Home-page: https://github.com/bartlomiejduda/ReverseBox
 Author: Bartlomiej Duda
@@ -186,13 +186,13 @@ or software researchers).
   - Decode N64_IA8 ✔️
   - Decode N64_RGBA32 ✔️
   - Decode N64_CMPR ✔️
-  - Decode BC1/DXT1 ✔️
-  - Decode BC2/DXT3 ✔️
-  - Decode BC3/DXT5 ✔️
-  - Decode BC4 ✔️
-  - Decode BC5 ✔️
-  - Decode BC6 ✔️
-  - Decode BC7 ✔️
+  - Decode/Encode BC1/DXT1 ✔️
+  - Decode/Encode BC2/DXT3 ✔️
+  - Decode/Encode BC3/DXT5 ✔️
+  - Decode/Encode BC4 ✔️
+  - Decode/Encode BC5 ✔️
+  - Decode/Encode BC6 ✔️
+  - Decode/Encode BC7 ✔️
   - Decode GST121 ✔️
   - Decode GST221 ✔️
   - Decode GST421 ✔️

{reversebox-0.35.7 → reversebox-0.37.1}/ReverseBox.egg-info/SOURCES.txt

@@ -79,7 +79,7 @@ reversebox/image/compression/compression_rle_tga.py
 reversebox/image/compression/compression_zlib.py
 reversebox/image/decoders/__init__.py
 reversebox/image/decoders/bumpmap_decoder.py
-reversebox/image/decoders/compressed_decoder.py
+reversebox/image/decoders/compressed_decoder_encoder.py
 reversebox/image/decoders/gst_decoder.py
 reversebox/image/decoders/n64_decoder.py
 reversebox/image/decoders/yuv_decoder.py

{reversebox-0.35.7 → reversebox-0.37.1}/reversebox/image/common.py

@@ -223,6 +223,10 @@ def get_block_data_size(img_format: ImageFormats) -> int:
         return 1
 
 
+def get_bc_image_data_size(image_height: int, image_width: int, image_format: ImageFormats) -> int:
+    return ((image_height + 3) // 4) * ((image_width + 3) // 4) * get_block_data_size(image_format)
+
+
 def calculate_aligned_value(value: int, multiple: int) -> int:
     return ((value + multiple - 1) // multiple) * multiple
 

reversebox-0.35.7/reversebox/image/decoders/compressed_decoder.py → reversebox-0.37.1/reversebox/image/decoders/compressed_decoder_encoder.py

@@ -1,5 +1,5 @@
 """
-Copyright © 2024  Bartłomiej Duda
+Copyright © 2024-2025  Bartłomiej Duda
 License: GPL-3.0 License
 """
 
@@ -17,11 +17,13 @@ from ctypes import (
 
 from reversebox.common.common import get_dll_path
 from reversebox.common.logger import get_logger
+from reversebox.image.common import get_bc_image_data_size
 from reversebox.image.image_formats import ImageFormats
 
 logger = get_logger(__name__)
 
 # fmt: off
+# mypy: ignore-errors
 
 
 class DXGIImage(Structure):
@@ -38,9 +40,9 @@ class DXGIImage(Structure):
     ]
 
 
-class CompressedImageDecoder:
+class CompressedImageDecoderEncoder:
     """
-    Decoder for any compressed images like BC1/DXT1, BC2/DXT2 etc.
+    Decoder/Encoder for any compressed images like BC1/DXT1, BC2/DXT2 etc.
     """
 
     def __init__(self):
@@ -91,15 +93,19 @@ class CompressedImageDecoder:
         else:
             raise Exception(f"Not supported image format! Image_format: {image_format}")
 
-    def _decode_directxtex_image(self, image_data: bytes, img_width: int, img_height: int, image_format: ImageFormats) -> bytes:
+    def _convert_directxtex_image(self, image_data: bytes, img_width: int, img_height: int, image_format: ImageFormats, encode_flag: bool) -> bytes:
         """
-        Function used for decoding compressed BC formats
+        Function used for decoding/encoding compressed BC formats
         """
         dll_path: str = get_dll_path("DirectXTex.dll")
-        input_format_number: int = self._get_dxgi_format_number(image_format)
-        output_format_number: int = self._get_dxgi_format_number(ImageFormats.RGBA8888)
+        if encode_flag:
+            input_format_number: int = self._get_dxgi_format_number(ImageFormats.RGBA8888)
+            output_format_number: int = self._get_dxgi_format_number(image_format)
+        else:
+            input_format_number: int = self._get_dxgi_format_number(image_format)
+            output_format_number: int = self._get_dxgi_format_number(ImageFormats.RGBA8888)
 
-        # calculating pitch logic
+        # calculating pitch params
         c_input_format_number = c_int(input_format_number)
         c_output_format_number = c_int(output_format_number)
         c_image_width = c_int(img_width)
@@ -110,6 +116,10 @@ class CompressedImageDecoder:
         c_output_slice_pitch = c_long(0)
         c_flags = c_int(0)
 
+        # encode params
+        c_threshold = ctypes.c_float(0.5)
+        c_nullptr = (c_uint8 * 100)()
+
         try:
             dll_file = ctypes.CDLL(dll_path)
             dll_file.ComputePitch(c_input_format_number, c_image_width, c_image_height, ctypes.byref(c_input_row_pitch), ctypes.byref(c_input_slice_pitch), c_flags)
@@ -122,22 +132,31 @@ class CompressedImageDecoder:
         input_dxgi_image: DXGIImage = self._init_dxgi_image(img_width, img_height, input_format_number, c_input_row_pitch.value, c_input_slice_pitch.value, image_data)
         output_dxgi_image: DXGIImage = self._init_dxgi_image(img_width, img_height, output_format_number, c_output_row_pitch.value, c_output_slice_pitch.value, b'')
 
-        # decompressing image logic
+        # decompressing/compressing image logic
         try:
             dll_file = ctypes.CDLL(dll_path)
-            h_result = dll_file.DecompressBC(ctypes.byref(input_dxgi_image), ctypes.byref(output_dxgi_image))
+
+            if encode_flag:
+                h_result = dll_file.CompressBC(ctypes.byref(input_dxgi_image), ctypes.byref(output_dxgi_image),
+                                               c_flags, c_flags,
+                                               c_threshold, c_nullptr)
+            else:
+                h_result = dll_file.DecompressBC(ctypes.byref(input_dxgi_image), ctypes.byref(output_dxgi_image))
         except Exception as error:
             raise Exception(f"Error while decoding compressed data! Error: {error}")
 
         if h_result != 0:
             raise Exception(f"DLL decompression failed! H_result: {h_result}")
 
-        decoded_data_size: int = img_height * img_width * 4
-        decoded_data = bytearray((c_uint8 * decoded_data_size).from_address(ctypes.addressof(output_dxgi_image.pixels.contents)))
-        return decoded_data
+        if encode_flag:
+            converted_data_size: int = get_bc_image_data_size(img_height, img_width, image_format)
+        else:
+            converted_data_size: int = img_height * img_width * 4
+        converted_data = bytearray((c_uint8 * converted_data_size).from_address(ctypes.addressof(output_dxgi_image.pixels.contents)))
+        return converted_data
 
     def decode_compressed_image_main(self, image_data: bytes, img_width: int, img_height: int, image_format: ImageFormats) -> bytes:
-        """
-        Main decoder function
-        """
-        return self._decode_directxtex_image(image_data, img_width, img_height, image_format)
+        return self._convert_directxtex_image(image_data, img_width, img_height, image_format, False)
+
+    def encode_compressed_image_main(self, image_data: bytes, img_width: int, img_height: int, image_format: ImageFormats) -> bytes:
+        return self._convert_directxtex_image(image_data, img_width, img_height, image_format, True)

{reversebox-0.35.7 → reversebox-0.37.1}/reversebox/image/image_decoder.py

@@ -8,7 +8,9 @@ import struct
 from reversebox.common.logger import get_logger
 from reversebox.image.common import convert_bpp_to_bytes_per_pixel
 from reversebox.image.decoders.bumpmap_decoder import BumpmapDecoder
-from reversebox.image.decoders.compressed_decoder import CompressedImageDecoder
+from reversebox.image.decoders.compressed_decoder_encoder import (
+    CompressedImageDecoderEncoder,
+)
 from reversebox.image.decoders.gst_decoder import GSTImageDecoder
 from reversebox.image.decoders.n64_decoder import N64Decoder
 from reversebox.image.decoders.yuv_decoder import YUVDecoder
@@ -792,8 +794,7 @@ class ImageDecoder:
         return self._decode_indexed(image_data, palette_data, img_width, img_height, image_format, palette_format, image_endianess, palette_endianess)
 
     def decode_compressed_image(self, image_data: bytes, img_width: int, img_height: int, image_format: ImageFormats) -> bytes:
-        compressed_decoder = CompressedImageDecoder()
-        return compressed_decoder.decode_compressed_image_main(image_data, img_width, img_height, image_format)
+        return CompressedImageDecoderEncoder().decode_compressed_image_main(image_data, img_width, img_height, image_format)
 
     def decode_gst_image(self, image_data: bytes, palette_data: bytes, img_width: int, img_height: int, image_format: ImageFormats, convert_format: ImageFormats, convert_pal_format: ImageFormats, is_swizzled: bool = True) -> bytes:
         gst_decoder = GSTImageDecoder()

{reversebox-0.35.7 → reversebox-0.37.1}/reversebox/image/image_encoder.py

@@ -12,6 +12,9 @@ from reversebox.image.common import (
     convert_bpp_to_bytes_per_pixel,
     get_bpp_for_image_format,
 )
+from reversebox.image.decoders.compressed_decoder_encoder import (
+    CompressedImageDecoderEncoder,
+)
 from reversebox.image.image_formats import ImageFormats
 from reversebox.image.pillow_wrapper import PillowWrapper
 from reversebox.io_files.bytes_handler import BytesHandler
@@ -431,3 +434,6 @@ class ImageEncoder:
 
     def encode_indexed_image(self, image_data: bytes, img_width: int, img_height: int, image_format: ImageFormats, palette_format: ImageFormats, max_color_count: int, image_endianess: str = "little", palette_endianess: str = "little") -> Tuple[bytes, bytes]:
         return self._encode_indexed(image_data, img_width, img_height, image_format, palette_format, image_endianess, palette_endianess, max_color_count)
+
+    def encode_compressed_image(self, image_data: bytes, img_width: int, img_height: int, image_format: ImageFormats) -> bytes:
+        return CompressedImageDecoderEncoder().encode_compressed_image_main(image_data, img_width, img_height, image_format)

{reversebox-0.35.7 → reversebox-0.37.1}/setup.py

@@ -8,7 +8,7 @@ from typing import Final
 
 import setuptools
 
-VERSION_NUM: Final[str] = "0.35.7"
+VERSION_NUM: Final[str] = "0.37.1"
 
 
 def get_long_description() -> str: