YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2026-03-29 21:15:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] fix X11 odd-size captures by aligning dimensions to even values

Browse Source
This commit is contained in:
dijunkun
2026-03-24 00:07:44 +08:00
parent eca68f6c7a
commit eee6c588bd
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/screen_capturer/linux/screen_capturer_x11.cpp
View File

@@ -121,8 +121,16 @@ int ScreenCapturerX11::Init(const int fps, cb_desktop_data cb) {
width_ = attr.width; width_ = attr.width;
height_ = attr.height; height_ = attr.height;
if (width_ % 2 != 0 || height_ % 2 != 0) { if ((width_ & 1) != 0 || (height_ & 1) != 0) {
LOG_ERROR("Width and height must be even numbers"); LOG_WARN(
"X11 root size {}x{} is not even, aligning down to {}x{} for NV12",
width_, height_, width_ & ~1, height_ & ~1);
width_ &= ~1;
height_ &= ~1;
}
if (width_ <= 1 || height_ <= 1) {
LOG_ERROR("Invalid capture size after alignment: {}x{}", width_, height_);
return -2; return -2;
} }
@@ -289,6 +297,16 @@ void ScreenCapturerX11::OnFrame() {
src_argb = reinterpret_cast<uint8_t*>(image->data); src_argb = reinterpret_cast<uint8_t*>(image->data);
} }
const size_t y_size =
static_cast<size_t>(width_) * static_cast<size_t>(height_);
const size_t uv_size = y_size / 2;
if (y_plane_.size() != y_size) {
y_plane_.resize(y_size);
}
if (uv_plane_.size() != uv_size) {
uv_plane_.resize(uv_size);
}
libyuv::ARGBToNV12(src_argb, width_ * 4, y_plane_.data(), width_, libyuv::ARGBToNV12(src_argb, width_ * 4, y_plane_.data(), width_,
uv_plane_.data(), width_, width_, height_); uv_plane_.data(), width_, width_, height_);