1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499
use super::symbol;
use super::BlockType;
use crate::bit;
use crate::finish::{Complete, Finish};
use crate::lz77;
#[cfg(feature = "no_std")]
use core::cmp;
#[cfg(feature = "no_std")]
use core2::io;
#[cfg(not(feature = "no_std"))]
use std::{cmp, io};
/// The default size of a DEFLATE block.
pub const DEFAULT_BLOCK_SIZE: usize = 1024 * 1024;
const MAX_NON_COMPRESSED_BLOCK_SIZE: usize = 0xFFFF;
/// Options for a DEFLATE encoder.
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct EncodeOptions<E = lz77::DefaultLz77Encoder> {
block_size: usize,
dynamic_huffman: bool,
lz77: Option<E>,
}
impl Default for EncodeOptions<lz77::DefaultLz77Encoder> {
fn default() -> Self {
Self::new()
}
}
impl EncodeOptions<lz77::DefaultLz77Encoder> {
/// Makes a default instance.
///
/// # Examples
/// ```
/// use libflate::deflate::{Encoder, EncodeOptions};
///
/// let options = EncodeOptions::new();
/// let encoder = Encoder::with_options(Vec::new(), options);
/// ```
pub fn new() -> Self {
EncodeOptions {
block_size: DEFAULT_BLOCK_SIZE,
dynamic_huffman: true,
lz77: Some(lz77::DefaultLz77Encoder::new()),
}
}
}
impl<E> EncodeOptions<E>
where
E: lz77::Lz77Encode,
{
/// Specifies the LZ77 encoder used to compress input data.
///
/// # Example
/// ```
/// use libflate::lz77::DefaultLz77Encoder;
/// use libflate::deflate::{Encoder, EncodeOptions};
///
/// let options = EncodeOptions::with_lz77(DefaultLz77Encoder::new());
/// let encoder = Encoder::with_options(Vec::new(), options);
/// ```
pub fn with_lz77(lz77: E) -> Self {
EncodeOptions {
block_size: DEFAULT_BLOCK_SIZE,
dynamic_huffman: true,
lz77: Some(lz77),
}
}
/// Disables LZ77 compression.
///
/// # Example
/// ```
/// use libflate::lz77::DefaultLz77Encoder;
/// use libflate::deflate::{Encoder, EncodeOptions};
///
/// let options = EncodeOptions::new().no_compression();
/// let encoder = Encoder::with_options(Vec::new(), options);
/// ```
pub fn no_compression(mut self) -> Self {
self.lz77 = None;
self
}
/// Specifies the hint of the size of a DEFLATE block.
///
/// The default value is `DEFAULT_BLOCK_SIZE`.
///
/// # Example
/// ```
/// use libflate::deflate::{Encoder, EncodeOptions};
///
/// let options = EncodeOptions::new().block_size(512 * 1024);
/// let encoder = Encoder::with_options(Vec::new(), options);
/// ```
pub fn block_size(mut self, size: usize) -> Self {
self.block_size = size;
self
}
/// Specifies to compress with fixed huffman codes.
///
/// # Example
/// ```
/// use libflate::deflate::{Encoder, EncodeOptions};
///
/// let options = EncodeOptions::new().fixed_huffman_codes();
/// let encoder = Encoder::with_options(Vec::new(), options);
/// ```
pub fn fixed_huffman_codes(mut self) -> Self {
self.dynamic_huffman = false;
self
}
fn get_block_type(&self) -> BlockType {
if self.lz77.is_none() {
BlockType::Raw
} else if self.dynamic_huffman {
BlockType::Dynamic
} else {
BlockType::Fixed
}
}
fn get_block_size(&self) -> usize {
if self.lz77.is_none() {
cmp::min(self.block_size, MAX_NON_COMPRESSED_BLOCK_SIZE)
} else {
self.block_size
}
}
}
/// DEFLATE encoder.
#[derive(Debug)]
pub struct Encoder<W, E = lz77::DefaultLz77Encoder> {
writer: bit::BitWriter<W>,
block: Block<E>,
}
impl<W> Encoder<W, lz77::DefaultLz77Encoder>
where
W: io::Write,
{
/// Makes a new encoder instance.
///
/// Encoded DEFLATE stream is written to `inner`.
///
/// # Examples
/// ```
/// #[cfg(feature = "no_std")]
/// use core2::io::Write;
/// #[cfg(not(feature = "no_std"))]
/// use std::io::Write;
/// use libflate::deflate::Encoder;
///
/// let mut encoder = Encoder::new(Vec::new());
/// encoder.write_all(b"Hello World!".as_ref()).unwrap();
///
/// assert_eq!(encoder.finish().into_result().unwrap(),
/// [5, 192, 49, 13, 0, 0, 8, 3, 65, 43, 224, 6, 7, 24, 128, 237,
/// 147, 38, 245, 63, 244, 230, 65, 181, 50, 215, 1]);
/// ```
pub fn new(inner: W) -> Self {
Self::with_options(inner, EncodeOptions::default())
}
}
impl<W, E> Encoder<W, E>
where
W: io::Write,
E: lz77::Lz77Encode,
{
/// Makes a new encoder instance with specified options.
///
/// Encoded DEFLATE stream is written to `inner`.
///
/// # Examples
/// ```
/// #[cfg(feature = "no_std")]
/// use core2::io::Write;
/// #[cfg(not(feature = "no_std"))]
/// use std::io::Write;
/// use libflate::deflate::{Encoder, EncodeOptions};
///
/// let options = EncodeOptions::new().no_compression();
/// let mut encoder = Encoder::with_options(Vec::new(), options);
/// encoder.write_all(b"Hello World!".as_ref()).unwrap();
///
/// assert_eq!(encoder.finish().into_result().unwrap(),
/// [1, 12, 0, 243, 255, 72, 101, 108, 108, 111, 32, 87, 111,
/// 114, 108, 100, 33]);
/// ```
pub fn with_options(inner: W, options: EncodeOptions<E>) -> Self {
Encoder {
writer: bit::BitWriter::new(inner),
block: Block::new(options),
}
}
/// Flushes internal buffer and returns the inner stream.
///
/// # Examples
/// ```
/// #[cfg(feature = "no_std")]
/// use core2::io::Write;
/// #[cfg(not(feature = "no_std"))]
/// use std::io::Write;
/// use libflate::deflate::Encoder;
///
/// let mut encoder = Encoder::new(Vec::new());
/// encoder.write_all(b"Hello World!".as_ref()).unwrap();
///
/// assert_eq!(encoder.finish().into_result().unwrap(),
/// [5, 192, 49, 13, 0, 0, 8, 3, 65, 43, 224, 6, 7, 24, 128, 237,
/// 147, 38, 245, 63, 244, 230, 65, 181, 50, 215, 1]);
/// ```
pub fn finish(mut self) -> Finish<W, io::Error> {
match self.block.finish(&mut self.writer) {
Ok(_) => Finish::new(self.writer.into_inner(), None),
Err(e) => Finish::new(self.writer.into_inner(), Some(e)),
}
}
/// Returns the immutable reference to the inner stream.
pub fn as_inner_ref(&self) -> &W {
self.writer.as_inner_ref()
}
/// Returns the mutable reference to the inner stream.
pub fn as_inner_mut(&mut self) -> &mut W {
self.writer.as_inner_mut()
}
/// Unwraps the `Encoder`, returning the inner stream.
pub fn into_inner(self) -> W {
self.writer.into_inner()
}
pub(crate) fn zlib_sync_flush(&mut self) -> io::Result<()> {
self.block.flush(&mut self.writer, false)?;
self.writer.write_bit(false)?;
self.writer.write_bits(2, BlockType::Raw as u16)?;
self.writer.flush()?;
self.writer.as_inner_mut().write_all(&[0, 0, 255, 255])?;
self.writer.as_inner_mut().flush()
}
}
impl<W, E> io::Write for Encoder<W, E>
where
W: io::Write,
E: lz77::Lz77Encode,
{
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
self.block.write(&mut self.writer, buf)?;
Ok(buf.len())
}
fn flush(&mut self) -> io::Result<()> {
self.block.flush(&mut self.writer, false)?;
self.writer.as_inner_mut().flush()
}
}
impl<W, E> Complete for Encoder<W, E>
where
W: io::Write,
E: lz77::Lz77Encode,
{
fn complete(self) -> io::Result<()> {
self.finish().into_result().map(|_| ())
}
}
#[derive(Debug)]
struct Block<E> {
block_type: BlockType,
block_size: usize,
block_buf: BlockBuf<E>,
}
impl<E> Block<E>
where
E: lz77::Lz77Encode,
{
fn new(options: EncodeOptions<E>) -> Self {
Block {
block_type: options.get_block_type(),
block_size: options.get_block_size(),
block_buf: BlockBuf::new(options.lz77, options.dynamic_huffman),
}
}
fn write<W>(&mut self, writer: &mut bit::BitWriter<W>, buf: &[u8]) -> io::Result<()>
where
W: io::Write,
{
self.block_buf.append(buf);
while self.block_buf.len() >= self.block_size {
self.flush(writer, false)?;
}
Ok(())
}
fn flush<W>(&mut self, writer: &mut bit::BitWriter<W>, is_final: bool) -> io::Result<()>
where
W: io::Write,
{
writer.write_bit(is_final)?;
writer.write_bits(2, self.block_type as u16)?;
self.block_buf.flush(writer)?;
Ok(())
}
fn finish<W>(mut self, writer: &mut bit::BitWriter<W>) -> io::Result<()>
where
W: io::Write,
{
self.flush(writer, true)?;
writer.flush()?;
Ok(())
}
}
#[derive(Debug)]
enum BlockBuf<E> {
Raw(RawBuf),
Fixed(CompressBuf<symbol::FixedHuffmanCodec, E>),
Dynamic(CompressBuf<symbol::DynamicHuffmanCodec, E>),
}
impl<E> BlockBuf<E>
where
E: lz77::Lz77Encode,
{
fn new(lz77: Option<E>, dynamic: bool) -> Self {
if let Some(lz77) = lz77 {
if dynamic {
BlockBuf::Dynamic(CompressBuf::new(symbol::DynamicHuffmanCodec, lz77))
} else {
BlockBuf::Fixed(CompressBuf::new(symbol::FixedHuffmanCodec, lz77))
}
} else {
BlockBuf::Raw(RawBuf::new())
}
}
fn append(&mut self, buf: &[u8]) {
match *self {
BlockBuf::Raw(ref mut b) => b.append(buf),
BlockBuf::Fixed(ref mut b) => b.append(buf),
BlockBuf::Dynamic(ref mut b) => b.append(buf),
}
}
fn len(&self) -> usize {
match *self {
BlockBuf::Raw(ref b) => b.len(),
BlockBuf::Fixed(ref b) => b.len(),
BlockBuf::Dynamic(ref b) => b.len(),
}
}
fn flush<W>(&mut self, writer: &mut bit::BitWriter<W>) -> io::Result<()>
where
W: io::Write,
{
match *self {
BlockBuf::Raw(ref mut b) => b.flush(writer),
BlockBuf::Fixed(ref mut b) => b.flush(writer),
BlockBuf::Dynamic(ref mut b) => b.flush(writer),
}
}
}
#[derive(Debug)]
struct RawBuf {
buf: Vec<u8>,
}
impl RawBuf {
fn new() -> Self {
RawBuf { buf: Vec::new() }
}
fn append(&mut self, buf: &[u8]) {
self.buf.extend_from_slice(buf);
}
fn len(&self) -> usize {
self.buf.len()
}
fn flush<W>(&mut self, writer: &mut bit::BitWriter<W>) -> io::Result<()>
where
W: io::Write,
{
let size = cmp::min(self.buf.len(), MAX_NON_COMPRESSED_BLOCK_SIZE);
writer.flush()?;
writer
.as_inner_mut()
.write_all(&(size as u16).to_le_bytes())?;
writer
.as_inner_mut()
.write_all(&(!size as u16).to_le_bytes())?;
writer.as_inner_mut().write_all(&self.buf[..size])?;
self.buf.drain(0..size);
Ok(())
}
}
#[derive(Debug)]
struct CompressBuf<H, E> {
huffman: H,
lz77: E,
buf: Vec<symbol::Symbol>,
original_size: usize,
}
impl<H, E> CompressBuf<H, E>
where
H: symbol::HuffmanCodec,
E: lz77::Lz77Encode,
{
fn new(huffman: H, lz77: E) -> Self {
CompressBuf {
huffman,
lz77,
buf: Vec::new(),
original_size: 0,
}
}
fn append(&mut self, buf: &[u8]) {
self.original_size += buf.len();
self.lz77.encode(buf, &mut self.buf);
}
fn len(&self) -> usize {
self.original_size
}
fn flush<W>(&mut self, writer: &mut bit::BitWriter<W>) -> io::Result<()>
where
W: io::Write,
{
self.lz77.flush(&mut self.buf);
self.buf.push(symbol::Symbol::EndOfBlock);
let symbol_encoder = self.huffman.build(&self.buf)?;
self.huffman.save(writer, &symbol_encoder)?;
for s in self.buf.drain(..) {
symbol_encoder.encode(writer, &s)?;
}
self.original_size = 0;
Ok(())
}
}
#[cfg(test)]
mod tests {
use super::super::Decoder;
use super::*;
#[cfg(feature = "no_std")]
use core2::io::{Read as _, Write as _};
#[cfg(not(feature = "no_std"))]
use std::io::{Read as _, Write as _};
#[test]
fn test_issues_52() {
// see: https://github.com/sile/libflate/issues/52
let input = crate::deflate::test_data::ISSUE_52_INPUT;
const LIMIT_1: usize = 16_031;
const LIMIT_2: usize = LIMIT_1 + 1;
// Attempt 1 (should succeed)
//
let mut encoder = Encoder::new(Vec::new());
encoder.write_all(&input[0..LIMIT_1]).unwrap();
let compressed: Vec<u8> = encoder.finish().into_result().unwrap();
assert!(LIMIT_1 > compressed.len());
// Attempt 2 (will fail without patch)
//
let mut encoder = Encoder::new(Vec::new());
encoder.write_all(&input[0..LIMIT_2]).unwrap();
let compressed: Vec<u8> = encoder.finish().into_result().unwrap();
assert!(LIMIT_2 > compressed.len());
}
#[test]
fn test_issue_27() {
// See: https://github.com/sile/libflate/issues/27
let writes = ["fooooooooooooooooo", "bar", "baz"];
let mut encoder = Encoder::new(Vec::new());
for _ in 0..2 {
for string in &writes {
encoder.write(string.as_bytes()).expect("Write failed");
}
encoder.flush().expect("Flush failed");
}
let finished = encoder.finish().unwrap();
println!("{:?}", finished.0);
let mut output = Vec::new();
Decoder::new(&finished.0[..])
.read_to_end(&mut output)
.unwrap();
assert_eq!(
output,
"fooooooooooooooooobarbazfooooooooooooooooobarbaz".as_bytes()
);
}
}