5 files changed, 36 insertions, 9 deletions
diff --git a/include/capture/capture.h b/include/capture/capture.h
index 026a955..7c8887d 100644
--- a/include/capture/capture.h
+++ b/include/capture/capture.h
@@ -3,22 +3,29 @@
 
 #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 gsr_capture gsr_capture;
+typedef struct AVMasteringDisplayMetadata AVMasteringDisplayMetadata;
+typedef struct AVContentLightMetadata AVContentLightMetadata;
 
 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 (*is_damaged)(gsr_capture *cap); /* can be NULL */
-    void (*clear_damage)(gsr_capture *cap); /* can be NULL */
+    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);
-    void (*capture_end)(gsr_capture *cap, AVFrame *frame); /* can be NULL */
     gsr_source_color (*get_source_color)(gsr_capture *cap);
     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 *priv; /* can be NULL */
@@ -26,12 +33,13 @@ struct gsr_capture {
 };
 
 int gsr_capture_start(gsr_capture *cap, AVCodecContext *video_codec_context, AVFrame *frame);
-void gsr_capture_tick(gsr_capture *cap, AVCodecContext *video_codec_context);
+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);
-void gsr_capture_capture_end(gsr_capture *cap, AVFrame *frame);
 gsr_source_color gsr_capture_get_source_color(gsr_capture *cap);
 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);
 
 #endif /* GSR_CAPTURE_CAPTURE_H */
diff --git a/include/capture/kms.h b/include/capture/kms.h
index 278a391..646928e 100644
--- a/include/capture/kms.h
+++ b/include/capture/kms.h
@@ -6,9 +6,11 @@
 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;
     bool hdr;
     bool record_cursor;
+    int fps;
 } 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 e24b712..95ca88d 100644
--- a/include/capture/nvfbc.h
+++ b/include/capture/nvfbc.h
@@ -11,8 +11,7 @@ typedef struct {
     vec2i pos;
     vec2i size;
     bool direct_capture;
-    bool overclock;
-    bool hdr;
+    gsr_color_depth color_depth;
     gsr_color_range color_range;
     bool record_cursor;
     bool use_software_video_encoder;
diff --git a/include/capture/portal.h b/include/capture/portal.h
new file mode 100644
index 0000000..2e2c6f2
--- /dev/null
+++ b/include/capture/portal.h
@@ -0,0 +1,18 @@
+#ifndef GSR_CAPTURE_PORTAL_H
+#define GSR_CAPTURE_PORTAL_H
+
+#include "capture.h"
+
+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) */
+    const char *portal_session_token_filepath;
+} 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 707421f..8c87404 100644
--- a/include/capture/xcomposite.h
+++ b/include/capture/xcomposite.h
@@ -11,7 +11,7 @@ typedef struct {
     vec2i region_size; /* This is currently only used with |follow_focused| */
     gsr_color_range color_range;
     bool record_cursor;
-    bool track_damage;
+    gsr_color_depth color_depth;
 } gsr_capture_xcomposite_params;
 
 gsr_capture* gsr_capture_xcomposite_create(const gsr_capture_xcomposite_params *params);