PyCriCodecsEx 0.0.3__tar.gz → 0.0.4__tar.gz

{pycricodecsex-0.0.3 → pycricodecsex-0.0.4}/CriCodecsEx/adx.cpp

@@ -542,7 +542,7 @@ static PyObject* AdxEncode(PyObject* self, PyObject* args){
         PyAdxSetError(AdxErrorCode);
         return NULL;
     }
-    unsigned int len = adx.size;
+    Py_ssize_t len = adx.size;
     return Py_BuildValue("y#", adxdata, len);
 }
 
@@ -557,6 +557,6 @@ static PyObject* AdxDecode(PyObject* self, PyObject* args){
         return NULL;
     }
     unsigned char *out = wav.WAVEBuffer;
-    unsigned int len = wav.wav.size+8;
+    Py_ssize_t len = wav.wav.size+8;
     return Py_BuildValue("y#", out, len);
 }

{pycricodecsex-0.0.3 → pycricodecsex-0.0.4}/CriCodecsEx/crilayla.cpp

@@ -1,13 +1,19 @@
-/* 
-    CRI layla decompression.
-	written by tpu. (https://forum.xentax.com/viewtopic.php?f=21&t=5137&p=44220&hilit=CRILAYLA#p44220)
-	Python wrapper by me (and modification).
+/* CRILAYLA Encoder/Decoder
 
-	CRIcompress method by KenTse
-    Taken from wmltogether's fork of CriPakTools.
-    Python wrapper by me.
 
-	Note: I have no idea how this compression technique works. I just made the wrapper.
+CRI layla decompression.
+written by tpu. (https://forum.xentax.com/viewtopic.php?f=21&t=5137&p=44220&hilit=CRILAYLA#p44220)
+Python wrapper by https://github.com/Youjose/PyCriCodecs (and modification).
+
+CRIcompress method by KenTse
+Taken from wmltogether's fork of CriPakTools.
+Python wrapper by https://github.com/Youjose/PyCriCodecs.    
+TODO: This implementation may produce larger output - which shouldn't be
+possible with LZ-based compression. Investigate and fix.
+For now, if compression fails, the original data is returned.
+See also:
+    - https://github.com/FanTranslatorsInternational/Kuriimu2/blob/imgui/src/lib/Kompression/Encoder/CrilaylaEncoder.cs
+    - https://glinscott.github.io/lz/index.html
 */
 #define PY_SSIZE_T_CLEAN
 #pragma once
@@ -22,32 +28,30 @@ struct crilayla_header{
     unsigned int compressed_size;
 };
 
