X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmixer.h;h=de8b45741ef30cf97058d5270f995f45e1680553;hb=25326c82bda01dfa1b86fb4f074d7697705239f8;hp=b4ed76f4575ff0403b4865a470af8925d548ddd1;hpb=eeda8995329601f9f4e35047358400833eeae68e;p=nageru diff --git a/nageru/mixer.h b/nageru/mixer.h index b4ed76f..de8b457 100644 --- a/nageru/mixer.h +++ b/nageru/mixer.h @@ -541,9 +541,10 @@ private: }; std::deque new_frames; std::condition_variable new_frames_changed; // Set whenever new_frames is changed. - QueueLengthPolicy queue_length_policy; // Refers to the "new_frames" queue. + std::vector new_raw_audio; + int last_timecode = -1; // Unwrapped. JitterHistory jitter_history; @@ -578,7 +579,7 @@ private: bool is_preroll; std::chrono::steady_clock::time_point frame_timestamp; }; - OutputFrameInfo get_one_frame_from_each_card(unsigned master_card_index, bool master_card_is_output, CaptureCard::NewFrame new_frames[MAX_VIDEO_CARDS], bool has_new_frame[MAX_VIDEO_CARDS]); + OutputFrameInfo get_one_frame_from_each_card(unsigned master_card_index, bool master_card_is_output, CaptureCard::NewFrame new_frames[MAX_VIDEO_CARDS], bool has_new_frame[MAX_VIDEO_CARDS], std::vector raw_audio[MAX_VIDEO_CARDS]); InputState input_state;