GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-28 23:13:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

vo_kitty: do not add trailing NULL byte in payload

Browse Source 
In the past `strlen` was used in the write function, which omitted the
trailing NULL byte, however with the addition of `bstr` API the NULL
byte produced by `av_base64_encode` in the output is also written to
stdout, this causes terminals (namely Ghostty) to not display the frame.

There was also an additional edge case where if the entire output is
less than 4096 bytes the finishing escape sequence `\033_Gm=0;` was
never emitted. Adding a check for this after the for loop fixes this
behavior.
This commit is contained in:
한승민
2025-03-26 18:25:49 +01:00
committed by Kacper Michajłow
parent d9dc84c0fc
commit 8edabd5644
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
video/out/vo_kitty.c
+16 -3
View File
@@ -346,19 +346,32 @@ static void flip_page(struct vo *vo)
DCS_GUARD_APPEND(p, bstr_xappend_asprintf(NULL, &p->cmd, KITTY_ESC_IMG,
p->width, p->height));
for (int offset = 0; offset < p->output_size; ) {
int chunk = MPMIN(4096, p->output_size - offset);
int output_size = p->output_size - 1;
int offset = 0;
for (; offset < output_size; ) {
int chunk = MPMIN(4096, output_size - offset);
if (offset > 0)
DCS_GUARD_APPEND(p, bstr_xappend_asprintf(NULL, &p->cmd,
KITTY_ESC_CONTINUE,
offset + chunk < p->output_size));
offset + chunk < output_size));
// Append at max chunk bytes
bstr_xappend(NULL, &p->cmd, (bstr){p->output + offset, chunk});
DCS_GUARD_APPEND(p, bstr_xappend(NULL, &p->cmd, KITTY_ESC_END));
offset += chunk;
}
// When the data is less than or equal to chunk size the final packet
// isn't sent, i.e. an escape sequence with `m=0`.
// This ensures that an escape sequence with `m=0` is sent and
// terminals stay happy
if (offset == 0) {
DCS_GUARD_APPEND(p, bstr_xappend_asprintf(NULL, &p->cmd,
KITTY_ESC_CONTINUE, 0));
DCS_GUARD_APPEND(p, bstr_xappend(NULL, &p->cmd, KITTY_ESC_END));
}
}
write_bstr(p->cmd);