Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

browser(ff-beta): fix screencast (#8033)

Browse source 
Both `libyuv::I420Copy` and `libyuv::I420Scale` support image cropping
by offsetting coordinates inside planes, but offsets must be even
numbers.

References #7998
This commit is contained in:
Andrey Lushnikov 2021-08-06 18:01:43 +03:00 committed by GitHub
parent 7ee92f3fc8
commit a515a2538e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
browser_patches/firefox-beta/BUILD_NUMBER
View file

@ -1,2 +1,2 @@
1273 1274
Changed: lushnikov@chromium.org Tue 03 Aug 2021 08:57:45 AM PDT Changed: lushnikov@chromium.org Fri 06 Aug 2021 07:58:41 AM PDT

15
browser_patches/firefox-beta/juggler/screencast/ScreencastEncoder.cpp
View file

@ -135,6 +135,9 @@ public:
double src_width = src->width() - m_margin.LeftRight(); double src_width = src->width() - m_margin.LeftRight();
double src_height = src->height() - m_margin.top; double src_height = src->height() - m_margin.top;
// YUV offsets must be even.
int yuvTopOffset = m_margin.top & 1 ? m_margin.top + 1 : m_margin.top;
int yuvLeftOffset = m_margin.left & 1 ? m_margin.left + 1 : m_margin.left;
if (src_width > image->w || src_height > image->h) { if (src_width > image->w || src_height > image->h) {
double scale = std::min(image->w / src_width, image->h / src_height); double scale = std::min(image->w / src_width, image->h / src_height);
@ -148,9 +151,9 @@ public:
src_height *= image->h / dst_height; src_height *= image->h / dst_height;
dst_height = image->h; dst_height = image->h;
} }
libyuv::I420Scale(src->DataY() + m_margin.top * src->StrideY() + m_margin.left, src->StrideY(), libyuv::I420Scale(src->DataY() + yuvTopOffset * src->StrideY() + yuvLeftOffset, src->StrideY(),
src->DataU() + (m_margin.top * src->StrideU() + m_margin.left) / 2, src->StrideU(), src->DataU() + (yuvTopOffset * src->StrideU() + yuvLeftOffset) / 2, src->StrideU(),
src->DataV() + (m_margin.top * src->StrideV() + m_margin.left) / 2, src->StrideV(), src->DataV() + (yuvTopOffset * src->StrideV() + yuvLeftOffset) / 2, src->StrideV(),
src_width, src_height, src_width, src_height,
y_data, y_stride, y_data, y_stride,
u_data, uv_stride, u_data, uv_stride,
@ -161,9 +164,9 @@ public:
int width = std::min<int>(image->w, src_width); int width = std::min<int>(image->w, src_width);
int height = std::min<int>(image->h, src_height); int height = std::min<int>(image->h, src_height);
libyuv::I420Copy(src->DataY() + m_margin.top * src->StrideY() + m_margin.left, src->StrideY(), libyuv::I420Copy(src->DataY() + yuvTopOffset * src->StrideY() + yuvLeftOffset, src->StrideY(),
src->DataU() + (m_margin.top * src->StrideU() + m_margin.left) / 2, src->StrideU(), src->DataU() + (yuvTopOffset * src->StrideU() + yuvLeftOffset) / 2, src->StrideU(),
src->DataV() + (m_margin.top * src->StrideV() + m_margin.left) / 2, src->StrideV(), src->DataV() + (yuvTopOffset * src->StrideV() + yuvLeftOffset) / 2, src->StrideV(),
y_data, y_stride, y_data, y_stride,
u_data, uv_stride, u_data, uv_stride,
v_data, uv_stride, v_data, uv_stride,