Cleaned up std:: prefix where possible

This commit is contained in:
Paul-Louis Ageneau
2021-06-04 11:28:19 +02:00
parent 2d97cc18c6
commit d218e7923c
2 changed files with 12 additions and 16 deletions

View File

@ -144,11 +144,11 @@ public:
void removeFormat(const string &fmt); void removeFormat(const string &fmt);
void addSSRC(uint32_t ssrc, optional<string> name, void addSSRC(uint32_t ssrc, optional<string> name, optional<string> msid = nullopt,
optional<string> msid = nullopt, optional<string> trackID = nullopt); optional<string> trackID = nullopt);
void removeSSRC(uint32_t oldSSRC); void removeSSRC(uint32_t oldSSRC);
void replaceSSRC(uint32_t oldSSRC, uint32_t ssrc, optional<string> name, void replaceSSRC(uint32_t oldSSRC, uint32_t ssrc, optional<string> name,
optional<string> msid = nullopt, optional<string> trackID = nullopt); optional<string> msid = nullopt, optional<string> trackID = nullopt);
bool hasSSRC(uint32_t ssrc); bool hasSSRC(uint32_t ssrc);
std::vector<uint32_t> getSSRCs(); std::vector<uint32_t> getSSRCs();
std::optional<std::string> getCNameForSsrc(uint32_t ssrc); std::optional<std::string> getCNameForSsrc(uint32_t ssrc);
@ -199,29 +199,25 @@ public:
std::map<int, RTPMap> mRtpMap; std::map<int, RTPMap> mRtpMap;
std::vector<uint32_t> mSsrcs; std::vector<uint32_t> mSsrcs;
std::map<uint32_t, string> mCNameMap; std::map<uint32_t, string> mCNameMap;
}; };
class RTC_CPP_EXPORT Audio : public Media { class RTC_CPP_EXPORT Audio : public Media {
public: public:
Audio(string mid = "audio", Direction dir = Direction::SendOnly); Audio(string mid = "audio", Direction dir = Direction::SendOnly);
void addAudioCodec(int payloadType, string codec, void addAudioCodec(int payloadType, string codec, optional<string> profile = std::nullopt);
optional<string> profile = std::nullopt);
void addOpusCodec(int payloadType, void addOpusCodec(int payloadType, optional<string> profile = DEFAULT_OPUS_AUDIO_PROFILE);
optional<string> profile = DEFAULT_OPUS_AUDIO_PROFILE);
}; };
class RTC_CPP_EXPORT Video : public Media { class RTC_CPP_EXPORT Video : public Media {
public: public:
Video(string mid = "video", Direction dir = Direction::SendOnly); Video(string mid = "video", Direction dir = Direction::SendOnly);
void addVideoCodec(int payloadType, string codec, void addVideoCodec(int payloadType, string codec, optional<string> profile = std::nullopt);
optional<string> profile = std::nullopt);
void addH264Codec(int payloadType, void addH264Codec(int payloadType, optional<string> profile = DEFAULT_H264_VIDEO_PROFILE);
optional<string> profile = DEFAULT_H264_VIDEO_PROFILE);
void addVP8Codec(int payloadType); void addVP8Codec(int payloadType);
void addVP9Codec(int payloadType); void addVP9Codec(int payloadType);
}; };

View File

@ -870,7 +870,7 @@ void Description::Media::parseSdpLine(string_view line) {
mSsrcs.emplace_back(ssrc); mSsrcs.emplace_back(ssrc);
} }
auto cnamePos = value.find("cname:"); auto cnamePos = value.find("cname:");
if (cnamePos != std::string::npos) { if (cnamePos != string::npos) {
auto cname = value.substr(cnamePos + 6); auto cname = value.substr(cnamePos + 6);
mCNameMap.emplace(ssrc, cname); mCNameMap.emplace(ssrc, cname);
} }
@ -891,12 +891,12 @@ void Description::Media::addRTPMap(const Description::Media::RTPMap &map) {
std::vector<uint32_t> Description::Media::getSSRCs() { return mSsrcs; } std::vector<uint32_t> Description::Media::getSSRCs() { return mSsrcs; }
std::optional<std::string> Description::Media::getCNameForSsrc(uint32_t ssrc) { optional<string> Description::Media::getCNameForSsrc(uint32_t ssrc) {
auto it = mCNameMap.find(ssrc); auto it = mCNameMap.find(ssrc);
if (it != mCNameMap.end()) { if (it != mCNameMap.end()) {
return it->second; return it->second;
} }
return std::nullopt; return nullopt;
} }
std::map<int, Description::Media::RTPMap>::iterator Description::Media::beginMaps() { std::map<int, Description::Media::RTPMap>::iterator Description::Media::beginMaps() {
@ -1000,7 +1000,7 @@ string Description::typeToString(Type type) {
} // namespace rtc } // namespace rtc
std::ostream &operator<<(std::ostream &out, const rtc::Description &description) { std::ostream &operator<<(std::ostream &out, const rtc::Description &description) {
return out << std::string(description); return out << string(description);
} }
std::ostream &operator<<(std::ostream &out, rtc::Description::Type type) { std::ostream &operator<<(std::ostream &out, rtc::Description::Type type) {