mark/image-similarity
1
0
Fork 0
Code Pull Requests Packages Projects Releases Activity

output fixes

Browse Source
This commit is contained in:
Mark Hoekveen
2024-05-11 01:22:58 +02:00
parent dc57133825
commit 8838e41eb1
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/descriptors/dct.rs
+11 -13
View File
@@ -1,12 +1,13 @@
use image::{save_buffer, GenericImageView};
use std::f64::consts::{PI, SQRT_2};
use crate::descriptors::{Descriptor, print_matrix, DCT};
use crate::descriptors::{Descriptor, DCT, print_matrix};
use log::debug;
impl DCT {
/// Returns a new DCT instance with a base quality DCT matrix.
pub fn new() -> DCT {
let base_quantization_matrix: [u8; 64] = [
let quantization_matrix: [u8; 64] = [
16, 11, 10, 16, 24, 40, 51, 61,
12, 12, 14, 19, 26, 58, 60, 55,
14, 13, 16, 24, 40, 57, 69, 56,
@@ -16,7 +17,7 @@ impl DCT {
49, 64, 78, 8, 10, 12, 12, 101,
72, 92, 95, 9, 11, 10, 103, 99,
];
DCT { quantization_matrix: base_quantization_matrix }
DCT { quantization_matrix }
}
// Builds DCT with given quality value
@@ -37,9 +38,7 @@ impl DCT {
self
}
pub fn dct(&self, img: image::DynamicImage) -> [f64; 64] {
//let qmatrix = self.quantization_matrix(self.quality);
//println!("Q-{} quantization matrix:\n{}", self.quality, print_matrix(qmatrix));
fn dct(&self, img: image::DynamicImage) -> [f64; 64] {
let mut dct_values: [f64; 64] = [0.0; 64];
img.save("resize.png").expect("Error saving file");
for u in 0..8 {
@@ -65,13 +64,12 @@ impl DCT {
(y*v*PI/16.0).cos()
}
dct_values[k] = alpha * sum;
//println!{"{}", dct_values[k]}
}
}
dct_values
}
pub fn idct(&self, dct_values: [f64; 64]) -> [u8; 64] {
fn idct(&self, dct_values: [f64; 64]) -> [u8; 64] {
let mut reconstructed: [u8; 64] = [0; 64];
for k in 0..64 {
let x = (k%8) as f64;
@@ -107,24 +105,24 @@ impl Descriptor for DCT {
fn describe(&self, img: image::DynamicImage) -> u64 {
let img = self.resize(img);
let mut dct_values = self.dct(img);
println!("DCT-coefficients:\n {}", print_matrix(dct_values));
debug!("DCT-coefficients:\n {}", print_matrix(dct_values));
// Quantization:
println!("Using quantization matrix:\n{}", print_matrix(self.quantization_matrix));
debug!("Using quantization matrix:\n{}", print_matrix(self.quantization_matrix));
for i in 0..64 {
dct_values[i] = (dct_values[i] / self.quantization_matrix[i] as f64).round();
}
println!("DCT-coefficients, quantized:\n {}", print_matrix(dct_values));
debug!("DCT-coefficients, quantized:\n {}", print_matrix(dct_values));
// De-quantization:
for i in 0..64 {
dct_values[i] = dct_values[i] * self.quantization_matrix[i] as f64;
}
println!("DCT-coefficients, de-quantized:\n {}", print_matrix(dct_values));
debug!("DCT-coefficients, de-quantized:\n {}", print_matrix(dct_values));
// Reconstruction original pixel values:
let reconstructed = self.idct(dct_values);
println!("Reconstructed pixel values:\n{}", print_matrix(reconstructed));
debug!("Reconstructed pixel values:\n{}", print_matrix(reconstructed));
save_buffer(
"reconstructed.png",