14665ff7d4
Clang version changed 223108:230914
Details: e144d30..6fdb142/tools/clang/scripts/update.sh
Removes the OVERRIDE macro defined in:
* webrtc/base/common.h
* webrtc/typedefs.h
The majority of the source changes were done by running this in src/:
perl -0pi -e "s/virtual\s([^({;]*(\([^({;]*\)[^({;]*))(OVERRIDE|override)/\1override/sg" `find {talk,webrtc} -name "*.h" -o -name "*.cc*" -o -name "*.mm*"`
which converted all:
virtual Foo() OVERRIDE
functions to:
Foo() override
Then I manually edited:
* talk/media/webrtc/fakewebrtccommon.h
* webrtc/test/fake_common.h
Remaining uses of OVERRIDE was fixed by search+replace.
Manual edits were done to fix virtual destructors that were
overriding inherited ones.
Finally a build error related to the pure virtual definitions of
Read, Write and Rewind in common_types.h required a bit of
refactoring in:
* webrtc/common_types.cc
* webrtc/common_types.h
* webrtc/system_wrappers/interface/file_wrapper.h
* webrtc/system_wrappers/source/file_impl.cc
This roll should make it possible for us to finally re-enable deadlock
detection for TSan on the buildbots.
BUG=4106
R=pbos@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/41069004
Cr-Commit-Position: refs/heads/master@{#8596}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8596 4adac7df-926f-26a2-2b94-8c16560cd09d
75 lines
2.8 KiB
C++
75 lines
2.8 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.
|
|
*/
|
|
|
|
#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_CROPPING_WINDOW_CAPTURER_H_
|
|
#define WEBRTC_MODULES_DESKTOP_CAPTURE_CROPPING_WINDOW_CAPTURER_H_
|
|
|
|
#include "webrtc/base/scoped_ptr.h"
|
|
#include "webrtc/modules/desktop_capture/desktop_capture_options.h"
|
|
#include "webrtc/modules/desktop_capture/screen_capturer.h"
|
|
#include "webrtc/modules/desktop_capture/window_capturer.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// WindowCapturer implementation that uses a screen capturer to capture the
|
|
// whole screen and crops the video frame to the window area when the captured
|
|
// window is on top.
|
|
class CroppingWindowCapturer : public WindowCapturer,
|
|
public DesktopCapturer::Callback {
|
|
public:
|
|
static WindowCapturer* Create(const DesktopCaptureOptions& options);
|
|
virtual ~CroppingWindowCapturer();
|
|
|
|
// DesktopCapturer implementation.
|
|
void Start(DesktopCapturer::Callback* callback) override;
|
|
void Capture(const DesktopRegion& region) override;
|
|
void SetExcludedWindow(WindowId window) override;
|
|
|
|
// WindowCapturer implementation.
|
|
bool GetWindowList(WindowList* windows) override;
|
|
bool SelectWindow(WindowId id) override;
|
|
bool BringSelectedWindowToFront() override;
|
|
|
|
// DesktopCapturer::Callback implementation, passed to |screen_capturer_| to
|
|
// intercept the capture result.
|
|
SharedMemory* CreateSharedMemory(size_t size) override;
|
|
void OnCaptureCompleted(DesktopFrame* frame) override;
|
|
|
|
protected:
|
|
explicit CroppingWindowCapturer(const DesktopCaptureOptions& options);
|
|
|
|
// The platform implementation should override these methods.
|
|
|
|
// Returns true if it is OK to capture the whole screen and crop to the
|
|
// selected window, i.e. the selected window is opaque, rectangular, and not
|
|
// occluded.
|
|
virtual bool ShouldUseScreenCapturer() = 0;
|
|
|
|
// Returns the window area relative to the top left of the virtual screen
|
|
// within the bounds of the virtual screen.
|
|
virtual DesktopRect GetWindowRectInVirtualScreen() = 0;
|
|
|
|
WindowId selected_window() const { return selected_window_; }
|
|
WindowId excluded_window() const { return excluded_window_; }
|
|
|
|
private:
|
|
DesktopCaptureOptions options_;
|
|
DesktopCapturer::Callback* callback_;
|
|
rtc::scoped_ptr<WindowCapturer> window_capturer_;
|
|
rtc::scoped_ptr<ScreenCapturer> screen_capturer_;
|
|
WindowId selected_window_;
|
|
WindowId excluded_window_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_CROPPING_WINDOW_CAPTURER_H_
|
|
|