-
-unsigned char *sbuf;
-unsigned int bitcnt;
-unsigned int bitdat;
-unsigned int get_bits(unsigned int n){
-	unsigned int data, mask;
-
-    if (bitcnt<n){
-	  data = ((24-bitcnt)>>3)+1;
-	  bitcnt += data*8;
-      while(data) {
-		bitdat = (bitdat<<8) | (*sbuf--);
-		data--;
-      }
-    }
-
-	data = bitdat>>(bitcnt-n);
-	bitcnt -= n;
-	mask = (1<<n)-1;
-	data &= mask;
-	return data;
-}
-
 unsigned int llcp_dec(unsigned char *src, unsigned int src_len, unsigned char *dst, unsigned int dst_len){
-	unsigned char *dbuf, *pbuf;
+    unsigned char *dbuf, *pbuf;
 	unsigned int plen, poffset, byte;
+    unsigned char *sbuf;
+    unsigned int bitcnt;
+    unsigned int bitdat;
+    auto get_bits = [&](unsigned int n){
+        unsigned int data, mask;
+    
+        if (bitcnt<n){
+          data = ((24-bitcnt)>>3)+1;
+          bitcnt += data*8;
+          while(data) {
+            bitdat = (bitdat<<8) | (*sbuf--);
+            data--;
+          }
+        }
+    
+        data = bitdat>>(bitcnt-n);
+        bitcnt -= n;
+        mask = (1<<n)-1;
+        data &= mask;
+        return data;
+    };
 
 	sbuf = src+src_len-1;
 	dbuf = dst+dst_len-1;
@@ -108,40 +112,41 @@ unsigned char* layla_decomp(unsigned char* data, crilayla_header header){
 	return dst;
 }
 
-unsigned int layla_comp(unsigned char* dest, unsigned int* destLen, unsigned char* src, unsigned int srcLen){
-    unsigned int n = srcLen - 1, m = *destLen - 0x1, T = 0, d = 0, p, q, i, j, k;
-    unsigned char* odest = dest;
+unsigned int layla_comp(unsigned char *dest, int *destLen, unsigned char *src, int srcLen)
+{
+    int n = srcLen - 1, m = *destLen - 0x1, T = 0, d = 0, p, q, i, j, k;
+    unsigned char *odest = dest;
     for (; n >= 0x100;)
     {
         j = n + 3 + 0x2000;
-        if (j > srcLen) j = srcLen;
-        for (i = n + 3, p = 0; i < j; i++)
+        if (j>srcLen) j = srcLen;
+        for (i = n + 3, p = 0; i<j; i++)
         {
             for (k = 0; k <= n - 0x100; k++)
             {
                 if (*(src + n - k) != *(src + i - k)) break;
             }
-            if (k > p)
+            if (k>p)
             {
                 q = i - n - 3; p = k;
             }
         }
-        if (p < 3)
+        if (p<3)
         {
             d = (d << 9) | (*(src + n--)); T += 9;
         }
         else
         {
             d = (((d << 1) | 1) << 13) | q; T += 14; n -= p;
-            if (p < 6)
+            if (p<6)
             {
                 d = (d << 2) | (p - 3); T += 2;
             }
-            else if (p < 13)
+            else if (p<13)
             {
                 d = (((d << 2) | 3) << 3) | (p - 6); T += 5;
             }
-            else if (p < 44)
+            else if (p<44)
             {
                 d = (((d << 5) | 0x1f) << 5) | (p - 13); T += 10;
             }
@@ -150,45 +155,50 @@ unsigned int layla_comp(unsigned char* dest, unsigned int* destLen, unsigned cha
                 d = ((d << 10) | 0x3ff); T += 10; p -= 44;
                 for (;;)
                 {
-                    for (; T >= 8;)
+                    for (; m > 0 && T >= 8;)
                     {
-                        *(dest + m--) = (d >> (T - 8)) & 0xff; T -= 8; d = d & ((1 << T) - 1);
+                        *(dest + m--) = (d >> (T - 8)) & 0xff; T -= 8; d = d&((1 << T) - 1);
                     }
-                    if (p < 255) break;
+                    if (p<255) break;
                     d = (d << 8) | 0xff; T += 8; p = p - 0xff;
                 }
                 d = (d << 8) | p; T += 8;
             }
         }
-        for (; T >= 8;)
+        for (; m > 0 && T >= 8;)
         {
-            *(dest + m--) = (d >> (T - 8)) & 0xff; T -= 8; d = d & ((1 << T) - 1);
+            *(dest + m--) = (d >> (T - 8)) & 0xff; T -= 8; d = d&((1 << T) - 1);
         }
     }
-    if (T != 0)
+    if (m > 0 && T != 0)
     {
         *(dest + m--) = d << (8 - T);
     }
-    *(dest + m--) = 0; *(dest + m) = 0;
-    for (;;)
-    {
-        if (((*destLen - m) & 3) == 0) break;
-        *(dest + m--) = 0;
+    if (m > 0) {
+        *(dest + m--) = 0; *(dest + m) = 0;
+        for (;;)
+        {
+            if (((*destLen - m) & 3) == 0) break;
+            *(dest + m--) = 0;
+        }
     }
+    if (m <= 0) 
+        return 0; // Underflow    
     *destLen = *destLen - m; dest += m;
-    unsigned int l[] = { 0x4c495243,0x414c5941,srcLen - 0x100,*destLen };
-    for (j = 0; j < 4; j++)
+    // CRIL AYLA srcLen-0x100 destLen
+    int l[] = { 0x4c495243,0x414c5941,srcLen - 0x100,*destLen };
+    for (j = 0; j<4; j++)
     {
-        for (i = 0; i < 4; i++)
+        for (i = 0; i<4; i++)
         {
             *(odest + i + j * 4) = l[j] & 0xff; l[j] >>= 8;
         }
     }
-    for (j = 0, odest += 0x10; j < *destLen; j++)
+    for (j = 0, odest += 0x10; j<*destLen; j++)
     {
         *(odest++) = *(dest + j);
     }
-    for (j = 0; j < 0x100; j++)
+    for (j = 0; j<0x100; j++)
     {
         *(odest++) = *(src + j);
     }
@@ -199,7 +209,17 @@ unsigned int layla_comp(unsigned char* dest, unsigned int* destLen, unsigned cha
 PyObject* CriLaylaDecompress(PyObject* self, PyObject* d){
 	unsigned char *data = (unsigned char *)PyBytes_AsString(d);
 	crilayla_header header = *(crilayla_header*)data;
-	unsigned char *out = layla_decomp((data+16), header);
+    
+    if (header.crilayla != 0x414c59434152494cULL) {
+        PyErr_SetString(PyExc_ValueError, "Invalid CRILAYLA header.");
+        return NULL;
+    }
+    
+    unsigned char *out;
+    Py_BEGIN_ALLOW_THREADS
+	out = layla_decomp((data+16), header);
+    Py_END_ALLOW_THREADS
+    
     PyObject *outObj = Py_BuildValue("y#", out, header.decompress_size+256);
     delete[] out;
 	return outObj;
@@ -213,14 +233,26 @@ unsigned char* CriLaylaDecompress(unsigned char* d){
 
 PyObject* CriLaylaCompress(PyObject* self, PyObject* args){
 	unsigned char *data;
-	unsigned int data_size;
+	Py_ssize_t data_size;
     if(!PyArg_ParseTuple(args, "y#", &data, &data_size)){
         return NULL;
     }
-    unsigned char *buf = new unsigned char[data_size];
-    memset(buf, 0, data_size);
-    layla_comp(buf, &data_size, data, data_size);
-	PyObject* bufObj = Py_BuildValue("y#", buf, data_size);
+
+    unsigned char *buf = new unsigned char[data_size + 0x200];
+
+    int compressed_size = data_size;    
+    int res = 0;
+    Py_BEGIN_ALLOW_THREADS
+    res = layla_comp(buf, &compressed_size, data, compressed_size);
+    Py_END_ALLOW_THREADS
+    PyObject* bufObj;
+    if (res && res < data_size) {
+        bufObj = Py_BuildValue("y#", buf, compressed_size);
+    } else {        
+        // FIXME
+        PyErr_SetString(PyExc_RuntimeError, "Compression failure.");
+        return NULL;
+    }
     delete[] buf;
     return bufObj;
 }

{pycricodecsex-0.0.3 → pycricodecsex-0.0.4}/CriCodecsEx/hca.cpp

@@ -3296,7 +3296,7 @@ static PyObject* HcaCrypt(PyObject* self, PyObject* args){
     }
 
     unsigned char *buffer = (unsigned char *)view.buf;
-    unsigned int length = view.len;
+    Py_ssize_t length = view.len;
     PyBuffer_Release(&view);
 
     clHCA* hca = (clHCA*)malloc(sizeof(clHCA));
@@ -3345,7 +3345,7 @@ static PyObject* HcaDecode(PyObject* self, PyObject* args){
     data *wavData = &wav.wav.chunks.WAVEdata;
 
     unsigned char *data;
-    unsigned int data_size;
+    Py_ssize_t data_size;
     unsigned int header_size;
     unsigned long long keycode;
     unsigned short subkey;

{pycricodecsex-0.0.3 → pycricodecsex-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyCriCodecsEx
-Version: 0.0.3
+Version: 0.0.4
 Summary: Criware formats library for Python
 Home-page: https://mos9527.github.io/PyCriCodecsEx/
 Classifier: Programming Language :: Python :: 3

pycricodecsex-0.0.4/PyCriCodecsEx/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.0.4"

{pycricodecsex-0.0.3 → pycricodecsex-0.0.4}/PyCriCodecsEx/acb.py

@@ -14,12 +14,16 @@ from copy import deepcopy
 
 class CueNameTable(UTFViewer):
     CueIndex: int
+    '''Index into CueTable'''
     CueName: str
+    '''Name of the cue'''
 
 
 class CueTable(UTFViewer):
     CueId: int
+    '''Corresponds to the cue index found in CueNameTable'''
     Length: int
+    '''Duration of the cue in milliseconds'''
     ReferenceIndex: int
     ReferenceType: int
 
@@ -52,14 +56,21 @@ class WaveformTable(UTFViewer):
 
 
 class ACBTable(UTFViewer):
+    '''ACB Table View'''
+
     AcbGuid: bytes
+    '''GUID of the ACB. This SHOULD be different for each ACB file.'''
     Name: str
-    Version: int
+    '''Name of the ACB. This is usually the name of the sound bank.'''
+    Version: int    
     VersionString: str
 
     AwbFile: bytes
     CueNameTable: List[CueNameTable]
+    '''A list of cue names with their corresponding indices into CueTable'''
     CueTable: List[CueTable]
+    '''A list of cues with their corresponding references'''
+
     SequenceTable: List[SequenceTable]
     SynthTable: List[SynthTable]
     TrackEventTable: List[TrackEventTable]
@@ -67,7 +78,7 @@ class ACBTable(UTFViewer):
     WaveformTable: List[WaveformTable]
 
     @staticmethod
-    def decode_tlv(data : bytes):
+    def _decode_tlv(data : bytes):
         pos = 0
         while pos < len(data):
             tag = data[pos : pos + 2]
@@ -76,16 +87,16 @@ class ACBTable(UTFViewer):
             pos += 3 + length
             yield (tag, value)
 
-    def waveform_of_track(self, index: int):
-        tlv = self.decode_tlv(self.TrackEventTable[index])
+    def _waveform_of_track(self, index: int):
+        tlv = self._decode_tlv(self.TrackEventTable[index])
         def noteOn(data: bytes):
             # Handle note on event
             tlv_type, tlv_index = AcbTrackCommandNoteOnStruct.unpack(data[:AcbTrackCommandNoteOnStruct.size])
             match tlv_type:
                 case 0x02: # Synth
-                    yield from self.waveform_of_synth(tlv_index)
+                    yield from self._waveform_of_synth(tlv_index)
                 case 0x03: # Sequence
-                    yield from self.waveform_of_sequence(tlv_index)
+                    yield from self._waveform_of_sequence(tlv_index)
                 # Ignore others silently                
         for code, data in tlv:
             match code:
@@ -94,13 +105,13 @@ class ACBTable(UTFViewer):
                 case 2003:
                     yield from noteOn(data)            
 
-    def waveform_of_sequence(self, index : int):
+    def _waveform_of_sequence(self, index : int):
         seq = self.SequenceTable[index]
         for i in range(seq.NumTracks):
             track_index = int.from_bytes(seq.TrackIndex[i*2:i*2+2], 'big')
             yield self.WaveformTable[track_index]
 
-    def waveform_of_synth(self, index: int):        
+    def _waveform_of_synth(self, index: int):        
         item_type, item_index = AcbSynthReferenceStruct.unpack(self.SynthTable[index].ReferenceItems)
         match item_type:
             case 0x00: # No audio
@@ -108,33 +119,42 @@ class ACBTable(UTFViewer):
             case 0x01: # Waveform
                 yield self.WaveformTable[item_index]
             case 0x02: # Yet another synth...
-                yield from self.waveform_of_synth(item_index)
+                yield from self._waveform_of_synth(item_index)
             case 0x03: # Sequence
-                yield from self.waveform_of_sequence(item_index)
+                yield from self._waveform_of_sequence(item_index)
             case _:
                 raise NotImplementedError(f"Unknown synth reference type: {item_type} at index {index}")
 
     def waveform_of(self, index : int) -> List["WaveformTable"]:
+        """Retrieves the waveform(s) associated with a cue.
+
+        Cues may reference multiple waveforms, which could also be reused."""
         cue = next(filter(lambda c: c.CueId == index, self.CueTable), None)
         assert cue, "cue of index %d not found" % index
         match cue.ReferenceType:
             case 0x01:
                 return [self.WaveformTable[index]]
             case 0x02:
-                return list(self.waveform_of_synth(index))
+                return list(self._waveform_of_synth(index))
             case 0x03:
-                return list(self.waveform_of_sequence(index))
+                return list(self._waveform_of_sequence(index))
             case 0x08:
                 raise NotImplementedError("BlockSequence type not implemented yet")
             case _:
                 raise NotImplementedError(f"Unknown cue reference type: {cue.ReferenceType}")
 
 @dataclass(frozen=True)
-class CueItem:
+class PackedCueItem:
+    '''Helper class for read-only cue information'''
+
     CueId: int
+    '''Cue ID'''
     CueName: str
+    '''Cue name'''
     Length: float
-    Waveforms: list[int] # List of waveform IDs
+    '''Duration in seconds'''
+    Waveforms: list[int]
+    '''List of waveform IDs, corresponds to ACB.get_waveforms()'''
 
 class ACB(UTF):
     """Use this class to read, and modify ACB files in memory."""
@@ -234,7 +254,7 @@ class ACB(UTF):
         pass
 
     @property
-    def cues(self) -> Generator[CueItem, None, None]:
+    def cues(self) -> Generator[PackedCueItem, None, None]:
         """Returns a generator of **read-only** Cues.
 
         Cues reference waveform bytes by their AWB IDs, which can be accessed via `waveforms`.
@@ -242,7 +262,7 @@ class ACB(UTF):
         """
         for name, cue in zip(self.view.CueNameTable, self.view.CueTable):
             waveforms = self.view.waveform_of(cue.CueId)
-            yield CueItem(cue.CueId, name.CueName, cue.Length / 1000.0, [waveform.MemoryAwbId for waveform in waveforms])
+            yield PackedCueItem(cue.CueId, name.CueName, cue.Length / 1000.0, [waveform.MemoryAwbId for waveform in waveforms])
 
 class ACBBuilder:
     """Use this class to build ACB files from an existing ACB object."""

{pycricodecsex-0.0.3 → pycricodecsex-0.0.4}/PyCriCodecsEx/adx.py

@@ -144,12 +144,15 @@ class ADXCodec(ADX):
     def get_metadata(self):
         return None
 
-    def get_encoded(self):
+    def get_encoded(self) -> bytes:
         """Gets the encoded ADX audio data."""
         return self.adx
 
-    def save(self, filepath: str):
-        """Saves the encoded ADX audio to filepath"""
-        with open(filepath, "wb") as f:
-            f.write(self.decode(self.adx))
+    def save(self, filepath: str | BinaryIO):
+        """Saves the decoded WAV audio to filepath or a writable stream"""
+        if type(filepath) == str:
+            with open(filepath, "wb") as f:
+                f.write(self.decode(self.adx))
+        else:
+            filepath.write(self.decode(self.adx))
 

{pycricodecsex-0.0.3 → pycricodecsex-0.0.4}/PyCriCodecsEx/awb.py

@@ -1,6 +1,5 @@
 from io import BytesIO, FileIO
-import os
-from typing import BinaryIO
+from typing import BinaryIO, Generator
 from struct import iter_unpack, pack
 from PyCriCodecsEx.chunk import *
 from PyCriCodecsEx.hca import HCA
@@ -55,7 +54,7 @@ class AWB:
             self.headersize = self.headersize + (self.align - (self.headersize % self.align))
         self.stream.seek(self.headersize, 0)
 
-    def get_files(self):
+    def get_files(self) -> Generator[bytes, None, None]:
         """Generator function to yield all data blobs from an AWB. """
         self.stream.seek(self.headersize, 0)
         for i in range(1, len(self.ofs)):

{pycricodecsex-0.0.3 → pycricodecsex-0.0.4}/PyCriCodecsEx/cpk.py

@@ -1,20 +1,27 @@
 import os
-from typing import BinaryIO
+from typing import BinaryIO, Generator
 from io import BytesIO, FileIO
 from PyCriCodecsEx.chunk import *
 from PyCriCodecsEx.utf import UTF, UTFBuilder
 from dataclasses import dataclass
-from concurrent.futures import ProcessPoolExecutor, as_completed
+from concurrent.futures import ThreadPoolExecutor, as_completed
 from tempfile import NamedTemporaryFile
 import CriCodecsEx
 
-def _worker_do_compression(src : str, dst: str):
+def _crilayla_compress_to_file(src : str, dst: str):
     with open(src, "rb") as fsrc, open(dst, "wb") as fdst:
         data = fsrc.read()
-        compressed = CriCodecsEx.CriLaylaCompress(data)
-        fdst.write(compressed)
+        try:
+            compressed = CriCodecsEx.CriLaylaCompress(data)
+            fdst.write(compressed)
+        except:
+            # Fallback for failed compression
+            # Again. FIXME.
+            fdst.write(data)
+            
 @dataclass
-class _PackFile():
+class PackedFile():
+    """Helper class for packed files within a CPK."""
     stream: BinaryIO
     path: str
     offset: int   
@@ -22,6 +29,7 @@ class _PackFile():
     compressed : bool = False
 
     def get_bytes(self) -> bytes:
+        """Get the raw bytes of the packed file, decompressing if necessary."""
         self.stream.seek(self.offset)
         data = self.stream.read(self.size)
         if self.compressed:
@@ -29,6 +37,7 @@ class _PackFile():
         return data
 
     def save(self, path : str):
+        """Save the packed file to a specified path."""
         with open(path, "wb") as f:
             f.write(self.get_bytes())
 class _TOC():
@@ -115,6 +124,9 @@ class CPK:
     
     @property
     def mode(self):
+        """Get the current mode of the CPK archive. [0,1,2,3]
+        
+        See also CPKBuilder"""
         TOC, ITOC, GTOC = 'TOC' in self.tables, 'ITOC' in self.tables, 'GTOC' in self.tables
         if TOC and ITOC and GTOC:
             return 3
@@ -127,8 +139,8 @@ class CPK:
         raise ValueError("Unknown CPK mode.")
 
     @property
-    def files(self):
-        """Retrieves a list of all files in the CPK archive."""
+    def files(self) -> Generator[PackedFile, None, None]:
+        """Creates a generator for all files in the CPK archive as PackedFile."""
         if "TOC" in self.tables:
             toctable = self.tables['TOC']
             rel_off = 0x800
@@ -139,10 +151,10 @@ class CPK:
                     filename = filename[:250] + "_" + str(i) # 250 because i might be 4 digits long.
                 if toctable['ExtractSize'][i] > toctable['FileSize'][i]:
                     self.stream.seek(rel_off+toctable["FileOffset"][i], 0)
-                    yield _PackFile(self.stream, os.path.join(dirname,filename), self.stream.tell(), toctable['FileSize'][i], compressed=True)
+                    yield PackedFile(self.stream, os.path.join(dirname,filename), self.stream.tell(), toctable['FileSize'][i], compressed=True)
                 else:
                     self.stream.seek(rel_off+toctable["FileOffset"][i], 0)
-                    yield _PackFile(self.stream, os.path.join(dirname,filename), self.stream.tell(), toctable['FileSize'][i])                    
+                    yield PackedFile(self.stream, os.path.join(dirname,filename), self.stream.tell(), toctable['FileSize'][i])                    
         elif "ITOC" in self.tables:
             toctableL = self.tables["ITOC"]['DataL'][0]
             toctableH = self.tables["ITOC"]['DataH'][0]
@@ -154,18 +166,18 @@ class CPK:
                 if i in toctableH['ID']:
                     idx = toctableH['ID'].index(i)
                     if toctableH['ExtractSize'][idx] > toctableH['FileSize'][idx]:
-                        yield _PackFile(self.stream, str(i), self.stream.tell(), toctableH['FileSize'][idx], compressed=True)
+                        yield PackedFile(self.stream, str(i), self.stream.tell(), toctableH['FileSize'][idx], compressed=True)
                     else:
-                        yield _PackFile(self.stream, str(i), self.stream.tell(), toctableH['FileSize'][idx])
+                        yield PackedFile(self.stream, str(i), self.stream.tell(), toctableH['FileSize'][idx])
                     if toctableH['FileSize'][idx] % align != 0:
                         seek_size = (align - toctableH['FileSize'][idx] % align)
                         self.stream.seek(seek_size, 1)
                 elif i in toctableL['ID']:
                     idx = toctableL['ID'].index(i)
                     if toctableL['ExtractSize'][idx] > toctableL['FileSize'][idx]:
-                        yield _PackFile(self.stream, str(i), self.stream.tell(), toctableL['FileSize'][idx], compressed=True)
+                        yield PackedFile(self.stream, str(i), self.stream.tell(), toctableL['FileSize'][idx], compressed=True)
                     else:
-                        yield _PackFile(self.stream, str(i), self.stream.tell(), toctableL['FileSize'][idx])
+                        yield PackedFile(self.stream, str(i), self.stream.tell(), toctableL['FileSize'][idx])
                     if toctableL['FileSize'][idx] % align != 0:
                         seek_size = (align - toctableL['FileSize'][idx] % align)
                         self.stream.seek(seek_size, 1)
@@ -247,9 +259,8 @@ class CPKBuilder:
             compress (bool, optional): Whether to compress the file. Defaults to False.
         
         NOTE: 
-            - In ITOC-related mode, the insertion order determines the final integer ID of the files.
-            - Compression can be VERY slow with high entropy files (e.g. encoded media). Use at discretion.
-        """
+            - In ITOC-related mode, the insertion order determines the final integer ID of the files.            
+        """        
         if not dst and self.mode != 0:
             raise ValueError("Destination filename must be specified in non-ITOC mode.")
         
@@ -263,7 +274,7 @@ class CPKBuilder:
             self.outfile.write(bytes(0x800 - pack_size % 0x800))
             self.progress_cb("Write %s" % os.path.basename(filename), i + 1, len(self.files))
 
-    def _populate_files(self, parallel : bool):
+    def _populate_files(self, threads : int = 1):
         self.files = []
         for src, dst, compress in self.in_files:
             if compress:
@@ -271,23 +282,15 @@ class CPKBuilder:
                 self.os_files.append((tmp.name, True))
             else:
                 self.os_files.append((src, False))
-        if parallel:
-            with ProcessPoolExecutor() as exec:
-                futures = []
-                for (src, _, _), (dst, compress) in zip(self.in_files,self.os_files):
-                    if compress:
-                        futures.append(exec.submit(_worker_do_compression, src, dst))
-                for i, fut in as_completed(futures):
-                    try:
-                        fut.result()
-                    except:
-                        pass
-                    self.progress_cb("Compress %s" % os.path.basename(src), i + 1, len(futures))
-        else:
-            for i, ((src, _, _), (dst, compress)) in enumerate(zip(self.in_files,self.os_files)):
-                    if compress:
-                        _worker_do_compression(src, dst)
-                        self.progress_cb("Compress %s" % os.path.basename(src), i + 1, len(self.in_files))
+        with ThreadPoolExecutor(max_workers=threads) as exec:
+            futures = []
+            for (src, _, _), (dst, compress) in zip(self.in_files,self.os_files):
+                if compress:
+                    _crilayla_compress_to_file(src, dst)
+                    # futures.append(exec.submit(_crilayla_compress_to_file, src, dst))
+            for i, fut in enumerate(as_completed(futures)):
+                fut.result()
+                self.progress_cb("Compress %s" % os.path.basename(src), i + 1, len(futures))
         for (src, filename, _) , (dst, _) in zip(self.in_files,self.os_files):
             file_size = os.stat(src).st_size         
             pack_size = os.stat(dst).st_size
@@ -304,23 +307,22 @@ class CPKBuilder:
                 pass
         self.os_files = []
 
-    def save(self, outfile : str | BinaryIO, parallel : bool = False):
+    def save(self, outfile : str | BinaryIO, threads : int = 1):
         """Build and save the bundle into a file
 
 
         Args:
             outfile (str | BinaryIO): The output file path or a writable binary stream.
-            parallel (bool, optional): Whether to use parallel processing for file compression (if at all used). Defaults to False.
+            threads (int, optional): The number of threads to use for file compression. Defaults to 1.
 
         NOTE: 
             - Temporary files may be created during the process if compression is used.
-            - parallel uses multiprocessing. Make sure your main function is guarded with `if __name__ == '__main__'` clause.
         """
         assert self.in_files, "cannot save empty bundle"
         self.outfile = outfile
         if type(outfile) == str:
             self.outfile = open(outfile, "wb")
-        self._populate_files(parallel)
+        self._populate_files(threads)
         if self.encrypt:
             encflag = 0
         else:

{pycricodecsex-0.0.3 → pycricodecsex-0.0.4}/PyCriCodecsEx/hca.py

@@ -438,14 +438,17 @@ class HCACodec(HCA):
         p.strings = b"<NULL>\x00" + p.strings
         return p.bytes()
 
-    def get_encoded(self):
+    def get_encoded(self) -> bytes:
         """Gets the encoded HCA audio data."""
         self.hcastream.seek(0)
         res = self.hcastream.read()
         self.hcastream.seek(0)
         return res
     
-    def save(self, filepath: str):
-        """Saves the decoded WAV audio to filepath"""
-        with open(filepath, "wb") as f:
-            f.write(self.decode())
+    def save(self, filepath: str | BinaryIO):
+        """Saves the decoded WAV audio to filepath or a writable stream"""
+        if type(filepath) == str:
+            with open(filepath, "wb") as f:
+                f.write(self.decode())
+        else:
+            filepath.write(self.decode())

{pycricodecsex-0.0.3 → pycricodecsex-0.0.4}/PyCriCodecsEx/usm.py

@@ -150,6 +150,7 @@ class USMCrypt:
 # are still unknown how to derive them, at least video wise it is possible, no idea how it's calculated audio wise nor anything else
 # seems like it could be random values and the USM would still work.
 class FFmpegCodec:
+    """Base codec for FFMpeg-based Video streams"""
     filename: str
     filesize: int
 
@@ -232,7 +233,7 @@ class FFmpegCodec:
         return len(self.packets)
 
     def frames(self):
-        """frame data, frame dict, is keyframe, duration"""
+        """Generator of [frame data, frame dict, is keyframe, duration]"""
         offsets = [int(packet["pos"]) for packet in self.packets] + [self.filesize]
         for i, frame in enumerate(self.packets):
             frame_size = offsets[i + 1] - offsets[i]
@@ -290,13 +291,16 @@ class FFmpegCodec:
         return SFV_list
 
     def save(self, filepath: str):
-        '''Saves the raw, underlying video stream to a file.'''
+        '''Saves the underlying video stream to a file.'''
         tell = self.file.tell()
         self.file.seek(0)
         shutil.copyfileobj(self.file, open(filepath, 'wb'))
         self.file.seek(tell)
 
 class VP9Codec(FFmpegCodec):
+    """VP9 Video stream codec.
+    
+    Only streams with `.ivf` containers are supported."""
     MPEG_CODEC = 9
     MPEG_DCPREC = 0
     VERSION = 16777984
@@ -305,6 +309,9 @@ class VP9Codec(FFmpegCodec):
         super().__init__(filename)
         assert self.format == "ivf", "must be ivf format."
 class H264Codec(FFmpegCodec):
+    """H264 Video stream codec.
+
+    Only streams with `.h264` containers are supported."""
     MPEG_CODEC = 5
     MPEG_DCPREC = 11
     VERSION = 0
@@ -315,6 +322,9 @@ class H264Codec(FFmpegCodec):
             self.format == "h264"
         ), "must be raw h264 data. transcode with '.h264' suffix as output"
 class MPEG1Codec(FFmpegCodec):
+    """MPEG1 Video stream codec.
+
+    Only streams with `.mpeg1` containers are supported."""
     MPEG_CODEC = 1
     MPEG_DCPREC = 11
     VERSION = 0
@@ -482,7 +492,7 @@ class USM(USMCrypt):
             stmid = int.to_bytes(stmid, 4, 'big', signed='False')
             yield stmid, str(filename), self.output.get(f'{stmid.decode()}_{chno}', None)
     
-    def get_video(self):
+    def get_video(self) -> VP9Codec | H264Codec | MPEG1Codec:
         """Create a video codec from the available streams.
 
         NOTE: A temporary file may be created with this process to determine the stream information."""

{pycricodecsex-0.0.3 → pycricodecsex-0.0.4}/PyCriCodecsEx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyCriCodecsEx
-Version: 0.0.3
+Version: 0.0.4
 Summary: Criware formats library for Python
 Home-page: https://mos9527.github.io/PyCriCodecsEx/
 Classifier: Programming Language :: Python :: 3

{pycricodecsex-0.0.3 → pycricodecsex-0.0.4}/setup.py

@@ -24,7 +24,7 @@ class BuildExt(build_ext):
                 # ASAN on Linux
                 # This only works with GCC - you also need to specify 
                 # LD_PRELOAD=$(gcc -print-file-name=libasan.so)
-                compile_args += ['-O0', '-g', '-fsanitize=address']
+                compile_args += ['-O0', '-g']
             else:
                 compile_args += ['-O2']
         for ext in self.extensions:

pycricodecsex-0.0.3/PyCriCodecsEx/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.0.3"