From 1ddc5b63cc3a3470edf4005c76fb6ce3d421f5e3 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Fri, 19 Oct 2018 10:35:14 +0200 Subject: [PATCH] Export symbols needed by the Chromium component build (part 5). 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: I452117a8385bb08f86c4863bb1079d3774a16a0d Reviewed-on: https://webrtc-review.googlesource.com/c/107042 Reviewed-by: Karl Wiberg Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#25268} --- api/peerconnectioninterface.h | 16 ++++++++++------ media/base/videocommon.h | 3 ++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/api/peerconnectioninterface.h b/api/peerconnectioninterface.h index 8775cf0de3..d0f96a02f1 100644 --- a/api/peerconnectioninterface.h +++ b/api/peerconnectioninterface.h @@ -1325,7 +1325,8 @@ class PeerConnectionFactoryInterface : public rtc::RefCountInterface { // rtc::Thread::Current()->Run(), or call // rtc::Thread::Current()->ProcessMessages() within the application's own // message loop. -rtc::scoped_refptr CreatePeerConnectionFactory( +RTC_EXPORT rtc::scoped_refptr +CreatePeerConnectionFactory( rtc::scoped_refptr audio_encoder_factory, rtc::scoped_refptr audio_decoder_factory); @@ -1339,7 +1340,8 @@ rtc::scoped_refptr CreatePeerConnectionFactory( // returned factory. // TODO(deadbeef): Use rtc::scoped_refptr<> and std::unique_ptr<> to make this // ownership transfer and ref counting more obvious. -rtc::scoped_refptr CreatePeerConnectionFactory( +RTC_EXPORT rtc::scoped_refptr +CreatePeerConnectionFactory( rtc::Thread* network_thread, rtc::Thread* worker_thread, rtc::Thread* signaling_thread, @@ -1355,7 +1357,8 @@ rtc::scoped_refptr CreatePeerConnectionFactory( // If |audio_mixer| is null, an internal audio mixer will be created and used. // If |audio_processing| is null, an internal audio processing module will be // created and used. -rtc::scoped_refptr CreatePeerConnectionFactory( +RTC_EXPORT rtc::scoped_refptr +CreatePeerConnectionFactory( rtc::Thread* network_thread, rtc::Thread* worker_thread, rtc::Thread* signaling_thread, @@ -1399,7 +1402,8 @@ CreatePeerConnectionFactory( // extra internal video codecs will be added. // When building WebRTC with rtc_use_builtin_sw_codecs = false, this is the // only available CreatePeerConnectionFactory overload. -rtc::scoped_refptr CreatePeerConnectionFactory( +RTC_EXPORT rtc::scoped_refptr +CreatePeerConnectionFactory( rtc::Thread* network_thread, rtc::Thread* worker_thread, rtc::Thread* signaling_thread, @@ -1416,7 +1420,7 @@ rtc::scoped_refptr CreatePeerConnectionFactory( // mixer. // // If |audio_mixer| is null, an internal audio mixer will be created and used. -rtc::scoped_refptr +RTC_EXPORT rtc::scoped_refptr CreatePeerConnectionFactoryWithAudioMixer( rtc::Thread* network_thread, rtc::Thread* worker_thread, @@ -1430,7 +1434,7 @@ CreatePeerConnectionFactoryWithAudioMixer( // Create a new instance of PeerConnectionFactoryInterface. // Same thread is used as worker and network thread. -inline rtc::scoped_refptr +RTC_EXPORT inline rtc::scoped_refptr CreatePeerConnectionFactory( rtc::Thread* worker_and_network_thread, rtc::Thread* signaling_thread, diff --git a/media/base/videocommon.h b/media/base/videocommon.h index 0ffd989cb6..6447cba3b2 100644 --- a/media/base/videocommon.h +++ b/media/base/videocommon.h @@ -17,6 +17,7 @@ #include +#include "rtc_base/system/rtc_export.h" #include "rtc_base/timeutils.h" namespace cricket { @@ -149,7 +150,7 @@ struct VideoFormatPod { uint32_t fourcc; // Color space. FOURCC_ANY means that any color space is OK. }; -struct VideoFormat : VideoFormatPod { +struct RTC_EXPORT VideoFormat : VideoFormatPod { static const int64_t kMinimumInterval = rtc::kNumNanosecsPerSec / 10000; // 10k fps.