Skip to content

Commit 0ae54bf

Browse files
Use correct algo lzma_alone for web player
Sadly kills any hopes of multithreaded encoding
1 parent e6ff84c commit 0ae54bf

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ edition = "2021"
77
[dependencies]
88
log = "0.4.22"
99
reqwest = { version = "0.12.9", features = ["stream"] }
10-
liblzma = { version = "0.3.5", features = ["static", "parallel"], optional = true }
10+
liblzma = { version = "0.3.5", features = ["static"], optional = true }
1111
serde = { version = "1.0.214", features = ["derive"] }
1212
serde_json = "1.0.132"
1313
sha2 = "0.10.8"

src/bundle.rs

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::{
88
use countio::Counter;
99
use liblzma::{
1010
read::XzDecoder,
11-
stream::{Check, Filters, LzmaOptions, MtStreamBuilder, Stream},
11+
stream::{LzmaOptions, Stream},
1212
write::XzEncoder,
1313
};
1414
use log::*;
@@ -24,23 +24,14 @@ fn get_lzma_encoder<W: Write>(writer: &mut W, level: u32) -> Result<XzEncoder<&m
2424
.literal_context_bits(3)
2525
.literal_position_bits(0)
2626
.position_bits(2)
27-
.dict_size(1 << 19);
28-
29-
let mut filters = Filters::new();
30-
filters.lzma2(&options);
31-
32-
let stream = MtStreamBuilder::new()
33-
.preset(level)
34-
.check(Check::Crc64)
35-
.threads(num_cpus::get() as u32)
36-
.filters(filters)
37-
.encoder()
38-
.unwrap();
27+
.dict_size(1 << 23);
28+
29+
let stream = Stream::new_lzma_encoder(&options)?;
3930
Ok(XzEncoder::new_stream(writer, stream))
4031
}
4132

4233
fn get_lzma_decoder<R: Read>(reader: &mut R) -> Result<XzDecoder<&mut R>, Error> {
43-
let stream = Stream::new_auto_decoder(u64::MAX, 0)?;
34+
let stream = Stream::new_lzma_decoder(u64::MAX)?;
4435
Ok(XzDecoder::new_stream(reader, stream))
4536
}
4637

0 commit comments

Comments
 (0)