ReverseBox 0.48.0__tar.gz → 0.48.2__tar.gz

{reversebox-0.48.0 → reversebox-0.48.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ReverseBox
-Version: 0.48.0
+Version: 0.48.2
 Summary: A set of functions useful in reverse engineering.
 Home-page: https://github.com/bartlomiejduda/ReverseBox
 Author: Bartlomiej Duda
@@ -140,6 +140,8 @@ or software researchers).
 
 * Image
   - Decode RGB121 ✔️
+  - Decode ALPHA4 ✔️
+  - Decode RAWBMP2_PS2 ✔️
   - Decode RGB121_BYTE ✔️
   - Decode RGBA2222 ✔️
   - Decode RGBX2222 ✔️

{reversebox-0.48.0 → reversebox-0.48.2}/README.md

@@ -103,6 +103,8 @@ or software researchers).
 
 * Image
   - Decode RGB121 ✔️
+  - Decode ALPHA4 ✔️
+  - Decode RAWBMP2_PS2 ✔️
   - Decode RGB121_BYTE ✔️
   - Decode RGBA2222 ✔️
   - Decode RGBX2222 ✔️

{reversebox-0.48.0 → reversebox-0.48.2}/ReverseBox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ReverseBox
-Version: 0.48.0
+Version: 0.48.2
 Summary: A set of functions useful in reverse engineering.
 Home-page: https://github.com/bartlomiejduda/ReverseBox
 Author: Bartlomiej Duda
@@ -140,6 +140,8 @@ or software researchers).
 
 * Image
   - Decode RGB121 ✔️
+  - Decode ALPHA4 ✔️
+  - Decode RAWBMP2_PS2 ✔️
   - Decode RGB121_BYTE ✔️
   - Decode RGBA2222 ✔️
   - Decode RGBX2222 ✔️

{reversebox-0.48.0 → reversebox-0.48.2}/reversebox/image/common.py

@@ -84,6 +84,8 @@ def get_bpp_for_image_format(image_format: ImageFormats) -> int:
                         ImageFormats.BC1_DXT1,
                         ImageFormats.BC4_UNORM,
                         ImageFormats.PAL4,
