From 85aebdffffb75a0e7cf55dc7d5250b5f2bf33d77 Mon Sep 17 00:00:00 2001
From: Andreas Reich <r_andreas2@web.de>
Date: Tue, 10 Sep 2024 20:28:06 +0200
Subject: [PATCH] move video module out of `renderer` in re_renderer (it is
 distintively not a renderer!)

---
 crates/viewer/re_renderer/src/lib.rs                           | 1 +
 crates/viewer/re_renderer/src/renderer/mod.rs                  | 3 ---
 .../viewer/re_renderer/src/{renderer => }/video/decoder/mod.rs | 0
 .../re_renderer/src/{renderer => }/video/decoder/native.rs     | 0
 .../viewer/re_renderer/src/{renderer => }/video/decoder/web.rs | 2 +-
 crates/viewer/re_renderer/src/{renderer => }/video/mod.rs      | 0
 crates/viewer/re_space_view_spatial/src/video_cache.rs         | 2 +-
 7 files changed, 3 insertions(+), 5 deletions(-)
 rename crates/viewer/re_renderer/src/{renderer => }/video/decoder/mod.rs (100%)
 rename crates/viewer/re_renderer/src/{renderer => }/video/decoder/native.rs (100%)
 rename crates/viewer/re_renderer/src/{renderer => }/video/decoder/web.rs (99%)
 rename crates/viewer/re_renderer/src/{renderer => }/video/mod.rs (100%)

diff --git a/crates/viewer/re_renderer/src/lib.rs b/crates/viewer/re_renderer/src/lib.rs
index 673e44e56a40..a0634e825a52 100644
--- a/crates/viewer/re_renderer/src/lib.rs
+++ b/crates/viewer/re_renderer/src/lib.rs
@@ -16,6 +16,7 @@ pub mod mesh;
 pub mod renderer;
 pub mod resource_managers;
 pub mod texture_info;
+pub mod video;
 pub mod view_builder;
 
 mod allocator;
diff --git a/crates/viewer/re_renderer/src/renderer/mod.rs b/crates/viewer/re_renderer/src/renderer/mod.rs
index 339a86b265c5..ccca81217c8a 100644
--- a/crates/viewer/re_renderer/src/renderer/mod.rs
+++ b/crates/viewer/re_renderer/src/renderer/mod.rs
@@ -31,9 +31,6 @@ pub(crate) use compositor::CompositorDrawData;
 mod debug_overlay;
 pub use debug_overlay::{DebugOverlayDrawData, DebugOverlayError, DebugOverlayRenderer};
 
-mod video;
-pub use video::Video;
-
 pub mod gpu_data {
     pub use super::lines::gpu_data::{LineStripInfo, LineVertex};
     pub use super::point_cloud::gpu_data::PositionRadius;
diff --git a/crates/viewer/re_renderer/src/renderer/video/decoder/mod.rs b/crates/viewer/re_renderer/src/video/decoder/mod.rs
similarity index 100%
rename from crates/viewer/re_renderer/src/renderer/video/decoder/mod.rs
rename to crates/viewer/re_renderer/src/video/decoder/mod.rs
diff --git a/crates/viewer/re_renderer/src/renderer/video/decoder/native.rs b/crates/viewer/re_renderer/src/video/decoder/native.rs
similarity index 100%
rename from crates/viewer/re_renderer/src/renderer/video/decoder/native.rs
rename to crates/viewer/re_renderer/src/video/decoder/native.rs
diff --git a/crates/viewer/re_renderer/src/renderer/video/decoder/web.rs b/crates/viewer/re_renderer/src/video/decoder/web.rs
similarity index 99%
rename from crates/viewer/re_renderer/src/renderer/video/decoder/web.rs
rename to crates/viewer/re_renderer/src/video/decoder/web.rs
index 11d5e051e6ec..c72438854d11 100644
--- a/crates/viewer/re_renderer/src/renderer/video/decoder/web.rs
+++ b/crates/viewer/re_renderer/src/video/decoder/web.rs
@@ -12,8 +12,8 @@ use re_video::{TimeMs, VideoData};
 
 use super::latest_at_idx;
 use crate::{
-    renderer::video::{DecodingError, FrameDecodingResult},
     resource_managers::GpuTexture2D,
+    video::{DecodingError, FrameDecodingResult},
     RenderContext,
 };
 
diff --git a/crates/viewer/re_renderer/src/renderer/video/mod.rs b/crates/viewer/re_renderer/src/video/mod.rs
similarity index 100%
rename from crates/viewer/re_renderer/src/renderer/video/mod.rs
rename to crates/viewer/re_renderer/src/video/mod.rs
diff --git a/crates/viewer/re_space_view_spatial/src/video_cache.rs b/crates/viewer/re_space_view_spatial/src/video_cache.rs
index 229dac9be86c..cbefebc41ded 100644
--- a/crates/viewer/re_space_view_spatial/src/video_cache.rs
+++ b/crates/viewer/re_space_view_spatial/src/video_cache.rs
@@ -1,7 +1,7 @@
 use egui::mutex::Mutex;
 use re_entity_db::VersionedInstancePathHash;
 use re_log_types::hash::Hash64;
-use re_renderer::renderer::Video;
+use re_renderer::video::Video;
 use re_renderer::RenderContext;
 use re_types::components::MediaType;
 use re_viewer_context::Cache;