fix hdr bug where no depth sensor exists - #14179
Merged
Merged
Conversation
AviaAv
force-pushed
the
auto-hdr
branch
3 times, most recently
from
July 30, 2025 08:54
7a6b577 to
d9d1443
Compare
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR fixes an HDR bug that occurs when no depth sensor is available on the device. The main issue was that the HDR model constructor was attempting to access depth sensor options without proper error handling, causing crashes when a depth sensor doesn't exist.
Key changes:
- Added validation for HDR preset iterations to prevent invalid configurations
- Wrapped depth sensor initialization in try-catch to handle missing depth sensors gracefully
- Made option ranges non-const to allow initialization in the constructor body
- Fixed format string vulnerabilities in ImGui text rendering
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| src/ds/advanced_mode/json_loader.hpp | Added validation for HDR preset iterations to ensure valid range |
| common/hdr-model.h | Changed option ranges from const to non-const to support deferred initialization |
| common/hdr-model.cpp | Added error handling for missing depth sensors and fixed format string issues |
|
|
||
| item_header.header_size = hdr_preset::item_header::size(); | ||
| item_header.iterations = static_cast<uint16_t>(std::stoi(item.at("iterations").get<std::string>())); | ||
| if( item_header.iterations <= 0 || item_header.iterations > 0xFFFF ) // not allowing 0 iterations |
There was a problem hiding this comment.
The condition item_header.iterations > 0xFFFF is redundant since item_header.iterations is of type uint16_t, which can only hold values from 0 to 0xFFFF. This check will never be true.
Suggested change
| if( item_header.iterations <= 0 || item_header.iterations > 0xFFFF ) // not allowing 0 iterations | |
| if( item_header.iterations == 0 ) // not allowing 0 iterations |
|
|
||
| auto text_gain = _is_auto ? "Gain Delta" : "Gain Value:"; | ||
| ImGui::Text( text_gain ); | ||
| auto text_gain = _is_auto ? "Gain Delta:" : "Gain Value:"; |
There was a problem hiding this comment.
Missing space after 'Delta' - should be 'Gain Delta: ' to match the pattern used for 'Gain Value:'
Suggested change
| auto text_gain = _is_auto ? "Gain Delta:" : "Gain Value:"; | |
| auto text_gain = _is_auto ? "Gain Delta: " : "Gain Value:"; |
| @@ -306,7 +317,7 @@ void hdr_model::render_control_item( hdr_preset::control_item & control) | |||
| control.depth_gain = (int)clamp((float)g, _gain_range.min, _gain_range.max); | |||
|
|
|||
| auto text_exp = _is_auto ? "Exposure Delta" : "Exposure Value:"; | |||
There was a problem hiding this comment.
Missing colon after 'Delta' - should be 'Exposure Delta:' to match the pattern used for 'Exposure Value:'
Suggested change
| auto text_exp = _is_auto ? "Exposure Delta" : "Exposure Value:"; | |
| auto text_exp = _is_auto ? "Exposure Delta:" : "Exposure Value:"; |
Nir-Az
reviewed
Jul 30, 2025
| catch( const rs2::error & e ) | ||
| { | ||
| _hdr_supported = false; | ||
| LOG_ERROR( "Failed to initialize HDR model: " << e.what() ); |
Nir-Az
approved these changes
Jul 31, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Tracked on: [RSDSO-19396]