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 kms capture getting stuck if more than 1 fd per plane

Browse Source
This commit is contained in:
dec05eba
2024-07-23 17:28:03 +02:00
parent 7e07ad1b6e
commit 91485ba75d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kms/client/kms_client.c
View File

@@ -88,7 +88,7 @@ static int recv_msg_from_server(int server_pid, int server_fd, gsr_kms_response
response_message.msg_iov = &iov; response_message.msg_iov = &iov;
response_message.msg_iovlen = 1; response_message.msg_iovlen = 1;
char cmsgbuf[CMSG_SPACE(sizeof(int) * GSR_KMS_MAX_ITEMS)]; char cmsgbuf[CMSG_SPACE(sizeof(int) * GSR_KMS_MAX_ITEMS * GSR_KMS_MAX_DMA_BUFS)];
memset(cmsgbuf, 0, sizeof(cmsgbuf)); memset(cmsgbuf, 0, sizeof(cmsgbuf));
response_message.msg_control = cmsgbuf; response_message.msg_control = cmsgbuf;
response_message.msg_controllen = sizeof(cmsgbuf); response_message.msg_controllen = sizeof(cmsgbuf);

7
kms/server/kms_server.c
View File

@@ -54,17 +54,18 @@ static int send_msg_to_client(int client_fd, gsr_kms_response *response) {
response_message.msg_iov = &iov; response_message.msg_iov = &iov;
response_message.msg_iovlen = 1; response_message.msg_iovlen = 1;
char cmsgbuf[CMSG_SPACE(sizeof(int) * max_int(1, response->num_items))]; const int num_fds = count_num_fds(response);
char cmsgbuf[CMSG_SPACE(sizeof(int) * max_int(1, num_fds))];
memset(cmsgbuf, 0, sizeof(cmsgbuf)); memset(cmsgbuf, 0, sizeof(cmsgbuf));
if(response->num_items > 0) { if(num_fds > 0) {
response_message.msg_control = cmsgbuf; response_message.msg_control = cmsgbuf;
response_message.msg_controllen = sizeof(cmsgbuf); response_message.msg_controllen = sizeof(cmsgbuf);
struct cmsghdr *cmsg = CMSG_FIRSTHDR(&response_message); struct cmsghdr *cmsg = CMSG_FIRSTHDR(&response_message);
cmsg->cmsg_level = SOL_SOCKET; cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS; cmsg->cmsg_type = SCM_RIGHTS;
cmsg->cmsg_len = CMSG_LEN(sizeof(int) * count_num_fds(response)); cmsg->cmsg_len = CMSG_LEN(sizeof(int) * num_fds);
int *fds = (int*)CMSG_DATA(cmsg); int *fds = (int*)CMSG_DATA(cmsg);
int fd_index = 0; int fd_index = 0;