10 files changed, 85 insertions, 198 deletions
diff --git a/include/capture/capture.h b/include/capture/capture.h
index 2eb8e42..c2128c5 100644
--- a/include/capture/capture.h
+++ b/include/capture/capture.h
@@ -3,66 +3,50 @@
 
 #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 void* VADisplay;
-typedef struct _VADRMPRIMESurfaceDescriptor VADRMPRIMESurfaceDescriptor;
-typedef struct gsr_cuda gsr_cuda;
-typedef struct AVFrame AVFrame;
-typedef struct CUgraphicsResource_st *CUgraphicsResource;
-typedef struct CUarray_st *CUarray;
-typedef struct CUctx_st *CUcontext;
-typedef struct CUstream_st *CUstream;
-
+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, AVFrame *frame);
-    void (*tick)(gsr_capture *cap, AVCodecContext *video_codec_context); /* 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);
+    /* These methods should not be called manually. Call gsr_capture_* instead. |capture_metdata->width| and |capture_metadata->height| should be set by this function */
+    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 */
+    bool (*capture_has_synchronous_task)(gsr_capture *cap); /* can be NULL. If this returns true then the time spent in |capture| is ignored for video/audio (capture is paused while the synchronous task happens) */
+    int (*capture)(gsr_capture *cap, gsr_capture_metadata *capture_metadata, gsr_color_conversion *color_conversion); /* Return 0 if the frame was captured */
+    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;
 };
 
-typedef struct gsr_capture_base gsr_capture_base;
-
-struct gsr_capture_base {
-    gsr_egl *egl;
-
-    unsigned int input_texture;
-    unsigned int target_textures[2];
-    unsigned int cursor_texture;
-
-    gsr_color_conversion color_conversion;
-
-    AVCodecContext *video_codec_context;
-};
-
-typedef struct {
-    gsr_cuda *cuda;
-    CUgraphicsResource *cuda_graphics_resources;
-    CUarray *mapped_arrays;
-} gsr_cuda_context;
-
-int gsr_capture_start(gsr_capture *cap, AVCodecContext *video_codec_context, AVFrame *frame);
-void gsr_capture_tick(gsr_capture *cap, AVCodecContext *video_codec_context);
+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);
-
-bool gsr_capture_base_setup_vaapi_textures(gsr_capture_base *self, AVFrame *frame, VADisplay va_dpy, VADRMPRIMESurfaceDescriptor *prime, gsr_color_range color_range);
-bool gsr_capture_base_setup_cuda_textures(gsr_capture_base *self, AVFrame *frame, gsr_cuda_context *cuda_context, gsr_color_range color_range, gsr_source_color source_color, bool hdr);
-void gsr_capture_base_stop(gsr_capture_base *self);
-
-bool drm_create_codec_context(const char *card_path, AVCodecContext *video_codec_context, int width, int height, bool hdr, VADisplay *va_dpy);
-bool cuda_create_codec_context(CUcontext cu_ctx, AVCodecContext *video_codec_context, int width, int height, bool hdr, CUstream *cuda_stream);
+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
index 674813a..ce09817 100644
--- a/include/capture/kms.h
+++ b/include/capture/kms.h
@@ -2,49 +2,18 @@
 #define GSR_CAPTURE_KMS_H
 
 #include "capture.h"
