From 112640282d236587dff0fd09e5137bfbc4cfec06 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sat, 26 Oct 2024 20:57:57 +0200 Subject: Add option to change output resolution (-s) --- include/capture/kms.h | 1 + include/capture/nvfbc.h | 1 + include/capture/portal.h | 1 + include/capture/xcomposite.h | 2 +- include/utils.h | 2 ++ include/vec2.h | 4 ++++ 6 files changed, 10 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/capture/kms.h b/include/capture/kms.h index 646928e..bf1ba62 100644 --- a/include/capture/kms.h +++ b/include/capture/kms.h @@ -11,6 +11,7 @@ typedef struct { bool hdr; bool record_cursor; int fps; + vec2i output_resolution; } 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 95ca88d..f291f33 100644 --- a/include/capture/nvfbc.h +++ b/include/capture/nvfbc.h @@ -15,6 +15,7 @@ typedef struct { gsr_color_range color_range; bool record_cursor; bool use_software_video_encoder; + vec2i output_resolution; } 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 2e2c6f2..3989b98 100644 --- a/include/capture/portal.h +++ b/include/capture/portal.h @@ -11,6 +11,7 @@ typedef struct { 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); diff --git a/include/capture/xcomposite.h b/include/capture/xcomposite.h index 8c87404..45eb481 100644 --- a/include/capture/xcomposite.h +++ b/include/capture/xcomposite.h @@ -8,10 +8,10 @@ typedef struct { gsr_egl *egl; 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; gsr_color_depth color_depth; + vec2i output_resolution; } gsr_capture_xcomposite_params; gsr_capture* gsr_capture_xcomposite_create(const gsr_capture_xcomposite_params *params); diff --git a/include/utils.h b/include/utils.h index 92eb851..9ccd26e 100644 --- a/include/utils.h +++ b/include/utils.h @@ -51,4 +51,6 @@ bool video_codec_context_is_vaapi(AVCodecContext *video_codec_context); bool vaapi_copy_drm_planes_to_video_surface(AVCodecContext *video_codec_context, AVFrame *video_frame, vec2i source_pos, vec2i source_size, vec2i dest_pos, vec2i dest_size, uint32_t format, vec2i size, const int *fds, const uint32_t *offsets, const uint32_t *pitches, const uint64_t *modifiers, int num_planes); bool vaapi_copy_egl_image_to_video_surface(gsr_egl *egl, EGLImage image, vec2i source_pos, vec2i source_size, vec2i dest_pos, vec2i dest_size, AVCodecContext *video_codec_context, AVFrame *video_frame); +vec2i scale_keep_aspect_ratio(vec2i from, vec2i to); + #endif /* GSR_UTILS_H */ diff --git a/include/vec2.h b/include/vec2.h index 3e33cfb..8fd3858 100644 --- a/include/vec2.h +++ b/include/vec2.h @@ -9,4 +9,8 @@ typedef struct { float x, y; } vec2f; +typedef struct { + double x, y; +} vec2d; + #endif /* VEC2_H */ -- cgit v1.2.3