Changeset 212401 in webkit


Ignore:
Timestamp:
Feb 15, 2017 3:23:30 PM (7 years ago)
Author:
achristensen@apple.com
Message:

Make libwebrtc.dylib
​https://bugs.webkit.org/show_bug.cgi?id=168335

Reviewed by Dan Bernstein.

We were building libwebrtc as a static library, which would prevent us from weak linking with it.
We need to explicitly export what we use from WebCore or WebKit2, and RTCLogging.mm now needs to
be built on Mac, so we make it not automatically reference counted to make it work on 32-bit El Capitan.

  • Configurations/libwebrtc.xcconfig:
  • Source/webrtc/api/jsep.h:
  • Source/webrtc/api/mediastream.h:
  • Source/webrtc/api/notifier.h:

(webrtc::Notifier::Notifier): Deleted.
(webrtc::Notifier::RegisterObserver): Deleted.
(webrtc::Notifier::UnregisterObserver): Deleted.
(webrtc::Notifier::FireOnChanged): Deleted.

  • Source/webrtc/api/peerconnectioninterface.h:
  • Source/webrtc/base/asyncpacketsocket.h:
  • Source/webrtc/base/asyncresolverinterface.h:

(rtc::AsyncResolverInterface::address): Deleted.

  • Source/webrtc/base/copyonwritebuffer.h:

(rtc::CopyOnWriteBuffer::CopyOnWriteBuffer): Deleted.
(rtc::CopyOnWriteBuffer::data): Deleted.
(rtc::CopyOnWriteBuffer::cdata): Deleted.
(rtc::CopyOnWriteBuffer::size): Deleted.
(rtc::CopyOnWriteBuffer::capacity): Deleted.
(rtc::CopyOnWriteBuffer::operator=): Deleted.
(rtc::CopyOnWriteBuffer::operator!=): Deleted.
(rtc::CopyOnWriteBuffer::operator[]): Deleted.
(rtc::CopyOnWriteBuffer::SetData): Deleted.
(rtc::CopyOnWriteBuffer::AppendData): Deleted.
(rtc::CopyOnWriteBuffer::swap): Deleted.
(rtc::CopyOnWriteBuffer::IsConsistent): Deleted.

  • Source/webrtc/base/event.h:
  • Source/webrtc/base/export.h: Added.
  • Source/webrtc/base/helpers.h:
  • Source/webrtc/base/ipaddress.h:

(rtc::IPAddress::IPAddress): Deleted.
(rtc::IPAddress::~IPAddress): Deleted.
(rtc::IPAddress::operator=): Deleted.
(rtc::IPAddress::family): Deleted.

  • Source/webrtc/base/location.h:

(rtc::Location::function_name): Deleted.
(rtc::Location::file_and_line): Deleted.

  • Source/webrtc/base/messagehandler.h:

(rtc::MessageHandler::MessageHandler): Deleted.

  • Source/webrtc/base/network.h:

(rtc::NetworkManagerBase::ipv6_enabled): Deleted.
(rtc::NetworkManagerBase::set_ipv6_enabled): Deleted.
(rtc::NetworkManagerBase::set_max_ipv6_networks): Deleted.
(rtc::NetworkManagerBase::max_ipv6_networks): Deleted.
(rtc::NetworkManagerBase::set_enumeration_permission): Deleted.
(rtc::BasicNetworkManager::started): Deleted.
(rtc::BasicNetworkManager::set_network_ignore_list): Deleted.
(rtc::BasicNetworkManager::set_ignore_non_default_routes): Deleted.
(rtc::Network::default_local_address_provider): Deleted.
(rtc::Network::set_default_local_address_provider): Deleted.
(rtc::Network::name): Deleted.
(rtc::Network::description): Deleted.
(rtc::Network::prefix): Deleted.
(rtc::Network::prefix_length): Deleted.
(rtc::Network::key): Deleted.
(rtc::Network::ip): Deleted.
(rtc::Network::AddIP): Deleted.
(rtc::Network::GetIPs): Deleted.
(rtc::Network::ClearIPs): Deleted.
(rtc::Network::scope_id): Deleted.
(rtc::Network::set_scope_id): Deleted.
(rtc::Network::ignored): Deleted.
(rtc::Network::set_ignored): Deleted.
(rtc::Network::type): Deleted.
(rtc::Network::set_type): Deleted.
(rtc::Network::GetCost): Deleted.
(rtc::Network::id): Deleted.
(rtc::Network::set_id): Deleted.
(rtc::Network::preference): Deleted.
(rtc::Network::set_preference): Deleted.
(rtc::Network::active): Deleted.
(rtc::Network::set_active): Deleted.

  • Source/webrtc/base/proxyinfo.h:
  • Source/webrtc/base/refcountedobject.h:

(rtc::RefCountedObject::RefCountedObject): Deleted.
(rtc::RefCountedObject::AddRef): Deleted.
(rtc::RefCountedObject::Release): Deleted.
(rtc::RefCountedObject::HasOneRef): Deleted.
(rtc::RefCountedObject::~RefCountedObject): Deleted.

  • Source/webrtc/base/socketaddress.h:

