From 30117bc3a37517f1ea65c06bcb64ca71290bc0b5 Mon Sep 17 00:00:00 2001 From: Paul-Louis Ageneau Date: Wed, 3 Mar 2021 12:25:43 +0100 Subject: [PATCH] Renamed Track::*RtcpHandler methods to Track::*MediaHandler --- examples/media/main.cpp | 2 +- examples/sfu-media/main.cpp | 2 +- examples/streamer/main.cpp | 4 ++-- include/rtc/track.hpp | 11 +++++++---- src/capi.cpp | 4 ++-- src/impl/track.cpp | 14 +++++++------- src/impl/track.hpp | 6 +++--- src/track.cpp | 8 ++++---- 8 files changed, 27 insertions(+), 24 deletions(-) diff --git a/examples/media/main.cpp b/examples/media/main.cpp index aa42091..ad00da9 100644 --- a/examples/media/main.cpp +++ b/examples/media/main.cpp @@ -68,7 +68,7 @@ int main() { auto track = pc->addTrack(media); auto session = std::make_shared(); - track->setRtcpHandler(session); + track->setMediaHandler(session); track->onMessage( [session, sock, addr](rtc::binary message) { diff --git a/examples/sfu-media/main.cpp b/examples/sfu-media/main.cpp index 71907fe..dbedfff 100644 --- a/examples/sfu-media/main.cpp +++ b/examples/sfu-media/main.cpp @@ -60,7 +60,7 @@ int main() { pc->setLocalDescription(); auto session = std::make_shared(); - track->setRtcpHandler(session); + track->setMediaHandler(session); const rtc::SSRC targetSSRC = 4; diff --git a/examples/streamer/main.cpp b/examples/streamer/main.cpp index 652f08a..693648c 100644 --- a/examples/streamer/main.cpp +++ b/examples/streamer/main.cpp @@ -230,7 +230,7 @@ shared_ptr addVideo(const shared_ptr pc, const auto nackResponder = make_shared(); h264Handler->addToChain(nackResponder); // set handler - track->setRtcpHandler(h264Handler); + track->setMediaHandler(h264Handler); track->onOpen(onOpen); auto trackData = make_shared(track, srReporter); return trackData; @@ -254,7 +254,7 @@ shared_ptr addAudio(const shared_ptr pc, const auto nackResponder = make_shared(); opusHandler->addToChain(nackResponder); // set handler - track->setRtcpHandler(opusHandler); + track->setMediaHandler(opusHandler); track->onOpen(onOpen); auto trackData = make_shared(track, srReporter); return trackData; diff --git a/include/rtc/track.hpp b/include/rtc/track.hpp index e9d0366..f3f229a 100644 --- a/include/rtc/track.hpp +++ b/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 handler); - shared_ptr getRtcpHandler(); + void setMediaHandler(shared_ptr handler); + shared_ptr getMediaHandler(); + + // Deprecated, use setMediaHandler() and getMediaHandler() + inline void setRtcpHandler(shared_ptr handler) { setMediaHandler(handler); } + inline shared_ptr getRtcpHandler() { return getMediaHandler(); } private: using CheshireCat::impl; diff --git a/src/capi.cpp b/src/capi.cpp index f5e395c..7b1e183 100644 --- a/src/capi.cpp +++ b/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; }); } diff --git a/src/impl/track.cpp b/src/impl/track.cpp index 1de5751..77c3f3e 100644 --- a/src/impl/track.cpp +++ b/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 handler) { +void Track::setMediaHandler(shared_ptr handler) { { std::unique_lock lock(mMutex); - mRtcpHandler = handler; + mMediaHandler = handler; } handler->onOutgoing(std::bind(&Track::transportSend, this, std::placeholders::_1)); } -shared_ptr Track::getRtcpHandler() { +shared_ptr Track::getMediaHandler() { std::shared_lock lock(mMutex); - return mRtcpHandler; + return mMediaHandler; } } // namespace rtc::impl diff --git a/src/impl/track.hpp b/src/impl/track.hpp index 6e3fca2..2262d57 100644 --- a/src/impl/track.hpp +++ b/src/impl/track.hpp @@ -58,8 +58,8 @@ public: Description::Media description() const; void setDescription(Description::Media description); - shared_ptr getRtcpHandler(); - void setRtcpHandler(shared_ptr handler); + shared_ptr getMediaHandler(); + void setMediaHandler(shared_ptr handler); #if RTC_ENABLE_MEDIA void open(shared_ptr transport); @@ -74,7 +74,7 @@ private: #endif Description::Media mMediaDescription; - shared_ptr mRtcpHandler; + shared_ptr mMediaHandler; mutable std::shared_mutex mMutex; diff --git a/src/track.cpp b/src/track.cpp index 058b64b..b2fbe7f 100644 --- a/src/track.cpp +++ b/src/track.cpp @@ -50,17 +50,17 @@ size_t Track::maxMessageSize() const { return impl()->maxMessageSize(); } -void Track::setRtcpHandler(shared_ptr handler) { - impl()->setRtcpHandler(std::move(handler)); +void Track::setMediaHandler(shared_ptr 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 Track::getRtcpHandler() { return impl()->getRtcpHandler(); } +shared_ptr Track::getMediaHandler() { return impl()->getMediaHandler(); } } // namespace rtc