Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry pick PR#12162-rs-hdr fix for d457 #12164

Merged
merged 2 commits into from
Sep 5, 2023
Merged

Cherry pick PR#12162-rs-hdr fix for d457 #12164

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59dcf99
cherry pick PR#12162-rs-hdr fix for d457
Nir-Az Sep 4, 2023
c9d4944
update comment
Nir-Az Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/proc/hdr-merge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,13 @@ namespace librealsense
// checking frame counter of first depth and ir are the same
if (use_ir)
{
// on devices that does not support meta data on IR frames, do not use IR for hdr merging
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does -> do

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be nice if it explained which devices did or did not support metadata on IR frames...

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to add to development too, no back merge is planned right?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right

if (!first_ir.supports_frame_metadata(RS2_FRAME_METADATA_FRAME_COUNTER) ||
!second_ir.supports_frame_metadata(RS2_FRAME_METADATA_FRAME_COUNTER) ||
!first_ir.supports_frame_metadata(RS2_FRAME_METADATA_SEQUENCE_ID) ||
!second_ir.supports_frame_metadata(RS2_FRAME_METADATA_SEQUENCE_ID))
return false;

int depth_frame_counter = static_cast<int>(first_depth.get_frame_metadata(RS2_FRAME_METADATA_FRAME_COUNTER));
int ir_frame_counter = static_cast<int>(first_ir.get_frame_metadata(RS2_FRAME_METADATA_FRAME_COUNTER));
use_ir = (depth_frame_counter == ir_frame_counter);
Expand Down
Loading