From e975811ece415b97dd1b07b4109e6e8911f42010 Mon Sep 17 00:00:00 2001 From: Boris Bolshem Date: Fri, 26 Aug 2016 15:58:55 +0300 Subject: [PATCH] Fix infrared issue --- sdk/src/tools/capture_tool/capture_tool.cpp | 7 +++---- sdk/src/utilities/command_line/basic_cmd_util.cpp | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sdk/src/tools/capture_tool/capture_tool.cpp b/sdk/src/tools/capture_tool/capture_tool.cpp index 1d24ad6..c4e06ea 100644 --- a/sdk/src/tools/capture_tool/capture_tool.cpp +++ b/sdk/src/tools/capture_tool/capture_tool.cpp @@ -50,13 +50,12 @@ void configure_device(rs::device* device, basic_cmd_util cl_util, std::shared_pt for(auto it = streams.begin(); it != streams.end(); ++it) { auto lrs_stream = convert_stream_type(*it); - device->enable_stream(lrs_stream, rs::preset::best_quality); bool is_stream_profile_available = cl_util.is_stream_profile_available(*it); - auto width = is_stream_profile_available ? cl_util.get_stream_width(*it) : device->get_stream_width(lrs_stream); - auto height = is_stream_profile_available ? cl_util.get_stream_height(*it) : device->get_stream_height(lrs_stream); - auto fps = is_stream_profile_available ? cl_util.get_stream_fps(*it) : device->get_stream_framerate(lrs_stream); + auto width = is_stream_profile_available ? cl_util.get_stream_width(*it) : 640; + auto height = is_stream_profile_available ? cl_util.get_stream_height(*it) : 480; + auto fps = is_stream_profile_available ? cl_util.get_stream_fps(*it) : 30; auto format = convert_pixel_format(cl_util.get_streanm_pixel_format(*it)); device->enable_stream(lrs_stream, width, height, format, fps); diff --git a/sdk/src/utilities/command_line/basic_cmd_util.cpp b/sdk/src/utilities/command_line/basic_cmd_util.cpp index 3bc86cf..76d3880 100644 --- a/sdk/src/utilities/command_line/basic_cmd_util.cpp +++ b/sdk/src/utilities/command_line/basic_cmd_util.cpp @@ -84,11 +84,11 @@ namespace rs add_option(enabled_stream_map[stream_type::infrared], "enable infrared stream"); add_multy_args_option_safe(streams_config_map[stream_type::infrared], "set infrared stream profile - [--]", 3, '-'); - add_single_arg_option("-ipf", "set infrared streams pixel format", "y16", "y16"); + add_single_arg_option("-ipf", "set infrared streams pixel format", "y8 y16", "y8"); add_option(enabled_stream_map[stream_type::infrared2], "enable infrared2 stream"); add_multy_args_option_safe(streams_config_map[stream_type::infrared2], "set infrared2 stream profile - [--]", 3, '-'); - add_single_arg_option("-i2pf", "set infrared2 streams pixel format", "y16", "y16"); + add_single_arg_option("-i2pf", "set infrared2 streams pixel format", "y8 y16", "y8"); add_option(enabled_stream_map[stream_type::fisheye], "enable fisheye stream"); add_multy_args_option_safe(streams_config_map[stream_type::fisheye], "set fisheye stream profile - [--]", 3, '-');