5d910286e1
Previously raw pointers were used for owned DesktopFrame instances. Updated all screen and window capturer implementations to use std::unique_ptr<>. Also includes some other cleanups in the capturers: - s/NULL/nullptr - moved default initializers to class definition. BUG=webrtc:5950 Review-Url: https://codereview.webrtc.org/1988783003 Cr-Commit-Position: refs/heads/master@{#13058}
51 lines
1.5 KiB
C++
51 lines
1.5 KiB
C++
/*
|
|
* Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include <memory>
|
|
|
|
#include "webrtc/modules/desktop_capture/cropped_desktop_frame.h"
|
|
|
|
#include "webrtc/base/constructormagic.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// A DesktopFrame that is a sub-rect of another DesktopFrame.
|
|
class CroppedDesktopFrame : public DesktopFrame {
|
|
public:
|
|
CroppedDesktopFrame(std::unique_ptr<DesktopFrame> frame,
|
|
const DesktopRect& rect);
|
|
|
|
private:
|
|
std::unique_ptr<DesktopFrame> frame_;
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(CroppedDesktopFrame);
|
|
};
|
|
|
|
std::unique_ptr<DesktopFrame> CreateCroppedDesktopFrame(
|
|
std::unique_ptr<DesktopFrame> frame,
|
|
const DesktopRect& rect) {
|
|
if (!DesktopRect::MakeSize(frame->size()).ContainsRect(rect))
|
|
return nullptr;
|
|
|
|
return std::unique_ptr<DesktopFrame>(
|
|
new CroppedDesktopFrame(std::move(frame), rect));
|
|
}
|
|
|
|
CroppedDesktopFrame::CroppedDesktopFrame(std::unique_ptr<DesktopFrame> frame,
|
|
const DesktopRect& rect)
|
|
: DesktopFrame(rect.size(),
|
|
frame->stride(),
|
|
frame->GetFrameDataAtPos(rect.top_left()),
|
|
frame->shared_memory()) {
|
|
frame_ = std::move(frame);
|
|
}
|
|
|
|
} // namespace webrtc
|