Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-07-01 23:57:37 +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

24
src/Rtp/RtpSession.h
View File

@@ -12,25 +12,25 @@
#define ZLMEDIAKIT_RTPSESSION_H
#if defined(ENABLE_RTPPROXY)
#include "Network/TcpSession.h"
#include "RtpSplitter.h"
#include "RtpProcess.h"
#include "Util/TimeTicker.h"
using namespace toolkit;
namespace mediakit{
class RtpSession : public Session , public RtpSplitter , public MediaSourceEvent{
class RtpSession : public toolkit::Session, public RtpSplitter, public MediaSourceEvent {
public:
static const string kStreamID;
static const string kIsUDP;
static const std::string kStreamID;
static const std::string kIsUDP;
RtpSession(const Socket::Ptr &sock);
RtpSession(const toolkit::Socket::Ptr &sock);
~RtpSession() override;
void onRecv(const Buffer::Ptr &) override;
void onError(const SockException &err) override;
void onRecv(const toolkit::Buffer::Ptr &) override;
void onError(const toolkit::SockException &err) override;
void onManager() override;
void attachServer(const Server &server) override;
void attachServer(const toolkit::Server &server) override;
protected:
// 通知其停止推流
@@ -47,12 +47,12 @@ private:
bool _search_rtp = false;
bool _search_rtp_finished = false;
uint32_t _ssrc = 0;
Ticker _ticker;
string _stream_id;
toolkit::Ticker _ticker;
std::string _stream_id;
struct sockaddr _addr;
RtpProcess::Ptr _process;
std::shared_ptr<ObjectStatistic<TcpSession> > _statistic_tcp;
std::shared_ptr<ObjectStatistic<UdpSession> > _statistic_udp;
std::shared_ptr<toolkit::ObjectStatistic<toolkit::TcpSession> > _statistic_tcp;
std::shared_ptr<toolkit::ObjectStatistic<toolkit::UdpSession> > _statistic_udp;
};
}//namespace mediakit