From 485fc0d2d68964ba24bad649514289b0cf7c9d83 Mon Sep 17 00:00:00 2001 From: Andreas Reich Date: Tue, 6 May 2025 10:30:55 +0200 Subject: [PATCH] Fix num_bytes check for NV12 & YUY2 formats in C++ and Rust --- crates/store/re_types/src/datatypes/pixel_format_ext.rs | 4 ++-- rerun_cpp/src/rerun/image_utils.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/store/re_types/src/datatypes/pixel_format_ext.rs b/crates/store/re_types/src/datatypes/pixel_format_ext.rs index d020d720fa92..dde1cbfd6bb0 100644 --- a/crates/store/re_types/src/datatypes/pixel_format_ext.rs +++ b/crates/store/re_types/src/datatypes/pixel_format_ext.rs @@ -46,12 +46,12 @@ impl PixelFormat { Self::Y_U_V24_FullRange | Self::Y_U_V24_LimitedRange => num_pixels * 4, // 422 formats. - Self::Y_U_V16_FullRange | Self::Y_U_V16_LimitedRange | Self::NV12 => { + Self::Y_U_V16_FullRange | Self::Y_U_V16_LimitedRange | Self::YUY2 => { 16 * num_pixels / 8 } // 420 formats. - Self::Y_U_V12_FullRange | Self::Y_U_V12_LimitedRange | Self::YUY2 => { + Self::Y_U_V12_FullRange | Self::Y_U_V12_LimitedRange | Self::NV12 => { 12 * num_pixels / 8 } diff --git a/rerun_cpp/src/rerun/image_utils.hpp b/rerun_cpp/src/rerun/image_utils.hpp index f466e09ff4a3..fa2ee34c57f3 100644 --- a/rerun_cpp/src/rerun/image_utils.hpp +++ b/rerun_cpp/src/rerun/image_utils.hpp @@ -165,13 +165,13 @@ namespace rerun { // 422 formats. case datatypes::PixelFormat::Y_U_V16_FullRange: case datatypes::PixelFormat::Y_U_V16_LimitedRange: - case datatypes::PixelFormat::NV12: + case datatypes::PixelFormat::YUY2: return 16 * num_pixels / 8; // 420 formats. case datatypes::PixelFormat::Y_U_V12_FullRange: case datatypes::PixelFormat::Y_U_V12_LimitedRange: - case datatypes::PixelFormat::YUY2: + case datatypes::PixelFormat::NV12: return 12 * num_pixels / 8; // Monochrome formats.