admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clear DesktopFrame in DxgiFrame to avoid legacy image

Browse Source 
Once the buffer returned by Windows is not newly allocated, it may contain
legacy images from previous capturing attempts. This usually is not a problem,
as implementations other than ScreenCapturerWinDirectx paint each pixel on the
frame. But due to the one capturer per monitor design of
ScreenCapturerWinDirectx, part of the frame may not be covered by any
DxgiOutputDuplicator, and cause the legacy image to be shown.
So a very simple fix is to clear the DesktopFrame in DxgiFrame.

BUG=708766

Review-Url: https://codereview.webrtc.org/2827983007
Cr-Commit-Position: refs/heads/master@{#17847}
This commit is contained in:
zijiehe 2017-04-24 11:50:05 -07:00 committed by Commit bot
parent d8868637ee
commit 9d1ea5cc22
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/modules/desktop_capture/win/dxgi_frame.cc
View File

@ -10,6 +10,8 @@
#include "webrtc/modules/desktop_capture/win/dxgi_frame.h"
#include <string.h>
#include <utility>
#include "webrtc/base/checks.h"
@ -46,6 +48,13 @@ bool DxgiFrame::Prepare(DesktopSize size, DesktopCapturer::SourceId source_id) {
if (!frame) {
return false;
}
// DirectX capturer won't paint each pixel in the frame due to its one
// capturer per monitor design. So once the new frame is created, we should
// clear it to avoid the legacy image to be remained on it. See
// http://crbug.com/708766.
RTC_DCHECK_EQ(frame->stride(),
frame->size().width() * DesktopFrame::kBytesPerPixel);
memset(frame->data(), 0, frame->stride() * frame->size().height());
frame_ = SharedDesktopFrame::Wrap(std::move(frame));
}