cd66a771ed
Current implementation requires MouseCursorMonitor to understand the SourceId of a DesktopCapturer implementation. But SourceId has different meanings across various DesktopCapturer implementations. So this change decouples the MouseCursorMonitor from DesktopCapturer, i.e. it does not need to know DesktopCapturer anymore, instead it always returns the absolute position of the mouse cursor. In DesktopAndCursorComposer, it can use the newly added DesktopFrame::top_left() to decide the relative position of mouse cursor and the DesktopFrame. Bug: webrtc:7950 Change-Id: Idfbde5cb0f79ff0acf4ad1e9a0ac5126f1bb2e98 Reviewed-on: https://chromium-review.googlesource.com/575315 Commit-Queue: Zijie He <zijiehe@chromium.org> Reviewed-by: Sergey Ulanov <sergeyu@chromium.org> Cr-Commit-Position: refs/heads/master@{#19115}
130 lines
4.4 KiB
C++
130 lines
4.4 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.
|
|
*/
|
|
|
|
#include "webrtc/modules/desktop_capture/desktop_frame.h"
|
|
|
|
#include <utility>
|
|
|
|
#include <string.h>
|
|
|
|
#include "webrtc/modules/desktop_capture/desktop_geometry.h"
|
|
#include "webrtc/rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
DesktopFrame::DesktopFrame(DesktopSize size,
|
|
int stride,
|
|
uint8_t* data,
|
|
SharedMemory* shared_memory)
|
|
: DesktopFrame(DesktopRect::MakeSize(size),
|
|
stride,
|
|
data,
|
|
shared_memory) {}
|
|
|
|
DesktopFrame::DesktopFrame(DesktopRect rect,
|
|
int stride,
|
|
uint8_t* data,
|
|
SharedMemory* shared_memory)
|
|
: data_(data),
|
|
shared_memory_(shared_memory),
|
|
rect_(rect),
|
|
stride_(stride),
|
|
capture_time_ms_(0),
|
|
capturer_id_(DesktopCapturerId::kUnknown) {}
|
|
|
|
DesktopFrame::~DesktopFrame() = default;
|
|
|
|
void DesktopFrame::CopyPixelsFrom(const uint8_t* src_buffer, int src_stride,
|
|
const DesktopRect& dest_rect) {
|
|
RTC_CHECK(DesktopRect::MakeSize(size()).ContainsRect(dest_rect));
|
|
|
|
uint8_t* dest = GetFrameDataAtPos(dest_rect.top_left());
|
|
for (int y = 0; y < dest_rect.height(); ++y) {
|
|
memcpy(dest, src_buffer, DesktopFrame::kBytesPerPixel * dest_rect.width());
|
|
src_buffer += src_stride;
|
|
dest += stride();
|
|
}
|
|
}
|
|
|
|
void DesktopFrame::CopyPixelsFrom(const DesktopFrame& src_frame,
|
|
const DesktopVector& src_pos,
|
|
const DesktopRect& dest_rect) {
|
|
RTC_CHECK(DesktopRect::MakeSize(src_frame.size()).ContainsRect(
|
|
DesktopRect::MakeOriginSize(src_pos, dest_rect.size())));
|
|
|
|
CopyPixelsFrom(src_frame.GetFrameDataAtPos(src_pos),
|
|
src_frame.stride(), dest_rect);
|
|
}
|
|
|
|
uint8_t* DesktopFrame::GetFrameDataAtPos(const DesktopVector& pos) const {
|
|
return data() + stride() * pos.y() + DesktopFrame::kBytesPerPixel * pos.x();
|
|
}
|
|
|
|
BasicDesktopFrame::BasicDesktopFrame(DesktopSize size)
|
|
: DesktopFrame(size, kBytesPerPixel * size.width(),
|
|
new uint8_t[kBytesPerPixel * size.width() * size.height()],
|
|
NULL) {
|
|
}
|
|
|
|
BasicDesktopFrame::~BasicDesktopFrame() {
|
|
delete[] data_;
|
|
}
|
|
|
|
DesktopFrame* BasicDesktopFrame::CopyOf(const DesktopFrame& frame) {
|
|
DesktopFrame* result = new BasicDesktopFrame(frame.size());
|
|
for (int y = 0; y < frame.size().height(); ++y) {
|
|
memcpy(result->data() + y * result->stride(),
|
|
frame.data() + y * frame.stride(),
|
|
frame.size().width() * kBytesPerPixel);
|
|
}
|
|
result->set_dpi(frame.dpi());
|
|
result->set_capture_time_ms(frame.capture_time_ms());
|
|
result->set_capturer_id(frame.capturer_id());
|
|
*result->mutable_updated_region() = frame.updated_region();
|
|
return result;
|
|
}
|
|
|
|
// static
|
|
std::unique_ptr<DesktopFrame> SharedMemoryDesktopFrame::Create(
|
|
DesktopSize size,
|
|
SharedMemoryFactory* shared_memory_factory) {
|
|
size_t buffer_size = size.height() * size.width() * kBytesPerPixel;
|
|
std::unique_ptr<SharedMemory> shared_memory =
|
|
shared_memory_factory->CreateSharedMemory(buffer_size);
|
|
if (!shared_memory)
|
|
return nullptr;
|
|
|
|
return Create(size, std::move(shared_memory));
|
|
}
|
|
|
|
// static
|
|
std::unique_ptr<DesktopFrame> SharedMemoryDesktopFrame::Create(
|
|
DesktopSize size,
|
|
std::unique_ptr<SharedMemory> shared_memory) {
|
|
RTC_DCHECK(shared_memory);
|
|
int stride = size.width() * kBytesPerPixel;
|
|
return std::unique_ptr<DesktopFrame>(new SharedMemoryDesktopFrame(
|
|
size, stride, shared_memory.release()));
|
|
}
|
|
|
|
SharedMemoryDesktopFrame::SharedMemoryDesktopFrame(DesktopSize size,
|
|
int stride,
|
|
SharedMemory* shared_memory)
|
|
: DesktopFrame(size,
|
|
stride,
|
|
reinterpret_cast<uint8_t*>(shared_memory->data()),
|
|
shared_memory) {}
|
|
|
|
SharedMemoryDesktopFrame::~SharedMemoryDesktopFrame() {
|
|
delete shared_memory_;
|
|
}
|
|
|
|
} // namespace webrtc
|