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

12
src/Rtmp/Rtmp.h
View File

@@ -21,8 +21,6 @@
#include "amf.h"
#include "Extension/Track.h"
using namespace toolkit;
#if !defined(_WIN32)
#define PACKED __attribute__((packed))
#else
@@ -175,7 +173,7 @@ public:
#pragma pack(pop)
#endif // defined(_WIN32)
class RtmpPacket : public Buffer{
class RtmpPacket : public toolkit::Buffer{
public:
friend class RtmpProtocol;
using Ptr = std::shared_ptr<RtmpPacket>;
@@ -186,7 +184,7 @@ public:
uint32_t stream_index;
uint32_t chunk_id;
size_t body_size;
BufferLikeString buffer;
toolkit::BufferLikeString buffer;
public:
static Ptr create();
@@ -259,7 +257,7 @@ public:
}
private:
friend class ResourcePool_l<RtmpPacket>;
friend class toolkit::ResourcePool_l<RtmpPacket>;
RtmpPacket(){
clear();
}
@@ -276,7 +274,7 @@ private:
private:
//对象个数统计
ObjectStatistic<RtmpPacket> _statistic;
toolkit::ObjectStatistic<RtmpPacket> _statistic;
};
/**
@@ -306,7 +304,7 @@ public:
TitleMeta(float dur_sec = 0,
size_t fileSize = 0,
const map<string,string> &header = map<string,string>()){
const std::map<std::string, std::string> &header = std::map<std::string, std::string>()){
_metadata.set("duration", dur_sec);
_metadata.set("fileSize", (int)fileSize);
_metadata.set("server",kServerName);