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

hdr-merge and sequence-id-filter proc blocks - adding ros read and write #7558

Merged
merged 1 commit into from
Nov 1, 2020
Merged

hdr-merge and sequence-id-filter proc blocks - adding ros read and write #7558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/ds5/ds5-device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "proc/depth-formats-converter.h"
#include "proc/depth-decompress.h"
#include "proc/hdr-merge.h"
#include "proc/sequence_id_filter.h"
#include "proc/sequence-id-filter.h"
#include "hdr-config.h"
#include "../common/fw/firmware-version.h"
#include "fw-update/fw-update-unsigned.h"
Expand Down
6 changes: 6 additions & 0 deletions src/media/ros/ros_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#include "proc/hole-filling-filter.h"
#include "proc/zero-order.h"
#include "proc/depth-decompress.h"
#include "proc/hdr-merge.h"
#include "proc/sequence-id-filter.h"
#include "std_msgs/Float32MultiArray.h"

namespace librealsense
Expand Down Expand Up @@ -1424,6 +1426,10 @@ namespace librealsense
return std::make_shared<ExtensionToType<RS2_EXTENSION_ZERO_ORDER_FILTER>::type>();
case RS2_EXTENSION_DEPTH_HUFFMAN_DECODER:
return std::make_shared<ExtensionToType<RS2_EXTENSION_DEPTH_HUFFMAN_DECODER>::type>();
case RS2_EXTENSION_HDR_MERGE:
return std::make_shared<ExtensionToType<RS2_EXTENSION_HDR_MERGE>::type>();
case RS2_EXTENSION_SEQUENCE_ID_FILTER:
return std::make_shared<ExtensionToType<RS2_EXTENSION_SEQUENCE_ID_FILTER>::type>();
default:
return nullptr;
}
Expand Down
5 changes: 4 additions & 1 deletion src/media/ros/ros_writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#include "proc/hole-filling-filter.h"
#include "proc/zero-order.h"
#include "proc/depth-decompress.h"
#include "proc/hdr-merge.h"
#include "proc/sequence-id-filter.h"
#include "ros_writer.h"
#include "l500/l500-motion.h"
#include "l500/l500-depth.h"
Expand Down Expand Up @@ -539,7 +541,6 @@ namespace librealsense
if (Is<ExtensionToType<T>::type>(E))\
return T;\

RETURN_IF_EXTENSION(block, RS2_EXTENSION_DECIMATION_FILTER);
RETURN_IF_EXTENSION(block, RS2_EXTENSION_DECIMATION_FILTER);
RETURN_IF_EXTENSION(block, RS2_EXTENSION_THRESHOLD_FILTER);
RETURN_IF_EXTENSION(block, RS2_EXTENSION_DISPARITY_FILTER);
Expand All @@ -548,6 +549,8 @@ namespace librealsense
RETURN_IF_EXTENSION(block, RS2_EXTENSION_HOLE_FILLING_FILTER);
RETURN_IF_EXTENSION(block, RS2_EXTENSION_ZERO_ORDER_FILTER);
RETURN_IF_EXTENSION(block, RS2_EXTENSION_DEPTH_HUFFMAN_DECODER);
RETURN_IF_EXTENSION(block, RS2_EXTENSION_HDR_MERGE);
RETURN_IF_EXTENSION(block, RS2_EXTENSION_SEQUENCE_ID_FILTER);

#undef RETURN_IF_EXTENSION

Expand Down
4 changes: 2 additions & 2 deletions src/proc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ target_sources(${LRS_TARGET}
"${CMAKE_CURRENT_LIST_DIR}/spatial-filter.cpp"
"${CMAKE_CURRENT_LIST_DIR}/temporal-filter.cpp"
"${CMAKE_CURRENT_LIST_DIR}/hdr-merge.cpp"
"${CMAKE_CURRENT_LIST_DIR}/sequence_id_filter.cpp"
"${CMAKE_CURRENT_LIST_DIR}/sequence-id-filter.cpp"
"${CMAKE_CURRENT_LIST_DIR}/hole-filling-filter.cpp"
"${CMAKE_CURRENT_LIST_DIR}/disparity-transform.cpp"
"${CMAKE_CURRENT_LIST_DIR}/y8i-to-y8y8.cpp"
Expand All @@ -48,7 +48,7 @@ target_sources(${LRS_TARGET}
"${CMAKE_CURRENT_LIST_DIR}/spatial-filter.h"
"${CMAKE_CURRENT_LIST_DIR}/temporal-filter.h"
"${CMAKE_CURRENT_LIST_DIR}/hdr-merge.h"
"${CMAKE_CURRENT_LIST_DIR}/sequence_id_filter.h"
"${CMAKE_CURRENT_LIST_DIR}/sequence-id-filter.h"
"${CMAKE_CURRENT_LIST_DIR}/hole-filling-filter.h"
"${CMAKE_CURRENT_LIST_DIR}/syncer-processing-block.h"
"${CMAKE_CURRENT_LIST_DIR}/disparity-transform.h"
Expand Down
2 changes: 1 addition & 1 deletion src/proc/sequence_id_filter.cpp → src/proc/sequence-id-filter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2020 Intel Corporation. All Rights Reserved.

#include "sequence_id_filter.h"
#include "sequence-id-filter.h"

namespace librealsense
{
Expand Down
0 src/proc/sequence_id_filter.h → src/proc/sequence-id-filter.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/rs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "proc/color-formats-converter.h"
#include "proc/rates-printer.h"
#include "proc/hdr-merge.h"
#include "proc/sequence_id_filter.h"
#include "proc/sequence-id-filter.h"
#include "media/playback/playback_device.h"
#include "stream.h"
#include "../include/librealsense2/h/rs_types.h"
Expand Down