review comments

rerun-io · Nov 13, 2024 · c879643 · c879643
1 parent dea20d4
commit c879643
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/crates/viewer/re_viewer/src/ui/settings_screen.rs b/crates/viewer/re_viewer/src/ui/settings_screen.rs
@@ -172,6 +172,8 @@ fn video_section_ui(ui: &mut Ui, app_options: &mut AppOptions) {
     // This affects only the web target, so we don't need to show it on native.
     #[cfg(target_arch = "wasm32")]
     {
+        use re_video::decode::DecodeHardwareAcceleration;
+
         let hardware_acceleration = &mut app_options.video_decoder_hw_acceleration;
         ui.horizontal(|ui| {
             ui.label("Decoder:");
@@ -180,17 +182,19 @@ fn video_section_ui(ui: &mut Ui, app_options: &mut AppOptions) {
                 .show_ui(ui, |ui| {
                     ui.selectable_value(
                         hardware_acceleration,
-                        re_video::decode::DecodeHardwareAcceleration::Auto,
-                        re_video::decode::DecodeHardwareAcceleration::Auto.to_string(),
-                    ) | ui.selectable_value(
+                        DecodeHardwareAcceleration::Auto,
+                        DecodeHardwareAcceleration::Auto.to_string(),
+                    );
+                    ui.selectable_value(
                         hardware_acceleration,
-                        re_video::decode::DecodeHardwareAcceleration::PreferSoftware,
-                        re_video::decode::DecodeHardwareAcceleration::PreferSoftware.to_string(),
-                    ) | ui.selectable_value(
+                        DecodeHardwareAcceleration::PreferSoftware,
+                        DecodeHardwareAcceleration::PreferSoftware.to_string(),
+                    );
+                    ui.selectable_value(
                         hardware_acceleration,
-                        re_video::decode::DecodeHardwareAcceleration::PreferHardware,
-                        re_video::decode::DecodeHardwareAcceleration::PreferHardware.to_string(),
-                    )
+                        DecodeHardwareAcceleration::PreferHardware,
+                        DecodeHardwareAcceleration::PreferHardware.to_string(),
+                    );
                 });
             // Note that the setting is part of the video's cache key, so, if it changes, the cache
             // entries outdate automatically.
@@ -223,6 +227,8 @@ fn ffmpeg_path_status_ui(ui: &mut Ui, app_options: &AppOptions) {
             }
         }
         Err(FFmpegVersionParseError::ParseVersion { raw_version }) => {
+            // We make this one a warning instead of an error because version parsing is flaky, and
+            // it might end up still working.
             ui.warning_label(&format!(
                 "FFmpeg binary found but unable to parse version: {raw_version}"
             ));

diff --git a/examples/python/openstreetmap_data/openstreetmap_data.py b/examples/python/openstreetmap_data/openstreetmap_data.py
@@ -66,7 +66,7 @@ def log_way(way: dict[str, Any]) -> None:
 
     coords = [(node["lat"], node["lon"]) for node in way["geometry"]]
 
-    rr.log(entity_path, rr.GeoLineStrings(lat_lon=[coords], radii=rr.components.Radius.ui_points(2.0)))
+    rr.qlog(entity_path, rr.GeoLineStrings(lat_lon=[coords], radii=rr.components.Radius.ui_points(2.0)))
     rr.log(entity_path, rr.AnyValues(**way.get("tags", {})))