From c66e004edcf3a4c641207dba74d05bd7440581d3 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Fri, 18 Oct 2019 09:52:22 +0200 Subject: [PATCH] Adding missing RTC_EXPORT for component build. Bug: webrtc:9419 Change-Id: Ifa5d21edc708b5012b71e2e5101e10c6352a7218 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/157162 Reviewed-by: Karl Wiberg Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#29533} --- api/audio_codecs/isac/BUILD.gn | 2 ++ api/audio_codecs/isac/audio_decoder_isac_fix.h | 3 ++- api/audio_codecs/isac/audio_encoder_isac_fix.h | 3 ++- api/video/encoded_image.h | 2 +- common_video/BUILD.gn | 1 + common_video/include/bitrate_adjuster.h | 3 ++- common_video/libyuv/include/webrtc_libyuv.h | 3 ++- modules/desktop_capture/BUILD.gn | 1 + modules/desktop_capture/mac/desktop_configuration.h | 3 ++- rtc_base/BUILD.gn | 1 + rtc_base/critical_section.h | 3 ++- rtc_base/rate_statistics.h | 3 ++- 12 files changed, 20 insertions(+), 8 deletions(-) diff --git a/api/audio_codecs/isac/BUILD.gn b/api/audio_codecs/isac/BUILD.gn index 719aee64ea..469176ffa2 100644 --- a/api/audio_codecs/isac/BUILD.gn +++ b/api/audio_codecs/isac/BUILD.gn @@ -79,6 +79,7 @@ rtc_library("audio_encoder_isac_fix") { "..:audio_codecs_api", "../../../modules/audio_coding:isac_fix", "../../../rtc_base:rtc_base_approved", + "../../../rtc_base/system:rtc_export", "//third_party/abseil-cpp/absl/strings", "//third_party/abseil-cpp/absl/types:optional", ] @@ -95,6 +96,7 @@ rtc_library("audio_decoder_isac_fix") { "..:audio_codecs_api", "../../../modules/audio_coding:isac_fix", "../../../rtc_base:rtc_base_approved", + "../../../rtc_base/system:rtc_export", "//third_party/abseil-cpp/absl/strings", "//third_party/abseil-cpp/absl/types:optional", ] diff --git a/api/audio_codecs/isac/audio_decoder_isac_fix.h b/api/audio_codecs/isac/audio_decoder_isac_fix.h index b7a5cef6dc..200914adfe 100644 --- a/api/audio_codecs/isac/audio_decoder_isac_fix.h +++ b/api/audio_codecs/isac/audio_decoder_isac_fix.h @@ -18,12 +18,13 @@ #include "api/audio_codecs/audio_codec_pair_id.h" #include "api/audio_codecs/audio_decoder.h" #include "api/audio_codecs/audio_format.h" +#include "rtc_base/system/rtc_export.h" namespace webrtc { // iSAC decoder API (fixed-point implementation) for use as a template // parameter to CreateAudioDecoderFactory<...>(). -struct AudioDecoderIsacFix { +struct RTC_EXPORT AudioDecoderIsacFix { struct Config {}; // Empty---no config values needed! static absl::optional SdpToConfig(const SdpAudioFormat& audio_format); static void AppendSupportedDecoders(std::vector* specs); diff --git a/api/audio_codecs/isac/audio_encoder_isac_fix.h b/api/audio_codecs/isac/audio_encoder_isac_fix.h index c3c3672b58..9bedde59f5 100644 --- a/api/audio_codecs/isac/audio_encoder_isac_fix.h +++ b/api/audio_codecs/isac/audio_encoder_isac_fix.h @@ -18,12 +18,13 @@ #include "api/audio_codecs/audio_codec_pair_id.h" #include "api/audio_codecs/audio_encoder.h" #include "api/audio_codecs/audio_format.h" +#include "rtc_base/system/rtc_export.h" namespace webrtc { // iSAC encoder API (fixed-point implementation) for use as a template // parameter to CreateAudioEncoderFactory<...>(). -struct AudioEncoderIsacFix { +struct RTC_EXPORT AudioEncoderIsacFix { struct Config { bool IsOk() const { return frame_size_ms == 30 || frame_size_ms == 60; } int frame_size_ms = 30; diff --git a/api/video/encoded_image.h b/api/video/encoded_image.h index 91f2e0f567..32308c9784 100644 --- a/api/video/encoded_image.h +++ b/api/video/encoded_image.h @@ -54,7 +54,7 @@ class EncodedImageBufferInterface : public rtc::RefCountInterface { }; // Basic implementation of EncodedImageBufferInterface. -class EncodedImageBuffer : public EncodedImageBufferInterface { +class RTC_EXPORT EncodedImageBuffer : public EncodedImageBufferInterface { public: static rtc::scoped_refptr Create() { return Create(0); } static rtc::scoped_refptr Create(size_t size); diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn index d77f4b8423..d22e4fddea 100644 --- a/common_video/BUILD.gn +++ b/common_video/BUILD.gn @@ -58,6 +58,7 @@ rtc_library("common_video") { "../rtc_base:checks", "../rtc_base:rtc_task_queue", "../rtc_base:safe_minmax", + "../rtc_base/system:rtc_export", "../system_wrappers:metrics", "//third_party/abseil-cpp/absl/types:optional", "//third_party/libyuv", diff --git a/common_video/include/bitrate_adjuster.h b/common_video/include/bitrate_adjuster.h index 8ede3f9c76..aea1872216 100644 --- a/common_video/include/bitrate_adjuster.h +++ b/common_video/include/bitrate_adjuster.h @@ -17,6 +17,7 @@ #include "absl/types/optional.h" #include "rtc_base/critical_section.h" #include "rtc_base/rate_statistics.h" +#include "rtc_base/system/rtc_export.h" #include "rtc_base/thread_annotations.h" namespace webrtc { @@ -24,7 +25,7 @@ namespace webrtc { // Certain hardware encoders tend to consistently overshoot the bitrate that // they are configured to encode at. This class estimates an adjusted bitrate // that when set on the encoder will produce the desired bitrate. -class BitrateAdjuster { +class RTC_EXPORT BitrateAdjuster { public: // min_adjusted_bitrate_pct and max_adjusted_bitrate_pct are the lower and // upper bound outputted adjusted bitrates as a percentage of the target diff --git a/common_video/libyuv/include/webrtc_libyuv.h b/common_video/libyuv/include/webrtc_libyuv.h index 408841e9e0..ba17577216 100644 --- a/common_video/libyuv/include/webrtc_libyuv.h +++ b/common_video/libyuv/include/webrtc_libyuv.h @@ -23,6 +23,7 @@ #include "api/scoped_refptr.h" #include "api/video/video_frame.h" #include "api/video/video_frame_buffer.h" +#include "rtc_base/system/rtc_export.h" namespace webrtc { @@ -133,7 +134,7 @@ void NV12Scale(uint8_t* tmp_buffer, // Helper class for directly converting and scaling NV12 to I420. The Y-plane // will be scaled directly to the I420 destination, which makes this faster // than separate NV12->I420 + I420->I420 scaling. -class NV12ToI420Scaler { +class RTC_EXPORT NV12ToI420Scaler { public: NV12ToI420Scaler(); ~NV12ToI420Scaler(); diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn index b72bf7e206..6b318b8775 100644 --- a/modules/desktop_capture/BUILD.gn +++ b/modules/desktop_capture/BUILD.gn @@ -242,6 +242,7 @@ if (is_mac) { "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../rtc_base/synchronization:rw_lock_wrapper", + "../../rtc_base/system:rtc_export", "../../sdk:helpers_objc", ] libs = [ diff --git a/modules/desktop_capture/mac/desktop_configuration.h b/modules/desktop_capture/mac/desktop_configuration.h index 53a90813e7..d95957d6ce 100644 --- a/modules/desktop_capture/mac/desktop_configuration.h +++ b/modules/desktop_capture/mac/desktop_configuration.h @@ -16,6 +16,7 @@ #include #include "modules/desktop_capture/desktop_geometry.h" +#include "rtc_base/system/rtc_export.h" namespace webrtc { @@ -48,7 +49,7 @@ struct MacDisplayConfiguration { typedef std::vector MacDisplayConfigurations; // Describes the configuration of the whole desktop. -struct MacDesktopConfiguration { +struct RTC_EXPORT MacDesktopConfiguration { // Used to request bottom-up or top-down coordinates. enum Origin { BottomLeftOrigin, TopLeftOrigin }; diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 9f6f148071..b643344271 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -186,6 +186,7 @@ rtc_library("criticalsection") { ":checks", ":macromagic", ":platform_thread_types", + "system:rtc_export", "system:unused", ] } diff --git a/rtc_base/critical_section.h b/rtc_base/critical_section.h index a13721e8a4..cf10463bdf 100644 --- a/rtc_base/critical_section.h +++ b/rtc_base/critical_section.h @@ -14,6 +14,7 @@ #include "rtc_base/checks.h" #include "rtc_base/constructor_magic.h" #include "rtc_base/platform_thread_types.h" +#include "rtc_base/system/rtc_export.h" #include "rtc_base/thread_annotations.h" #if defined(WEBRTC_WIN) @@ -45,7 +46,7 @@ namespace rtc { // Locking methods (Enter, TryEnter, Leave)are const to permit protecting // members inside a const context without requiring mutable CriticalSections // everywhere. CriticalSection is reentrant lock. -class RTC_LOCKABLE CriticalSection { +class RTC_LOCKABLE RTC_EXPORT CriticalSection { public: CriticalSection(); ~CriticalSection(); diff --git a/rtc_base/rate_statistics.h b/rtc_base/rate_statistics.h index a4236545af..65b5fa10d9 100644 --- a/rtc_base/rate_statistics.h +++ b/rtc_base/rate_statistics.h @@ -17,10 +17,11 @@ #include #include "absl/types/optional.h" +#include "rtc_base/system/rtc_export.h" namespace webrtc { -class RateStatistics { +class RTC_EXPORT RateStatistics { public: static constexpr float kBpsScale = 8000.0f;