Add pixel skipping, readme & docs
Some checks failed
Some checks failed
This commit is contained in:
parent
57dcd2a4e9
commit
0c988ece22
201
LICENSE-APACHE
Normal file
201
LICENSE-APACHE
Normal file
|
@ -0,0 +1,201 @@
|
|||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
21
LICENSE-MIT
Normal file
21
LICENSE-MIT
Normal file
|
@ -0,0 +1,21 @@
|
|||
MIT License
|
||||
|
||||
Copyright (c) 2019 Raincal
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
77
README.md
77
README.md
|
@ -0,0 +1,77 @@
|
|||
# blurhash-update
|
||||
|
||||
_A blurhash encoder for streaming bytes_
|
||||
|
||||
## Supports
|
||||
- [x] Encoding
|
||||
- [ ] Decoding
|
||||
|
||||
## Motivation
|
||||
|
||||
There exists already a [blurhash crate](https://github.com/whisperfish/blurhash-rs), which is a good
|
||||
choice for creating blurhashes, however, it requires that all pixels for a given image exist in
|
||||
memory in order to compute it. For very large images, this might not be ideal.
|
||||
|
||||
blurhash-update provides an API for processing bytes from an image as they are made available. This
|
||||
isn't as performant as blurhash in like-for-like comparisons, but the benefit of a lower memory
|
||||
overhead can be useful in some scenarios.
|
||||
|
||||
blurhash-update also provides the ability to reduce accuracy by skipping processing of some of the
|
||||
input pixels. This greatly improves performance, but might lead to blurhashes that don't look quite
|
||||
right.
|
||||
|
||||
## Usage
|
||||
|
||||
```rust
|
||||
use std::io::Read;
|
||||
|
||||
use blurhash_update::{Components, Encoder, ImageBounds};
|
||||
use clap::Parser;
|
||||
|
||||
#[derive(clap::Parser)]
|
||||
struct Args {
|
||||
/// Width of the provided image
|
||||
#[clap(long)]
|
||||
width: u32,
|
||||
|
||||
/// Height of the provided image
|
||||
#[clap(long)]
|
||||
height: u32,
|
||||
}
|
||||
|
||||
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
let Args { width, height } = Args::parse();
|
||||
let mut encoder = Encoder::new(Components { x: 4, y: 3 }, ImageBounds { width, height }, 1)?;
|
||||
|
||||
let mut stdin = std::io::stdin().lock();
|
||||
let mut buf = [0u8; 1024];
|
||||
|
||||
loop {
|
||||
let n = stdin.read(&mut buf)?;
|
||||
|
||||
if n == 0 {
|
||||
break;
|
||||
}
|
||||
|
||||
encoder.update(&buf[..n]);
|
||||
}
|
||||
|
||||
println!("{}", encoder.finalize());
|
||||
|
||||
Ok(())
|
||||
}
|
||||
```
|
||||
|
||||
Example usage:
|
||||
```bash
|
||||
magick convert /path/to/image RGBA:- | \
|
||||
cargo r --example --release -- --width blah --height blah
|
||||
```
|
||||
|
||||
## License
|
||||
|
||||
blurhash-update is licensed under either of the following:
|
||||
|
||||
- Apache License, Version 2.0, ([LICENSE-APACHE](./LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
|
||||
- MIT license ([LICENSE-MIT](./LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
|
||||
|
|
@ -58,6 +58,45 @@ pub fn criterion_benchmark(c: &mut Criterion) {
|
|||
}
|
||||
|
||||
group.finish();
|
||||
|
||||
let mut group = c.benchmark_group("blurhash-update-skip");
|
||||
|
||||
let inputs = [
|
||||
"data/19dd1c444d1c7939.png",
|
||||
"data/f73d2ee39133d871.jpg",
|
||||
"data/shenzi.png",
|
||||
];
|
||||
|
||||
for skip in [2, 4, 8] {
|
||||
for input in inputs {
|
||||
let name = format!("{skip}-{input}");
|
||||
|
||||
group.bench_with_input(
|
||||
BenchmarkId::from_parameter(name),
|
||||
&(skip, input),
|
||||
|b, (s, i)| {
|
||||
let img = image::open(i).unwrap();
|
||||
let width = img.width();
|
||||
let height = img.height();
|
||||
let rgba = img.to_rgba8();
|
||||
let bytes = rgba.as_bytes();
|
||||
|
||||
b.iter(|| {
|
||||
let mut encoder = black_box(blurhash_update::Encoder::new(
|
||||
Components { x: 4, y: 3 },
|
||||
ImageBounds { width, height },
|
||||
*s,
|
||||
))
|
||||
.unwrap();
|
||||
encoder.update(bytes);
|
||||
let _bhash = black_box(encoder.finalize());
|
||||
});
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
group.finish();
|
||||
}
|
||||
|
||||
criterion_group!(benches, criterion_benchmark);
|
||||
|
|
|
@ -21,7 +21,7 @@ struct Args {
|
|||
// ```
|
||||
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
let Args { width, height } = Args::parse();
|
||||
let mut encoder = Encoder::new(Components { x: 4, y: 3 }, ImageBounds { width, height })?;
|
||||
let mut encoder = Encoder::new(Components { x: 4, y: 3 }, ImageBounds { width, height }, 8)?;
|
||||
|
||||
let mut stdin = std::io::stdin().lock();
|
||||
let mut buf = [0u8; 1024];
|
||||
|
|
105
src/lib.rs
105
src/lib.rs
|
@ -1,3 +1,6 @@
|
|||
#![doc = include_str!("../README.md")]
|
||||
#![deny(missing_docs)]
|
||||
|
||||
mod base83;
|
||||
mod srgb_lookup;
|
||||
|
||||
|
@ -12,14 +15,22 @@ const BYTES_PER_PIXEL: usize = 4;
|
|||
/// More components will increase the definition of the blurhash, but also increase processing
|
||||
/// time.
|
||||
pub struct Components {
|
||||
/// How many components to process in the x direction
|
||||
pub x: u32,
|
||||
|
||||
/// How many components to process in the y direction
|
||||
pub y: u32,
|
||||
}
|
||||
|
||||
/// Width and height of the input image
|
||||
/// Bounds for the input image
|
||||
///
|
||||
/// These are required since they can not be inferred from the RGBA values
|
||||
#[derive(Clone, Copy, Debug)]
|
||||
pub struct ImageBounds {
|
||||
/// The input image's width
|
||||
pub width: u32,
|
||||
|
||||
/// The input image's height
|
||||
pub height: u32,
|
||||
}
|
||||
|
||||
|
@ -36,6 +47,7 @@ pub struct ComponentError;
|
|||
/// Encoder type used to produce blurhashes
|
||||
pub struct Encoder {
|
||||
index: usize,
|
||||
skip: u32,
|
||||
components: Components,
|
||||
factors: Box<[(ComponentState, [f32; BYTES_PER_PIXEL])]>,
|
||||
bounds: ImageBounds,
|
||||
|
@ -49,7 +61,7 @@ pub fn encode(
|
|||
bounds: ImageBounds,
|
||||
rgba8_image: &[u8],
|
||||
) -> Result<String, ComponentError> {
|
||||
let mut encoder = Encoder::new(components, bounds)?;
|
||||
let mut encoder = Encoder::new(components, bounds, 1)?;
|
||||
encoder.update(rgba8_image);
|
||||
Ok(encoder.finalize())
|
||||
}
|
||||
|
@ -57,10 +69,16 @@ pub fn encode(
|
|||
impl Encoder {
|
||||
/// Create a new Encoder to produce a blurhash
|
||||
///
|
||||
/// The `skip` value indicates how many pixels can be skipped when proccessing the image. this
|
||||
/// value will be squared to produce the final skip value. When set to 1, no pixels will be
|
||||
/// skipped, when set to 2, one in four pixels will be processed. when set to 3, one in 9
|
||||
/// pixels will be processed, etc. This improves performance at the cost of losing accuracy.
|
||||
///
|
||||
/// Errors if too many components are requested
|
||||
pub fn new(
|
||||
Components { x, y }: Components,
|
||||
bounds: ImageBounds,
|
||||
skip: u32,
|
||||
) -> Result<Self, ComponentError> {
|
||||
if !(1..=9).contains(&x) || !(1..=9).contains(&y) {
|
||||
return Err(ComponentError);
|
||||
|
@ -68,6 +86,7 @@ impl Encoder {
|
|||
|
||||
Ok(Self {
|
||||
index: 0,
|
||||
skip,
|
||||
components: Components { x, y },
|
||||
factors: Box::from(
|
||||
(0..y)
|
||||
|
@ -94,17 +113,23 @@ impl Encoder {
|
|||
let basis_scale_x = PI / self.bounds.width as f32;
|
||||
let basis_scale_y = PI / self.bounds.height as f32;
|
||||
|
||||
for (ComponentState { basis, .. }, [_, g, b, _]) in self.factors.iter_mut() {
|
||||
for (val, slot) in rgba8_image[..offset]
|
||||
.iter()
|
||||
.map(|byte| *basis * srgb_to_linear(*byte))
|
||||
.zip(
|
||||
[b, g][..offset.saturating_sub(BYTES_PER_PIXEL - 2)]
|
||||
.iter_mut()
|
||||
.rev(),
|
||||
)
|
||||
{
|
||||
**slot += val;
|
||||
let px = (self.index / BYTES_PER_PIXEL) as u32;
|
||||
let px_x = px % self.bounds.width;
|
||||
let px_y = px / self.bounds.width;
|
||||
|
||||
if px_x % self.skip == 0 && px_y % self.skip == 0 {
|
||||
for (ComponentState { basis, .. }, [_, g, b, _]) in self.factors.iter_mut() {
|
||||
for (val, slot) in rgba8_image[..offset]
|
||||
.iter()
|
||||
.map(|byte| *basis * srgb_to_linear(*byte))
|
||||
.zip(
|
||||
[b, g][..offset.saturating_sub(BYTES_PER_PIXEL - 2)]
|
||||
.iter_mut()
|
||||
.rev(),
|
||||
)
|
||||
{
|
||||
**slot += val;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -116,19 +141,22 @@ impl Encoder {
|
|||
let px = pixels + i as u32;
|
||||
let px_x = px % self.bounds.width;
|
||||
let px_y = px / self.bounds.width;
|
||||
let scale_x = px_x as f32 * basis_scale_x;
|
||||
let scale_y = px_y as f32 * basis_scale_y;
|
||||
|
||||
for (ComponentState { x, y, .. }, rgb) in self.factors.iter_mut() {
|
||||
let basis = f32::cos(*x as f32 * scale_x) * f32::cos(*y as f32 * scale_y);
|
||||
if px_y % self.skip == 0 && px_x % self.skip == 0 {
|
||||
let scale_x = px_x as f32 * basis_scale_x;
|
||||
let scale_y = px_y as f32 * basis_scale_y;
|
||||
|
||||
assert_eq!(chunk.len(), rgb.len());
|
||||
for (val, slot) in chunk
|
||||
.iter()
|
||||
.map(|byte| basis * srgb_to_linear(*byte))
|
||||
.zip(rgb)
|
||||
{
|
||||
*slot += val;
|
||||
for (ComponentState { x, y, .. }, rgb) in self.factors.iter_mut() {
|
||||
let basis = f32::cos(*x as f32 * scale_x) * f32::cos(*y as f32 * scale_y);
|
||||
|
||||
assert_eq!(chunk.len(), rgb.len());
|
||||
for (val, slot) in chunk
|
||||
.iter()
|
||||
.map(|byte| basis * srgb_to_linear(*byte))
|
||||
.zip(rgb)
|
||||
{
|
||||
*slot += val;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -137,19 +165,22 @@ impl Encoder {
|
|||
let px = pixels + (rgba8_image[offset..].len() / BYTES_PER_PIXEL) as u32;
|
||||
let px_x = px % self.bounds.width;
|
||||
let px_y = px / self.bounds.width;
|
||||
let scale_x = px_x as f32 * basis_scale_x;
|
||||
let scale_y = px_y as f32 * basis_scale_y;
|
||||
|
||||
for (ComponentState { x, y, basis }, rgb) in self.factors.iter_mut() {
|
||||
*basis = f32::cos(*x as f32 * scale_x) * f32::cos(*y as f32 * scale_y);
|
||||
if px_y % self.skip == 0 && px_x % self.skip == 0 {
|
||||
let scale_x = px_x as f32 * basis_scale_x;
|
||||
let scale_y = px_y as f32 * basis_scale_y;
|
||||
|
||||
for (val, slot) in chunks
|
||||
.remainder()
|
||||
.iter()
|
||||
.map(|byte| *basis * srgb_to_linear(*byte))
|
||||
.zip(rgb)
|
||||
{
|
||||
*slot += val;
|
||||
for (ComponentState { x, y, basis }, rgb) in self.factors.iter_mut() {
|
||||
*basis = f32::cos(*x as f32 * scale_x) * f32::cos(*y as f32 * scale_y);
|
||||
|
||||
for (val, slot) in chunks
|
||||
.remainder()
|
||||
.iter()
|
||||
.map(|byte| *basis * srgb_to_linear(*byte))
|
||||
.zip(rgb)
|
||||
{
|
||||
*slot += val;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -162,7 +193,8 @@ impl Encoder {
|
|||
for (ComponentState { x, y, .. }, rgb) in self.factors.iter_mut() {
|
||||
let normalisation = if *x == 0 && *y == 0 { 1. } else { 2. };
|
||||
|
||||
let scale = normalisation / (self.bounds.width * self.bounds.height) as f32;
|
||||
let scale = self.skip.pow(2) as f32 * normalisation
|
||||
/ (self.bounds.width * self.bounds.height) as f32;
|
||||
|
||||
for slot in rgb {
|
||||
*slot *= scale;
|
||||
|
@ -337,6 +369,7 @@ mod tests {
|
|||
let mut encoder = super::Encoder::new(
|
||||
crate::Components { x: 4, y: 3 },
|
||||
crate::ImageBounds { width, height },
|
||||
1,
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
|
|
Loading…
Reference in a new issue