diff options
Diffstat (limited to 'transcoder')
| -rw-r--r-- | transcoder/Cargo.toml | 3 | ||||
| -rw-r--r-- | transcoder/src/image.rs | 39 |
2 files changed, 33 insertions, 9 deletions
diff --git a/transcoder/Cargo.toml b/transcoder/Cargo.toml index 1416c10..f77f62c 100644 --- a/transcoder/Cargo.toml +++ b/transcoder/Cargo.toml @@ -13,6 +13,9 @@ image = "0.24.7" # image = { git = "https://github.com/metamuffin/image-rs", features = [ # "avif-decoder", # ] } +libavif-image = { version = "0.10.0", default-features = false, features = [ + "codec-dav1d", +] } anyhow = "1.0.75" rgb = "0.8.36" rav1e = { version = "0.6.6", default-features = false, features = [ diff --git a/transcoder/src/image.rs b/transcoder/src/image.rs index 3cd9986..7f52ff3 100644 --- a/transcoder/src/image.rs +++ b/transcoder/src/image.rs @@ -1,11 +1,14 @@ use crate::LOCAL_TRANSCODING_TASKS; use anyhow::Context; -use image::{imageops::FilterType, ImageFormat}; +use image::imageops::FilterType; use jellybase::{cache::async_cache_file, AssetLocationExt}; use jellycommon::AssetLocation; use log::{debug, info}; use rgb::FromSlice; -use std::{fs::File, io::BufReader}; +use std::{ + fs::File, + io::{BufReader, Read, Seek, SeekFrom}, +}; use tokio::io::AsyncWriteExt; pub async fn transcode( @@ -27,13 +30,31 @@ pub async fn transcode( info!("encoding {asset:?} (speed={speed}, quality={quality}, width={width})"); let encoded = tokio::task::spawn_blocking(move || { let original_path = asset.path(); - // TODO shouldn't be neccessary with guessed format. - let file = BufReader::new(File::open(&original_path).context("opening source")?); - let mut reader = image::io::Reader::new(file); - reader.set_format(ImageFormat::Avif); - let reader = reader.with_guessed_format().context("guessing format")?; - debug!("guessed format (or fallback): {:?}", reader.format()); - let original = reader.decode().context("decoding image")?.to_rgba8(); + let mut file = + BufReader::new(File::open(&original_path).context("opening source")?); + + // TODO: use better image library that supports AVIF + let is_avif = { + let mut magic = [0u8; 12]; + file.read_exact(&mut magic).context("reading magic")?; + file.seek(SeekFrom::Start(0)) + .context("seeking back to start")?; + // TODO: magic experimentally found and probably not working in all cases but fine as long as our avif enc uses that + magic + == [ + 0x00, 0x00, 0x00, 0x18, 0x66, 0x74, 0x79, 0x70, 0x61, 0x76, 0x69, 0x66, + ] + }; + let original = if is_avif { + let mut buf = Vec::new(); + file.read_to_end(&mut buf).context("reading image")?; + libavif_image::read(&buf).unwrap().to_rgba8() + } else { + let reader = image::io::Reader::new(file); + let reader = reader.with_guessed_format().context("guessing format")?; + debug!("guessed format (or fallback): {:?}", reader.format()); + reader.decode().context("decoding image")?.to_rgba8() + }; let image = image::imageops::resize( &original, width as u32, |