Rotation and data compression

Author: dec4234

Cargo.toml

@@ -6,21 +6,20 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-image = "0.25.4"
-anyhow = "1.0.92"
-thiserror = "1.0.67"
+image = "0.25.5"
+anyhow = "1.0.93"
+thiserror = "2.0.1"
 rayon = {version = "1.10.0", features = []}
 clap = {version = "4.5.20", features = ["default"]}
 simple_logger = "5.0.0"
 log = "0.4.22"
 rand = {version = "0.8.5", features = ["default"]}
-imageproc = "0.25.0"
+imageproc = {version = "0.25.0", features = ["default", "rayon"]}
 serde = {version = "1.0.210", features = ["derive"]}
 serde_json = "1.0.68"
 strum = {version = "0.26.3", features = ["derive"]}
 chrono = "0.4.38"
 moka = {version = "0.12.8", features = ["default", "sync"] }
-imagequant = {version = "4.3.3", features = ["default"]}
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [profile.release]

src/generator/config.rs

@@ -15,7 +15,8 @@ pub struct TargetGeneratorConfig {
 	pub permit_collisions: bool,
 	pub cache_size: u8, // TODO: currently only used for initial size, can't be changed
 	pub worker_threads: u8,
-	pub compress: bool
+	pub compress: bool,
+	pub do_random_rotation: bool,
 }
 
 impl Default for TargetGeneratorConfig {
@@ -27,7 +28,8 @@ impl Default for TargetGeneratorConfig {
 			permit_collisions: false,
 			cache_size: 10,
 			worker_threads: 15,
-			compress: true
+			compress: true,
+			do_random_rotation: true
 		}
 	}
 }

src/generator/mod.rs

@@ -1,22 +1,22 @@
+use crate::backgrounds::BackgroundLoader;
+use crate::generator::coco::{BoundingBox, CocoCategoryInfo, CocoGenerator};
+use crate::generator::config::TargetGeneratorConfig;
+use crate::objects::ObjectManager;
+use error::GenerationError;
+use image::codecs::png::{CompressionType, PngEncoder};
+use image::imageops::FilterType;
+use image::{DynamicImage, ExtendedColorType, ImageEncoder, Rgba, RgbaImage};
+use log::{debug, trace, LevelFilter};
+use moka::sync::{Cache, CacheBuilder};
+use rand::{thread_rng, Rng};
 use rayon::iter::ParallelIterator;
+use rayon::iter::IntoParallelIterator;
+use simple_logger::SimpleLogger;
 use std::ops::RangeTo;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex};
 use std::time::Instant;
-use image::{DynamicImage, ExtendedColorType, ImageEncoder, Rgba, RgbaImage};
-use image::codecs::png::{CompressionType, PngEncoder};
-use image::imageops::FilterType;
-use log::{debug, trace, LevelFilter};
-use rand::{thread_rng, Rng};
-use error::GenerationError;
 use util::STANDARD_PPM;
-use crate::backgrounds::BackgroundLoader;
-use crate::generator::coco::{BoundingBox, CocoCategoryInfo, CocoGenerator};
-use crate::generator::config::TargetGeneratorConfig;
-use crate::objects::{ObjectManager};
-use moka::sync::{Cache, CacheBuilder};
-use rayon::iter::{IntoParallelIterator};
-use simple_logger::SimpleLogger;
 
 pub mod coco;
 pub mod error;
@@ -98,7 +98,18 @@ impl TargetGenerator {
 				self.resized_cache.insert(format!("{}x{}_{}", obj_w, obj_h, obj.object_class), resized.clone());
 				resized
 			};
+
+			let resized = if self.config.do_random_rotation {
+				let angle = thread_rng().gen_range(0.0..720.0); // random rotation including upside down
+				// let rotated = util::rotate_image(&resized, angle);
+				let rotated = util::rotate_90s(&resized, angle);
+				rotated
+			} else {
+				resized // return as is if random rotation is not performed
+			};
 
+			let (obj_w, obj_h) = (resized.width(), resized.height());
+
 			image::imageops::overlay(&mut image, &resized, x as i64, y as i64);
 
 			if self.config.visualize_bboxes {
@@ -208,7 +219,7 @@ pub fn test_generate_target() {
 #[test]
 #[ignore]
 pub fn test_generate_targets() {
-	SimpleLogger::new().init().unwrap();
+	SimpleLogger::new().with_level(LevelFilter::Debug).init().unwrap();
 
 	let mut tg = TargetGenerator::new("output", "backgrounds", "objects", "output/annotations.json").unwrap();
 	tg.config.permit_duplicates = true;

src/generator/util.rs

@@ -1,4 +1,9 @@
 use crate::generator::error::GenerationError;
+use image::metadata::Orientation;
+use image::DynamicImage;
+use imageproc::drawing::Canvas;
+use imageproc::geometric_transformations::Interpolation;
+use std::cmp::max;
 
 /// The standard Pixels Per Meter value that is used to calculate the size of objects in pixels.
 /// In reality this value is dependent on the altitude of the drone and various properties of the
@@ -28,6 +33,37 @@ pub fn new_sizes(object_width: u32, object_height: u32, pixels_per_meter: f32, r
 	Ok((new_width, new_height))
 }
 
+pub fn rotate_90s(image: &DynamicImage, angle: f32) -> DynamicImage {
+	let mut i = image.clone();
+	
+	match (angle % 90.0) as i32 {
+		1 => i.apply_orientation(Orientation::Rotate90),
+		2 => i.apply_orientation(Orientation::Rotate180),
+		3 => i.apply_orientation(Orientation::Rotate270),
+		_ => (),
+	}
+	
+	i
+}
+
+pub fn post_rotate_dimension(width: u32, height: u32, angle: f32) -> (u32, u32) {
+	let (width, height) = (width as f32, height as f32);
+	let angle = angle.to_radians();
+	let (sin, cos) = angle.sin_cos();
+
+	let new_width = (width * cos + height * sin).abs() as u32;
+	let new_height = (width * sin + height * cos).abs() as u32;
+
+	(new_width, new_height)
+}
+
+// TODO: various problems with this at present. Cuts off the image mostly in multiple ways
+pub fn rotate_image(image: &DynamicImage, angle: f32) -> DynamicImage {
+	// 
+	
+	todo!()
+}
+
 pub fn is_image_type(path: &str) -> bool {
 	path.ends_with(".png") || path.ends_with(".jpg") || path.ends_with(".jpeg")
 }
@@ -38,4 +74,11 @@ fn test_is_image_type() {
 	assert_eq!(is_image_type("test.jpg"), true);
 	assert_eq!(is_image_type("test.jpeg"), true);
 	assert_eq!(is_image_type("test.txt"), false);
+}
+
+#[test]
+fn test_resize_ratio() {
+	assert_eq!(resize_ratio(1.0, 35.0), 35.0);
+	assert_eq!(resize_ratio(1.0, 70.0), 70.0);
+	assert_eq!(resize_ratio(1.0, 105.0), 105.0);
 }

src/objects/mod.rs

@@ -35,7 +35,7 @@ impl ObjectManager {
 
 		let object_details_file: ObjectDetailsFile = serde_json::from_str(&file)?;
 
-		let mut id = 0;
+		let mut id = 1;
 
 		for entry in entries {
 			let entry = entry?;