If we have waiting B-frames at the end of the encode, encode them as such.

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index e46d918d6d8421312725dfc872d5730cd5010bc0..1a4a3f9d3c292f4d4aaa85a4415c8420bc1083b7 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -204,7 +204,7 @@ float find_peak(const float *samples, size_t num_samples)
 {
        float m = fabs(samples[0]);
        for (size_t i = 1; i < num_samples; ++i) {
-               m = std::max(m, fabs(samples[i]));
+               m = max(m, fabs(samples[i]));
        }
        return m;
 }
@@ -353,6 +353,8 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
                clock_gettime(CLOCK_MONOTONIC, &frame_upload_start);
        }
        userdata->last_interlaced = interlaced;
+       userdata->last_frame_rate_nom = frame_rate_nom;
+       userdata->last_frame_rate_den = frame_rate_den;
        RefCountedFrame new_frame(video_frame);
 
        // Upload the textures.