Skip to content

Commit d01a85c

Browse files
IsseWlucasmerlin
authored andcommitted
Make some player errors informational only
Fix for video errors now being red like: <img width="1284" height="962" alt="image" src="https://github.com/user-attachments/assets/026dd36b-1b22-4538-8fa5-7a35ba400c0d" /> Source-Ref: f72b171b23214eb074a061df178a1919d953d3cb (cherry picked from commit bab10ae)
1 parent ef64df8 commit d01a85c

2 files changed

Lines changed: 15 additions & 4 deletions

File tree

crates/viewer/re_renderer/src/video/player.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,12 @@ impl VideoPlayer {
194194
) -> Result<(), VideoPlayerError>,
195195
get_video_buffer: &dyn Fn(re_tuid::Tuid) -> &'a [u8],
196196
) -> Result<VideoFrameTexture, VideoPlayerError> {
197-
if video_description.keyframe_indices.is_empty() {
198-
return Err(InsufficientSampleDataError::NoKeyFrames.into());
199-
}
200197
if video_description.samples.is_empty() {
201198
return Err(InsufficientSampleDataError::NoSamples.into());
202199
}
200+
if video_description.keyframe_indices.is_empty() {
201+
return Err(InsufficientSampleDataError::NoKeyFrames.into());
202+
}
203203
if requested_pts.0 < 0 {
204204
return Err(VideoPlayerError::NegativeTimestamp);
205205
}

crates/viewer/re_view_spatial/src/visualizers/video/video_stream.rs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use re_renderer::video::{InsufficientSampleDataError, VideoPlayerError};
12
use re_sdk_types::Archetype as _;
23
use re_sdk_types::archetypes::VideoStream;
34
use re_sdk_types::components::Opacity;
@@ -219,13 +220,23 @@ impl VisualizerSystem for VideoStreamVisualizer {
219220
}
220221

221222
Err(err) => {
223+
let severity = match err {
224+
VideoPlayerError::InsufficientSampleData(
225+
InsufficientSampleDataError::NoKeyFrames
226+
| InsufficientSampleDataError::NoSamples
227+
| InsufficientSampleDataError::ExpectedSampleNotAvailable
228+
| InsufficientSampleDataError::NoSamplesPriorToRequestedTimestamp,
229+
) => VideoPlaybackIssueSeverity::Informational,
230+
_ => VideoPlaybackIssueSeverity::Error,
231+
};
232+
222233
show_video_playback_issue(
223234
ctx,
224235
&mut self.data,
225236
highlight,
226237
world_from_entity,
227238
err.to_string(),
228-
VideoPlaybackIssueSeverity::Error,
239+
severity,
229240
video_resolution,
230241
entity_path,
231242
);

0 commit comments

Comments
 (0)