Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-07-07 04:08:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

整理命名空间 (#1409)

Browse Source 
* feat: remove using namespace mediakit in header files.

(cherry picked from commit d44aeb339a8a0e1f0455be82b21fe4b1b536299f)

* feat: remove using namespace mediakit in FFmpegSource.h

* feat: remove using namespace mediakit in RtpExt.h

* feat: remove using namespace mediakit in header files.

* feat: remove using namespace std in header files.

* feat: remove using namespace std in header files when zltoolkit remove std in header

* 补充命名空间

* 整理命名空间

* 整理命名空间2

* 修复macos ci

* 修复编译问题

* 修复编译问题2

* 修复编译问题3

Co-authored-by: Johnny <hellojinqiang@gmail.com>
Co-authored-by: Xiaofeng Wang <wasphin@gmail.com>
This commit is contained in:
夏楚
2022-02-02 20:34:50 +08:00
committed by GitHub
parent 80a0e27d8c
commit c72cf4cbcc
239 changed files with 1887 additions and 1766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/Rtsp/Rtsp.h
View File

@@ -20,10 +20,6 @@
#include "Common/macros.h"
#include "Extension/Frame.h"
using namespace std;
using namespace toolkit;
using namespace mediakit;
namespace mediakit {
namespace Rtsp {
@@ -129,7 +125,7 @@ public:
//返回有效负载总长度,不包括csrc、ext、padding
size_t getPayloadSize(size_t rtp_size) const;
//打印调试信息
string dumpString(size_t rtp_size) const;
std::string dumpString(size_t rtp_size) const;
private:
//返回有效负载偏移量
@@ -143,7 +139,7 @@ private:
#endif // defined(_WIN32)
//此rtp为rtp over tcp形式，需要忽略前4个字节
class RtpPacket : public BufferRaw{
class RtpPacket : public toolkit::BufferRaw{
public:
using Ptr = std::shared_ptr<RtpPacket>;
enum {
@@ -157,7 +153,7 @@ public:
const RtpHeader* getHeader() const;
//打印调试信息
string dumpString() const;
std::string dumpString() const;
//主机字节序的seq
uint16_t getSeq() const;
@@ -181,12 +177,12 @@ public:
static Ptr create();
private:
friend class ResourcePool_l<RtpPacket>;
friend class toolkit::ResourcePool_l<RtpPacket>;
RtpPacket() = default;
private:
//对象个数统计
ObjectStatistic<RtpPacket> _statistic;
toolkit::ObjectStatistic<RtpPacket> _statistic;
};
class RtpPayload {
@@ -205,29 +201,29 @@ private:
class SdpTrack {
public:
using Ptr = std::shared_ptr<SdpTrack>;
string _t;
string _b;
std::string _t;
std::string _b;
uint16_t _port;
float _duration = 0;
float _start = 0;
float _end = 0;
map<char, string> _other;
multimap<string, string> _attr;
std::map<char, std::string> _other;
std::multimap<std::string, std::string> _attr;
string toString(uint16_t port = 0) const;
string getName() const;
string getControlUrl(const string &base_url) const;
std::string toString(uint16_t port = 0) const;
std::string getName() const;
std::string getControlUrl(const std::string &base_url) const;
public:
int _pt;
int _channel;
int _samplerate;
TrackType _type;
string _codec;
string _fmtp;
string _control;
std::string _codec;
std::string _fmtp;
std::string _control;
public:
bool _inited = false;
@@ -243,17 +239,17 @@ public:
using Ptr = std::shared_ptr<SdpParser>;
SdpParser() {}
SdpParser(const string &sdp) { load(sdp); }
SdpParser(const std::string &sdp) { load(sdp); }
~SdpParser() {}
void load(const string &sdp);
void load(const std::string &sdp);
bool available() const;
SdpTrack::Ptr getTrack(TrackType type) const;
vector<SdpTrack::Ptr> getAvailableTrack() const;
string toString() const;
std::vector<SdpTrack::Ptr> getAvailableTrack() const;
std::string toString() const;
private:
vector<SdpTrack::Ptr> _track_vec;
std::vector<SdpTrack::Ptr> _track_vec;
};
/**
@@ -263,18 +259,18 @@ class RtspUrl{
public:
bool _is_ssl;
uint16_t _port;
string _url;
string _user;
string _passwd;
string _host;
std::string _url;
std::string _user;
std::string _passwd;
std::string _host;
public:
RtspUrl() = default;
~RtspUrl() = default;
bool parse(const string &url);
bool parse(const std::string &url);
private:
bool setup(bool,const string &, const string &, const string &);
bool setup(bool,const std::string &, const std::string &, const std::string &);
};
/**
@@ -300,7 +296,7 @@ public:
* 获取sdp字符串
* @return
*/
virtual string getSdp() const = 0;
virtual std::string getSdp() const = 0;
/**
* 获取pt
@@ -336,7 +332,7 @@ public:
* @param version sdp版本
*/
TitleSdp(float dur_sec = 0,
const map<string, string> &header = map<string, string>(),
const std::map<std::string, std::string> &header = std::map<std::string, std::string>(),
int version = 0) : Sdp(0, 0) {
_printer << "v=" << version << "\r\n";
@@ -362,7 +358,7 @@ public:
_printer << "a=control:*\r\n";
}
string getSdp() const override {
std::string getSdp() const override {
return _printer;
}
@@ -376,15 +372,15 @@ public:
private:
float _dur_sec = 0;
_StrPrinter _printer;
toolkit::_StrPrinter _printer;
};
//创建rtp over tcp4个字节的头
Buffer::Ptr makeRtpOverTcpPrefix(uint16_t size, uint8_t interleaved);
toolkit::Buffer::Ptr makeRtpOverTcpPrefix(uint16_t size, uint8_t interleaved);
//创建rtp-rtcp端口对
void makeSockPair(std::pair<Socket::Ptr, Socket::Ptr> &pair, const string &local_ip);
void makeSockPair(std::pair<toolkit::Socket::Ptr, toolkit::Socket::Ptr> &pair, const std::string &local_ip);
//十六进制方式打印ssrc
string printSSRC(uint32_t ui32Ssrc);
std::string printSSRC(uint32_t ui32Ssrc);
} //namespace mediakit
#endif //RTSP_RTSP_H_