This reverts commit 16fe3f290a524a136f71660a114d0b03ef501f10.
Reason for revert:
After discussing this problem with nisse@ and yvesg@, we decided to modify
how RTC_EXPORT works and avoid to depend on the macro COMPONENT_BUILD.
RTC_EXPORT will instead depend on a macro WEBRTC_COMPONENT_BUILD (which
can be set as a GN argument which defaults to false).
When all the symbols needed by Chromium will be marked with RTC_EXPORT we
will flip the GN arg in Chromium, setting to to `component_build` and from
that moment, Chromium will depend on a WebRTC shared library when
`component_build=true`.
Original change's description:
> Revert "Export symbols needed by the Chromium component build (part 1)."
>
> This reverts commit 99eea42fc1fe0be0ebed13c5eba7e1e42059bc5a.
>
> Reason for revert:
> lld-link: error: undefined symbol: "__declspec(dllimport) bool __cdecl cricket::UnwrapTurnPacket(unsigned char const *, unsigned int, unsigned int *, unsigned int *)" (__imp_?UnwrapTurnPacket@cricket@@YA_NPBEIPAI1@Z)
> >>> referenced by obj/services/network/network_service/socket_manager.obj:("virtual void __thiscall network::P2PSocketManager::DumpPacket(class base::span<unsigned char const, 4294967295>, bool)" (?DumpPacket@P2PSocketManager@network@@EAEXV?$span@$$CBE$0PPPPPPPP@@base@@_N@Z))
> lld-link: error: undefined symbol: "__declspec(dllimport) bool __cdecl cricket::ValidateRtpHeader(unsigned char const *, unsigned int, unsigned int *)" (__imp_?ValidateRtpHeader@cricket@@YA_NPBEIPAI@Z)
> >>> referenced by obj/services/network/network_service/socket_manager.obj:("virtual void __thiscall network::P2PSocketManager::DumpPacket(class base::span<unsigned char const, 4294967295>, bool)" (?DumpPacket@P2PSocketManager@network@@EAEXV?$span@$$CBE$0PPPPPPPP@@base@@_N@Z))
> lld-link: error: undefined symbol: "__declspec(dllimport) bool __cdecl cricket::ApplyPacketOptions(unsigned char *, unsigned int, struct rtc::PacketTimeUpdateParams const &, unsigned __int64)" (__imp_?ApplyPacketOptions@cricket@@YA_NPAEIABUPacketTimeUpdateParams@rtc@@_K@Z)
> >>> referenced by obj/services/network/network_service/socket_tcp.obj:("virtual void __thiscall network::P2PSocketTcp::DoSend(class net::IPEndPoint const &, class std::vector<signed char, class std::allocator<signed char>> const &, struct rtc::PacketOptions const &, struct net::NetworkTrafficAnnotationTag)" (?DoSend@P2PSocketTcp@network@@MAEXABVIPEndPoint@net@@ABV?$vector@CV?$allocator@C@std@@@std@@ABUPacketOptions@rtc@@UNetworkTrafficAnnotationTag@4@@Z))
> >>> referenced by obj/services/network/network_service/socket_tcp.obj:("virtual void __thiscall network::P2PSocketStunTcp::DoSend(class net::IPEndPoint const &, class std::vector<signed char, class std::allocator<signed char>> const &, struct rtc::PacketOptions const &, struct net::NetworkTrafficAnnotationTag)" (?DoSend@P2PSocketStunTcp@network@@MAEXABVIPEndPoint@net@@ABV?$vector@CV?$allocator@C@std@@@std@@ABUPacketOptions@rtc@@UNetworkTrafficAnnotationTag@4@@Z))
> lld-link: error: undefined symbol: "__declspec(dllimport) bool __cdecl cricket::ApplyPacketOptions(unsigned char *, unsigned int, struct rtc::PacketTimeUpdateParams const &, unsigned __int64)" (__imp_?ApplyPacketOptions@cricket@@YA_NPAEIABUPacketTimeUpdateParams@rtc@@_K@Z)
> >>> referenced by obj/services/network/network_service/socket_udp.obj:("bool __thiscall network::P2PSocketUdp::DoSend(struct network::P2PSocketUdp::PendingPacket const &)" (?DoSend@P2PSocketUdp@network@@AAE_NABUPendingPacket@12@@Z))
>
> Original change's description:
> > Reland "Reland "Export symbols needed by the Chromium component build (part 1).""
> >
> > This reverts commit b49520bfc08f5c5832dda1d642125f0bb898f974.
> >
> > Reason for revert: Problem fixed in https://chromium-review.googlesource.com/c/chromium/src/+/1261398.
> >
> > Original change's description:
> > > Revert "Reland "Export symbols needed by the Chromium component build (part 1).""
> > >
> > > This reverts commit 588f4642d1a29f7beaf28265dbd08728191b4c52.
> > >
> > > Reason for revert: Breaks WebRTC Chromium FYI Win Builder (dbg).
> > > lld-link: error: undefined symbol: "__declspec(dllimport) __thiscall webrtc::Config::Config(void)" (__imp_??0Config@webrtc@@QAE@XZ)
> > > [...]
> > >
> > > Original change's description:
> > > > Reland "Export symbols needed by the Chromium component build (part 1)."
> > > >
> > > > This reverts commit 2ea9af227517556136fd629dd2663c0d75d77c7b.
> > > >
> > > > Reason for revert: The problem will be fixed by
> > > > https://chromium-review.googlesource.com/c/chromium/src/+/1261122.
> > > >
> > > > Original change's description:
> > > > > Revert "Export symbols needed by the Chromium component build (part 1)."
> > > > >
> > > > > This reverts commit 9e24dcff167c4eb3555bf0ce6eaba090c10fbe53.
> > > > >
> > > > > Reason for revert: Breaks chromium.webrtc.fyi bots.
> > > > >
> > > > > Original change's description:
> > > > > > Export symbols needed by the Chromium component build (part 1).
> > > > > >
> > > > > > This CL uses RTC_EXPORT (defined in rtc_base/system/rtc_export.h)
> > > > > > to mark WebRTC symbols as visible from a shared library, this doesn't
> > > > > > mean these symbols are part of the public API (please continue to refer
> > > > > > to [1] for info about what is considered public WebRTC API).
> > > > > >
> > > > > > [1] - https://webrtc.googlesource.com/src/+/HEAD/native-api.md
> > > > > >
> > > > > > Bug: webrtc:9419
> > > > > > Change-Id: I802abd32874d42d3aa5ecd3c8022e7cf5e043d99
> > > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/103505
> > > > > > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> > > > > > Reviewed-by: Niels Moller <nisse@webrtc.org>
> > > > > > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> > > > > > Cr-Commit-Position: refs/heads/master@{#24969}
> > > > >
> > > > > TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org
> > > > >
> > > > > Change-Id: I01f6e18f0d2c0f0309cdaa6c943c3927e1f1f49f
> > > > > No-Presubmit: true
> > > > > No-Tree-Checks: true
> > > > > No-Try: true
> > > > > Bug: webrtc:9419
> > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/103720
> > > > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> > > > > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> > > > > Cr-Commit-Position: refs/heads/master@{#24974}
> > > >
> > > > TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org
> > > >
> > > > Change-Id: I83bbc7f550fc23e823c4d055e0a6f60c828960dd
> > > > No-Presubmit: true
> > > > No-Tree-Checks: true
> > > > No-Try: true
> > > > Bug: webrtc:9419
> > > > Reviewed-on: https://webrtc-review.googlesource.com/c/103740
> > > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> > > > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> > > > Cr-Commit-Position: refs/heads/master@{#24980}
> > >
> > > TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org
> > >
> > > Change-Id: I4b7cfe492f2c8eeda5c8ac52520e0cfc95ade9b0
> > > No-Presubmit: true
> > > No-Tree-Checks: true
> > > No-Try: true
> > > Bug: webrtc:9419
> > > Reviewed-on: https://webrtc-review.googlesource.com/c/103801
> > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> > > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> > > Cr-Commit-Position: refs/heads/master@{#24983}
> >
> > TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org
> >
> > # Not skipping CQ checks because original CL landed > 1 day ago.
> >
> > Bug: webrtc:9419
> > Change-Id: Id986a0a03cdc2818690337784396882af067f7fa
> > Reviewed-on: https://webrtc-review.googlesource.com/c/104602
> > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> > Reviewed-by: Niels Moller <nisse@webrtc.org>
> > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#25049}
>
> TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org
>
> Change-Id: I6f58b9c90defccdb160307783fb55271ab424fa1
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:9419
> Reviewed-on: https://webrtc-review.googlesource.com/c/104623
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#25050}
TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org
Change-Id: I4d01ed96ae40a8f9ca42c466be5c87653d75d7c1
Bug: webrtc:9419
Reviewed-on: https://webrtc-review.googlesource.com/c/104641
Reviewed-by: Yves Gerey <yvesg@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25108}
194 lines
7.4 KiB
C++
194 lines
7.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.
|
|
*/
|
|
|
|
#ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_H_
|
|
#define MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_H_
|
|
|
|
#include <memory>
|
|
|
|
#include "modules/desktop_capture/desktop_capture_types.h"
|
|
#include "modules/desktop_capture/desktop_geometry.h"
|
|
#include "modules/desktop_capture/desktop_region.h"
|
|
#include "modules/desktop_capture/shared_memory.h"
|
|
#include "rtc_base/constructormagic.h"
|
|
#include "rtc_base/system/rtc_export.h"
|
|
|
|
namespace webrtc {
|
|
|
|
const int kStandardDPI = 96;
|
|
|
|
// DesktopFrame represents a video frame captured from the screen.
|
|
class RTC_EXPORT DesktopFrame {
|
|
public:
|
|
// DesktopFrame objects always hold RGBA data.
|
|
static const int kBytesPerPixel = 4;
|
|
|
|
virtual ~DesktopFrame();
|
|
|
|
// Returns the rectangle in full desktop coordinates to indicate it covers
|
|
// the area of top_left() to top_letf() + size() / scale_factor().
|
|
DesktopRect rect() const;
|
|
|
|
// Returns the scale factor from DIPs to physical pixels of the frame.
|
|
// Assumes same scale in both X and Y directions at present.
|
|
float scale_factor() const;
|
|
|
|
// Size of the frame. In physical coordinates, mapping directly from the
|
|
// underlying buffer.
|
|
const DesktopSize& size() const { return size_; }
|
|
|
|
// The top-left of the frame in full desktop coordinates. E.g. the top left
|
|
// monitor should start from (0, 0). The desktop coordinates may be scaled by
|
|
// OS, but this is always consistent with the MouseCursorMonitor.
|
|
const DesktopVector& top_left() const { return top_left_; }
|
|
void set_top_left(const DesktopVector& top_left) { top_left_ = top_left; }
|
|
|
|
// Distance in the buffer between two neighboring rows in bytes.
|
|
int stride() const { return stride_; }
|
|
|
|
// Data buffer used for the frame.
|
|
uint8_t* data() const { return data_; }
|
|
|
|
// SharedMemory used for the buffer or NULL if memory is allocated on the
|
|
// heap. The result is guaranteed to be deleted only after the frame is
|
|
// deleted (classes that inherit from DesktopFrame must ensure it).
|
|
SharedMemory* shared_memory() const { return shared_memory_; }
|
|
|
|
// Indicates region of the screen that has changed since the previous frame.
|
|
const DesktopRegion& updated_region() const { return updated_region_; }
|
|
DesktopRegion* mutable_updated_region() { return &updated_region_; }
|
|
|
|
// DPI of the screen being captured. May be set to zero, e.g. if DPI is
|
|
// unknown.
|
|
const DesktopVector& dpi() const { return dpi_; }
|
|
void set_dpi(const DesktopVector& dpi) { dpi_ = dpi; }
|
|
|
|
// Time taken to capture the frame in milliseconds.
|
|
int64_t capture_time_ms() const { return capture_time_ms_; }
|
|
void set_capture_time_ms(int64_t time_ms) { capture_time_ms_ = time_ms; }
|
|
|
|
// Copies pixels from a buffer or another frame. |dest_rect| rect must lay
|
|
// within bounds of this frame.
|
|
void CopyPixelsFrom(const uint8_t* src_buffer,
|
|
int src_stride,
|
|
const DesktopRect& dest_rect);
|
|
void CopyPixelsFrom(const DesktopFrame& src_frame,
|
|
const DesktopVector& src_pos,
|
|
const DesktopRect& dest_rect);
|
|
|
|
// A helper to return the data pointer of a frame at the specified position.
|
|
uint8_t* GetFrameDataAtPos(const DesktopVector& pos) const;
|
|
|
|
// The DesktopCapturer implementation which generates current DesktopFrame.
|
|
// Not all DesktopCapturer implementations set this field; it's set to
|
|
// kUnknown by default.
|
|
uint32_t capturer_id() const { return capturer_id_; }
|
|
void set_capturer_id(uint32_t capturer_id) { capturer_id_ = capturer_id; }
|
|
|
|
// Copies various information from |other|. Anything initialized in
|
|
// constructor are not copied.
|
|
// This function is usually used when sharing a source DesktopFrame with
|
|
// several clients: the original DesktopFrame should be kept unchanged. For
|
|
// example, BasicDesktopFrame::CopyOf() and SharedDesktopFrame::Share().
|
|
void CopyFrameInfoFrom(const DesktopFrame& other);
|
|
|
|
// Copies various information from |other|. Anything initialized in
|
|
// constructor are not copied. Not like CopyFrameInfoFrom() function, this
|
|
// function uses swap or move constructor to avoid data copy. It won't break
|
|
// the |other|, but some of its information may be missing after this
|
|
// operation. E.g. other->updated_region_;
|
|
// This function is usually used when wrapping a DesktopFrame: the wrapper
|
|
// instance takes the ownership of |other|, so other components cannot access
|
|
// |other| anymore. For example, CroppedDesktopFrame and
|
|
// DesktopFrameWithCursor.
|
|
void MoveFrameInfoFrom(DesktopFrame* other);
|
|
|
|
protected:
|
|
DesktopFrame(DesktopSize size,
|
|
int stride,
|
|
uint8_t* data,
|
|
SharedMemory* shared_memory);
|
|
|
|
// Ownership of the buffers is defined by the classes that inherit from this
|
|
// class. They must guarantee that the buffer is not deleted before the frame
|
|
// is deleted.
|
|
uint8_t* const data_;
|
|
SharedMemory* const shared_memory_;
|
|
|
|
private:
|
|
const DesktopSize size_;
|
|
const int stride_;
|
|
|
|
DesktopRegion updated_region_;
|
|
DesktopVector top_left_;
|
|
DesktopVector dpi_;
|
|
int64_t capture_time_ms_;
|
|
uint32_t capturer_id_;
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(DesktopFrame);
|
|
};
|
|
|
|
// A DesktopFrame that stores data in the heap.
|
|
class RTC_EXPORT BasicDesktopFrame : public DesktopFrame {
|
|
public:
|
|
explicit BasicDesktopFrame(DesktopSize size);
|
|
|
|
~BasicDesktopFrame() override;
|
|
|
|
// Creates a BasicDesktopFrame that contains copy of |frame|.
|
|
// TODO(zijiehe): Return std::unique_ptr<DesktopFrame>
|
|
static DesktopFrame* CopyOf(const DesktopFrame& frame);
|
|
|
|
private:
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(BasicDesktopFrame);
|
|
};
|
|
|
|
// A DesktopFrame that stores data in shared memory.
|
|
class SharedMemoryDesktopFrame : public DesktopFrame {
|
|
public:
|
|
// May return nullptr if |shared_memory_factory| failed to create a
|
|
// SharedMemory instance.
|
|
// |shared_memory_factory| should not be nullptr.
|
|
static std::unique_ptr<DesktopFrame> Create(
|
|
DesktopSize size,
|
|
SharedMemoryFactory* shared_memory_factory);
|
|
|
|
// Takes ownership of |shared_memory|.
|
|
// Deprecated, use the next constructor.
|
|
SharedMemoryDesktopFrame(DesktopSize size,
|
|
int stride,
|
|
SharedMemory* shared_memory);
|
|
|
|
// Preferred.
|
|
SharedMemoryDesktopFrame(DesktopSize size,
|
|
int stride,
|
|
std::unique_ptr<SharedMemory> shared_memory);
|
|
|
|
~SharedMemoryDesktopFrame() override;
|
|
|
|
private:
|
|
// Avoid unexpected order of parameter evaluation.
|
|
// Executing both std::unique_ptr<T>::operator->() and
|
|
// std::unique_ptr<T>::release() in the member initializer list is not safe.
|
|
// Depends on the order of parameter evaluation,
|
|
// std::unique_ptr<T>::operator->() may trigger assertion failure if it has
|
|
// been evaluated after std::unique_ptr<T>::release(). By using this
|
|
// constructor, std::unique_ptr<T>::operator->() won't be involved anymore.
|
|
SharedMemoryDesktopFrame(DesktopRect rect,
|
|
int stride,
|
|
SharedMemory* shared_memory);
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(SharedMemoryDesktopFrame);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_H_
|