+                        ImageFormats.ALPHA4,
+                        ImageFormats.RAWBMP2_PS2
                         ):
         return 4
     elif image_format in (ImageFormats.RGBX2222,

{reversebox-0.48.0 → reversebox-0.48.2}/reversebox/image/image_decoder.py

@@ -74,6 +74,24 @@ class ImageDecoder:
         p[3] = 0xFF
         return p
 
+    # A4 (Alpha 4-bit)
+    def _decode_alpha4_pixel(self, pixel_int: int) -> bytes:
+        p = bytearray(4)
+        p[0] = 0xFF
+        p[1] = 0xFF
+        p[2] = 0xFF
+        p[3] = pixel_int & 0xFF
+        return p
+
+    # RAWBMP/2 PS2 (4-bit)
+    def _decode_rawbmp2_ps2_pixel(self, pixel_int: int) -> bytes:
+        p = bytearray(4)
+        p[0] = 0xFF
+        p[1] = 0xFF
+        p[2] = 0xFF
+        p[3] = (16 * pixel_int) & 0xFF
+        return p
+
     # A8 (Alpha 8-bit)
     def _decode_alpha8_pixel(self, pixel_int: int) -> bytes:
         p = bytearray(4)
@@ -566,6 +584,8 @@ class ImageDecoder:
         # image_format: (decode_function, bits_per_pixel, image_entry_read_function)
         ImageFormats.RGB121: (_decode_rgb121_byte_pixel, 4, get_uint8),
         ImageFormats.N64_I4: (_decode_i4_pixel, 4, get_uint8),  # GRAY, 4bpp
+        ImageFormats.ALPHA4: (_decode_alpha4_pixel, 4, get_uint8),
+        ImageFormats.RAWBMP2_PS2: (_decode_rawbmp2_ps2_pixel, 4, get_uint8),
 
         ImageFormats.RGB121_BYTE: (_decode_rgb121_byte_pixel, 8, get_uint8),
         ImageFormats.GRAY8: (_decode_gray8_pixel, 8, get_uint8),

{reversebox-0.48.0 → reversebox-0.48.2}/reversebox/image/image_formats.py

@@ -19,6 +19,8 @@ class ImageFormats(Enum):
     # Generic Formats
     # 4-bit
     RGB121 = "rgb121"  # PIX_FMT_RGB4 / packed RGB 1:2:1 bitstream, 4bpp, (msb)1R 2G 1B(lsb)
+    ALPHA4 = "alpha4"  # (A4 / Alpha 4-bit)
+    RAWBMP2_PS2 = "rawbmp2_ps2"  # RAWBMP/2 PS2 (4-bit)
 
     # 8-bit
     RGBX2222 = "rgbx2222"

{reversebox-0.48.0 → reversebox-0.48.2}/reversebox/image/swizzling/swizzle_x360.py

@@ -41,27 +41,35 @@ def _xg_address_2d_tiled_y(block_offset: int, width_in_blocks: int, texel_byte_p
 
 
 def _convert_x360_image_data(image_data: bytes, image_width: int, image_height: int, block_pixel_size: int, texel_byte_pitch: int, swizzle_flag: bool) -> bytes:
-    converted_data: bytearray = bytearray(len(image_data))
-
     width_in_blocks: int = image_width // block_pixel_size
     height_in_blocks: int = image_height // block_pixel_size
 
-    for j in range(height_in_blocks):
-        for i in range(width_in_blocks):
-            block_offset = j * width_in_blocks + i
-            x = _xg_address_2d_tiled_x(block_offset, width_in_blocks, texel_byte_pitch)
-            y = _xg_address_2d_tiled_y(block_offset, width_in_blocks, texel_byte_pitch)
-            src_byte_offset = (j * width_in_blocks * texel_byte_pitch + i * texel_byte_pitch)
-            dest_byte_offset = (y * width_in_blocks * texel_byte_pitch + x * texel_byte_pitch)
+    padded_width_in_blocks: int = (width_in_blocks + 31) & ~31
+    padded_height_in_blocks: int = (height_in_blocks + 31) & ~31
+    total_padded_blocks = padded_width_in_blocks * padded_height_in_blocks
+
+    if not swizzle_flag:
+        converted_data: bytearray = bytearray(width_in_blocks * height_in_blocks * texel_byte_pitch)
+    else:
+        converted_data: bytearray = bytearray(total_padded_blocks * texel_byte_pitch)  # type: ignore
+
+    for block_offset in range(total_padded_blocks):
+        x = _xg_address_2d_tiled_x(block_offset, padded_width_in_blocks, texel_byte_pitch)
+        y = _xg_address_2d_tiled_y(block_offset, padded_width_in_blocks, texel_byte_pitch)
 
-            if dest_byte_offset + texel_byte_pitch > len(converted_data):
-                continue
+        if x < width_in_blocks and y < height_in_blocks:
             if not swizzle_flag:
-                converted_data[dest_byte_offset: dest_byte_offset + texel_byte_pitch] = image_data[src_byte_offset: src_byte_offset + texel_byte_pitch]
+                src_byte_offset = block_offset * texel_byte_pitch
+                dest_byte_offset = (y * width_in_blocks + x) * texel_byte_pitch
+                if src_byte_offset + texel_byte_pitch <= len(image_data):
+                    converted_data[dest_byte_offset: dest_byte_offset + texel_byte_pitch] = image_data[src_byte_offset: src_byte_offset + texel_byte_pitch]
             else:
-                converted_data[src_byte_offset: src_byte_offset + texel_byte_pitch] = image_data[dest_byte_offset: dest_byte_offset + texel_byte_pitch]
+                src_byte_offset = (y * width_in_blocks + x) * texel_byte_pitch
+                dest_byte_offset = block_offset * texel_byte_pitch
+                if src_byte_offset + texel_byte_pitch <= len(image_data):
+                    converted_data[dest_byte_offset: dest_byte_offset + texel_byte_pitch] = image_data[src_byte_offset: src_byte_offset + texel_byte_pitch]
 
-    return converted_data
+    return bytes(converted_data)
 
 
 def unswizzle_x360(image_data: bytes, img_width: int, img_height: int, block_pixel_size: int = 4, texel_byte_pitch: int = 8) -> bytes:

{reversebox-0.48.0 → reversebox-0.48.2}/setup.py

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