public/gpu-screen-recorder
1
0
Fork 0
mirror of https://repo.dec05eba.com/gpu-screen-recorder synced 2026-03-31 09:07:13 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix build issues on older ffmpeg (disable unused vulkan encoder for now), fix incorrect wayland protocol file

Browse Source
This commit is contained in:
dec05eba
2025-04-25 11:14:40 +02:00
parent 06b559ecef
commit b4bbed2402
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
protocol/xdg-output-unstable-v1.xml
View File

@@ -151,7 +151,7 @@
summary="height in global compositor space"/> summary="height in global compositor space"/>
</event> </event>
<event name="done" deprecated-since="3"> <event name="done">
<description summary="all information about the output have been sent"> <description summary="all information about the output have been sent">
This event is sent after all other properties of an xdg_output This event is sent after all other properties of an xdg_output
have been sent. have been sent.

7
src/encoder/video/vulkan.c
View File

@@ -23,7 +23,7 @@ static bool gsr_video_encoder_vulkan_setup_context(gsr_video_encoder_vulkan *sel
AVDictionary *options = NULL; AVDictionary *options = NULL;
//av_dict_set(&options, "linear_images", "1", 0); //av_dict_set(&options, "linear_images", "1", 0);
//av_dict_set(&options, "disable_multiplane", "1", 0); //av_dict_set(&options, "disable_multiplane", "1", 0);
#if 0
// TODO: Use correct device // TODO: Use correct device
if(av_hwdevice_ctx_create(&self->device_ctx, AV_HWDEVICE_TYPE_VULKAN, NULL, options, 0) < 0) { if(av_hwdevice_ctx_create(&self->device_ctx, AV_HWDEVICE_TYPE_VULKAN, NULL, options, 0) < 0) {
fprintf(stderr, "gsr error: gsr_video_encoder_vulkan_setup_context: failed to create hardware device context\n"); fprintf(stderr, "gsr error: gsr_video_encoder_vulkan_setup_context: failed to create hardware device context\n");
@@ -57,6 +57,7 @@ static bool gsr_video_encoder_vulkan_setup_context(gsr_video_encoder_vulkan *sel
video_codec_context->hw_frames_ctx = av_buffer_ref(frame_context); video_codec_context->hw_frames_ctx = av_buffer_ref(frame_context);
av_buffer_unref(&frame_context); av_buffer_unref(&frame_context);
#endif
return true; return true;
} }
@@ -99,7 +100,7 @@ static bool gsr_video_encoder_vulkan_setup_textures(gsr_video_encoder_vulkan *se
} }
while(self->params.egl->glGetError()) {} while(self->params.egl->glGetError()) {}
#if 0
AVVkFrame *target_surface_id = (AVVkFrame*)frame->data[0]; AVVkFrame *target_surface_id = (AVVkFrame*)frame->data[0];
AVVulkanDeviceContext* vv = video_codec_context_get_vulkan_data(video_codec_context); AVVulkanDeviceContext* vv = video_codec_context_get_vulkan_data(video_codec_context);
const size_t luma_size = frame->width * frame->height; const size_t luma_size = frame->width * frame->height;
@@ -224,7 +225,7 @@ static bool gsr_video_encoder_vulkan_setup_textures(gsr_video_encoder_vulkan *se
fprintf(stderr, "3 gl error: %d\n", self->params.egl->glGetError()); fprintf(stderr, "3 gl error: %d\n", self->params.egl->glGetError());
self->params.egl->glBindTexture(GL_TEXTURE_2D, 0); self->params.egl->glBindTexture(GL_TEXTURE_2D, 0);
} }
#endif
return true; return true;
} }

2
src/main.cpp
View File

@@ -3618,7 +3618,6 @@ int main(int argc, char **argv) {
if(force_iframe_frame) { if(force_iframe_frame) {
video_frame->pict_type = AV_PICTURE_TYPE_I; video_frame->pict_type = AV_PICTURE_TYPE_I;
video_frame->flags |= AV_FRAME_FLAG_KEY;
} }
int ret = avcodec_send_frame(video_codec_context, video_frame); int ret = avcodec_send_frame(video_codec_context, video_frame);
@@ -3632,7 +3631,6 @@ int main(int argc, char **argv) {
if(force_iframe_frame) { if(force_iframe_frame) {
force_iframe_frame = false; force_iframe_frame = false;
video_frame->pict_type = AV_PICTURE_TYPE_NONE; video_frame->pict_type = AV_PICTURE_TYPE_NONE;
video_frame->flags &= ~AV_FRAME_FLAG_KEY;
} }
} }