]> git.sesse.net Git - nageru/blobdiff - mixer.cpp
Use std::chrono for (almost) all time keeping.
[nageru] / mixer.cpp
index fd33abbb18f35d3569b89f4d673c37e9e7a92365..9e281cbdf72583470a1289b8030cdac7d042effa 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -3,6 +3,7 @@
 #include "mixer.h"
 
 #include <assert.h>
+#include <endian.h>
 #include <epoxy/egl.h>
 #include <movit/effect_chain.h>
 #include <movit/effect_util.h>
@@ -17,6 +18,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include <algorithm>
+#include <chrono>
 #include <cmath>
 #include <condition_variable>
 #include <cstddef>
@@ -45,6 +47,7 @@ class QOpenGLContext;
 
 using namespace movit;
 using namespace std;
+using namespace std::chrono;
 using namespace std::placeholders;
 using namespace bmusb;
 
@@ -62,7 +65,7 @@ void convert_fixed24_to_fp32(float *dst, size_t out_channels, const uint8_t *src
                        uint32_t s2 = *src++;
                        uint32_t s3 = *src++;
                        uint32_t s = s1 | (s1 << 8) | (s2 << 16) | (s3 << 24);
-                       dst[i * out_channels + j] = int(s) * (1.0f / 4294967296.0f);
+                       dst[i * out_channels + j] = int(s) * (1.0f / 2147483648.0f);
                }
                src += 3 * (in_channels - out_channels);
        }
@@ -73,9 +76,8 @@ void convert_fixed32_to_fp32(float *dst, size_t out_channels, const uint8_t *src
        assert(in_channels >= out_channels);
        for (size_t i = 0; i < num_samples; ++i) {
                for (size_t j = 0; j < out_channels; ++j) {
-                       // Note: Assumes little-endian.
-                       int32_t s = *(int32_t *)src;
-                       dst[i * out_channels + j] = s * (1.0f / 4294967296.0f);
+                       int32_t s = le32toh(*(int32_t *)src);
+                       dst[i * out_channels + j] = s * (1.0f / 2147483648.0f);
                        src += 4;
                }
                src += 4 * (in_channels - out_channels);
@@ -201,7 +203,8 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 
        unsigned num_fake_cards = 0;
        for ( ; card_index < num_cards; ++card_index, ++num_fake_cards) {
-               configure_card(card_index, new FakeCapture(WIDTH, HEIGHT, FAKE_FPS, OUTPUT_FREQUENCY, card_index), /*is_fake_capture=*/true);
+               FakeCapture *capture = new FakeCapture(WIDTH, HEIGHT, FAKE_FPS, OUTPUT_FREQUENCY, card_index, global_flags.fake_cards_audio);
+               configure_card(card_index, capture, /*is_fake_capture=*/true);
        }
 
        if (num_fake_cards > 0) {
@@ -379,10 +382,8 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
                        is_mode_scanning[card_index] = false;
                } else {
                        static constexpr double switch_time_s = 0.5;  // Should be enough time for the signal to stabilize.
-                       timespec now;
-                       clock_gettime(CLOCK_MONOTONIC, &now);
-                       double sec_since_last_switch = (now.tv_sec - last_mode_scan_change[card_index].tv_sec) +
-                               1e-9 * (now.tv_nsec - last_mode_scan_change[card_index].tv_nsec);
+                       steady_clock::time_point now = steady_clock::now();
+                       double sec_since_last_switch = duration<double>(steady_clock::now() - last_mode_scan_change[card_index]).count();
                        if (sec_since_last_switch > switch_time_s) {
                                // It isn't this mode; try the next one.
                                mode_scanlist_index[card_index]++;
@@ -504,7 +505,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
        PBOFrameAllocator::Userdata *userdata = (PBOFrameAllocator::Userdata *)video_frame.userdata;
 
        unsigned num_fields = video_format.interlaced ? 2 : 1;
-       timespec frame_upload_start;
+       steady_clock::time_point frame_upload_start;
        if (video_format.interlaced) {
                // Send the two fields along as separate frames; the other side will need to add
                // a deinterlacer to actually get this right.
@@ -513,7 +514,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
                assert(frame_length % 2 == 0);
                frame_length /= 2;
                num_fields = 2;
-               clock_gettime(CLOCK_MONOTONIC, &frame_upload_start);
+               frame_upload_start = steady_clock::now();
        }
        userdata->last_interlaced = video_format.interlaced;
        userdata->last_has_signal = video_format.has_signal;
@@ -594,16 +595,9 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
                        // against the video display, although the latter is not as critical.)
                        // This requires our system clock to be reasonably close to the
                        // video clock, but that's not an unreasonable assumption.
-                       timespec second_field_start;
-                       second_field_start.tv_nsec = frame_upload_start.tv_nsec +
-                               frame_length * 1000000000 / TIMEBASE;
-                       second_field_start.tv_sec = frame_upload_start.tv_sec +
-                               second_field_start.tv_nsec / 1000000000;
-                       second_field_start.tv_nsec %= 1000000000;
-
-                       while (clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME,
-                                              &second_field_start, nullptr) == -1 &&
-                              errno == EINTR) ;
+                       steady_clock::time_point second_field_start = frame_upload_start +
+                               nanoseconds(frame_length * 1000000000 / TIMEBASE);
+                       this_thread::sleep_until(second_field_start);
                }
 
                {
@@ -641,8 +635,8 @@ void Mixer::thread_func()
                exit(1);
        }
 
-       struct timespec start, now;
-       clock_gettime(CLOCK_MONOTONIC, &start);
+       steady_clock::time_point start, now;
+       start = steady_clock::now();
 
        int frame = 0;
        int stats_dropped_frames = 0;
@@ -699,14 +693,13 @@ void Mixer::thread_func()
                        }
                }
 
