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

Do not crop DesktopFrame if the size won't change

Browse Source 
CreateCroppedDesktopFrame() does not need to create a CroppedDesktopFrame if the
size won't change.

Bug: webrtc:8039
Change-Id: Ie6789a4b473b69bced94c4a25a68f1da6bb3510e
Reviewed-on: https://chromium-review.googlesource.com/587808
Commit-Queue: Zijie He <zijiehe@chromium.org>
Reviewed-by: Jamie Walch <jamiewalch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#19163}
This commit is contained in:
Zijie He 2017-07-26 17:52:38 -07:00 committed by Commit Bot
parent 2059bb3e4b
commit 9c0914f938
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/modules/desktop_capture/cropped_desktop_frame.cc
View File

@ -12,6 +12,7 @@
#include "webrtc/modules/desktop_capture/cropped_desktop_frame.h"
#include "webrtc/rtc_base/checks.h"
#include "webrtc/rtc_base/constructormagic.h"
namespace webrtc {
@ -31,8 +32,15 @@ class CroppedDesktopFrame : public DesktopFrame {
std::unique_ptr<DesktopFrame> CreateCroppedDesktopFrame(
std::unique_ptr<DesktopFrame> frame,
const DesktopRect& rect) {
if (!DesktopRect::MakeSize(frame->size()).ContainsRect(rect))
RTC_DCHECK(frame);
if (!DesktopRect::MakeSize(frame->size()).ContainsRect(rect)) {
return nullptr;
}
if (frame->size().equals(rect.size())) {
return frame;
}
return std::unique_ptr<DesktopFrame>(
new CroppedDesktopFrame(std::move(frame), rect));

4
webrtc/modules/desktop_capture/cropped_desktop_frame.h
View File

@ -15,6 +15,10 @@
namespace webrtc {
// Creates a DesktopFrame to contain only the area of |rect| in the original
// |frame|.
// |frame| should not be nullptr. |rect| is in |frame| coordinate, i.e.
// |frame|->top_left() does not impact the area of |rect|.
// Returns nullptr frame if |rect| is not contained by the bounds of |frame|.
std::unique_ptr<DesktopFrame> CreateCroppedDesktopFrame(
std::unique_ptr<DesktopFrame> frame,