10 files changed, 107 insertions, 103 deletions
diff --git a/include/capture/capture.h b/include/capture/capture.h
index 82a9555..634eee0 100644
--- a/include/capture/capture.h
+++ b/include/capture/capture.h
@@ -1,32 +1,51 @@
 #ifndef GSR_CAPTURE_CAPTURE_H
 #define GSR_CAPTURE_CAPTURE_H
 
+#include "../color_conversion.h"
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 
 typedef struct AVCodecContext AVCodecContext;
+typedef struct AVStream AVStream;
 typedef struct AVFrame AVFrame;
-
+typedef struct AVMasteringDisplayMetadata AVMasteringDisplayMetadata;
+typedef struct AVContentLightMetadata AVContentLightMetadata;
 typedef struct gsr_capture gsr_capture;
 
+typedef struct {
+    int width;
+    int height;
+    int fps;
+    AVCodecContext *video_codec_context; /* can be NULL */
+    AVFrame *frame; /* can be NULL, but will never be NULL if |video_codec_context| is set */
+} gsr_capture_metadata;
+
 struct gsr_capture {
     /* 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 (*capture_end)(gsr_capture *cap, AVFrame *frame); /* can be NULL */
-    void (*destroy)(gsr_capture *cap, AVCodecContext *video_codec_context);
+    int (*start)(gsr_capture *cap, gsr_capture_metadata *capture_metadata);
+    void (*on_event)(gsr_capture *cap, gsr_egl *egl); /* can be NULL */
+    void (*tick)(gsr_capture *cap); /* can be NULL. If there is an event then |on_event| is called before this */
+    bool (*should_stop)(gsr_capture *cap, bool *err); /* can be NULL. If NULL, return false */
+    int (*capture)(gsr_capture *cap, gsr_capture_metadata *capture_metadata, gsr_color_conversion *color_conversion);
+    bool (*uses_external_image)(gsr_capture *cap); /* can be NULL. If NULL, return false */
+    bool (*set_hdr_metadata)(gsr_capture *cap, AVMasteringDisplayMetadata *mastering_display_metadata, AVContentLightMetadata *light_metadata); /* can be NULL. If NULL, return false */
+    uint64_t (*get_window_id)(gsr_capture *cap); /* can be NULL. Returns 0 if unknown */
+    bool (*is_damaged)(gsr_capture *cap); /* can be NULL */
+    void (*clear_damage)(gsr_capture *cap); /* can be NULL */
+    void (*destroy)(gsr_capture *cap);
 
     void *priv; /* can be NULL */
     bool started;
 };
 
-int gsr_capture_start(gsr_capture *cap, AVCodecContext *video_codec_context);
-void gsr_capture_tick(gsr_capture *cap, AVCodecContext *video_codec_context, AVFrame **frame);
+int gsr_capture_start(gsr_capture *cap, gsr_capture_metadata *capture_metadata);
+void gsr_capture_on_event(gsr_capture *cap, gsr_egl *egl);
+void gsr_capture_tick(gsr_capture *cap);
 bool gsr_capture_should_stop(gsr_capture *cap, bool *err);
-int gsr_capture_capture(gsr_capture *cap, AVFrame *frame);
-void gsr_capture_end(gsr_capture *cap, AVFrame *frame);
-/* Calls |gsr_capture_stop| as well */
-void gsr_capture_destroy(gsr_capture *cap, AVCodecContext *video_codec_context);
+int gsr_capture_capture(gsr_capture *cap, gsr_capture_metadata *capture_metadata, gsr_color_conversion *color_conversion);
+bool gsr_capture_uses_external_image(gsr_capture *cap);
+bool gsr_capture_set_hdr_metadata(gsr_capture *cap, AVMasteringDisplayMetadata *mastering_display_metadata, AVContentLightMetadata *light_metadata);
+void gsr_capture_destroy(gsr_capture *cap);
 
 #endif /* GSR_CAPTURE_CAPTURE_H */
