New compression/decompression API

[wimlib] / include / wimlib / wim.h

diff --git a/include/wimlib/wim.h b/include/wimlib/wim.h
index d1e0971372f460cd7edc5289be6b3ac80f7e1785..99a37362eefd6420d0e7a0b15b2b0733edc7e750 100644 (file)
--- a/include/wimlib/wim.h
+++ b/include/wimlib/wim.h
@@ -42,8 +42,9 @@ struct WIMStruct {
        /* Temporary field */
        void *private;
 
-       /* LZX compression context for default thread  */
-       struct wimlib_lzx_context *lzx_context;
+       struct wimlib_decompressor *decompressor;
+       enum wimlib_compression_type decompressor_ctype;
+       u32 decompressor_max_block_size;
 
        struct list_head subwims;
 
@@ -70,6 +71,21 @@ struct WIMStruct {
 
        /* One of WIMLIB_COMPRESSION_TYPE_*, cached from the header flags. */
        u8 compression_type : 2;
+
+       /* Overwritten compression type for wimlib_overwrite() or
+        * wimlib_write().  Can be changed by
+        * wimlib_set_output_compression_type(); otherwise is the same as
+        * compression_type.  */
+       u8 out_compression_type : 2;
+
+       /* Uncompressed size of compressed chunks in this WIM (cached from
+        * header).  */
+       u32 chunk_size;
+
+       /* Overridden chunk size for wimlib_overwrite() or wimlib_write().  Can
+        * be changed by wimlib_set_output_chunk_size(); otherwise is the same
+        * as chunk_size.  */
+       u32 out_chunk_size;
 };
 
 static inline bool wim_is_pipable(const WIMStruct *wim)
@@ -79,7 +95,7 @@ static inline bool wim_is_pipable(const WIMStruct *wim)
 
 static inline bool wim_has_integrity_table(const WIMStruct *wim)
 {
-       return (wim->hdr.integrity.offset != 0);
+       return (wim->hdr.integrity_table_reshdr.offset_in_wim != 0);
 }
 
 static inline bool wim_has_metadata(const WIMStruct *wim)
@@ -87,15 +103,17 @@ static inline bool wim_has_metadata(const WIMStruct *wim)
        return (wim->image_metadata != NULL || wim->hdr.image_count == 0);
 }
 
-extern void
+extern int
 wim_recalculate_refcnts(WIMStruct *wim);
 
 extern int
-init_wim_header(struct wim_header *hdr, int ctype);
+set_wim_hdr_cflags(int ctype, struct wim_header *hdr);
+
+extern int
+init_wim_header(struct wim_header *hdr, int ctype, u32 chunk_size);
 
 extern int
-read_wim_header(const tchar *filename, struct filedes *in_fd,
-               struct wim_header *hdr);
+read_wim_header(WIMStruct *wim, struct wim_header *hdr);
 
 extern int
 write_wim_header(const struct wim_header *hdr, struct filedes *out_fd);