X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=6d0cbce1593b6da92c4f426668d948c982683921;hb=196392c483a9cbf7fd7b572d9242aa283031453f;hp=07a31e959fe5a21e2b268ed7f4aad11e0ac2e90a;hpb=6ebc7f7bd501d1115bf164ce3e1c22db326798c2;p=nageru

diff --git a/mixer.h b/mixer.h
index 07a31e9..6d0cbce 100644
--- a/mixer.h
+++ b/mixer.h
@@ -34,6 +34,7 @@
 #include "timebase.h"
 #include "stereocompressor.h"
 #include "filter.h"
+#include "input_state.h"
 
 class H264Encoder;
 class QSurface;
@@ -170,16 +171,6 @@ public:
 
 	void reset_meters();
 
-	struct BufferedFrame {
-		RefCountedFrame frame;
-		unsigned field_number;
-	};
-
-	BufferedFrame get_buffered_frame(int card, int history_pos)
-	{
-		return buffered_frames[card][history_pos];
-	}
-
 private:
 	void bm_frame(unsigned card_index, uint16_t timecode,
 		FrameAllocator::Frame video_frame, size_t video_offset, uint16_t video_format,
@@ -237,12 +228,7 @@ private:
 	};
 	CaptureCard cards[MAX_CARDS];  // protected by <bmusb_mutex>
 
-	// For each card, the last three frames (or fields), with 0 being the
-	// most recent one. Note that we only need the actual history if we have
-	// interlaced output (for deinterlacing), so if we detect progressive input,
-	// we immediately clear out all history and all entries will point to the same
-	// frame.
-	BufferedFrame buffered_frames[MAX_CARDS][FRAME_HISTORY_LENGTH];
+	InputState input_state;
 
 	class OutputChannel {
 	public: