b4c7b8365d
Reason for revert: Broke chromium builder Original issue's description: > Use std::unique_ptr<> to pass frame ownership in DesktopCapturer impls. > > 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 > > Committed: https://crrev.com/4a627a8c13554d12412cabb8f751caee6e61ee32 > Cr-Commit-Position: refs/heads/master@{#13032} TBR=wez@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5950 Review-Url: https://codereview.webrtc.org/2030333003 Cr-Commit-Position: refs/heads/master@{#13033}
51 lines
1.5 KiB
C++
51 lines
1.5 KiB
C++
/*
|
|
* Copyright (c) 2013 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.
|
|
*/
|
|
|
|
#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_
|
|
#define WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_
|
|
|
|
#include "webrtc/base/constructormagic.h"
|
|
#include "webrtc/base/scoped_ref_ptr.h"
|
|
#include "webrtc/modules/desktop_capture/desktop_frame.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// SharedDesktopFrame is a DesktopFrame that may have multiple instances all
|
|
// sharing the same buffer.
|
|
class SharedDesktopFrame : public DesktopFrame {
|
|
public:
|
|
virtual ~SharedDesktopFrame();
|
|
|
|
static SharedDesktopFrame* Wrap(DesktopFrame* desktop_frame);
|
|
|
|
// Returns the underlying instance of DesktopFrame.
|
|
DesktopFrame* GetUnderlyingFrame();
|
|
|
|
// Creates a clone of this object.
|
|
SharedDesktopFrame* Share();
|
|
|
|
// Checks if the frame is currently shared. If it returns false it's
|
|
// guaranteed that there are no clones of the object.
|
|
bool IsShared();
|
|
|
|
private:
|
|
class Core;
|
|
|
|
SharedDesktopFrame(rtc::scoped_refptr<Core> core);
|
|
|
|
rtc::scoped_refptr<Core> core_;
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(SharedDesktopFrame);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_
|