osmarks/meme-search-engine
1
0
Fork 0
mirror of https://github.com/osmarks/meme-search-engine.git synced 2025-07-22 03:42:53 +00:00
Code Issues Releases Wiki Activity

use slightly worse image scaling

Browse Source
This commit is contained in:
osmarks 2024-11-13 18:31:18 +00:00
parent 8097ce8d91
commit 512b776e10
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common.rs
View File

@ -7,8 +7,8 @@ use anyhow::Result;
use std::io::Cursor; use std::io::Cursor;
use reqwest::Client; use reqwest::Client;
use tracing::instrument; use tracing::instrument;
use fast_image_resize::Resizer; use fast_image_resize::{Resizer, ResizeOptions, ResizeAlg};
use fast_image_resize::images::Image; use fast_image_resize::images::{Image, ImageRef};
use anyhow::Context; use anyhow::Context;
std::thread_local! { std::thread_local! {
@ -26,12 +26,19 @@ pub fn resize_for_embed_sync<T: Borrow<DynamicImage> + Send + 'static>(config: I
// the model currently in use wants aspect ratio 1:1 regardless of input // the model currently in use wants aspect ratio 1:1 regardless of input
// I think this was previously being handled in the CLIP server but that is slightly lossy // I think this was previously being handled in the CLIP server but that is slightly lossy
let src_rgb = DynamicImage::from(image.borrow().to_rgb8()); // TODO this might be significantly inefficient for RGB8->RGB8 case let src_rgb = match image.borrow() {
DynamicImage::ImageRgb8(x) => x,
x => &x.to_rgb8()
};
let (original_width, original_height) = src_rgb.dimensions();
let src_rgb = ImageRef::new(original_width, original_height, src_rgb.as_raw(), fast_image_resize::PixelType::U8x3)?;
let mut dst_image = Image::new(config.image_size.0, config.image_size.1, fast_image_resize::PixelType::U8x3); let mut dst_image = Image::new(config.image_size.0, config.image_size.1, fast_image_resize::PixelType::U8x3);
// use Hamming for downscaling, Lanczos3 for upscaling (I don't expect much upscaling)
let opts = ResizeOptions::default().resize_alg(ResizeAlg::Convolution(if original_width > config.image_size.0 && original_height > config.image_size.1 { fast_image_resize::FilterType::Hamming } else { fast_image_resize::FilterType::Lanczos3 }));
RESIZER.with_borrow_mut(|resizer| { RESIZER.with_borrow_mut(|resizer| {
resizer.resize(&src_rgb, &mut dst_image, None) resizer.resize(&src_rgb, &mut dst_image, Some(&opts))
}).context("resize failure")?; }).context("resize failure")?;
let mut buf = Vec::new(); let mut buf = Vec::new();

2
src/reddit_dump.rs
View File

@ -348,7 +348,7 @@ async fn main() -> Result<()> {
output: String::from("."), output: String::from("."),
backend: String::from("http://localhost:1708"), backend: String::from("http://localhost:1708"),
mode: OperatingMode::FullRun, mode: OperatingMode::FullRun,
filename_threshold: Some(String::from("RS_2017-08.zst")), filename_threshold: Some(String::from("RS_2019-07.zst")),
metrics_addr: String::from("0.0.0.0:9914"), metrics_addr: String::from("0.0.0.0:9914"),
contact_info: String::from("scraping-ops@osmarks.net"), contact_info: String::from("scraping-ops@osmarks.net"),
discard_hashes: [4168519401919155623, 4577010157274124110].into_iter().collect() discard_hashes: [4168519401919155623, 4577010157274124110].into_iter().collect()