Merge branch 'develop' into f/AUD-217_LV2_Worker_Thread_Extension

Author: IliasBergstrom

src/plugins/step_sequencer_plugin.cpp

@@ -131,8 +131,8 @@ void StepSequencerPlugin::process_audio(const ChunkSampleBuffer& in_buffer, Chun
         return;
     }
 
-    double start_beat = _host_control.transport()->current_bar_beats() * MULTIPLIER_8TH_NOTE;
-    double end_beat = _host_control.transport()->current_bar_beats(AUDIO_CHUNK_SIZE) * MULTIPLIER_8TH_NOTE;
+    float start_beat = _host_control.transport()->current_bar_beats() * MULTIPLIER_8TH_NOTE;
+    float end_beat = _host_control.transport()->current_bar_beats(AUDIO_CHUNK_SIZE) * MULTIPLIER_8TH_NOTE;
 
     /* New 8th note during this chunk */
     if (static_cast<int>(end_beat) - static_cast<int>(start_beat) != 0)

test/unittests/engine/event_timer_test.cpp

@@ -46,12 +46,15 @@ TEST_F(TestEventTimer, TestToOffsetConversion)
     ASSERT_EQ(0, offset);
 
     /* Create a timestamp in the middle of the chunk, note we must add
-     * chunk time here because the EventTimer is 1 chunk ahead internally */
+     * chunk time here because the EventTimer is 1 chunk ahead internally,
+     * Because of rounding errors, the resulting sample offset could be
+     * both AUDIO_CHUNK_SIZE / 2 and AUDIO_CHUNK_SIZE / 2 -1 */
     auto chunk_time = calc_chunk_time(TEST_SAMPLE_RATE);
     Time timestamp = 1s + chunk_time + chunk_time / 2;
     std::tie(send_now, offset) = _module_under_test.sample_offset_from_realtime(timestamp);
     ASSERT_TRUE(send_now);
-    ASSERT_EQ(AUDIO_CHUNK_SIZE / 2 - 1, offset);
+    ASSERT_GE(offset, AUDIO_CHUNK_SIZE / 2 - 1);
+    ASSERT_LE(offset, AUDIO_CHUNK_SIZE / 2);
 }
 
 TEST_F(TestEventTimer, TestToRealTimesConversion)

test/unittests/engine/transport_test.cpp

@@ -84,7 +84,7 @@ TEST_F(TestTransport, TestTimeline68Time)
     _module_under_test.set_sample_rate(TEST_SAMPLERATE);
     _module_under_test.set_tempo(180, false);
     _module_under_test.set_time_signature({6, 8}, false);
-    constexpr float precision = 3.0f * AUDIO_CHUNK_SIZE / TEST_SAMPLERATE;
+    constexpr float precision = 4.0f * AUDIO_CHUNK_SIZE / TEST_SAMPLERATE;
 
     /* Check that the starting point is 0 */
     _module_under_test.set_playing_mode(PlayingMode::PLAYING, false);

test/unittests/library/processor_test.cpp

@@ -250,8 +250,8 @@ TEST_F(TestBypassManager, TestCrossfade)
 
     _module_under_test.crossfade_output(bypass_buffer, buffer, 2, 2);
 
