d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 19:08:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Case-insensitive sdp search

Browse source
This commit is contained in:
trilene 2020-07-16 15:44:07 -04:00
parent 8968d51b65
commit f8ef55c133
1 changed files with 37 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/WebRTCSession.cpp
View file

@ -1,3 +1,5 @@
#include <cctype>
#include "WebRTCSession.h" #include "WebRTCSession.h"
#include "Logging.h" #include "Logging.h"
@ -23,6 +25,8 @@ gboolean onICEGatheringCompletion(gpointer timerid);
void createAnswer(GstPromise *promise, gpointer webrtc); void createAnswer(GstPromise *promise, gpointer webrtc);
void addDecodeBin(GstElement *webrtc G_GNUC_UNUSED, GstPad *newpad, GstElement *pipe); void addDecodeBin(GstElement *webrtc G_GNUC_UNUSED, GstPad *newpad, GstElement *pipe);
void linkNewPad(GstElement *decodebin G_GNUC_UNUSED, GstPad *newpad, GstElement *pipe); void linkNewPad(GstElement *decodebin G_GNUC_UNUSED, GstPad *newpad, GstElement *pipe);
std::string::const_iterator findName(const std::string &sdp, const std::string &name);
int getPayloadType(const std::string &sdp, const std::string &name);
} }
bool bool
@ -94,28 +98,10 @@ WebRTCSession::acceptOffer(const std::string& sdp)
glocalsdp.clear(); glocalsdp.clear();
gcandidates.clear(); gcandidates.clear();
// eg a=rtpmap:111 opus/48000/2 int opusPayloadType = getPayloadType(sdp, "opus");
int opusPayloadType = 0; if (opusPayloadType == -1) {
if (auto e = sdp.find("opus"); e == std::string::npos) {
nhlog::ui()->error("WebRTC: remote offer - opus media attribute missing");
return false; return false;
} }
else {
if (auto s = sdp.rfind(':', e); s == std::string::npos) {
nhlog::ui()->error("WebRTC: remote offer - unable to determine opus payload type");
return false;
}
else {
++s;
try {
opusPayloadType = std::stoi(std::string(sdp, s, e - s));
}
catch(...) {
nhlog::ui()->error("WebRTC: remote offer - unable to determine opus payload type");
return false;
}
}
}
GstWebRTCSessionDescription *offer = parseSDP(sdp, GST_WEBRTC_SDP_TYPE_OFFER); GstWebRTCSessionDescription *offer = parseSDP(sdp, GST_WEBRTC_SDP_TYPE_OFFER);
if (!offer) if (!offer)
@ -273,6 +259,37 @@ WebRTCSession::addTurnServers()
namespace { namespace {
std::string::const_iterator findName(const std::string &sdp, const std::string &name)
{
return std::search(sdp.cbegin(), sdp.cend(), name.cbegin(), name.cend(),
[](unsigned char c1, unsigned char c2) {return std::tolower(c1) == std::tolower(c2);});
}
int getPayloadType(const std::string &sdp, const std::string &name)
{
// eg a=rtpmap:111 opus/48000/2
auto e = findName(sdp, name);
if (e == sdp.cend()) {
nhlog::ui()->error("WebRTC: remote offer - " + name + " attribute missing");
return -1;
}
if (auto s = sdp.rfind(':', e - sdp.cbegin()); s == std::string::npos) {
nhlog::ui()->error("WebRTC: remote offer - unable to determine " + name + " payload type");
return -1;
}
else {
++s;
try {
return std::stoi(std::string(sdp, s, e - sdp.cbegin() - s));
}
catch(...) {
nhlog::ui()->error("WebRTC: remote offer - unable to determine " + name + " payload type");
}
}
return -1;
}
gboolean gboolean
newBusMessage(GstBus *bus G_GNUC_UNUSED, GstMessage *msg, gpointer user_data) newBusMessage(GstBus *bus G_GNUC_UNUSED, GstMessage *msg, gpointer user_data)
{ {