diff --git a/include/capture/kms.h b/include/capture/kms.h
new file mode 100644
index 0000000..ce09817
--- /dev/null
+++ b/include/capture/kms.h
@@ -0,0 +1,19 @@
+#ifndef GSR_CAPTURE_KMS_H
+#define GSR_CAPTURE_KMS_H
+
+#include "capture.h"
+
+typedef struct {
+    gsr_egl *egl;
+    const char *display_to_capture; /* A copy is made of this */
+    bool hdr;
+    bool record_cursor;
+    int fps;
+    vec2i output_resolution;
+    vec2i region_size;
+    vec2i region_position;
+} gsr_capture_kms_params;
+
+gsr_capture* gsr_capture_kms_create(const gsr_capture_kms_params *params);
+
+#endif /* GSR_CAPTURE_KMS_H */
diff --git a/include/capture/kms_cuda.h b/include/capture/kms_cuda.h
deleted file mode 100644
index c2b2ad8..0000000
--- a/include/capture/kms_cuda.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef GSR_CAPTURE_KMS_CUDA_H
-#define GSR_CAPTURE_KMS_CUDA_H
-
-#include "../vec2.h"
-#include "../utils.h"
-#include "capture.h"
-
-typedef struct _XDisplay Display;
-
-typedef struct {
-    gsr_egl *egl;
-    const char *display_to_capture; /* if this is "screen", then the first monitor is captured. A copy is made of this */
-    gsr_gpu_info gpu_inf;
-    const char *card_path; /* reference */
-} gsr_capture_kms_cuda_params;
-
-gsr_capture* gsr_capture_kms_cuda_create(const gsr_capture_kms_cuda_params *params);
-
-#endif /* GSR_CAPTURE_KMS_CUDA_H */
diff --git a/include/capture/kms_vaapi.h b/include/capture/kms_vaapi.h
deleted file mode 100644
index 26cda2c..0000000
--- a/include/capture/kms_vaapi.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef GSR_CAPTURE_KMS_VAAPI_H
-#define GSR_CAPTURE_KMS_VAAPI_H
-
-#include "../vec2.h"
-#include "../utils.h"
-#include "capture.h"
-
-typedef struct _XDisplay Display;
-
-typedef struct {
-    gsr_egl *egl;
-    const char *display_to_capture; /* if this is "screen", then the first monitor is captured. A copy is made of this */
-    gsr_gpu_info gpu_inf;
-    const char *card_path; /* reference */
-    bool wayland;
-} gsr_capture_kms_vaapi_params;
-
-gsr_capture* gsr_capture_kms_vaapi_create(const gsr_capture_kms_vaapi_params *params);
-
-#endif /* GSR_CAPTURE_KMS_VAAPI_H */
diff --git a/include/capture/nvfbc.h b/include/capture/nvfbc.h
index 5678473..7e30d01 100644
--- a/include/capture/nvfbc.h
+++ b/include/capture/nvfbc.h
@@ -2,20 +2,17 @@
 #define GSR_CAPTURE_NVFBC_H
 
 #include "capture.h"
-#include "../egl.h"
 #include "../vec2.h"
 
-typedef struct _XDisplay Display;
-
 typedef struct {
-    Display *dpy;
     gsr_egl *egl;
     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;
     bool direct_capture;
-    bool overclock;
+    bool record_cursor;
+    vec2i output_resolution;
+    vec2i region_size;
+    vec2i region_position;
 } gsr_capture_nvfbc_params;
 
 gsr_capture* gsr_capture_nvfbc_create(const gsr_capture_nvfbc_params *params);
