Skip to content

Commit 07fcad1

Browse files
committed
Adds No_MEDIA and NO_WEBSOCKET options
1 parent 389a330 commit 07fcad1

4 files changed

+46
-2
lines changed

src/cpp/main.cpp

+14
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,38 @@
22
#include "rtc-wrapper.h"
33
#include "peer-connection-wrapper.h"
44
#include "data-channel-wrapper.h"
5+
6+
#if RTC_ENABLE_MEDIA == 1
57
#include "media-rtcpreceivingsession-wrapper.h"
68
#include "media-track-wrapper.h"
79
#include "media-video-wrapper.h"
810
#include "media-audio-wrapper.h"
11+
#endif
12+
13+
#if RTC_ENABLE_WEBSOCKET == 1
914
#include "web-socket-wrapper.h"
1015
#include "web-socket-server-wrapper.h"
16+
#endif
1117

1218
Napi::Object InitAll(Napi::Env env, Napi::Object exports)
1319
{
1420
RtcWrapper::Init(env, exports);
21+
22+
#if RTC_ENABLE_MEDIA == 1
1523
RtcpReceivingSessionWrapper::Init(env, exports);
1624
TrackWrapper::Init(env, exports);
1725
VideoWrapper::Init(env, exports);
1826
AudioWrapper::Init(env, exports);
27+
#endif
28+
1929
DataChannelWrapper::Init(env, exports);
2030
PeerConnectionWrapper::Init(env, exports);
31+
32+
#if RTC_ENABLE_WEBSOCKET == 1
2133
WebSocketWrapper::Init(env, exports);
2234
WebSocketServerWrapper::Init(env, exports);
35+
#endif
36+
2337
return exports;
2438
}
2539

src/cpp/peer-connection-wrapper.cpp

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
#include "peer-connection-wrapper.h"
22
#include "data-channel-wrapper.h"
3+
4+
#if RTC_ENABLE_MEDIA == 1
35
#include "media-track-wrapper.h"
46
#include "media-video-wrapper.h"
57
#include "media-audio-wrapper.h"
8+
#endif
69

710
#include "plog/Log.h"
811

@@ -43,7 +46,11 @@ Napi::Object PeerConnectionWrapper::Init(Napi::Env env, Napi::Object exports)
4346
InstanceMethod("remoteDescription", &PeerConnectionWrapper::remoteDescription),
4447
InstanceMethod("addRemoteCandidate", &PeerConnectionWrapper::addRemoteCandidate),
4548
InstanceMethod("createDataChannel", &PeerConnectionWrapper::createDataChannel),
49+
50+
#if RTC_ENABLE_MEDIA == 1
4651
InstanceMethod("addTrack", &PeerConnectionWrapper::addTrack),
52+
InstanceMethod("onTrack", &PeerConnectionWrapper::onTrack),
53+
#endif
4754
InstanceMethod("hasMedia", &PeerConnectionWrapper::hasMedia),
4855
InstanceMethod("state", &PeerConnectionWrapper::state),
4956
InstanceMethod("iceState", &PeerConnectionWrapper::iceState),
@@ -56,7 +63,6 @@ Napi::Object PeerConnectionWrapper::Init(Napi::Env env, Napi::Object exports)
5663
InstanceMethod("onSignalingStateChange", &PeerConnectionWrapper::onSignalingStateChange),
5764
InstanceMethod("onGatheringStateChange", &PeerConnectionWrapper::onGatheringStateChange),
5865
InstanceMethod("onDataChannel", &PeerConnectionWrapper::onDataChannel),
59-
InstanceMethod("onTrack", &PeerConnectionWrapper::onTrack),
6066
InstanceMethod("bytesSent", &PeerConnectionWrapper::bytesSent),
6167
InstanceMethod("bytesReceived", &PeerConnectionWrapper::bytesReceived),
6268
InstanceMethod("rtt", &PeerConnectionWrapper::rtt),
@@ -1049,6 +1055,7 @@ std::string PeerConnectionWrapper::candidateTransportTypeToString(const rtc::Can
10491055
}
10501056
}
10511057

