Do not use the timing of dropped frames as part of the video master clock.

[nageru] / pbo_frame_allocator.h

diff --git a/pbo_frame_allocator.h b/pbo_frame_allocator.h
index 5e6a519b667ae1bf0a35a4b4ab3a903d49b6eced..9220491669c2a194bac2b3c2833d3c3f2ffaf696 100644 (file)
--- a/pbo_frame_allocator.h
+++ b/pbo_frame_allocator.h
@@ -12,7 +12,7 @@
 // An allocator that allocates straight into OpenGL pinned memory.
 // Meant for video frames only. We use a queue rather than a stack,
 // since we want to maximize pipelineability.
-class PBOFrameAllocator : public FrameAllocator {
+class PBOFrameAllocator : public bmusb::FrameAllocator {
 public:
        // Note: You need to have an OpenGL context when calling
        // the constructor.
@@ -32,11 +32,11 @@ public:
                // The second set is only used for the second field of interlaced inputs.
                GLuint tex_y[2], tex_cbcr[2];
                GLuint last_width[2], last_height[2];
+               bool last_interlaced, last_has_signal, last_is_connected;
+               unsigned last_frame_rate_nom, last_frame_rate_den;
        };
 
 private:
-       size_t frame_size;
-
        std::mutex freelist_mutex;
        std::queue<Frame> freelist;
        GLenum buffer;