-               int64_t duration = new_frames[master_card_index].length;
-               render_one_frame(duration);
+               int64_t frame_duration = new_frames[master_card_index].length;
+               render_one_frame(frame_duration);
                ++frame;
-               pts_int += duration;
+               pts_int += frame_duration;
 
-               clock_gettime(CLOCK_MONOTONIC, &now);
-               double elapsed = now.tv_sec - start.tv_sec +
-                       1e-9 * (now.tv_nsec - start.tv_nsec);
+               now = steady_clock::now();
+               double elapsed = duration<double>(now - start).count();
                if (frame % 100 == 0) {
                        printf("%d frames (%d dropped) in %.3f seconds = %.1f fps (%.1f ms/frame)",
                                frame, stats_dropped_frames, elapsed, frame / elapsed,
@@ -817,7 +810,8 @@ void Mixer::handle_hotplugged_cards()
                CaptureCard *card = &cards[card_index];
                if (card->capture->get_disconnected()) {
                        fprintf(stderr, "Card %u went away, replacing with a fake card.\n", card_index);
-                       configure_card(card_index, new FakeCapture(WIDTH, HEIGHT, FAKE_FPS, OUTPUT_FREQUENCY, card_index), /*is_fake_capture=*/true);
+                       FakeCapture *capture = new FakeCapture(WIDTH, HEIGHT, FAKE_FPS, OUTPUT_FREQUENCY, card_index, global_flags.fake_cards_audio);
+                       configure_card(card_index, capture, /*is_fake_capture=*/true);
                        card->queue_length_policy.reset(card_index);
                        card->capture->start_bm_capture();
                }
@@ -1058,21 +1052,6 @@ void Mixer::process_audio_one_frame(int64_t frame_pts_int, int num_samples)
 
 //     printf("limiter=%+5.1f  compressor=%+5.1f\n", 20.0*log10(limiter_att), 20.0*log10(compressor_att));
 
-       // Upsample 4x to find interpolated peak.
-       peak_resampler.inp_data = samples_out.data();
-       peak_resampler.inp_count = samples_out.size() / 2;
-
-       vector<float> interpolated_samples_out;
-       interpolated_samples_out.resize(samples_out.size());
-       while (peak_resampler.inp_count > 0) {  // About four iterations.
-               peak_resampler.out_data = &interpolated_samples_out[0];
-               peak_resampler.out_count = interpolated_samples_out.size() / 2;
-               peak_resampler.process();
-               size_t out_stereo_samples = interpolated_samples_out.size() / 2 - peak_resampler.out_count;
-               peak = max<float>(peak, find_peak(interpolated_samples_out.data(), out_stereo_samples * 2));
-               peak_resampler.out_data = nullptr;
-       }
-
        // At this point, we are most likely close to +0 LU, but all of our
        // measurements have been on raw sample values, not R128 values.
        // So we have a final makeup gain to get us to +0 LU; the gain
@@ -1113,6 +1092,21 @@ void Mixer::process_audio_one_frame(int64_t frame_pts_int, int num_samples)
                final_makeup_gain = m;
        }
 
+       // Upsample 4x to find interpolated peak.
+       peak_resampler.inp_data = samples_out.data();
+       peak_resampler.inp_count = samples_out.size() / 2;
+
+       vector<float> interpolated_samples_out;
+       interpolated_samples_out.resize(samples_out.size());
+       while (peak_resampler.inp_count > 0) {  // About four iterations.
+               peak_resampler.out_data = &interpolated_samples_out[0];
+               peak_resampler.out_count = interpolated_samples_out.size() / 2;
+               peak_resampler.process();
+               size_t out_stereo_samples = interpolated_samples_out.size() / 2 - peak_resampler.out_count;
+               peak = max<float>(peak, find_peak(interpolated_samples_out.data(), out_stereo_samples * 2));
+               peak_resampler.out_data = nullptr;
+       }
+
        // Find R128 levels and L/R correlation.
        vector<float> left, right;
        deinterleave_samples(samples_out, &left, &right);
@@ -1248,7 +1242,7 @@ void Mixer::start_mode_scanning(unsigned card_index)
        assert(!mode_scanlist[card_index].empty());
        mode_scanlist_index[card_index] = 0;
        cards[card_index].capture->set_video_mode(mode_scanlist[card_index][0]);
-       clock_gettime(CLOCK_MONOTONIC, &last_mode_scan_change[card_index]);
+       last_mode_scan_change[card_index] = steady_clock::now();
 }
 
 Mixer::OutputChannel::~OutputChannel()