Renamed Track::*RtcpHandler methods to Track::*MediaHandler

examples/media/main.cpp

@@ -68,7 +68,7 @@ int main() {
 		auto track = pc->addTrack(media);
 
 		auto session = std::make_shared<rtc::RtcpReceivingSession>();
-		track->setRtcpHandler(session);
+		track->setMediaHandler(session);
 
 		track->onMessage(
 		    [session, sock, addr](rtc::binary message) {

examples/sfu-media/main.cpp

@@ -60,7 +60,7 @@ int main() {
 		pc->setLocalDescription();
 
 		auto session = std::make_shared<rtc::RtcpReceivingSession>();
-		track->setRtcpHandler(session);
+		track->setMediaHandler(session);
 
 		const rtc::SSRC targetSSRC = 4;
 

examples/streamer/main.cpp

@@ -230,7 +230,7 @@ shared_ptr<ClientTrackData> addVideo(const shared_ptr<PeerConnection> pc, const
     auto nackResponder = make_shared<RtcpNackResponder>();
     h264Handler->addToChain(nackResponder);
     // set handler
-    track->setRtcpHandler(h264Handler);
+    track->setMediaHandler(h264Handler);
     track->onOpen(onOpen);
     auto trackData = make_shared<ClientTrackData>(track, srReporter);
     return trackData;
@@ -254,7 +254,7 @@ shared_ptr<ClientTrackData> addAudio(const shared_ptr<PeerConnection> pc, const
     auto nackResponder = make_shared<RtcpNackResponder>();
     opusHandler->addToChain(nackResponder);
     // set handler
-    track->setRtcpHandler(opusHandler);
+    track->setMediaHandler(opusHandler);
     track->onOpen(onOpen);
     auto trackData = make_shared<ClientTrackData>(track, srReporter);
     return trackData;

include/rtc/track.hpp

@@ -20,8 +20,8 @@
 #define RTC_TRACK_H
 
 #include "channel.hpp"
-#include "description.hpp"
 #include "common.hpp"
+#include "description.hpp"
 #include "mediahandler.hpp"
 #include "message.hpp"
 
@@ -57,9 +57,12 @@ public:
 
 	bool requestKeyframe();
 
-	// RTCP handler
-	void setRtcpHandler(shared_ptr<MediaHandler> handler);
-	shared_ptr<MediaHandler> getRtcpHandler();
+	void setMediaHandler(shared_ptr<MediaHandler> handler);
+	shared_ptr<MediaHandler> getMediaHandler();
+
+	// Deprecated, use setMediaHandler() and getMediaHandler()
+	inline void setRtcpHandler(shared_ptr<MediaHandler> handler) { setMediaHandler(handler); }
+	inline shared_ptr<MediaHandler> getRtcpHandler() { return getMediaHandler(); }
 
 private:
 	using CheshireCat<impl::Track>::impl;

src/capi.cpp

@@ -550,7 +550,7 @@ int rtcSetH264PacketizationHandler(int tr, uint32_t ssrc, const char *cname, uin
 		emplaceMediaChainableHandler(h264Handler, tr);
 		emplaceRTPConfig(rtpConfig, tr);
 		// set handler
-		track->setRtcpHandler(h264Handler);
+		track->setMediaHandler(h264Handler);
 		return RTC_ERR_SUCCESS;
 	});
 }
@@ -570,7 +570,7 @@ int rtcSetOpusPacketizationHandler(int tr, uint32_t ssrc, const char *cname, uin
 		emplaceMediaChainableHandler(opusHandler, tr);
 		emplaceRTPConfig(rtpConfig, tr);
 		// set handler
-		track->setRtcpHandler(opusHandler);
+		track->setMediaHandler(opusHandler);
 		return RTC_ERR_SUCCESS;
 	});
 }

src/impl/track.cpp

@@ -58,7 +58,7 @@ void Track::setDescription(Description::Media description) {
 void Track::close() {
 	mIsClosed = true;
 
-	setRtcpHandler(nullptr);
+	setMediaHandler(nullptr);
 	resetCallbacks();
 }
 
@@ -120,7 +120,7 @@ void Track::incoming(message_ptr message) {
 		return;
 	}
 
-	if (auto handler = getRtcpHandler()) {
+	if (auto handler = getMediaHandler()) {
 		message = handler->incoming(message);
 		if (!message)
 			return;
@@ -146,7 +146,7 @@ bool Track::outgoing(message_ptr message) {
 		return false;
 	}
 
-	if (auto handler = getRtcpHandler()) {
+	if (auto handler = getMediaHandler()) {
 		message = handler->outgoing(message);
 		if (!message)
 			return false;
@@ -179,18 +179,18 @@ bool Track::transportSend([[maybe_unused]] message_ptr message) {
 #endif
 }
 
-void Track::setRtcpHandler(shared_ptr<MediaHandler> handler) {
+void Track::setMediaHandler(shared_ptr<MediaHandler> handler) {
 	{
 		std::unique_lock lock(mMutex);
-		mRtcpHandler = handler;
+		mMediaHandler = handler;
 	}
 
 	handler->onOutgoing(std::bind(&Track::transportSend, this, std::placeholders::_1));
 }
 
-shared_ptr<MediaHandler> Track::getRtcpHandler() {
+shared_ptr<MediaHandler> Track::getMediaHandler() {
 	std::shared_lock lock(mMutex);
-	return mRtcpHandler;
+	return mMediaHandler;
 }
 
 } // namespace rtc::impl

src/impl/track.hpp

@@ -58,8 +58,8 @@ public:
 	Description::Media description() const;
 	void setDescription(Description::Media description);
 
-	shared_ptr<MediaHandler> getRtcpHandler();
-	void setRtcpHandler(shared_ptr<MediaHandler> handler);
+	shared_ptr<MediaHandler> getMediaHandler();
+	void setMediaHandler(shared_ptr<MediaHandler> handler);
 
 #if RTC_ENABLE_MEDIA
 	void open(shared_ptr<DtlsSrtpTransport> transport);
@@ -74,7 +74,7 @@ private:
 #endif
 
 	Description::Media mMediaDescription;
-	shared_ptr<MediaHandler> mRtcpHandler;
+	shared_ptr<MediaHandler> mMediaHandler;
 
 	mutable std::shared_mutex mMutex;
 

src/track.cpp

@@ -50,17 +50,17 @@ size_t Track::maxMessageSize() const {
 	return impl()->maxMessageSize();
 }
 
-void Track::setRtcpHandler(shared_ptr<MediaHandler> handler) {
-	impl()->setRtcpHandler(std::move(handler));
+void Track::setMediaHandler(shared_ptr<MediaHandler> handler) {
+	impl()->setMediaHandler(std::move(handler));
 }
 
 bool Track::requestKeyframe() {
-	if (auto handler = impl()->getRtcpHandler())
+	if (auto handler = impl()->getMediaHandler())
 		return handler->requestKeyframe();
 
 	return false;
 }
 
-shared_ptr<MediaHandler> Track::getRtcpHandler() { return impl()->getRtcpHandler(); }
+shared_ptr<MediaHandler> Track::getMediaHandler() { return impl()->getMediaHandler(); }
 
 } // namespace rtc