Refactor xcomposite into abstract capture api

Refactor c++ files into c files, more usable

3 files changed, 32 insertions, 8 deletions

diff --git a/include/capture/capture.h b/include/capture/capture.h
index 9e23a23..edcc14d 100644
--- a/include/capture/capture.h
+++ b/include/capture/capture.h
@@ -3,23 +3,28 @@
 
 #include <stdbool.h>
 
+typedef struct AVCodecContext AVCodecContext;
 typedef struct AVFrame AVFrame;
 
 typedef struct gsr_capture gsr_capture;
 
 struct gsr_capture {
-    int (*start)(gsr_capture *cap);
-    void (*stop)(gsr_capture *cap);
+    /* These methods should not be called manually. Call gsr_capture_* instead */
+    int (*start)(gsr_capture *cap, AVCodecContext *video_codec_context);
+    void (*tick)(gsr_capture *cap, AVCodecContext *video_codec_context, AVFrame **frame); /* can be NULL */
+    bool (*should_stop)(gsr_capture *cap, bool *err); /* can be NULL */
     int (*capture)(gsr_capture *cap, AVFrame *frame);
-    void (*destroy)(gsr_capture *cap);
+    void (*destroy)(gsr_capture *cap, AVCodecContext *video_codec_context);
 
-    void *priv;
+    void *priv; /* can be NULL */
+    bool started;
 };
 
-int gsr_capture_start(gsr_capture *cap);
-void gsr_capture_stop(gsr_capture *cap);
+int gsr_capture_start(gsr_capture *cap, AVCodecContext *video_codec_context);
+void gsr_capture_tick(gsr_capture *cap, AVCodecContext *video_codec_context, AVFrame **frame);
+bool gsr_capture_should_stop(gsr_capture *cap, bool *err);
 int gsr_capture_capture(gsr_capture *cap, AVFrame *frame);
 /* Calls |gsr_capture_stop| as well */
-void gsr_capture_destroy(gsr_capture *cap);
+void gsr_capture_destroy(gsr_capture *cap, AVCodecContext *video_codec_context);
 
 #endif /* GSR_CAPTURE_CAPTURE_H */
diff --git a/include/capture/nvfbc.h b/include/capture/nvfbc.h
index b749b87..06587d8 100644
--- a/include/capture/nvfbc.h
+++ b/include/capture/nvfbc.h
@@ -4,8 +4,11 @@
 #include "capture.h"
 #include "../vec2.h"
 
+typedef struct _XDisplay Display;
+
 typedef struct {
-    const char *display_to_capture; /* if this is "screen", then the entire x11 screen is captured (all displays) */
+    Display *dpy;
+    const char *display_to_capture; /* if this is "screen", then the entire x11 screen is captured (all displays). A copy is made of this */
     int fps;
     vec2i pos;
     vec2i size;
diff --git a/include/capture/xcomposite.h b/include/capture/xcomposite.h
new file mode 100644
index 0000000..edd335c
--- /dev/null
+++ b/include/capture/xcomposite.h
@@ -0,0 +1,16 @@
+#ifndef GSR_CAPTURE_XCOMPOSITE_H
+#define GSR_CAPTURE_XCOMPOSITE_H
+
+#include "capture.h"
+#include "../vec2.h"
+#include <X11/X.h>
+
+typedef struct _XDisplay Display;
+
+typedef struct {
+    Window window;
+} gsr_capture_xcomposite_params;
+
+gsr_capture* gsr_capture_xcomposite_create(const gsr_capture_xcomposite_params *params);
+
+#endif /* GSR_CAPTURE_XCOMPOSITE_H */