zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove workaround for libyuv::CopyPlane zero-height crash

Browse Source 
The libyuv fix for this issue was submitted > 2 months ago so it
should be safe to remove the workaround from webrtc.

Bug: chromium:1330019
Change-Id: Ibcf3818739673005e40d7ef9917c5f5692c50df4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/272861
Commit-Queue: Joe Downing <joedow@google.com>
Reviewed-by: Alexander Cooper <alcooper@chromium.org>
Cr-Commit-Position: refs/heads/main@{#37895}
This commit is contained in:
Joe Downing
2022-08-24 13:41:17 -07:00
committed by WebRTC LUCI CQ
parent 0bd166530d
commit ee9d41a439
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/desktop_capture/desktop_frame.cc
View File

@ -45,13 +45,9 @@ void DesktopFrame::CopyPixelsFrom(const uint8_t* src_buffer,
RTC_CHECK(DesktopRect::MakeSize(size()).ContainsRect(dest_rect));
uint8_t* dest = GetFrameDataAtPos(dest_rect.top_left());
// TODO(crbug.com/1330019): Temporary workaround for a known libyuv crash when
// the height or width is 0. Remove this once this change has been merged.
if (dest_rect.width() && dest_rect.height()) {
libyuv::CopyPlane(src_buffer, src_stride, dest, stride(),
DesktopFrame::kBytesPerPixel * dest_rect.width(),
dest_rect.height());
}
libyuv::CopyPlane(src_buffer, src_stride, dest, stride(),
DesktopFrame::kBytesPerPixel * dest_rect.width(),
dest_rect.height());
}
void DesktopFrame::CopyPixelsFrom(const DesktopFrame& src_frame,