diff options
Diffstat (limited to 'core/io/compression.cpp')
| -rw-r--r-- | core/io/compression.cpp | 183 |
1 files changed, 120 insertions, 63 deletions
diff --git a/core/io/compression.cpp b/core/io/compression.cpp index 156767d241..67ba5de0fa 100644 --- a/core/io/compression.cpp +++ b/core/io/compression.cpp @@ -26,66 +26,123 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "compression.h"
-
-#include "fastlz.h"
-#include "os/copymem.h"
-
-int Compression::compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size,Mode p_mode) {
-
- switch(p_mode) {
- case MODE_FASTLZ: {
-
- if (p_src_size<16) {
- uint8_t src[16];
- zeromem(&src[p_src_size],16-p_src_size);
- copymem(src,p_src,p_src_size);
- return fastlz_compress(src,16,p_dst);
- } else {
- return fastlz_compress(p_src,p_src_size,p_dst);
- }
-
- } break;
- }
-
- ERR_FAIL_V(-1);
-}
-
-int Compression::get_max_compressed_buffer_size(int p_src_size,Mode p_mode){
-
- switch(p_mode) {
- case MODE_FASTLZ: {
-
-
- int ss = p_src_size+p_src_size*6/100;
- if (ss<66)
- ss=66;
- return ss;
-
- } break;
- }
-
- ERR_FAIL_V(-1);
-
-}
-
-
-
-void Compression::decompress(uint8_t *p_dst, int p_dst_max_size, const uint8_t *p_src, int p_src_size,Mode p_mode){
-
- switch(p_mode) {
- case MODE_FASTLZ: {
-
- if (p_dst_max_size<16) {
- uint8_t dst[16];
- fastlz_decompress(p_src,p_src_size,dst,16);
- copymem(p_dst,dst,p_dst_max_size);
- } else {
- fastlz_decompress(p_src,p_src_size,p_dst,p_dst_max_size);
- }
- return;
- } break;
- }
-
- ERR_FAIL();
-}
+#include "compression.h" + +#include "fastlz.h" +#include "zlib.h" +#include "zip_io.h" +#include "os/copymem.h" + +int Compression::compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size,Mode p_mode) { + + switch(p_mode) { + case MODE_FASTLZ: { + + if (p_src_size<16) { + uint8_t src[16]; + zeromem(&src[p_src_size],16-p_src_size); + copymem(src,p_src,p_src_size); + return fastlz_compress(src,16,p_dst); + } else { + return fastlz_compress(p_src,p_src_size,p_dst); + } + + } break; + case MODE_DEFLATE: { + + z_stream strm; + strm.zalloc = zipio_alloc; + strm.zfree = zipio_free; + strm.opaque = Z_NULL; + int err = deflateInit(&strm,Z_DEFAULT_COMPRESSION); + if (err==Z_OK) + return -1; + + strm.avail_in=p_src_size; + int aout = deflateBound(&strm,p_src_size);; + strm.avail_out=aout; + strm.next_in=(Bytef*)p_src; + strm.next_out=p_dst; + deflate(&strm,Z_FINISH); + aout = aout - strm.avail_out; + deflateEnd(&strm); + return aout; + + } break; + } + + ERR_FAIL_V(-1); +} + +int Compression::get_max_compressed_buffer_size(int p_src_size,Mode p_mode){ + + switch(p_mode) { + case MODE_FASTLZ: { + + + int ss = p_src_size+p_src_size*6/100; + if (ss<66) + ss=66; + return ss; + + } break; + case MODE_DEFLATE: { + + z_stream strm; + strm.zalloc = zipio_alloc; + strm.zfree = zipio_free; + strm.opaque = Z_NULL; + int err = deflateInit(&strm,Z_DEFAULT_COMPRESSION); + if (err==Z_OK) + return -1; + int aout = deflateBound(&strm,p_src_size); + deflateEnd(&strm); + return aout; + } break; + } + + ERR_FAIL_V(-1); + +} + + + +void Compression::decompress(uint8_t *p_dst, int p_dst_max_size, const uint8_t *p_src, int p_src_size,Mode p_mode){ + + switch(p_mode) { + case MODE_FASTLZ: { + + if (p_dst_max_size<16) { + uint8_t dst[16]; + fastlz_decompress(p_src,p_src_size,dst,16); + copymem(p_dst,dst,p_dst_max_size); + } else { + fastlz_decompress(p_src,p_src_size,p_dst,p_dst_max_size); + } + return; + } break; + case MODE_DEFLATE: { + + z_stream strm; + strm.zalloc = zipio_alloc; + strm.zfree = zipio_free; + strm.opaque = Z_NULL; + strm.avail_in= 0; + strm.next_in=Z_NULL; + int err = inflateInit(&strm); + ERR_FAIL_COND(err!=Z_OK); + + strm.avail_in=p_src_size; + strm.avail_out=p_dst_max_size; + strm.next_in=(Bytef*)p_src; + strm.next_out=p_dst; + + err = inflate(&strm,Z_FINISH); + inflateEnd(&strm); + ERR_FAIL_COND(err!=Z_STREAM_END); + return; + } break; + } + + ERR_FAIL(); +} |