diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/capture/capture.h | 4 | ||||
| -rw-r--r-- | include/color_conversion.h | 3 | ||||
| -rw-r--r-- | include/pipewire_audio.h | 108 | ||||
| -rw-r--r-- | include/sound.hpp | 21 | ||||
| -rw-r--r-- | include/utils.h | 2 |
5 files changed, 130 insertions, 8 deletions
diff --git a/include/capture/capture.h b/include/capture/capture.h index 7c8887d..dc5b7ac 100644 --- a/include/capture/capture.h +++ b/include/capture/capture.h @@ -9,9 +9,9 @@ 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; +typedef struct gsr_capture gsr_capture; struct gsr_capture { /* These methods should not be called manually. Call gsr_capture_* instead */ @@ -20,7 +20,6 @@ struct gsr_capture { 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); - 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 */ @@ -37,7 +36,6 @@ 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); -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); diff --git a/include/color_conversion.h b/include/color_conversion.h index 236bfbd..c079edd 100644 --- a/include/color_conversion.h +++ b/include/color_conversion.h @@ -33,7 +33,6 @@ typedef struct { typedef struct { gsr_egl *egl; - gsr_source_color source_color; gsr_destination_color destination_color; unsigned int destination_textures[2]; @@ -57,7 +56,7 @@ typedef struct { int gsr_color_conversion_init(gsr_color_conversion *self, const gsr_color_conversion_params *params); void gsr_color_conversion_deinit(gsr_color_conversion *self); -void gsr_color_conversion_draw(gsr_color_conversion *self, unsigned int texture_id, vec2i source_pos, vec2i source_size, vec2i texture_pos, vec2i texture_size, float rotation, bool external_texture); +void gsr_color_conversion_draw(gsr_color_conversion *self, unsigned int texture_id, vec2i source_pos, vec2i source_size, vec2i texture_pos, vec2i texture_size, float rotation, bool external_texture, gsr_source_color source_color); void gsr_color_conversion_clear(gsr_color_conversion *self); #endif /* GSR_COLOR_CONVERSION_H */ diff --git a/include/pipewire_audio.h b/include/pipewire_audio.h index ae14cb3..8cfb2d2 100644 --- a/include/pipewire_audio.h +++ b/include/pipewire_audio.h @@ -1,4 +1,112 @@ #ifndef GSR_PIPEWIRE_AUDIO_H #define GSR_PIPEWIRE_AUDIO_H +#include <pipewire/thread-loop.h> +#include <pipewire/context.h> +#include <pipewire/core.h> +#include <spa/utils/hook.h> + +#include <stdbool.h> + +#define GSR_PIPEWIRE_AUDIO_MAX_STREAM_NODES 64 +#define GSR_PIPEWIRE_AUDIO_MAX_PORTS 64 +#define GSR_PIPEWIRE_AUDIO_MAX_REQUESTED_LINKS 32 + +typedef enum { + GSR_PIPEWIRE_AUDIO_NODE_TYPE_STREAM_OUTPUT, /* Application audio */ + GSR_PIPEWIRE_AUDIO_NODE_TYPE_STREAM_INPUT, /* Audio recording input */ + GSR_PIPEWIRE_AUDIO_NODE_TYPE_SINK +} gsr_pipewire_audio_node_type; + +typedef struct { + uint32_t id; + char *name; + gsr_pipewire_audio_node_type type; +} gsr_pipewire_audio_node; + +typedef enum { + GSR_PIPEWIRE_AUDIO_PORT_DIRECTION_INPUT, + GSR_PIPEWIRE_AUDIO_PORT_DIRECTION_OUTPUT +} gsr_pipewire_audio_port_direction; + +typedef struct { + uint32_t id; + uint32_t node_id; + gsr_pipewire_audio_port_direction direction; + char *name; +} gsr_pipewire_audio_port; + +typedef enum { + GSR_PIPEWIRE_AUDIO_LINK_OUTPUT_TYPE_STREAM, + GSR_PIPEWIRE_AUDIO_LINK_OUTPUT_TYPE_SINK +} gsr_pipewire_audio_link_output_type; + +typedef struct { + char **app_names; + int num_app_names; + char *output_name; + bool inverted; + gsr_pipewire_audio_link_output_type output_type; +} gsr_pipewire_audio_requested_link; + +typedef struct { + struct pw_thread_loop *thread_loop; + struct pw_context *context; + struct pw_core *core; + struct spa_hook core_listener; + struct pw_registry *registry; + struct spa_hook registry_listener; + int server_version_sync; + + gsr_pipewire_audio_node stream_nodes[GSR_PIPEWIRE_AUDIO_MAX_STREAM_NODES]; + int num_stream_nodes; + + gsr_pipewire_audio_port ports[GSR_PIPEWIRE_AUDIO_MAX_PORTS]; + int num_ports; + + gsr_pipewire_audio_requested_link requested_links[GSR_PIPEWIRE_AUDIO_MAX_REQUESTED_LINKS]; + int num_requested_links; +} gsr_pipewire_audio; + +bool gsr_pipewire_audio_init(gsr_pipewire_audio *self); +void gsr_pipewire_audio_deinit(gsr_pipewire_audio *self); + +/* + This function links audio source outputs from applications that match the name |app_names_output| to the input + that matches the name |stream_name_input|. + If an application or a new application starts outputting audio after this function is called and the app name matches + then it will automatically link the audio sources. + |app_names_output| and |stream_name_input| are case-insensitive matches. +*/ +bool gsr_pipewire_audio_add_link_from_apps_to_stream(gsr_pipewire_audio *self, const char **app_names_output, int num_app_names_output, const char *stream_name_input); +/* + This function links audio source outputs from all applications except the ones that match the name |app_names_output| to the input + that matches the name |stream_name_input|. + If an application or a new application starts outputting audio after this function is called and the app name doesn't matche + then it will automatically link the audio sources. + |app_names_output| and |stream_name_input| are case-insensitive matches. +*/ +bool gsr_pipewire_audio_add_link_from_apps_to_stream_inverted(gsr_pipewire_audio *self, const char **app_names_output, int num_app_names_output, const char *stream_name_input); + +/* + This function links audio source outputs from applications that match the name |app_names_output| to the input + that matches the name |sink_name_input|. + If an application or a new application starts outputting audio after this function is called and the app name matches + then it will automatically link the audio sources. + |app_names_output| and |sink_name_input| are case-insensitive matches. +*/ +bool gsr_pipewire_audio_add_link_from_apps_to_sink(gsr_pipewire_audio *self, const char **app_names_output, int num_app_names_output, const char *sink_name_input); +/* + This function links audio source outputs from all applications except the ones that match the name |app_names_output| to the input + that matches the name |sink_name_input|. + If an application or a new application starts outputting audio after this function is called and the app name doesn't matche + then it will automatically link the audio sources. + |app_names_output| and |sink_name_input| are case-insensitive matches. +*/ +bool gsr_pipewire_audio_add_link_from_apps_to_sink_inverted(gsr_pipewire_audio *self, const char **app_names_output, int num_app_names_output, const char *sink_name_input); + +/* Return true to continue */ +typedef bool (*gsr_pipewire_audio_app_query_callback)(const char *app_name, void *userdata); +void gsr_pipewire_audio_for_each_app(gsr_pipewire_audio *self, gsr_pipewire_audio_app_query_callback callback, void *userdata); + #endif /* GSR_PIPEWIRE_AUDIO_H */ diff --git a/include/sound.hpp b/include/sound.hpp index 7bcc120..018ff4a 100644 --- a/include/sound.hpp +++ b/include/sound.hpp @@ -26,6 +26,11 @@ typedef struct { unsigned int frames; } SoundDevice; +enum class AudioInputType { + DEVICE, + APPLICATION +}; + struct AudioInput { std::string name; std::string description; @@ -37,8 +42,14 @@ struct AudioDevices { std::vector<AudioInput> audio_inputs; }; +struct ApplicationAudio { + std::string name; +}; + struct MergedAudioInputs { std::vector<AudioInput> audio_inputs; + AudioInputType type = AudioInputType::DEVICE; + bool inverted = false; }; typedef enum { @@ -48,12 +59,15 @@ typedef enum { } AudioFormat; /* - Get a sound device by name, returning the device into the @device parameter. - The device should be closed with @sound_device_close after it has been used - to clean up internal resources. + Get a sound device by name, returning the device into the |device| parameter. Returns 0 on success, or a negative value on failure. */ int sound_device_get_by_name(SoundDevice *device, const char *device_name, const char *description, unsigned int num_channels, unsigned int period_frame_size, AudioFormat audio_format); +/* + Creates a module-combine-sink and connects to it for recording, returning the device into the |device| parameter. + Returns 0 on success, or a negative value on failure. +*/ +int sound_device_create_combined_sink_connect(SoundDevice *device, const char *combined_sink_name, unsigned int num_channels, unsigned int period_frame_size, AudioFormat audio_format); void sound_device_close(SoundDevice *device); @@ -64,5 +78,6 @@ void sound_device_close(SoundDevice *device); int sound_device_read_next_chunk(SoundDevice *device, void **buffer, double timeout_sec, double *latency_seconds); AudioDevices get_pulseaudio_inputs(); +std::vector<ApplicationAudio> get_pulseaudio_applications(); #endif /* GPU_SCREEN_RECORDER_H */ diff --git a/include/utils.h b/include/utils.h index 9ccd26e..984b963 100644 --- a/include/utils.h +++ b/include/utils.h @@ -28,6 +28,8 @@ typedef struct { } get_monitor_by_name_userdata; double clock_get_monotonic_seconds(void); +bool generate_random_characters(char *buffer, int buffer_size, const char *alphabet, size_t alphabet_size); +bool generate_random_characters_standard_alphabet(char *buffer, int buffer_size); typedef void (*active_monitor_callback)(const gsr_monitor *monitor, void *userdata); void for_each_active_monitor_output_x11_not_cached(Display *display, active_monitor_callback callback, void *userdata); |