-    EXPECT_LT(buffer.channel(1)[AUDIO_CHUNK_SIZE - 1], 2.0f);
-    EXPECT_GT(buffer.channel(1)[AUDIO_CHUNK_SIZE - 1], 1.0f);
+    EXPECT_LE(buffer.channel(1)[AUDIO_CHUNK_SIZE - 1], 2.0f);
+    EXPECT_GE(buffer.channel(1)[AUDIO_CHUNK_SIZE - 1], 1.0f);
 
     for (int i = 0; i < chunks_in_ramp - 1; ++i)
     {

test/unittests/library/vst2x_wrapper_test.cpp

@@ -5,7 +5,6 @@
 #include "test_utils/test_utils.h"
 #include "test_utils/host_control_mockup.h"
 
-#include "test_utils/engine_mockup.h"
 #include "library/vst2x_wrapper.cpp"
 
 using namespace sushi;
@@ -202,11 +201,14 @@ TEST_F(TestVst2xWrapper, TestTimeInfo)
     _host_control._transport.set_playing_mode(PlayingMode::PLAYING, false);
     _host_control._transport.set_tempo(60, false);
     _host_control._transport.set_time_signature({4, 4}, false);
-    _host_control._transport.set_time(std::chrono::seconds(1), static_cast<int64_t>(TEST_SAMPLE_RATE));
+    _host_control._transport.set_time(std::chrono::seconds(2), static_cast<int64_t>(TEST_SAMPLE_RATE) * 2);
     auto time_info = _module_under_test->time_info();
-    EXPECT_EQ(static_cast<int64_t>(TEST_SAMPLE_RATE), time_info->samplePos);
-    EXPECT_EQ(1'000'000'000, time_info->nanoSeconds);
-    EXPECT_FLOAT_EQ(1.0f, time_info->ppqPos);
+    /* For these numbers to match exactly, we need to choose a time interval which
+     * is an integer multiple of AUDIO_CHUNK_SIZE, hence 2 seconds at 48000, which
+     * is good up to AUDIO_CHUNK_SIZE = 256 */
+    EXPECT_EQ(static_cast<int64_t>(TEST_SAMPLE_RATE) * 2, time_info->samplePos);
+    EXPECT_EQ(2'000'000'000, time_info->nanoSeconds);
+    EXPECT_FLOAT_EQ(2.0f, time_info->ppqPos);
     EXPECT_FLOAT_EQ(60.0f, time_info->tempo);
     EXPECT_FLOAT_EQ(0.0f, time_info->barStartPos);
     EXPECT_EQ(4, time_info->timeSigNumerator);

test/unittests/library/vst3x_wrapper_test.cpp

@@ -210,17 +210,19 @@ TEST_F(TestVst3xWrapper, TestTimeInfo)
     _host_control._transport.set_playing_mode(PlayingMode::PLAYING, false);
     _host_control._transport.set_tempo(120, false);
     _host_control._transport.set_time_signature({3, 4}, false);
-    _host_control._transport.set_time(std::chrono::seconds(1), static_cast<int64_t>(TEST_SAMPLE_RATE));
+    _host_control._transport.set_time(std::chrono::seconds(2), static_cast<int64_t>(TEST_SAMPLE_RATE) * 2);
 
     _module_under_test->_fill_processing_context();
     auto context = _module_under_test->_process_data.processContext;
-
+    /* For these numbers to match exactly, we need to choose a time interval which
+     * is an integer multiple of AUDIO_CHUNK_SIZE, hence 2 seconds at 48000, which
+     * is good up to AUDIO_CHUNK_SIZE = 256 */
     EXPECT_FLOAT_EQ(TEST_SAMPLE_RATE, context->sampleRate);
-    EXPECT_EQ(static_cast<int64_t>(TEST_SAMPLE_RATE), context->projectTimeSamples);
-    EXPECT_EQ(1'000'000'000, context->systemTime);
-    EXPECT_EQ(static_cast<int64_t>(TEST_SAMPLE_RATE), context->continousTimeSamples);
-    EXPECT_FLOAT_EQ(2.0f, context->projectTimeMusic);
-    EXPECT_FLOAT_EQ(0.0f, context->barPositionMusic);
+    EXPECT_EQ(static_cast<int64_t>(TEST_SAMPLE_RATE) * 2, context->projectTimeSamples);
+    EXPECT_EQ(2'000'000'000, context->systemTime);
+    EXPECT_EQ(static_cast<int64_t>(TEST_SAMPLE_RATE) * 2, context->continousTimeSamples);
+    EXPECT_FLOAT_EQ(4.0f, context->projectTimeMusic);
+    EXPECT_FLOAT_EQ(3.0f, context->barPositionMusic);
     EXPECT_FLOAT_EQ(120.0f, context->tempo);
     EXPECT_EQ(3, context->timeSigNumerator);
     EXPECT_EQ(4, context->timeSigDenominator);

test/unittests/plugins/step_sequencer_test.cpp

@@ -38,8 +38,8 @@ TEST_F(TestStepSequencerPlugin, TestOutput)
 
     ASSERT_TRUE(_fifo.empty());
     /* 1/8 notes at 120 bpm equals 4 notes/sec, @48000 results having an
-     * 18 note at 12000, so fast forward the time so directly before this time */
-    _host_control._transport.set_time(std::chrono::milliseconds(249), 11990);
+     * 8th note at 12000, so fast forward the time so directly before this time */
+    _host_control._transport.set_time(std::chrono::microseconds(249'500), 11'990);
     _module_under_test.process_audio(buffer, buffer);
     RtEvent e;
     bool got_event = _fifo.pop(e);