diff --git a/include/capture/portal.h b/include/capture/portal.h
new file mode 100644
index 0000000..74cdba9
--- /dev/null
+++ b/include/capture/portal.h
@@ -0,0 +1,17 @@
+#ifndef GSR_CAPTURE_PORTAL_H
+#define GSR_CAPTURE_PORTAL_H
+
+#include "capture.h"
+
+typedef struct {
+    gsr_egl *egl;
+    bool record_cursor;
+    bool restore_portal_session;
+    /* If this is set to NULL then this defaults to $XDG_CONFIG_HOME/gpu-screen-recorder/restore_token ($XDG_CONFIG_HOME defaults to $HOME/.config) */
+    const char *portal_session_token_filepath;
+    vec2i output_resolution;
+} gsr_capture_portal_params;
+
+gsr_capture* gsr_capture_portal_create(const gsr_capture_portal_params *params);
+
+#endif /* GSR_CAPTURE_PORTAL_H */
diff --git a/include/capture/xcomposite.h b/include/capture/xcomposite.h
new file mode 100644
index 0000000..bf6532e
--- /dev/null
+++ b/include/capture/xcomposite.h
@@ -0,0 +1,17 @@
+#ifndef GSR_CAPTURE_XCOMPOSITE_H
+#define GSR_CAPTURE_XCOMPOSITE_H
+
+#include "capture.h"
+#include "../vec2.h"
+
+typedef struct {
+    gsr_egl *egl;
+    unsigned long window;
+    bool follow_focused; /* If this is set then |window| is ignored */
+    bool record_cursor;
+    vec2i output_resolution;
+} gsr_capture_xcomposite_params;
+
+gsr_capture* gsr_capture_xcomposite_create(const gsr_capture_xcomposite_params *params);
+
+#endif /* GSR_CAPTURE_XCOMPOSITE_H */
diff --git a/include/capture/xcomposite_cuda.h b/include/capture/xcomposite_cuda.h
deleted file mode 100644
index 2106714..0000000
--- a/include/capture/xcomposite_cuda.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef GSR_CAPTURE_XCOMPOSITE_CUDA_H
-#define GSR_CAPTURE_XCOMPOSITE_CUDA_H
-
-#include "capture.h"
-#include "../egl.h"
-#include "../vec2.h"
-#include <X11/X.h>
-
-typedef struct _XDisplay Display;
-
-typedef struct {
-    gsr_egl *egl;
-    Display *dpy;
-    Window window;
-    bool follow_focused; /* If this is set then |window| is ignored */
-    vec2i region_size; /* This is currently only used with |follow_focused| */
-    bool overclock;
-} gsr_capture_xcomposite_cuda_params;
-
-gsr_capture* gsr_capture_xcomposite_cuda_create(const gsr_capture_xcomposite_cuda_params *params);
-
-#endif /* GSR_CAPTURE_XCOMPOSITE_CUDA_H */
diff --git a/include/capture/xcomposite_vaapi.h b/include/capture/xcomposite_vaapi.h
deleted file mode 100644
index e80c60a..0000000
--- a/include/capture/xcomposite_vaapi.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef GSR_CAPTURE_XCOMPOSITE_VAAPI_H
-#define GSR_CAPTURE_XCOMPOSITE_VAAPI_H
-
-#include "capture.h"
-#include "../egl.h"
-#include "../vec2.h"
-#include <X11/X.h>
-
-typedef struct _XDisplay Display;
-
-typedef struct {
-    gsr_egl *egl;
-    Display *dpy;
-    Window window;
-    bool follow_focused; /* If this is set then |window| is ignored */
-    vec2i region_size; /* This is currently only used with |follow_focused| */
-    const char *card_path; /* reference */
-} gsr_capture_xcomposite_vaapi_params;
-
-gsr_capture* gsr_capture_xcomposite_vaapi_create(const gsr_capture_xcomposite_vaapi_params *params);
-
-#endif /* GSR_CAPTURE_XCOMPOSITE_VAAPI_H */
diff --git a/include/capture/ximage.h b/include/capture/ximage.h
new file mode 100644
index 0000000..e6c3607
--- /dev/null
+++ b/include/capture/ximage.h
@@ -0,0 +1,18 @@
+#ifndef GSR_CAPTURE_XIMAGE_H
+#define GSR_CAPTURE_XIMAGE_H
+
+#include "capture.h"
+#include "../vec2.h"
+
+typedef struct {
+    gsr_egl *egl;
+    const char *display_to_capture; /* A copy is made of this */
+    bool record_cursor;
+    vec2i output_resolution;
+    vec2i region_size;
+    vec2i region_position;
+} gsr_capture_ximage_params;
+
+gsr_capture* gsr_capture_ximage_create(const gsr_capture_ximage_params *params);
+
+#endif /* GSR_CAPTURE_XIMAGE_H */