-#include "../../kms/client/kms_client.h"
-#include "../color_conversion.h"
-#include "../vec2.h"
-#include "../defs.h"
-#include <stdbool.h>
-
-typedef struct AVCodecContext AVCodecContext;
-typedef struct AVMasteringDisplayMetadata AVMasteringDisplayMetadata;
-typedef struct AVContentLightMetadata AVContentLightMetadata;
-typedef struct gsr_capture_kms gsr_capture_kms;
-typedef struct gsr_egl gsr_egl;
-typedef struct AVFrame AVFrame;
-
-#define MAX_CONNECTOR_IDS 32
 
 typedef struct {
-    uint32_t connector_ids[MAX_CONNECTOR_IDS];
-    int num_connector_ids;
-} MonitorId;
-
-struct gsr_capture_kms {
-    gsr_capture_base base;
-
-    bool should_stop;
-    bool stop_is_error;
-    
-    gsr_kms_client kms_client;
-    gsr_kms_response kms_response;
-
-    vec2i capture_pos;
-    vec2i capture_size;
-    MonitorId monitor_id;
-
-    AVMasteringDisplayMetadata *mastering_display_metadata;
-    AVContentLightMetadata *light_metadata;
-
-    gsr_monitor_rotation monitor_rotation;
-};
-
-/* Returns 0 on success */
-int gsr_capture_kms_start(gsr_capture_kms *self, const char *display_to_capture, gsr_egl *egl, AVCodecContext *video_codec_context, AVFrame *frame);
-void gsr_capture_kms_stop(gsr_capture_kms *self);
-bool gsr_capture_kms_capture(gsr_capture_kms *self, AVFrame *frame, bool hdr, bool screen_plane_use_modifiers, bool cursor_texture_is_external, bool record_cursor);
-void gsr_capture_kms_cleanup_kms_fds(gsr_capture_kms *self);
+    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 433e053..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 "../color_conversion.h"
-#include "capture.h"
-
-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 */
-    bool hdr;
-    gsr_color_range color_range;
-    bool record_cursor;
-} 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 bf078b5..0000000
--- a/include/capture/kms_vaapi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef GSR_CAPTURE_KMS_VAAPI_H
-#define GSR_CAPTURE_KMS_VAAPI_H
-
-#include "../vec2.h"
-#include "../utils.h"
-#include "../color_conversion.h"
-#include "capture.h"
-
-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 */
-    bool hdr;
-    gsr_color_range color_range;
-    bool record_cursor;
-} 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 36bc2b6..7e30d01 100644
--- a/include/capture/nvfbc.h
+++ b/include/capture/nvfbc.h
@@ -8,13 +8,11 @@ typedef struct {
     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 hdr;
-    gsr_color_range color_range;
     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
index ce0dbad..bf6532e 100644
--- a/include/capture/xcomposite.h
+++ b/include/capture/xcomposite.h
@@ -2,50 +2,16 @@
 #define GSR_CAPTURE_XCOMPOSITE_H
 
 #include "capture.h"
-#include "../egl.h"
 #include "../vec2.h"
-#include "../color_conversion.h"
-#include "../window_texture.h"
-#include "../cursor.h"
 
 typedef struct {
     gsr_egl *egl;
-    Window window;
+    unsigned long window;
     bool follow_focused; /* If this is set then |window| is ignored */
-    vec2i region_size; /* This is currently only used with |follow_focused| */
-    gsr_color_range color_range;
     bool record_cursor;
+    vec2i output_resolution;
 } gsr_capture_xcomposite_params;
 
-typedef struct {
-    gsr_capture_base base;
-    gsr_capture_xcomposite_params params;
-    XEvent xev;
-
-    bool should_stop;
-    bool stop_is_error;
-    bool window_resized;
-    bool follow_focused_initialized;
-
-    Window window;
-    vec2i window_size;
-    vec2i texture_size;
-    double window_resize_timer;
-    
-    WindowTexture window_texture;
-
-    Atom net_active_window_atom;
-
-    gsr_cursor cursor;
-    bool clear_next_frame;
-} gsr_capture_xcomposite;
-
-void gsr_capture_xcomposite_init(gsr_capture_xcomposite *self, const gsr_capture_xcomposite_params *params);
-
-int gsr_capture_xcomposite_start(gsr_capture_xcomposite *self, AVCodecContext *video_codec_context, AVFrame *frame);
-void gsr_capture_xcomposite_stop(gsr_capture_xcomposite *self);
-void gsr_capture_xcomposite_tick(gsr_capture_xcomposite *self, AVCodecContext *video_codec_context);
-bool gsr_capture_xcomposite_should_stop(gsr_capture_xcomposite *self, bool *err);
-int gsr_capture_xcomposite_capture(gsr_capture_xcomposite *self, AVFrame *frame);
+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 b93c6de..0000000
--- a/include/capture/xcomposite_cuda.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef GSR_CAPTURE_XCOMPOSITE_CUDA_H
-#define GSR_CAPTURE_XCOMPOSITE_CUDA_H
-
-#include "capture.h"
-#include "xcomposite.h"
-
-typedef struct {
-    gsr_capture_xcomposite_params base;
-    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 5d4b338..0000000
--- a/include/capture/xcomposite_vaapi.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef GSR_CAPTURE_XCOMPOSITE_VAAPI_H
-#define GSR_CAPTURE_XCOMPOSITE_VAAPI_H
-
-#include "capture.h"
-#include "xcomposite.h"
-
-typedef struct {
-    gsr_capture_xcomposite_params base;
-} 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 */