Skip to content

Commit

Permalink
WIP - add prints for debug
Browse files Browse the repository at this point in the history
  • Loading branch information
@OhadMeir
OhadMeir committed Jun 25, 2024
1 parent 2d05791 commit 57cc588
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 40 deletions.
50 changes: 42 additions & 8 deletions src/mf/mf-uvc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,9 @@ namespace librealsense
void wmf_uvc_device::init_xu(const extension_unit& xu)
{
LOG_ERROR( "wmf_uvc_device::init_xu start. UID = " << get_device_unique_id() << " this = " << this );
std::lock_guard< std::recursive_mutex > lock( _source_lock );
LOG_ERROR( "wmf_uvc_device::init_xu got lock" );
if (!_source)
throw std::runtime_error("Could not initialize extensions controls!");
Expand All @@ -282,11 +283,15 @@ namespace librealsense
CHECK_HR(unknown->QueryInterface(__uuidof(IKsControl),
reinterpret_cast<void **>(&ks_control)));
_ks_controls[xu.node] = ks_control;
LOG_ERROR( "wmf_uvc_device::init_xu finished. _ks_controls[" << xu.node << "] = " << ks_control );
}
bool wmf_uvc_device::set_xu(const extension_unit& xu, uint8_t ctrl, const uint8_t* data, int len)
{
auto ks_control = get_ks_control(xu);
LOG_ERROR( "wmf_uvc_device::set_xu start. UID = " << get_device_unique_id() << " this = " << this );
auto ks_control = get_ks_control( xu );
LOG_ERROR( "wmf_uvc_device::set_xu got ks_control " << ks_control << " for xu.node " << xu.node );
KSP_NODE node;
memset(&node, 0, sizeof(KSP_NODE));
Expand All @@ -308,7 +313,9 @@ namespace librealsense
bool wmf_uvc_device::get_xu(const extension_unit& xu, uint8_t ctrl, uint8_t* data, int len) const
{
auto ks_control = get_ks_control(xu);
LOG_ERROR( "wmf_uvc_device::get_xu start. UID = " << get_device_unique_id() << " this = " << this );
auto ks_control = get_ks_control( xu );
LOG_ERROR( "wmf_uvc_device::get_xu got ks_control " << ks_control << " for xu.node " << xu.node );
KSP_NODE node;
memset(&node, 0, sizeof(KSP_NODE));
Expand Down Expand Up @@ -399,7 +406,9 @@ namespace librealsense
control_range wmf_uvc_device::get_xu_range(const extension_unit& xu, uint8_t ctrl, int len) const
{
auto ks_control = get_ks_control(xu);
LOG_ERROR( "wmf_uvc_device::get_xu_range start. UID = " << get_device_unique_id() << " this = " << this );
auto ks_control = get_ks_control( xu );
LOG_ERROR( "wmf_uvc_device::get_xu_range got ks_control " << ks_control << " for xu.node " << xu.node );
/* get step, min and max values*/
KSP_NODE node;
Expand Down Expand Up @@ -504,11 +513,15 @@ namespace librealsense
bool wmf_uvc_device::get_pu(rs2_option opt, int32_t& value) const
{
LOG_ERROR( "wmf_uvc_device::get_pu for option " << opt << ". UID = " << get_device_unique_id() << " this = " << this );
long val = 0, flags = 0;
if ((opt == RS2_OPTION_EXPOSURE) || (opt == RS2_OPTION_ENABLE_AUTO_EXPOSURE))
{
auto hr = get_camera_control()->Get(CameraControl_Exposure, &val, &flags);
if (hr == DEVICE_NOT_READY_ERROR)
auto cam = get_camera_control();
LOG_ERROR( "wmf_uvc_device::get_pu get_camera_control returned " << cam );
auto hr = cam->Get(CameraControl_Exposure, &val, &flags);
LOG_ERROR( "wmf_uvc_device::get_pu Get result = " << std::hex << hr );
if( hr == DEVICE_NOT_READY_ERROR )
return false;
value = (opt == RS2_OPTION_EXPOSURE) ? to_100micros(val) : (flags == CameraControl_Flags_Auto);
Expand Down Expand Up @@ -551,6 +564,7 @@ namespace librealsense
bool wmf_uvc_device::set_pu(rs2_option opt, int value)
{
LOG_ERROR( "wmf_uvc_device::set_pu for option " << opt << ". UID = " << get_device_unique_id() << " this = " << this );
if (opt == RS2_OPTION_EXPOSURE)
{
auto hr = get_camera_control()->Set(CameraControl_Exposure, from_100micros(value), CameraControl_Flags_Manual);
Expand Down Expand Up @@ -686,6 +700,7 @@ namespace librealsense
control_range wmf_uvc_device::get_pu_range(rs2_option opt) const
{
LOG_ERROR( "wmf_uvc_device::get_pu_range for option " << opt << ". UID = " << get_device_unique_id() << " this = " << this );
if (opt == RS2_OPTION_ENABLE_AUTO_EXPOSURE ||
opt == RS2_OPTION_ENABLE_AUTO_WHITE_BALANCE)
{
Expand Down Expand Up @@ -791,7 +806,8 @@ namespace librealsense
_systemwide_lock(info.unique_id.c_str(), WAIT_FOR_MUTEX_TIME_OUT),
_location(""), _device_usb_spec(usb3_type)
{
if (!is_connected(info))
LOG_ERROR( "wmf_uvc_device::wmf_uvc_device. this = " << this );
if( ! is_connected( info ) )
{
throw std::runtime_error("Camera not connected!");
}
Expand Down Expand Up @@ -820,7 +836,9 @@ namespace librealsense
wmf_uvc_device::~wmf_uvc_device()
{
try {
LOG_ERROR( "wmf_uvc_device::~wmf_uvc_device. this = " << this );
try
{
if (_streaming)
{
flush(MF_SOURCE_READER_ALL_STREAMS);
Expand Down Expand Up @@ -864,7 +882,9 @@ namespace librealsense
void wmf_uvc_device::set_d0()
{
LOG_ERROR( "wmf_uvc_device::set_d0 start. UID = " << get_device_unique_id() << " this = " << this );
std::lock_guard< std::recursive_mutex > lock( _source_lock );
LOG_ERROR( "wmf_uvc_device::set_d0 got lock" );
if (!_device_attrs)
_device_attrs = create_device_attrs();
Expand All @@ -876,9 +896,11 @@ namespace librealsense
//enable source
CHECK_HR(MFCreateDeviceSource(_device_attrs, &_source));
LOG_HR(_source->QueryInterface(__uuidof(IAMCameraControl), reinterpret_cast<void **>(&_camera_control)));
LOG_ERROR( "wmf_uvc_device::set_d0 _camera_control = " << _camera_control << " _camera_control.p = " << _camera_control.p);
// The IAMVideoProcAmp interface adjusts the qualities of an incoming video signal, such as brightness,
// contrast, hue, saturation, gamma, and sharpness.
auto hr = _source->QueryInterface( __uuidof( IAMVideoProcAmp ), reinterpret_cast< void ** >( &_video_proc ) );
LOG_ERROR( "wmf_uvc_device::set_d0 _video_proc = " << _video_proc << " _video_proc.p = " << _video_proc.p);
// E_NOINTERFACE is expected... especially when no video camera
if( hr != E_NOINTERFACE )
LOG_HR_STR( "QueryInterface(IAMVideoProcAmp)", hr );
Expand All @@ -890,11 +912,15 @@ namespace librealsense
for( auto && xu : _xus )
init_xu( xu );
LOG_ERROR( "wmf_uvc_device::set_d0 finished" );
}
void wmf_uvc_device::set_d3()
{
LOG_ERROR( "wmf_uvc_device::set_d3 start. UID = " << get_device_unique_id() << " this = " << this );
std::lock_guard< std::recursive_mutex > lock( _source_lock );
LOG_ERROR( "wmf_uvc_device::set_d3 got lock" );
safe_release(_camera_control);
safe_release(_video_proc);
Expand All @@ -904,6 +930,8 @@ namespace librealsense
for (auto& elem : _streams)
elem.callback = nullptr;
_power_state = D3;
LOG_ERROR( "wmf_uvc_device::set_d3 finished" );
}
void wmf_uvc_device::foreach_profile(std::function<void(const mf_profile& profile, CComPtr<IMFMediaType> media_type, bool& quit)> action) const
Expand Down Expand Up @@ -1069,6 +1097,7 @@ namespace librealsense

IAMVideoProcAmp* wmf_uvc_device::get_video_proc() const
{
LOG_ERROR( "wmf_uvc_device::get_video_proc _video_proc = " << _video_proc << " _video_proc.p = " << _video_proc.p);
if (get_power_state() != D0)
throw std::runtime_error("Device must be powered to query video_proc!");
if (!_video_proc.p)
Expand All @@ -1078,6 +1107,8 @@ namespace librealsense

IAMCameraControl* wmf_uvc_device::get_camera_control() const
{
LOG_ERROR( "wmf_uvc_device::get_camera_control _camera_control = " << _camera_control << " _camera_control.p = " << _camera_control.p);

if (get_power_state() != D0)
throw std::runtime_error("Device must be powered to query camera_control!");
if (!_camera_control.p)
Expand Down Expand Up @@ -1219,7 +1250,10 @@ namespace librealsense

power_state wmf_uvc_device::get_power_state() const
{
LOG_ERROR( "wmf_uvc_device::get_power_state start. UID = " << get_device_unique_id() << " this = " << this );
std::lock_guard< std::recursive_mutex > lock( _source_lock );
std::string tmp = _source ? "D0" : "D3";
LOG_ERROR( "wmf_uvc_device::get_power_state got lock. power state is " << tmp );
return _source ? D0 : D3;
}
} //namespace platform
Expand Down
8 changes: 6 additions & 2 deletions src/uvc-sensor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,9 @@ void uvc_sensor::acquire_power()
{
std::lock_guard< std::mutex > lock( _power_lock );
auto & user_count = environment::get_instance().get_device_power_counter( _device->get_device_unique_id() );
if( user_count.fetch_add( 1 ) == 0 )
int count = user_count.fetch_add( 1 );
LOG_ERROR( "uvc_sensor::acquire_power(). Counter is " + std::to_string( count ) );
if( count == 0 )
{
try
{
Expand All @@ -438,7 +440,9 @@ void uvc_sensor::release_power()
{
std::lock_guard< std::mutex > lock( _power_lock );
auto & user_count = environment::get_instance().get_device_power_counter( _device->get_device_unique_id() );
if( user_count.fetch_add( -1 ) == 1 )
int count = user_count.fetch_add( -1 );
LOG_ERROR( "uvc_sensor::release_power(). Counter is " + std::to_string( count ) );
if( count == 1 )
{
try
{
Expand Down
57 changes: 27 additions & 30 deletions unit-tests/live/options/test-presets.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@

# test:device each(D400*)

# See FW stability issue RSDSO-18908
# test:retries 2

import pyrealsense2 as rs
from rspy import test
from rspy import log
Expand All @@ -27,35 +24,35 @@
depth_sensor.set_option( rs.option.visual_preset, int(rs.rs400_visual_preset.default ) )
test.check( depth_sensor.get_option( rs.option.visual_preset ) == rs.rs400_visual_preset.default )

with test.closure( 'save/load preset' ):
am_dev = rs.rs400_advanced_mode(dev)
saved_values = am_dev.serialize_json()
depth_control_group = am_dev.get_depth_control()
depth_control_group.textureCountThreshold = 250
am_dev.set_depth_control( depth_control_group )
test.check( depth_sensor.get_option( rs.option.visual_preset ) == rs.rs400_visual_preset.custom )
# with test.closure( 'save/load preset' ):
# am_dev = rs.rs400_advanced_mode(dev)
# saved_values = am_dev.serialize_json()
# depth_control_group = am_dev.get_depth_control()
# depth_control_group.textureCountThreshold = 250
# am_dev.set_depth_control( depth_control_group )
# test.check( depth_sensor.get_option( rs.option.visual_preset ) == rs.rs400_visual_preset.custom )

am_dev.load_json( saved_values )
test.check( am_dev.get_depth_control().textureCountThreshold != 250 )

with test.closure( 'setting color options' ):
# Using Hue to test if setting visual preset changes color sensor settings.
# Not all cameras support Hue (e.g. D457) but using common setting like Gain or Exposure is dependant on auto-exposure logic
# This test is intended to check new D500 modules logic of not updating color sensor setting, while keeping legacy
# D400 devices behavior of updating it. For this purpose it is OK if not all module types will be tested.
if color_sensor.supports( rs.option.hue ):
color_sensor.set_option( rs.option.hue, 123 )
test.check( color_sensor.get_option( rs.option.hue ) == 123 )
# am_dev.load_json( saved_values )
# test.check( am_dev.get_depth_control().textureCountThreshold != 250 )

# with test.closure( 'setting color options' ):
# # Using Hue to test if setting visual preset changes color sensor settings.
# # Not all cameras support Hue (e.g. D457) but using common setting like Gain or Exposure is dependant on auto-exposure logic
# # This test is intended to check new D500 modules logic of not updating color sensor setting, while keeping legacy
# # D400 devices behavior of updating it. For this purpose it is OK if not all module types will be tested.
# if color_sensor.supports( rs.option.hue ):
# color_sensor.set_option( rs.option.hue, 123 )
# test.check( color_sensor.get_option( rs.option.hue ) == 123 )

depth_sensor.set_option( rs.option.visual_preset, int(rs.rs400_visual_preset.default ) )
if product_line == "D400":
# D400 devices set color options as part of preset setting
test.check( color_sensor.get_option( rs.option.hue ) != 123 )
elif product_line == "D500":
# D500 devices do not set color options as part of preset setting
test.check( color_sensor.get_option( rs.option.hue ) == 123 )
else:
raise RuntimeError( 'unsupported product line' )
# depth_sensor.set_option( rs.option.visual_preset, int(rs.rs400_visual_preset.default ) )
# if product_line == "D400":
# # D400 devices set color options as part of preset setting
# test.check( color_sensor.get_option( rs.option.hue ) != 123 )
# elif product_line == "D500":
# # D500 devices do not set color options as part of preset setting
# test.check( color_sensor.get_option( rs.option.hue ) == 123 )
# else:
# raise RuntimeError( 'unsupported product line' )

tw.stop_wrapper( dev )
test.print_results_and_exit()

0 comments on commit 57cc588

Please sign in to comment.