Revert "Export symbols needed by the Chromium component build (part 1)."

This reverts commit 9e24dcff16.

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}
This commit is contained in:
Mirko Bonadei 2018-10-04 09:49:42 +00:00 committed by Commit Bot
parent e073514c2f
commit 2ea9af2275
34 changed files with 39 additions and 84 deletions

View file

@ -39,9 +39,6 @@ rtc_source_set("aec3_config") {
"echo_canceller3_config.cc", "echo_canceller3_config.cc",
"echo_canceller3_config.h", "echo_canceller3_config.h",
] ]
deps = [
"../../rtc_base/system:rtc_export",
]
} }
rtc_source_set("aec3_factory") { rtc_source_set("aec3_factory") {
@ -57,7 +54,6 @@ rtc_source_set("aec3_factory") {
":echo_control", ":echo_control",
"../../modules/audio_processing/aec3", "../../modules/audio_processing/aec3",
"../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_approved",
"../../rtc_base/system:rtc_export",
"//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/memory",
] ]
} }

View file

@ -13,12 +13,10 @@
#include <stddef.h> // size_t #include <stddef.h> // size_t
#include "rtc_base/system/rtc_export.h"
namespace webrtc { namespace webrtc {
// Configuration struct for EchoCanceller3 // Configuration struct for EchoCanceller3
struct RTC_EXPORT EchoCanceller3Config { struct EchoCanceller3Config {
EchoCanceller3Config(); EchoCanceller3Config();
EchoCanceller3Config(const EchoCanceller3Config& e); EchoCanceller3Config(const EchoCanceller3Config& e);
struct Delay { struct Delay {

View file

@ -15,11 +15,10 @@
#include "api/audio/echo_canceller3_config.h" #include "api/audio/echo_canceller3_config.h"
#include "api/audio/echo_control.h" #include "api/audio/echo_control.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc { namespace webrtc {
class RTC_EXPORT EchoCanceller3Factory : public EchoControlFactory { class EchoCanceller3Factory : public EchoControlFactory {
public: public:
// Factory producing EchoCanceller3 instances with the default configuration. // Factory producing EchoCanceller3 instances with the default configuration.
EchoCanceller3Factory(); EchoCanceller3Factory();

View file

@ -25,7 +25,6 @@ rtc_static_library("audio_encoder_L16") {
"../../../modules/audio_coding:pcm16b", "../../../modules/audio_coding:pcm16b",
"../../../rtc_base:rtc_base_approved", "../../../rtc_base:rtc_base_approved",
"../../../rtc_base:safe_minmax", "../../../rtc_base:safe_minmax",
"../../../rtc_base/system:rtc_export",
"//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",
] ]

View file

@ -18,7 +18,6 @@
#include "api/audio_codecs/audio_codec_pair_id.h" #include "api/audio_codecs/audio_codec_pair_id.h"
#include "api/audio_codecs/audio_encoder.h" #include "api/audio_codecs/audio_encoder.h"
#include "api/audio_codecs/audio_format.h" #include "api/audio_codecs/audio_format.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc { namespace webrtc {
@ -26,7 +25,7 @@ namespace webrtc {
// CreateAudioEncoderFactory<...>(). // CreateAudioEncoderFactory<...>().
// //
// NOTE: This struct is still under development and may change without notice. // NOTE: This struct is still under development and may change without notice.
struct RTC_EXPORT AudioEncoderL16 { struct AudioEncoderL16 {
struct Config { struct Config {
bool IsOk() const { bool IsOk() const {
return (sample_rate_hz == 8000 || sample_rate_hz == 16000 || return (sample_rate_hz == 8000 || sample_rate_hz == 16000 ||

View file

@ -25,7 +25,6 @@ rtc_static_library("audio_encoder_g711") {
"../../../modules/audio_coding:g711", "../../../modules/audio_coding:g711",
"../../../rtc_base:rtc_base_approved", "../../../rtc_base:rtc_base_approved",
"../../../rtc_base:safe_minmax", "../../../rtc_base:safe_minmax",
"../../../rtc_base/system:rtc_export",
"//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",
] ]

View file

@ -18,7 +18,6 @@
#include "api/audio_codecs/audio_codec_pair_id.h" #include "api/audio_codecs/audio_codec_pair_id.h"
#include "api/audio_codecs/audio_encoder.h" #include "api/audio_codecs/audio_encoder.h"
#include "api/audio_codecs/audio_format.h" #include "api/audio_codecs/audio_format.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc { namespace webrtc {
@ -26,7 +25,7 @@ namespace webrtc {
// CreateAudioEncoderFactory<...>(). // CreateAudioEncoderFactory<...>().
// //
// NOTE: This struct is still under development and may change without notice. // NOTE: This struct is still under development and may change without notice.
struct RTC_EXPORT AudioEncoderG711 { struct AudioEncoderG711 {
struct Config { struct Config {
enum class Type { kPcmU, kPcmA }; enum class Type { kPcmU, kPcmA };
bool IsOk() const { bool IsOk() const {

View file

@ -33,7 +33,6 @@ rtc_static_library("audio_encoder_g722") {
"../../../modules/audio_coding:g722", "../../../modules/audio_coding:g722",
"../../../rtc_base:rtc_base_approved", "../../../rtc_base:rtc_base_approved",
"../../../rtc_base:safe_minmax", "../../../rtc_base:safe_minmax",
"../../../rtc_base/system:rtc_export",
"//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",
] ]

View file

@ -19,7 +19,6 @@
#include "api/audio_codecs/audio_encoder.h" #include "api/audio_codecs/audio_encoder.h"
#include "api/audio_codecs/audio_format.h" #include "api/audio_codecs/audio_format.h"
#include "api/audio_codecs/g722/audio_encoder_g722_config.h" #include "api/audio_codecs/g722/audio_encoder_g722_config.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc { namespace webrtc {
@ -27,7 +26,7 @@ namespace webrtc {
// CreateAudioEncoderFactory<...>(). // CreateAudioEncoderFactory<...>().
// //
// NOTE: This struct is still under development and may change without notice. // NOTE: This struct is still under development and may change without notice.
struct RTC_EXPORT AudioEncoderG722 { struct AudioEncoderG722 {
using Config = AudioEncoderG722Config; using Config = AudioEncoderG722Config;
static absl::optional<AudioEncoderG722Config> SdpToConfig( static absl::optional<AudioEncoderG722Config> SdpToConfig(
const SdpAudioFormat& audio_format); const SdpAudioFormat& audio_format);

View file

@ -131,7 +131,6 @@ rtc_static_library("audio_decoder_isac_float") {
"../../..:webrtc_common", "../../..:webrtc_common",
"../../../modules/audio_coding:isac", "../../../modules/audio_coding:isac",
"../../../rtc_base:rtc_base_approved", "../../../rtc_base:rtc_base_approved",
"../../../rtc_base/system:rtc_export",
"//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",
] ]

View file

@ -18,7 +18,6 @@
#include "api/audio_codecs/audio_codec_pair_id.h" #include "api/audio_codecs/audio_codec_pair_id.h"
#include "api/audio_codecs/audio_decoder.h" #include "api/audio_codecs/audio_decoder.h"
#include "api/audio_codecs/audio_format.h" #include "api/audio_codecs/audio_format.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc { namespace webrtc {
@ -26,7 +25,7 @@ namespace webrtc {
// parameter to CreateAudioDecoderFactory<...>(). // parameter to CreateAudioDecoderFactory<...>().
// //
// NOTE: This struct is still under development and may change without notice. // NOTE: This struct is still under development and may change without notice.
struct RTC_EXPORT AudioDecoderIsacFloat { struct AudioDecoderIsacFloat {
struct Config { struct Config {
bool IsOk() const { bool IsOk() const {
return sample_rate_hz == 16000 || sample_rate_hz == 32000; return sample_rate_hz == 16000 || sample_rate_hz == 32000;

View file

@ -44,7 +44,6 @@ rtc_source_set("audio_encoder_opus") {
"..:audio_codecs_api", "..:audio_codecs_api",
"../../../modules/audio_coding:webrtc_opus", "../../../modules/audio_coding:webrtc_opus",
"../../../rtc_base:rtc_base_approved", "../../../rtc_base:rtc_base_approved",
"../../../rtc_base/system:rtc_export",
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",
] ]
} }
@ -61,7 +60,6 @@ rtc_static_library("audio_decoder_opus") {
"../../..:webrtc_common", "../../..:webrtc_common",
"../../../modules/audio_coding:webrtc_opus", "../../../modules/audio_coding:webrtc_opus",
"../../../rtc_base:rtc_base_approved", "../../../rtc_base:rtc_base_approved",
"../../../rtc_base/system:rtc_export",
"//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",
] ]

View file

@ -18,7 +18,6 @@
#include "api/audio_codecs/audio_codec_pair_id.h" #include "api/audio_codecs/audio_codec_pair_id.h"
#include "api/audio_codecs/audio_decoder.h" #include "api/audio_codecs/audio_decoder.h"
#include "api/audio_codecs/audio_format.h" #include "api/audio_codecs/audio_format.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc { namespace webrtc {
@ -26,7 +25,7 @@ namespace webrtc {
// CreateAudioDecoderFactory<...>(). // CreateAudioDecoderFactory<...>().
// //
// NOTE: This struct is still under development and may change without notice. // NOTE: This struct is still under development and may change without notice.
struct RTC_EXPORT AudioDecoderOpus { struct AudioDecoderOpus {
struct Config { struct Config {
int num_channels; int num_channels;
}; };

View file

@ -19,7 +19,6 @@
#include "api/audio_codecs/audio_encoder.h" #include "api/audio_codecs/audio_encoder.h"
#include "api/audio_codecs/audio_format.h" #include "api/audio_codecs/audio_format.h"
#include "api/audio_codecs/opus/audio_encoder_opus_config.h" #include "api/audio_codecs/opus/audio_encoder_opus_config.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc { namespace webrtc {
@ -27,7 +26,7 @@ namespace webrtc {
// CreateAudioEncoderFactory<...>(). // CreateAudioEncoderFactory<...>().
// //
// NOTE: This struct is still under development and may change without notice. // NOTE: This struct is still under development and may change without notice.
struct RTC_EXPORT AudioEncoderOpus { struct AudioEncoderOpus {
using Config = AudioEncoderOpusConfig; using Config = AudioEncoderOpusConfig;
static absl::optional<AudioEncoderOpusConfig> SdpToConfig( static absl::optional<AudioEncoderOpusConfig> SdpToConfig(
const SdpAudioFormat& audio_format); const SdpAudioFormat& audio_format);

View file

@ -136,7 +136,6 @@ rtc_static_library("rtc_media_base") {
"../modules/audio_processing:audio_processing_statistics", "../modules/audio_processing:audio_processing_statistics",
"../rtc_base:rtc_base", "../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_approved",
"../rtc_base/system:rtc_export",
"../rtc_base/third_party/sigslot", "../rtc_base/third_party/sigslot",
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",
] ]

View file

@ -12,7 +12,6 @@
#define MEDIA_BASE_RTPUTILS_H_ #define MEDIA_BASE_RTPUTILS_H_
#include "rtc_base/byteorder.h" #include "rtc_base/byteorder.h"
#include "rtc_base/system/rtc_export.h"
namespace rtc { namespace rtc {
struct PacketTimeUpdateParams; struct PacketTimeUpdateParams;
@ -69,9 +68,9 @@ bool IsValidRtpRtcpPacketSize(bool rtcp, size_t size);
const char* RtpRtcpStringLiteral(bool rtcp); const char* RtpRtcpStringLiteral(bool rtcp);
// Verifies that a packet has a valid RTP header. // Verifies that a packet has a valid RTP header.
bool RTC_EXPORT ValidateRtpHeader(const uint8_t* rtp, bool ValidateRtpHeader(const uint8_t* rtp,
size_t length, size_t length,
size_t* header_length); size_t* header_length);
// Helper method which updates the absolute send time extension if present. // Helper method which updates the absolute send time extension if present.
bool UpdateRtpAbsSendTimeExtension(uint8_t* rtp, bool UpdateRtpAbsSendTimeExtension(uint8_t* rtp,
@ -81,11 +80,10 @@ bool UpdateRtpAbsSendTimeExtension(uint8_t* rtp,
// Applies specified |options| to the packet. It updates the absolute send time // Applies specified |options| to the packet. It updates the absolute send time
// extension header if it is present present then updates HMAC. // extension header if it is present present then updates HMAC.
bool RTC_EXPORT bool ApplyPacketOptions(uint8_t* data,
ApplyPacketOptions(uint8_t* data, size_t length,
size_t length, const rtc::PacketTimeUpdateParams& packet_time_params,
const rtc::PacketTimeUpdateParams& packet_time_params, uint64_t time_us);
uint64_t time_us);
} // namespace cricket } // namespace cricket

View file

@ -14,18 +14,16 @@
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
#include "rtc_base/system/rtc_export.h"
namespace cricket { namespace cricket {
struct PacketOptions; struct PacketOptions;
// Finds data location within a TURN Channel Message or TURN Send Indication // Finds data location within a TURN Channel Message or TURN Send Indication
// message. // message.
bool RTC_EXPORT UnwrapTurnPacket(const uint8_t* packet, bool UnwrapTurnPacket(const uint8_t* packet,
size_t packet_size, size_t packet_size,
size_t* content_position, size_t* content_position,
size_t* content_size); size_t* content_size);
} // namespace cricket } // namespace cricket

View file

@ -115,7 +115,6 @@ rtc_static_library("audio_processing") {
"../../rtc_base:safe_minmax", "../../rtc_base:safe_minmax",
"../../rtc_base:sanitizer", "../../rtc_base:sanitizer",
"../../rtc_base/system:arch", "../../rtc_base/system:arch",
"../../rtc_base/system:rtc_export",
"../../system_wrappers:cpu_features_api", "../../system_wrappers:cpu_features_api",
"../../system_wrappers:field_trial", "../../system_wrappers:field_trial",
"../../system_wrappers:metrics", "../../system_wrappers:metrics",
@ -163,7 +162,6 @@ rtc_source_set("audio_processing_statistics") {
"include/audio_processing_statistics.h", "include/audio_processing_statistics.h",
] ]
deps = [ deps = [
"../../rtc_base/system:rtc_export",
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",
] ]
} }

View file

@ -17,7 +17,6 @@ rtc_source_set("aec_dump") {
deps = [ deps = [
"../", "../",
"../../../rtc_base:rtc_base_approved", "../../../rtc_base:rtc_base_approved",
"../../../rtc_base/system:rtc_export",
] ]
} }

View file

@ -16,7 +16,6 @@
#include "modules/audio_processing/include/aec_dump.h" #include "modules/audio_processing/include/aec_dump.h"
#include "rtc_base/platform_file.h" #include "rtc_base/platform_file.h"
#include "rtc_base/system/rtc_export.h"
namespace rtc { namespace rtc {
class TaskQueue; class TaskQueue;
@ -24,7 +23,7 @@ class TaskQueue;
namespace webrtc { namespace webrtc {
class RTC_EXPORT AecDumpFactory { class AecDumpFactory {
public: public:
// The |worker_queue| may not be null and must outlive the created // The |worker_queue| may not be null and must outlive the created
// AecDump instance. |max_log_size_bytes == -1| means the log size // AecDump instance. |max_log_size_bytes == -1| means the log size

View file

@ -34,7 +34,6 @@
#include "rtc_base/platform_file.h" #include "rtc_base/platform_file.h"
#include "rtc_base/refcount.h" #include "rtc_base/refcount.h"
#include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc { namespace webrtc {
@ -552,7 +551,7 @@ class AudioProcessing : public rtc::RefCountInterface {
float minimum_ = 0.0f; // Long-term minimum. float minimum_ = 0.0f; // Long-term minimum.
}; };
struct RTC_EXPORT AudioProcessingStatistics { struct AudioProcessingStatistics {
AudioProcessingStatistics(); AudioProcessingStatistics();
AudioProcessingStatistics(const AudioProcessingStatistics& other); AudioProcessingStatistics(const AudioProcessingStatistics& other);
~AudioProcessingStatistics(); ~AudioProcessingStatistics();
@ -649,7 +648,7 @@ class AudioProcessing : public rtc::RefCountInterface {
static const int kChunkSizeMs = 10; static const int kChunkSizeMs = 10;
}; };
class RTC_EXPORT AudioProcessingBuilder { class AudioProcessingBuilder {
public: public:
AudioProcessingBuilder(); AudioProcessingBuilder();
~AudioProcessingBuilder(); ~AudioProcessingBuilder();

View file

@ -12,12 +12,11 @@
#define MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_STATISTICS_H_ #define MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_STATISTICS_H_
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc { namespace webrtc {
// This version of the stats uses Optionals, it will replace the regular // This version of the stats uses Optionals, it will replace the regular
// AudioProcessingStatistics struct. // AudioProcessingStatistics struct.
struct RTC_EXPORT AudioProcessingStats { struct AudioProcessingStats {
AudioProcessingStats(); AudioProcessingStats();
AudioProcessingStats(const AudioProcessingStats& other); AudioProcessingStats(const AudioProcessingStats& other);
~AudioProcessingStats(); ~AudioProcessingStats();

View file

@ -14,7 +14,6 @@
#include <map> #include <map>
#include "rtc_base/constructormagic.h" #include "rtc_base/constructormagic.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc { namespace webrtc {
@ -58,7 +57,7 @@ enum class ConfigOptionID {
// config.Set<Algo1_CostFunction>(new SqrCost()); // config.Set<Algo1_CostFunction>(new SqrCost());
// //
// Note: This class is thread-compatible (like STL containers). // Note: This class is thread-compatible (like STL containers).
class RTC_EXPORT Config { class Config {
public: public:
// Returns the option if set or a default constructed one. // Returns the option if set or a default constructed one.
// Callers that access options too often are encouraged to cache the result. // Callers that access options too often are encouraged to cache the result.

View file

@ -11,11 +11,9 @@
#ifndef MODULES_AUDIO_PROCESSING_TYPING_DETECTION_H_ #ifndef MODULES_AUDIO_PROCESSING_TYPING_DETECTION_H_
#define MODULES_AUDIO_PROCESSING_TYPING_DETECTION_H_ #define MODULES_AUDIO_PROCESSING_TYPING_DETECTION_H_
#include "rtc_base/system/rtc_export.h"
namespace webrtc { namespace webrtc {
class RTC_EXPORT TypingDetection { class TypingDetection {
public: public:
TypingDetection(); TypingDetection();
virtual ~TypingDetection(); virtual ~TypingDetection();

View file

@ -30,7 +30,6 @@ rtc_static_library("primitives") {
deps = [ deps = [
"../..:webrtc_common", "../..:webrtc_common",
"../../rtc_base:checks", "../../rtc_base:checks",
"../../rtc_base/system:rtc_export",
"//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/memory",
] ]
@ -377,7 +376,6 @@ rtc_static_library("desktop_capture_generic") {
"../../rtc_base:rtc_base", # TODO(kjellander): Cleanup in bugs.webrtc.org/3806. "../../rtc_base:rtc_base", # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
"../../rtc_base/synchronization:rw_lock_wrapper", "../../rtc_base/synchronization:rw_lock_wrapper",
"../../rtc_base/system:arch", "../../rtc_base/system:arch",
"../../rtc_base/system:rtc_export",
"../../system_wrappers", "../../system_wrappers",
"../../system_wrappers:cpu_features_api", "../../system_wrappers:cpu_features_api",
"../../system_wrappers:metrics", "../../system_wrappers:metrics",

View file

@ -12,7 +12,6 @@
#define MODULES_DESKTOP_CAPTURE_CROPPED_DESKTOP_FRAME_H_ #define MODULES_DESKTOP_CAPTURE_CROPPED_DESKTOP_FRAME_H_
#include "modules/desktop_capture/desktop_frame.h" #include "modules/desktop_capture/desktop_frame.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc { namespace webrtc {
@ -21,9 +20,9 @@ namespace webrtc {
// |frame| should not be nullptr. |rect| is in |frame| coordinate, i.e. // |frame| should not be nullptr. |rect| is in |frame| coordinate, i.e.
// |frame|->top_left() does not impact the area of |rect|. // |frame|->top_left() does not impact the area of |rect|.
// Returns nullptr frame if |rect| is not contained by the bounds of |frame|. // Returns nullptr frame if |rect| is not contained by the bounds of |frame|.
std::unique_ptr<DesktopFrame> RTC_EXPORT std::unique_ptr<DesktopFrame> CreateCroppedDesktopFrame(
CreateCroppedDesktopFrame(std::unique_ptr<DesktopFrame> frame, std::unique_ptr<DesktopFrame> frame,
const DesktopRect& rect); const DesktopRect& rect);
} // namespace webrtc } // namespace webrtc

View file

@ -15,15 +15,14 @@
#include "modules/desktop_capture/desktop_capture_options.h" #include "modules/desktop_capture/desktop_capture_options.h"
#include "modules/desktop_capture/desktop_capturer.h" #include "modules/desktop_capture/desktop_capturer.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc { namespace webrtc {
// WindowCapturer implementation that uses a screen capturer to capture the // WindowCapturer implementation that uses a screen capturer to capture the
// whole screen and crops the video frame to the window area when the captured // whole screen and crops the video frame to the window area when the captured
// window is on top. // window is on top.
class RTC_EXPORT CroppingWindowCapturer : public DesktopCapturer, class CroppingWindowCapturer : public DesktopCapturer,
public DesktopCapturer::Callback { public DesktopCapturer::Callback {
public: public:
static std::unique_ptr<DesktopCapturer> CreateCapturer( static std::unique_ptr<DesktopCapturer> CreateCapturer(
const DesktopCaptureOptions& options); const DesktopCaptureOptions& options);

View file

@ -17,16 +17,14 @@
#include "modules/desktop_capture/desktop_capturer.h" #include "modules/desktop_capture/desktop_capturer.h"
#include "modules/desktop_capture/mouse_cursor_monitor.h" #include "modules/desktop_capture/mouse_cursor_monitor.h"
#include "rtc_base/constructormagic.h" #include "rtc_base/constructormagic.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc { namespace webrtc {
// A wrapper for DesktopCapturer that also captures mouse using specified // A wrapper for DesktopCapturer that also captures mouse using specified
// MouseCursorMonitor and renders it on the generated streams. // MouseCursorMonitor and renders it on the generated streams.
class RTC_EXPORT DesktopAndCursorComposer class DesktopAndCursorComposer : public DesktopCapturer,
: public DesktopCapturer, public DesktopCapturer::Callback,
public DesktopCapturer::Callback, public MouseCursorMonitor::Callback {
public MouseCursorMonitor::Callback {
public: public:
// Creates a new blender that captures mouse cursor using // Creates a new blender that captures mouse cursor using
// MouseCursorMonitor::Create(options) and renders it into the frames // MouseCursorMonitor::Create(options) and renders it into the frames

View file

@ -12,7 +12,6 @@
#include "rtc_base/constructormagic.h" #include "rtc_base/constructormagic.h"
#include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/system/rtc_export.h"
#if defined(USE_X11) #if defined(USE_X11)
#include "modules/desktop_capture/x11/shared_x_display.h" #include "modules/desktop_capture/x11/shared_x_display.h"
@ -27,7 +26,7 @@ namespace webrtc {
// An object that stores initialization parameters for screen and window // An object that stores initialization parameters for screen and window
// capturers. // capturers.
class RTC_EXPORT DesktopCaptureOptions { class DesktopCaptureOptions {
public: public:
// Returns instance of DesktopCaptureOptions with default parameters. On Linux // Returns instance of DesktopCaptureOptions with default parameters. On Linux
// also initializes X window connection. x_display() will be set to null if // also initializes X window connection. x_display() will be set to null if

View file

@ -22,7 +22,6 @@
#include "modules/desktop_capture/desktop_capture_types.h" #include "modules/desktop_capture/desktop_capture_types.h"
#include "modules/desktop_capture/desktop_frame.h" #include "modules/desktop_capture/desktop_frame.h"
#include "modules/desktop_capture/shared_memory.h" #include "modules/desktop_capture/shared_memory.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc { namespace webrtc {
@ -30,7 +29,7 @@ class DesktopCaptureOptions;
class DesktopFrame; class DesktopFrame;
// Abstract interface for screen and window capturers. // Abstract interface for screen and window capturers.
class RTC_EXPORT DesktopCapturer { class DesktopCapturer {
public: public:
enum class Result { enum class Result {
// The frame was captured successfully. // The frame was captured successfully.

View file

@ -18,14 +18,13 @@
#include "modules/desktop_capture/desktop_region.h" #include "modules/desktop_capture/desktop_region.h"
#include "modules/desktop_capture/shared_memory.h" #include "modules/desktop_capture/shared_memory.h"
#include "rtc_base/constructormagic.h" #include "rtc_base/constructormagic.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc { namespace webrtc {
const int kStandardDPI = 96; const int kStandardDPI = 96;
// DesktopFrame represents a video frame captured from the screen. // DesktopFrame represents a video frame captured from the screen.
class RTC_EXPORT DesktopFrame { class DesktopFrame {
public: public:
// DesktopFrame objects always hold RGBA data. // DesktopFrame objects always hold RGBA data.
static const int kBytesPerPixel = 4; static const int kBytesPerPixel = 4;
@ -136,7 +135,7 @@ class RTC_EXPORT DesktopFrame {
}; };
// A DesktopFrame that stores data in the heap. // A DesktopFrame that stores data in the heap.
class RTC_EXPORT BasicDesktopFrame : public DesktopFrame { class BasicDesktopFrame : public DesktopFrame {
public: public:
explicit BasicDesktopFrame(DesktopSize size); explicit BasicDesktopFrame(DesktopSize size);

View file

@ -17,7 +17,6 @@
#include "modules/desktop_capture/desktop_capturer.h" #include "modules/desktop_capture/desktop_capturer.h"
#include "modules/desktop_capture/desktop_frame_generator.h" #include "modules/desktop_capture/desktop_frame_generator.h"
#include "modules/desktop_capture/shared_memory.h" #include "modules/desktop_capture/shared_memory.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc { namespace webrtc {
@ -32,7 +31,7 @@ namespace webrtc {
// Double buffering is guaranteed by the FrameGenerator. FrameGenerator // Double buffering is guaranteed by the FrameGenerator. FrameGenerator
// implements in desktop_frame_generator.h guarantee double buffering, they // implements in desktop_frame_generator.h guarantee double buffering, they
// creates a new instance of DesktopFrame each time. // creates a new instance of DesktopFrame each time.
class RTC_EXPORT FakeDesktopCapturer : public DesktopCapturer { class FakeDesktopCapturer : public DesktopCapturer {
public: public:
FakeDesktopCapturer(); FakeDesktopCapturer();
~FakeDesktopCapturer() override; ~FakeDesktopCapturer() override;

View file

@ -529,7 +529,6 @@ rtc_source_set("rtc_task_queue_api") {
deps = [ deps = [
":macromagic", ":macromagic",
":ptr_util", ":ptr_util",
"system:rtc_export",
"//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/memory",
] ]
} }

View file

@ -18,7 +18,6 @@
#include "absl/memory/memory.h" #include "absl/memory/memory.h"
#include "rtc_base/constructormagic.h" #include "rtc_base/constructormagic.h"
#include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/system/rtc_export.h"
#include "rtc_base/thread_annotations.h" #include "rtc_base/thread_annotations.h"
namespace rtc { namespace rtc {
@ -151,7 +150,7 @@ static std::unique_ptr<QueuedTask> NewClosure(Closure&& closure,
// TaskQueue itself has been deleted or it may happen synchronously while the // TaskQueue itself has been deleted or it may happen synchronously while the
// TaskQueue instance is being deleted. This may vary from one OS to the next // TaskQueue instance is being deleted. This may vary from one OS to the next
// so assumptions about lifetimes of pending tasks should not be made. // so assumptions about lifetimes of pending tasks should not be made.
class RTC_LOCKABLE RTC_EXPORT TaskQueue { class RTC_LOCKABLE TaskQueue {
public: public:
// TaskQueue priority levels. On some platforms these will map to thread // TaskQueue priority levels. On some platforms these will map to thread
// priorities, on others such as Mac and iOS, GCD queue priorities. // priorities, on others such as Mac and iOS, GCD queue priorities.