1058+
#if RTC_ENABLE_MEDIA == 1
10521059
Napi::Value PeerConnectionWrapper::addTrack(const Napi::CallbackInfo &info)
10531060
{
10541061
PLOG_DEBUG << "addTrack() called";
@@ -1132,6 +1139,7 @@ void PeerConnectionWrapper::onTrack(const Napi::CallbackInfo &info)
11321139
args = {instance};
11331140
}); });
11341141
}
1142+
#endif
11351143

11361144
Napi::Value PeerConnectionWrapper::hasMedia(const Napi::CallbackInfo &info)
11371145
{

src/cpp/peer-connection-wrapper.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ class PeerConnectionWrapper : public Napi::ObjectWrap<PeerConnectionWrapper>
2727
Napi::Value remoteDescription(const Napi::CallbackInfo &info);
2828
void addRemoteCandidate(const Napi::CallbackInfo &info);
2929
Napi::Value createDataChannel(const Napi::CallbackInfo &info);
30+
31+
#if RTC_ENABLE_MEDIA == 1
3032
Napi::Value addTrack(const Napi::CallbackInfo &info);
33+
void onTrack(const Napi::CallbackInfo &info);
34+
#endif
35+
3136
Napi::Value hasMedia(const Napi::CallbackInfo &info);
3237
Napi::Value state(const Napi::CallbackInfo &info);
3338
Napi::Value iceState(const Napi::CallbackInfo &info);
@@ -42,7 +47,6 @@ class PeerConnectionWrapper : public Napi::ObjectWrap<PeerConnectionWrapper>
4247
void onSignalingStateChange(const Napi::CallbackInfo &info);
4348
void onGatheringStateChange(const Napi::CallbackInfo &info);
4449
void onDataChannel(const Napi::CallbackInfo &info);
45-
void onTrack(const Napi::CallbackInfo &info);
4650

4751
// Stats
4852
Napi::Value bytesSent(const Napi::CallbackInfo &info);

src/cpp/rtc-wrapper.cpp

+18
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
#include "rtc-wrapper.h"
22
#include "peer-connection-wrapper.h"
33
#include "data-channel-wrapper.h"
4+
5+
#if RTC_ENABLE_MEDIA == 1
46
#include "media-track-wrapper.h"
7+
#endif
8+
9+
#if RTC_ENABLE_WEBSOCKET == 1
510
#include "web-socket-wrapper.h"
611
#include "web-socket-server-wrapper.h"
12+
#endif
713

814
#include "plog/Log.h"
915

@@ -118,9 +124,15 @@ void RtcWrapper::cleanup(const Napi::CallbackInfo &info)
118124
{
119125
PeerConnectionWrapper::CloseAll();
120126
DataChannelWrapper::CloseAll();
127+
128+
#if RTC_ENABLE_MEDIA == 1
121129
TrackWrapper::CloseAll();
130+
#endif
131+
132+
#if RTC_ENABLE_WEBSOCKET == 1
122133
WebSocketWrapper::CloseAll();
123134
WebSocketServerWrapper::StopAll();
135+
#endif
124136

125137
const auto timeout = std::chrono::seconds(10);
126138
if (rtc::Cleanup().wait_for(std::chrono::seconds(timeout)) == std::future_status::timeout)
@@ -129,8 +141,14 @@ void RtcWrapper::cleanup(const Napi::CallbackInfo &info)
129141
// Cleanup the instances
130142
PeerConnectionWrapper::CleanupAll();
131143
DataChannelWrapper::CleanupAll();
144+
145+
#if RTC_ENABLE_MEDIA == 1
132146
TrackWrapper::CleanupAll();
147+
#endif
148+
149+
#if RTC_ENABLE_WEBSOCKET == 1
133150
WebSocketWrapper::CleanupAll();
151+
#endif
134152

135153
if (logCallback)
136154
logCallback.reset();

0 commit comments

Comments
 (0)