(rtc::SocketAddress::hostname): Deleted.
(rtc::SocketAddress::family): Deleted.
(rtc::SocketAddress::scope_id): Deleted.
(rtc::SocketAddress::SetScopeID): Deleted.
(rtc::SocketAddress::operator !=): Deleted.

  • Source/webrtc/base/thread.h:
  • Source/webrtc/common_types.h:
  • Source/webrtc/common_video/include/video_frame_buffer.h:

(webrtc::I420Buffer::Copy): Deleted.
(webrtc::I420Buffer::CropAndScaleFrom): Deleted.
(webrtc::I420Buffer::ScaleFrom): Deleted.

  • Source/webrtc/common_video/libyuv/include/webrtc_libyuv.h:
  • Source/webrtc/p2p/base/basicpacketsocketfactory.h:
  • Source/webrtc/p2p/client/basicportallocator.h:

(cricket::BasicPortAllocator::network_ignore_mask): Deleted.
(cricket::BasicPortAllocator::network_manager): Deleted.
(cricket::BasicPortAllocator::socket_factory): Deleted.

  • Source/webrtc/sdk/objc/Framework/Classes/RTCLogging.mm:

(RTCFileName):

  • Source/webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.h:
  • Source/webrtc/video_frame.h:

(webrtc::VideoFrame::timestamp_us): Deleted.
(webrtc::VideoFrame::set_timestamp_us): Deleted.
(webrtc::VideoFrame::set_timestamp): Deleted.
(webrtc::VideoFrame::timestamp): Deleted.
(webrtc::VideoFrame::transport_frame_id): Deleted.
(webrtc::VideoFrame::set_ntp_time_ms): Deleted.
(webrtc::VideoFrame::ntp_time_ms): Deleted.
(webrtc::VideoFrame::rotation): Deleted.
(webrtc::VideoFrame::set_rotation): Deleted.
(webrtc::VideoFrame::set_render_time_ms): Deleted.
(webrtc::VideoFrame::render_time_ms): Deleted.
(webrtc::VideoFrame::is_texture): Deleted.

  • build: Added.
  • build/Debug: Added.
  • libwebrtc.xcodeproj/project.pbxproj:
