Skip to content

Commit

Permalink
Bugfix for incorrect playback rate changes when pressing buttons (#1513)
Browse files Browse the repository at this point in the history
- Playback rate expected to be changed by 10% with each
increase/decrease step.
- Use +0.1 and -0.1 in decrease/increase rate formula instead of
multiply by factor of the 1.1 and 0.9 respectively.

Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
(cherry picked from commit 95f78b6)

# Conflicts:
#	rosbag2_transport/src/rosbag2_transport/player.cpp
  • Loading branch information
MichaelOrlov authored and mergify[bot] committed Dec 16, 2023
1 parent ca0f7fb commit d53dc11
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
8 changes: 8 additions & 0 deletions rosbag2_transport/src/rosbag2_transport/player.cpp
Expand Up @@ -637,12 +637,20 @@ void Player::add_keyboard_callbacks()
);
add_key_callback(
play_options_.increase_rate_key,
<<<<<<< HEAD
[this]() {set_rate(get_rate() * 1.1);},
=======
[this]() {owner_->set_rate(get_rate() + 0.1);},
>>>>>>> 95f78b6 (Bugfix for incorrect playback rate changes when pressing buttons (#1513))
"Increase Rate 10%"
);
add_key_callback(
play_options_.decrease_rate_key,
<<<<<<< HEAD
[this]() {set_rate(get_rate() * 0.9);},
=======
[this]() {owner_->set_rate(get_rate() - 0.1);},
>>>>>>> 95f78b6 (Bugfix for incorrect playback rate changes when pressing buttons (#1513))
"Decrease Rate 10%"
);
}
Expand Down
Expand Up @@ -157,8 +157,14 @@ TEST_F(RosBag2PlayTestFixture, test_keyboard_controls)
keyboard_handler->simulate_key_press(play_options_.pause_resume_toggle_key);
EXPECT_THAT(player->is_paused(), true);

keyboard_handler->simulate_key_press(play_options_.increase_rate_key);
EXPECT_DOUBLE_EQ(player->get_rate(), 1.0);
keyboard_handler->simulate_key_press(play_options_.decrease_rate_key);
// Each increase/decrease shall change playback rate value by 10%
EXPECT_DOUBLE_EQ(player->get_rate(), 0.9);
keyboard_handler->simulate_key_press(play_options_.increase_rate_key);
EXPECT_DOUBLE_EQ(player->get_rate(), 1.0);
keyboard_handler->simulate_key_press(play_options_.increase_rate_key);
EXPECT_DOUBLE_EQ(player->get_rate(), 1.1);

// start play thread
std::thread player_thread = std::thread([player]() {player->play();});
Expand All @@ -177,7 +183,7 @@ TEST_F(RosBag2PlayTestFixture, test_keyboard_controls)
EXPECT_THAT(player->num_paused, 1);
EXPECT_THAT(player->num_resumed, 1);
EXPECT_THAT(player->num_played_next, 1);
EXPECT_THAT(player->num_set_rate, 2);
EXPECT_THAT(player->num_set_rate, 3);
}

TEST_F(RecordIntegrationTestFixture, test_keyboard_controls)
Expand Down

0 comments on commit d53dc11

Please sign in to comment.