From b9fa7f2fa25ee37c87077bce468c95e48fce5c18 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Fri, 5 Jul 2024 01:59:04 +0200 Subject: Separate video encoding method from capture method With this instead of kms_cuda/kms_vaapi/kms_software and xcomposite_cuda/xcomposite_vaapi/xcomposite_software there is now only kms and xcomposite. --- include/capture/capture.h | 50 ++++++----------------------------- include/capture/kms.h | 50 ++++++----------------------------- include/capture/kms_cuda.h | 19 ------------- include/capture/kms_software.h | 19 ------------- include/capture/kms_vaapi.h | 19 ------------- include/capture/xcomposite.h | 43 ++---------------------------- include/capture/xcomposite_cuda.h | 14 ---------- include/capture/xcomposite_software.h | 13 --------- include/capture/xcomposite_vaapi.h | 13 --------- 9 files changed, 18 insertions(+), 222 deletions(-) delete mode 100644 include/capture/kms_cuda.h delete mode 100644 include/capture/kms_software.h delete mode 100644 include/capture/kms_vaapi.h delete mode 100644 include/capture/xcomposite_cuda.h delete mode 100644 include/capture/xcomposite_software.h delete mode 100644 include/capture/xcomposite_vaapi.h (limited to 'include/capture') diff --git a/include/capture/capture.h b/include/capture/capture.h index 8c654f4..026a955 100644 --- a/include/capture/capture.h +++ b/include/capture/capture.h @@ -6,15 +6,6 @@ typedef struct AVCodecContext AVCodecContext; 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 gsr_capture gsr_capture; struct gsr_capture { @@ -23,49 +14,24 @@ struct gsr_capture { 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 */ - bool (*should_stop)(gsr_capture *cap, bool *err); /* can be NULL */ - int (*capture)(gsr_capture *cap, AVFrame *frame); + 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 */ void (*destroy)(gsr_capture *cap, AVCodecContext *video_codec_context); 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); 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 */ +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); 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); -bool gsr_capture_base_setup_textures(gsr_capture_base *self, AVFrame *frame, gsr_color_range color_range, gsr_source_color source_color, bool hdr, bool cursor_texture_is_external); -void gsr_capture_base_stop(gsr_capture_base *self); - -bool vaapi_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); - #endif /* GSR_CAPTURE_CAPTURE_H */ diff --git a/include/capture/kms.h b/include/capture/kms.h index 674813a..278a391 100644 --- a/include/capture/kms.h +++ b/include/capture/kms.h @@ -2,49 +2,15 @@ #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 - -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; /* if this is "screen", then the first monitor is captured. A copy is made of this */ + gsr_color_range color_range; + bool hdr; + bool record_cursor; +} 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_software.h b/include/capture/kms_software.h deleted file mode 100644 index f9b57f3..0000000 --- a/include/capture/kms_software.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef GSR_CAPTURE_KMS_SOFTWARE_H -#define GSR_CAPTURE_KMS_SOFTWARE_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_software_params; - -gsr_capture* gsr_capture_kms_software_create(const gsr_capture_kms_software_params *params); - -#endif /* GSR_CAPTURE_KMS_SOFTWARE_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/xcomposite.h b/include/capture/xcomposite.h index 27b289a..707421f 100644 --- a/include/capture/xcomposite.h +++ b/include/capture/xcomposite.h @@ -2,15 +2,11 @@ #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; @@ -18,41 +14,6 @@ typedef struct { bool track_damage; } 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; - - int damage_event; - int damage_error; - XID damage; - bool damaged; -} 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_is_damaged(gsr_capture_xcomposite *self); -void gsr_capture_xcomposite_clear_damage(gsr_capture_xcomposite *self); -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_software.h b/include/capture/xcomposite_software.h deleted file mode 100644 index d41083c..0000000 --- a/include/capture/xcomposite_software.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef GSR_CAPTURE_XCOMPOSITE_SOFTWARE_H -#define GSR_CAPTURE_XCOMPOSITE_SOFTWARE_H - -#include "capture.h" -#include "xcomposite.h" - -typedef struct { - gsr_capture_xcomposite_params base; -} gsr_capture_xcomposite_software_params; - -gsr_capture* gsr_capture_xcomposite_software_create(const gsr_capture_xcomposite_software_params *params); - -#endif /* GSR_CAPTURE_XCOMPOSITE_SOFTWARE_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 */ -- cgit v1.2.3