Location:
trunk/Source/ThirdParty/libwebrtc
Files:
1 added
29 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r212397 r212401  
     12017-02-15  Alex Christensen  <achristensen@webkit.org>
     2
     3        Make libwebrtc.dylib
     4        https://bugs.webkit.org/show_bug.cgi?id=168335
     5
     6        Reviewed by Dan Bernstein.
     7
     8        We were building libwebrtc as a static library, which would prevent us from weak linking with it.
     9        We need to explicitly export what we use from WebCore or WebKit2, and RTCLogging.mm now needs to
     10        be built on Mac, so we make it not automatically reference counted to make it work on 32-bit El Capitan.
     11
     12        * Configurations/libwebrtc.xcconfig:
     13        * Source/webrtc/api/jsep.h:
     14        * Source/webrtc/api/mediastream.h:
     15        * Source/webrtc/api/notifier.h:
     16        (webrtc::Notifier::Notifier): Deleted.
     17        (webrtc::Notifier::RegisterObserver): Deleted.
     18        (webrtc::Notifier::UnregisterObserver): Deleted.
     19        (webrtc::Notifier::FireOnChanged): Deleted.
     20        * Source/webrtc/api/peerconnectioninterface.h:
     21        * Source/webrtc/base/asyncpacketsocket.h:
     22        * Source/webrtc/base/asyncresolverinterface.h:
     23        (rtc::AsyncResolverInterface::address): Deleted.
     24        * Source/webrtc/base/copyonwritebuffer.h:
     25        (rtc::CopyOnWriteBuffer::CopyOnWriteBuffer): Deleted.
     26        (rtc::CopyOnWriteBuffer::data): Deleted.
     27        (rtc::CopyOnWriteBuffer::cdata): Deleted.
     28        (rtc::CopyOnWriteBuffer::size): Deleted.
     29        (rtc::CopyOnWriteBuffer::capacity): Deleted.
     30        (rtc::CopyOnWriteBuffer::operator=): Deleted.
     31        (rtc::CopyOnWriteBuffer::operator!=): Deleted.
     32        (rtc::CopyOnWriteBuffer::operator[]): Deleted.
     33        (rtc::CopyOnWriteBuffer::SetData): Deleted.
     34        (rtc::CopyOnWriteBuffer::AppendData): Deleted.
     35        (rtc::CopyOnWriteBuffer::swap): Deleted.
     36        (rtc::CopyOnWriteBuffer::IsConsistent): Deleted.
     37        * Source/webrtc/base/event.h:
     38        * Source/webrtc/base/export.h: Added.
     39        * Source/webrtc/base/helpers.h:
     40        * Source/webrtc/base/ipaddress.h:
     41        (rtc::IPAddress::IPAddress): Deleted.
     42        (rtc::IPAddress::~IPAddress): Deleted.
     43        (rtc::IPAddress::operator=): Deleted.
     44        (rtc::IPAddress::family): Deleted.
     45        * Source/webrtc/base/location.h:
     46        (rtc::Location::function_name): Deleted.
     47        (rtc::Location::file_and_line): Deleted.
     48        * Source/webrtc/base/messagehandler.h:
     49        (rtc::MessageHandler::MessageHandler): Deleted.
     50        * Source/webrtc/base/network.h:
     51        (rtc::NetworkManagerBase::ipv6_enabled): Deleted.
     52        (rtc::NetworkManagerBase::set_ipv6_enabled): Deleted.
     53        (rtc::NetworkManagerBase::set_max_ipv6_networks): Deleted.
     54        (rtc::NetworkManagerBase::max_ipv6_networks): Deleted.
     55        (rtc::NetworkManagerBase::set_enumeration_permission): Deleted.
     56        (rtc::BasicNetworkManager::started): Deleted.
     57        (rtc::BasicNetworkManager::set_network_ignore_list): Deleted.
     58        (rtc::BasicNetworkManager::set_ignore_non_default_routes): Deleted.
     59        (rtc::Network::default_local_address_provider): Deleted.
     60        (rtc::Network::set_default_local_address_provider): Deleted.
     61        (rtc::Network::name): Deleted.
     62        (rtc::Network::description): Deleted.
     63        (rtc::Network::prefix): Deleted.
     64        (rtc::Network::prefix_length): Deleted.
     65        (rtc::Network::key): Deleted.
     66        (rtc::Network::ip): Deleted.
     67        (rtc::Network::AddIP): Deleted.
     68        (rtc::Network::GetIPs): Deleted.
     69        (rtc::Network::ClearIPs): Deleted.
     70        (rtc::Network::scope_id): Deleted.
     71        (rtc::Network::set_scope_id): Deleted.
     72        (rtc::Network::ignored): Deleted.
     73        (rtc::Network::set_ignored): Deleted.
     74        (rtc::Network::type): Deleted.
     75        (rtc::Network::set_type): Deleted.
     76        (rtc::Network::GetCost): Deleted.
     77        (rtc::Network::id): Deleted.
     78        (rtc::Network::set_id): Deleted.
     79        (rtc::Network::preference): Deleted.
     80        (rtc::Network::set_preference): Deleted.
     81        (rtc::Network::active): Deleted.
     82        (rtc::Network::set_active): Deleted.
     83        * Source/webrtc/base/proxyinfo.h:
     84        * Source/webrtc/base/refcountedobject.h:
     85        (rtc::RefCountedObject::RefCountedObject): Deleted.
     86        (rtc::RefCountedObject::AddRef): Deleted.
     87        (rtc::RefCountedObject::Release): Deleted.
     88        (rtc::RefCountedObject::HasOneRef): Deleted.
     89        (rtc::RefCountedObject::~RefCountedObject): Deleted.
     90        * Source/webrtc/base/socketaddress.h:
     91        (rtc::SocketAddress::hostname): Deleted.
     92        (rtc::SocketAddress::family): Deleted.
     93        (rtc::SocketAddress::scope_id): Deleted.
     94        (rtc::SocketAddress::SetScopeID): Deleted.
     95        (rtc::SocketAddress::operator !=): Deleted.
     96        * Source/webrtc/base/thread.h:
     97        * Source/webrtc/common_types.h:
     98        * Source/webrtc/common_video/include/video_frame_buffer.h:
     99        (webrtc::I420Buffer::Copy): Deleted.
     100        (webrtc::I420Buffer::CropAndScaleFrom): Deleted.
     101        (webrtc::I420Buffer::ScaleFrom): Deleted.
     102        * Source/webrtc/common_video/libyuv/include/webrtc_libyuv.h:
     103        * Source/webrtc/p2p/base/basicpacketsocketfactory.h:
     104        * Source/webrtc/p2p/client/basicportallocator.h:
     105        (cricket::BasicPortAllocator::network_ignore_mask): Deleted.
     106        (cricket::BasicPortAllocator::network_manager): Deleted.
     107        (cricket::BasicPortAllocator::socket_factory): Deleted.
     108        * Source/webrtc/sdk/objc/Framework/Classes/RTCLogging.mm:
     109        (RTCFileName):
     110        * Source/webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.h:
     111        * Source/webrtc/video_frame.h:
     112        (webrtc::VideoFrame::timestamp_us): Deleted.
     113        (webrtc::VideoFrame::set_timestamp_us): Deleted.
     114        (webrtc::VideoFrame::set_timestamp): Deleted.
     115        (webrtc::VideoFrame::timestamp): Deleted.
     116        (webrtc::VideoFrame::transport_frame_id): Deleted.
     117        (webrtc::VideoFrame::set_ntp_time_ms): Deleted.
     118        (webrtc::VideoFrame::ntp_time_ms): Deleted.
     119        (webrtc::VideoFrame::rotation): Deleted.
     120        (webrtc::VideoFrame::set_rotation): Deleted.
     121        (webrtc::VideoFrame::set_render_time_ms): Deleted.
     122        (webrtc::VideoFrame::render_time_ms): Deleted.
     123        (webrtc::VideoFrame::is_texture): Deleted.
     124        * build: Added.
     125        * build/Debug: Added.
     126        * libwebrtc.xcodeproj/project.pbxproj:
     127
    11282017-02-15  Youenn Fablet  <youenn@apple.com>
    2129

  • trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig

    r212397 r212401  
    1 PRODUCT_NAME = webrtc;
     1PRODUCT_NAME = libwebrtc;
    22
    33CLANG_WARN_BOOL_CONVERSION = YES;
    … …  
    2222EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = *_sse.cc *_sse2.cc macutils.cc macwindowpicker.cc audio_device_mac.cc audio_mixer_manager_mac.cc;
    2323EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = macutils.cc macwindowpicker.cc audio_device_mac.cc audio_mixer_manager_mac.cc;
    24 EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = audio_device_ios.mm voice_processing_audio_unit.mm audio_device_not_implemented_ios.mm RTCAudioSessionConfiguration.m RTCAudioSessionDelegateAdapter.mm RTCAudioSession.mm RTCAudioSession+Configuration.mm RTCUIApplication.mm RTCLogging.mm;
     24EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = audio_device_ios.mm voice_processing_audio_unit.mm audio_device_not_implemented_ios.mm RTCAudioSessionConfiguration.m RTCAudioSessionDelegateAdapter.mm RTCAudioSession.mm RTCAudioSession+Configuration.mm RTCUIApplication.mm;

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/api/jsep.h

    r212333 r212401  
    1818
    1919#include "webrtc/base/basictypes.h"
     20#include "webrtc/base/export.h"
    2021#include "webrtc/base/refcount.h"
    2122
    … …  
    5657// Returns NULL if the sdp string can't be parsed.
    5758// |error| can be NULL if doesn't care about the failure reason.
    58 IceCandidateInterface* CreateIceCandidate(const std::string& sdp_mid,
     59WEBRTC_EXPORT IceCandidateInterface* CreateIceCandidate(const std::string& sdp_mid,
    5960                                          int sdp_mline_index,
    6061                                          const std::string& sdp,
    … …  
    113114// Returns NULL if the sdp string can't be parsed or the type is unsupported.
    114115// |error| can be NULL if doesn't care about the failure reason.
    115 SessionDescriptionInterface* CreateSessionDescription(const std::string& type,
     116WEBRTC_EXPORT SessionDescriptionInterface* CreateSessionDescription(const std::string& type,
    116117                                                      const std::string& sdp,
    117118                                                      SdpParseError* error);

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/api/mediastream.h

    r212333 r212401  
    1919#include "webrtc/api/mediastreaminterface.h"
    2020#include "webrtc/api/notifier.h"
     21#include "webrtc/base/export.h"
    2122
    2223namespace webrtc {
    2324
    24 class MediaStream : public Notifier<MediaStreamInterface> {
     25class WEBRTC_EXPORT MediaStream : public Notifier<MediaStreamInterface> {
    2526 public:
    2627  static rtc::scoped_refptr<MediaStream> Create(const std::string& label);

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/api/notifier.h

    r212333 r212401  
    1616#include "webrtc/api/mediastreaminterface.h"
    1717#include "webrtc/base/common.h"
     18#include "webrtc/base/export.h"
    1819
    1920namespace webrtc {
    … …  
    2122// Implement a template version of a notifier.
    2223template <class T>
    23 class Notifier : public T {
     24class WEBRTC_EXPORT Notifier : public T {
    2425 public:
    2526  Notifier() {

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/api/peerconnectioninterface.h

    r212333 r212401  
    6666#include "webrtc/api/statstypes.h"
    6767#include "webrtc/api/umametrics.h"
     68#include "webrtc/base/export.h"
    6869#include "webrtc/base/fileutils.h"
    6970#include "webrtc/base/network.h"
    … …  
    740741// If non-null, ownership of |default_adm|, |encoder_factory| and
    741742// |decoder_factory| are transferred to the returned factory.
    742 rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
     743WEBRTC_EXPORT rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
    743744    rtc::Thread* network_thread,
    744745    rtc::Thread* worker_thread,

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/asyncpacketsocket.h

    r212333 r212401  
    1414#include "webrtc/base/constructormagic.h"
    1515#include "webrtc/base/dscp.h"
     16#include "webrtc/base/export.h"
    1617#include "webrtc/base/sigslot.h"
    1718#include "webrtc/base/socket.h"
    … …  
    2324// extension, including the information needed to update the authentication tag
    2425// after changing the value.
    25 struct PacketTimeUpdateParams {
     26struct WEBRTC_EXPORT PacketTimeUpdateParams {
    2627  PacketTimeUpdateParams();
    2728  ~PacketTimeUpdateParams();
    … …  
    6667// Provides the ability to receive packets asynchronously. Sends are not
    6768// buffered since it is acceptable to drop packets under high load.
    68 class AsyncPacketSocket : public sigslot::has_slots<> {
     69class WEBRTC_EXPORT AsyncPacketSocket : public sigslot::has_slots<> {
    6970 public:
    7071  enum State {

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/asyncresolverinterface.h

    r212333 r212401  
    1212#define WEBRTC_BASE_ASYNCRESOLVERINTERFACE_H_
    1313
     14#include "webrtc/base/export.h"
    1415#include "webrtc/base/sigslot.h"
    1516#include "webrtc/base/socketaddress.h"
    … …  
    1819
    1920// This interface defines the methods to resolve the address asynchronously.
    20 class AsyncResolverInterface {
     21class WEBRTC_EXPORT AsyncResolverInterface {
    2122 public:
    2223  AsyncResolverInterface();

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/checks.h

    r210942 r212401  
    1212#define WEBRTC_BASE_CHECKS_H_
    1313
     14#include "webrtc/base/export.h"
    1415#include "webrtc/typedefs.h"
    1516
    … …  
    211212
    212213// This is identical to LogMessageVoidify but in name.
    213 class FatalMessageVoidify {
     214class WEBRTC_EXPORT FatalMessageVoidify {
    214215 public:
    215216  FatalMessageVoidify() { }

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/copyonwritebuffer.h

    r212333 r212401  
    1717#include "webrtc/base/buffer.h"
    1818#include "webrtc/base/checks.h"
     19#include "webrtc/base/export.h"
    1920#include "webrtc/base/refcount.h"
    2021#include "webrtc/base/scoped_ref_ptr.h"
    … …  
    2223namespace rtc {
    2324
    24 class CopyOnWriteBuffer {
     25class WEBRTC_EXPORT CopyOnWriteBuffer {
    2526 public:
    2627  // An empty buffer.

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/event.h

    r212333 r212401  
    2121
    2222#include "webrtc/base/basictypes.h"
     23#include "webrtc/base/export.h"
    2324
    2425namespace rtc {
    2526
    26 class Event {
     27class WEBRTC_EXPORT Event {
    2728 public:
    2829  static const int kForever = -1;

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/helpers.h

    r212333 r212401  
    1414#include <string>
    1515#include "webrtc/base/basictypes.h"
     16#include "webrtc/base/export.h"
    1617
    1718namespace rtc {
    … …  
    2627// Generates a (cryptographically) random string of the given length.
    2728// We generate base64 values so that they will be printable.
    28 std::string CreateRandomString(size_t length);
     29WEBRTC_EXPORT std::string CreateRandomString(size_t length);
    2930
    3031// Generates a (cryptographically) random string of the given length.

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/ipaddress.h

    r212333 r212401  
    2828#include "webrtc/base/basictypes.h"
    2929#include "webrtc/base/byteorder.h"
     30#include "webrtc/base/export.h"
    3031#if defined(WEBRTC_WIN)
    3132#include "webrtc/base/win32.h"
    … …  
    4849
    4950// Version-agnostic IP address class, wraps a union of in_addr and in6_addr.
    50 class IPAddress {
     51class WEBRTC_EXPORT IPAddress {
    5152 public:
    5253  IPAddress() : family_(AF_UNSPEC) {

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/location.h

    r212333 r212401  
    1414#include <string>
    1515
     16#include "webrtc/base/export.h"
    1617#include "webrtc/system_wrappers/include/stringize_macros.h"
    1718
    … …  
    2223// This is a stripped down version of:
    2324// https://code.google.com/p/chromium/codesearch#chromium/src/base/location.h
    24 class Location {
     25class WEBRTC_EXPORT Location {
    2526 public:
    2627  // Constructor should be called with a long-lived char*, such as __FILE__.

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/messagehandler.h

    r212333 r212401  
    1616
    1717#include "webrtc/base/constructormagic.h"
     18#include "webrtc/base/export.h"
    1819
    1920namespace rtc {
    … …  
    2324// Messages get dispatched to a MessageHandler
    2425
    25 class MessageHandler {
     26class WEBRTC_EXPORT MessageHandler {
    2627 public:
    2728  virtual ~MessageHandler();

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/network.h

    r212333 r212401  
    1919
    2020#include "webrtc/base/basictypes.h"
     21#include "webrtc/base/export.h"
    2122#include "webrtc/base/ipaddress.h"
    2223#include "webrtc/base/networkmonitor.h"
    … …  
    136137
    137138// Base class for NetworkManager implementations.
    138 class NetworkManagerBase : public NetworkManager {
     139class WEBRTC_EXPORT NetworkManagerBase : public NetworkManager {
    139140 public:
    140141  NetworkManagerBase();
    … …  
    201202// Basic implementation of the NetworkManager interface that gets list
    202203// of networks using OS APIs.
    203 class BasicNetworkManager : public NetworkManagerBase,
     204class WEBRTC_EXPORT BasicNetworkManager : public NetworkManagerBase,
    204205                            public MessageHandler,
    205206                            public sigslot::has_slots<> {
    … …  
    277278
    278279// Represents a Unix-type network interface, with a name and single address.
    279 class Network {
     280class WEBRTC_EXPORT Network {
    280281 public:
    281282  Network(const std::string& name,

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/proxyinfo.h

    r212333 r212401  
    1313
    1414#include <string>
     15#include "webrtc/base/cryptstring.h"
     16#include "webrtc/base/export.h"
    1517#include "webrtc/base/socketaddress.h"
    16 #include "webrtc/base/cryptstring.h"
    1718
    1819namespace rtc {
    … …  
    2627const char * ProxyToString(ProxyType proxy);
    2728
    28 struct ProxyInfo {
     29struct WEBRTC_EXPORT ProxyInfo {
    2930  ProxyType type;
    3031  SocketAddress address;

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/refcountedobject.h

    r212333 r212401  
    1414
    1515#include "webrtc/base/atomicops.h"
     16#include "webrtc/base/export.h"
    1617
    1718namespace rtc {
    1819
    1920template <class T>
    20 class RefCountedObject : public T {
     21class WEBRTC_EXPORT RefCountedObject : public T {
    2122 public:
    2223  RefCountedObject() {}

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/socketaddress.h

    r212333 r212401  
    2626
    2727// Records an IP address and port.
    28 class SocketAddress {
     28class WEBRTC_EXPORT SocketAddress {
    2929 public:
    3030  // Creates a nil address.

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/thread.h

    r212333 r212401  
    9494// WARNING! SUBCLASSES MUST CALL Stop() IN THEIR DESTRUCTORS!  See ~Thread().
    9595
    96 class LOCKABLE Thread : public MessageQueue {
     96class LOCKABLE WEBRTC_EXPORT Thread : public MessageQueue {
    9797 public:
    9898  // Create a new Thread and optionally assign it to the passed SocketServer.

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/common_types.h

    r212333 r212401  
    2828#endif
    2929
     30#ifdef WIN32
    3031#if defined(WEBRTC_EXPORT)
    3132#define WEBRTC_DLLEXPORT _declspec(dllexport)
    3233#elif defined(WEBRTC_DLL)
    3334#define WEBRTC_DLLEXPORT _declspec(dllimport)
     35#endif
    3436#else
    3537#define WEBRTC_DLLEXPORT

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/common_video/include/video_frame_buffer.h

    r212333 r212401  
    1717
    1818#include "webrtc/base/callback.h"
     19#include "webrtc/base/export.h"
    1920#include "webrtc/base/refcount.h"
    2021#include "webrtc/base/scoped_ref_ptr.h"
    … …  
    5758
    5859// Plain I420 buffer in standard memory.
    59 class I420Buffer : public VideoFrameBuffer {
     60class WEBRTC_EXPORT I420Buffer : public VideoFrameBuffer {
    6061 public:
    6162  I420Buffer(int width, int height);

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/common_video/libyuv/include/webrtc_libyuv.h

    r212333 r212401  
    1919#include <vector>
    2020
     21#include "webrtc/base/export.h"
    2122#include "webrtc/common_types.h"  // RawVideoTypes.
    2223#include "webrtc/common_video/rotation.h"
    … …  
    101102// only exception at the time of this writing is
    102103// VideoCaptureImpl::IncomingFrame, which still needs libyuv::ConvertToI420.
    103 int ConvertToI420(VideoType src_video_type,
     104WEBRTC_EXPORT int ConvertToI420(VideoType src_video_type,
    104105                  const uint8_t* src_frame,
    105106                  int crop_x,

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/p2p/base/basicpacketsocketfactory.h

    r212333 r212401  
    1212#define WEBRTC_P2P_BASE_BASICPACKETSOCKETFACTORY_H_
    1313
     14#include "webrtc/base/export.h"
    1415#include "webrtc/p2p/base/packetsocketfactory.h"
    1516
    … …  
    2021class Thread;
    2122
    22 class BasicPacketSocketFactory : public PacketSocketFactory {
     23class WEBRTC_EXPORT BasicPacketSocketFactory : public PacketSocketFactory {
    2324 public:
    2425  BasicPacketSocketFactory();

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/p2p/client/basicportallocator.h

    r212333 r212401  
    1717
    1818#include "webrtc/p2p/base/portallocator.h"
     19#include "webrtc/base/export.h"
    1920#include "webrtc/base/messagequeue.h"
    2021#include "webrtc/base/network.h"
    … …  
    2324namespace cricket {
    2425
    25 class BasicPortAllocator : public PortAllocator {
     26class WEBRTC_EXPORT BasicPortAllocator : public PortAllocator {
    2627 public:
    2728  BasicPortAllocator(rtc::NetworkManager* network_manager,

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/RTCLogging.mm

    r212333 r212401  
    3939NSString* RTCFileName(const char* file_path) {
    4040  NSString* ns_file_path =
    41       [[NSString alloc] initWithBytesNoCopy:const_cast<char*>(file_path)
     41      [[[NSString alloc] initWithBytesNoCopy:const_cast<char*>(file_path)
    4242                                     length:strlen(file_path)
    4343                                   encoding:NSUTF8StringEncoding
    44                                freeWhenDone:NO];
     44                               freeWhenDone:NO] autorelease];
    4545  return ns_file_path.lastPathComponent;
    4646}

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.h

    r212333 r212401  
    1212#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOXVIDEOCODECFACTORY_H_
    1313
     14#include "webrtc/base/export.h"
    1415#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
    1516#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
    … …  
    1718namespace webrtc {
    1819
    19 class VideoToolboxVideoEncoderFactory
     20class WEBRTC_EXPORT VideoToolboxVideoEncoderFactory
    2021    : public cricket::WebRtcVideoEncoderFactory {
    2122 public:
    … …  
    3233};
    3334
    34 class VideoToolboxVideoDecoderFactory
     35class WEBRTC_EXPORT VideoToolboxVideoDecoderFactory
    3536    : public cricket::WebRtcVideoDecoderFactory {
    3637 public:

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/video_frame.h

    r212333 r212401  
    1212#define WEBRTC_VIDEO_FRAME_H_
    1313
     14#include "webrtc/base/export.h"
    1415#include "webrtc/base/scoped_ref_ptr.h"
    1516#include "webrtc/base/timeutils.h"
    … …  
    2122namespace webrtc {
    2223
    23 class VideoFrame {
     24class WEBRTC_EXPORT VideoFrame {
    2425 public:
    2526  // TODO(nisse): Deprecated. Using the default constructor violates the

  • trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj

    r212397 r212401  
    4242                414D71171E4AEAFB0023E526 /* sctp_indata.c in Sources */ = {isa = PBXBuildFile; fileRef = 414D71151E4AEACD0023E526 /* sctp_indata.c */; };
    4343                414D71191E4AEB110023E526 /* sctp_userspace.c in Sources */ = {isa = PBXBuildFile; fileRef = 414D71181E4AEB110023E526 /* sctp_userspace.c */; };
     44                5C0073031E5513E70042215A /* libboringssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C63FC601E418411002CA531 /* libboringssl.a */; };
     45                5C0073041E5513E70042215A /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C4B4A8E1E42C336002651C8 /* libopus.a */; };
     46                5C0073051E5513E70042215A /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0884D11E4A97E300403995 /* libsrtp.a */; };
     47                5C0073061E5513E70042215A /* libusrsctp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C11A12D1E4577E1004F0987 /* libusrsctp.a */; };
     48                5C0073071E5513E70042215A /* libwebrtcpcrtc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C088C0B1E4AA3B100403995 /* libwebrtcpcrtc.a */; };
     49                5C0073081E5513E70042215A /* libyuv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0884DE1E4A980100403995 /* libyuv.a */; };
     50                5C00730E1E5513E70042215A /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0073091E5513E70042215A /* AudioToolbox.framework */; };
     51                5C00730F1E5513E70042215A /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C00730A1E5513E70042215A /* AVFoundation.framework */; };
     52                5C0073101E5513E70042215A /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C00730B1E5513E70042215A /* CoreAudio.framework */; };
     53                5C0073111E5513E70042215A /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C00730C1E5513E70042215A /* CoreMedia.framework */; };
     54                5C0073121E5513E70042215A /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C00730D1E5513E70042215A /* CoreVideo.framework */; };
     55                5C0073141E5514020042215A /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0073131E5514020042215A /* VideoToolbox.framework */; };
    4456                5C0884E31E4A986000403995 /* compare.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4D341E4323D4002651C8 /* compare.cc */; };
    4557                5C0884E41E4A986000403995 /* compare_common.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4D2F1E4323D4002651C8 /* compare_common.cc */; };
    … …  
    13991411                5CDD85361E43B39C00621E92 /* flexfec_receive_stream.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CDD85251E43B39C00621E92 /* flexfec_receive_stream.cc */; };
    14001412                5CDD85371E43B39C00621E92 /* flexfec_receive_stream.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CDD85261E43B39C00621E92 /* flexfec_receive_stream.h */; };
    1401                 5CDD853B1E43B39C00621E92 /* transport_adapter.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CDD852B1E43B39C00621E92 /* transport_adapter.cc */; };
    14021413                5CDD853C1E43B39C00621E92 /* transport_adapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CDD852C1E43B39C00621E92 /* transport_adapter.h */; };
    14031414                5CDD85581E43B42B00621E92 /* h264.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CDD854B1E43B42B00621E92 /* h264.cc */; };
    … …  
    24082419                5CFD53931E4BD3A300482908 /* scale_neon.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD538B1E4BD3A300482908 /* scale_neon.cc */; };
    24092420                5CFD53941E4BD3A300482908 /* scale_neon64.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD538C1E4BD3A300482908 /* scale_neon64.cc */; };
    2410                 5CFD54911E4E650700482908 /* RTCLogging.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD54901E4E650700482908 /* RTCLogging.mm */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
     2421                5CFD54911E4E650700482908 /* RTCLogging.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD54901E4E650700482908 /* RTCLogging.mm */; };
    24112422/* End PBXBuildFile section */
    24122423
    … …  
    26552666                414D71151E4AEACD0023E526 /* sctp_indata.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sctp_indata.c; path = netinet/sctp_indata.c; sourceTree = "<group>"; };
    26562667                414D71181E4AEB110023E526 /* sctp_userspace.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sctp_userspace.c; path = netinet/sctp_userspace.c; sourceTree = "<group>"; };
     2668                5C0073091E5513E70042215A /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
     2669                5C00730A1E5513E70042215A /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
     2670                5C00730B1E5513E70042215A /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
     2671                5C00730C1E5513E70042215A /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
     2672                5C00730D1E5513E70042215A /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
     2673                5C0073131E5514020042215A /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
    26572674                5C0884891E4A978C00403995 /* libsrtp.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = libsrtp.xcconfig; sourceTree = "<group>"; };
    26582675                5C08848A1E4A978C00403995 /* libyuv.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = libyuv.xcconfig; sourceTree = "<group>"; };
    … …  
    50515068                5D7C59C61208C68B001C873E /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
    50525069                5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
    5053                 FB39D0D11200F0E300088E69 /* libwebrtc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwebrtc.a; sourceTree = BUILT_PRODUCTS_DIR; };
     5070                FB39D0D11200F0E300088E69 /* libwebrtc.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libwebrtc.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
    50545071/* End PBXFileReference section */
    50555072
    … …  
    51015118                        buildActionMask = 2147483647;
    51025119                        files = (
     5120                                5C0073141E5514020042215A /* VideoToolbox.framework in Frameworks */,
     5121                                5C00730E1E5513E70042215A /* AudioToolbox.framework in Frameworks */,
     5122                                5C00730F1E5513E70042215A /* AVFoundation.framework in Frameworks */,
     5123                                5C0073101E5513E70042215A /* CoreAudio.framework in Frameworks */,
     5124                                5C0073111E5513E70042215A /* CoreMedia.framework in Frameworks */,
     5125                                5C0073121E5513E70042215A /* CoreVideo.framework in Frameworks */,
     5126                                5C0073031E5513E70042215A /* libboringssl.a in Frameworks */,
     5127                                5C0073041E5513E70042215A /* libopus.a in Frameworks */,
     5128                                5C0073051E5513E70042215A /* libsrtp.a in Frameworks */,
     5129                                5C0073061E5513E70042215A /* libusrsctp.a in Frameworks */,
     5130                                5C0073071E5513E70042215A /* libwebrtcpcrtc.a in Frameworks */,
     5131                                5C0073081E5513E70042215A /* libyuv.a in Frameworks */,
    51035132                        );
    51045133                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    71287157                        isa = PBXGroup;
    71297158                        children = (
     7159                                5C0073131E5514020042215A /* VideoToolbox.framework */,
     7160                                5C0073091E5513E70042215A /* AudioToolbox.framework */,
     7161                                5C00730A1E5513E70042215A /* AVFoundation.framework */,
     7162                                5C00730B1E5513E70042215A /* CoreAudio.framework */,
     7163                                5C00730C1E5513E70042215A /* CoreMedia.framework */,
     7164                                5C00730D1E5513E70042215A /* CoreVideo.framework */,
    71307165                        );
    71317166                        name = Frameworks;
    … …  
    90029037                                5C0884D11E4A97E300403995 /* libsrtp.a */,
    90039038                                5C11A12D1E4577E1004F0987 /* libusrsctp.a */,
    9004                                 FB39D0D11200F0E300088E69 /* libwebrtc.a */,
     9039                                FB39D0D11200F0E300088E69 /* libwebrtc.dylib */,
    90059040                                5C088C0B1E4AA3B100403995 /* libwebrtcpcrtc.a */,
    90069041                                5C0884DE1E4A980100403995 /* libyuv.a */,
    … …  
    1022310258                        name = libwebrtc;
    1022410259                        productName = libwebrtc;
    10225                         productReference = FB39D0D11200F0E300088E69 /* libwebrtc.a */;
    10226                         productType = "com.apple.product-type.library.static";
     10260                        productReference = FB39D0D11200F0E300088E69 /* libwebrtc.dylib */;
     10261                        productType = "com.apple.product-type.library.dynamic";
    1022710262                };
    1022810263/* End PBXNativeTarget section */
    … …  
    1160611641                                5C63FA1D1E4174F6002CA531 /* transport.cc in Sources */,
    1160711642                                5CDD85C11E43B5C000621E92 /* transport_adapter.cc in Sources */,
    11608                                 5CDD853B1E43B39C00621E92 /* transport_adapter.cc in Sources */,
    1160911643                                5CDD89831E43BF3A00621E92 /* transport_feedback.cc in Sources */,
    1161011644                                5CDD8FBB1E43CD0700621E92 /* transport_feedback_adapter.cc in Sources */,
Note: See TracChangeset for help on using the changeset viewer.