6 files changed, 37 insertions, 18 deletions
diff --git a/include/capture/capture.h b/include/capture/capture.h
index dc5b7ac..634eee0 100644
--- a/include/capture/capture.h
+++ b/include/capture/capture.h
@@ -13,31 +13,39 @@ 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);
+    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, AVFrame *frame, gsr_color_conversion *color_conversion);
+    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, AVCodecContext *video_codec_context);
+    void (*destroy)(gsr_capture *cap);
 
     void *priv; /* can be NULL */
     bool started;
 };
 
-int gsr_capture_start(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, gsr_color_conversion *color_conversion);
+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, AVCodecContext *video_codec_context);
+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 bf1ba62..ce09817 100644
--- a/include/capture/kms.h
+++ b/include/capture/kms.h
@@ -5,13 +5,13 @@
 
 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_color_depth color_depth;
-    gsr_color_range color_range;
+    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);
diff --git a/include/capture/nvfbc.h b/include/capture/nvfbc.h
index f291f33..7e30d01 100644
--- a/include/capture/nvfbc.h
+++ b/include/capture/nvfbc.h
@@ -8,14 +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;
-    gsr_color_depth color_depth;
-    gsr_color_range color_range;
     bool record_cursor;
-    bool use_software_video_encoder;
     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
index 3989b98..74cdba9 100644
--- a/include/capture/portal.h
+++ b/include/capture/portal.h
@@ -5,8 +5,6 @@
 
 typedef struct {
     gsr_egl *egl;
-    gsr_color_depth color_depth;
-    gsr_color_range color_range;
     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) */
diff --git a/include/capture/xcomposite.h b/include/capture/xcomposite.h
index 45eb481..bf6532e 100644
--- a/include/capture/xcomposite.h
+++ b/include/capture/xcomposite.h
@@ -8,9 +8,7 @@ typedef struct {
     gsr_egl *egl;
     unsigned long window;
     bool follow_focused; /* If this is set then |window| is ignored */
-    gsr_color_range color_range;
     bool record_cursor;
-    gsr_color_depth color_depth;
     vec2i output_resolution;
 } gsr_capture_xcomposite_params;
 
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 */