generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add shape in DesktopFrame.

Browse Source 
The shape will be used for Me2App mode in chromoting.

R=wez@chromium.org

Review URL: https://webrtc-codereview.appspot.com/4369005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5243 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
sergeyu@chromium.org
2013-12-07 01:03:28 +00:00
parent 4acf4507b8
commit 5e13ac967b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/modules/desktop_capture/desktop_frame.h
View File

@@ -14,6 +14,7 @@
#include "webrtc/modules/desktop_capture/desktop_geometry.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h"
#include "webrtc/modules/desktop_capture/desktop_region.h" #include "webrtc/modules/desktop_capture/desktop_region.h"
#include "webrtc/modules/desktop_capture/shared_memory.h" #include "webrtc/modules/desktop_capture/shared_memory.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {
@@ -53,6 +54,11 @@ class DesktopFrame {
int32_t capture_time_ms() const { return capture_time_ms_; } int32_t capture_time_ms() const { return capture_time_ms_; }
void set_capture_time_ms(int32_t time_ms) { capture_time_ms_ = time_ms; } void set_capture_time_ms(int32_t time_ms) { capture_time_ms_ = time_ms; }
// Optional shape for the frame. Frames may be shaped e.g. if
// capturing the contents of a shaped window.
const DesktopRegion* shape() const { return shape_.get(); }
void set_shape(DesktopRegion* shape) { shape_.reset(shape); }
// Copies pixels from a buffer or another frame. |dest_rect| rect must lay // Copies pixels from a buffer or another frame. |dest_rect| rect must lay
// within bounds of this frame. // within bounds of this frame.
void CopyPixelsFrom(uint8_t* src_buffer, int src_stride, void CopyPixelsFrom(uint8_t* src_buffer, int src_stride,
@@ -77,9 +83,9 @@ class DesktopFrame {
SharedMemory* const shared_memory_; SharedMemory* const shared_memory_;
DesktopRegion updated_region_; DesktopRegion updated_region_;
DesktopVector dpi_; DesktopVector dpi_;
int32_t capture_time_ms_; int32_t capture_time_ms_;
scoped_ptr<DesktopRegion> shape_;
private: private:
DISALLOW_COPY_AND_ASSIGN(DesktopFrame); DISALLOW_COPY_AND_ASSIGN(DesktopFrame);