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

21
src/Rtmp/amf.h
View File

@@ -19,8 +19,6 @@
#include <stdexcept>
#include <functional>
#include "Network/Buffer.h"
using namespace std;
using namespace toolkit;
enum AMFType {
AMF_NUMBER,
@@ -39,8 +37,9 @@ class AMFValue;
class AMFValue {
public:
friend class AMFEncoder;
typedef std::map<std::string, AMFValue> mapType;
typedef std::vector<AMFValue> arrayType;
using mapType = std::map<std::string, AMFValue>;
using arrayType = std::vector<AMFValue>;
~AMFValue();
AMFValue(AMFType type = AMF_NULL);
@@ -58,17 +57,19 @@ public:
double as_number() const;
int as_integer() const;
bool as_boolean() const;
string to_string() const;
std::string to_string() const;
const AMFValue &operator[](const char *str) const;
void object_for_each(const function<void(const string &key, const AMFValue &val)> &fun) const ;
void object_for_each(const std::function<void(const std::string &key, const AMFValue &val)> &fun) const ;
operator bool() const;
void set(const std::string &s, const AMFValue &val);
void add(const AMFValue &val);
private:
const mapType &getMap() const;
const arrayType &getArr() const;
void destroy();
void init();
private:
AMFType _type;
union {
@@ -83,9 +84,10 @@ private:
class AMFDecoder {
public:
AMFDecoder(const BufferLikeString &buf, size_t pos, int version = 0);
AMFDecoder(const toolkit::BufferLikeString &buf, size_t pos, int version = 0);
template<typename TP>
TP load();
private:
std::string load_key();
AMFValue load_object();
@@ -93,8 +95,9 @@ private:
AMFValue load_arr();
uint8_t front();
uint8_t pop_front();
private:
const BufferLikeString &buf;
const toolkit::BufferLikeString &buf;
size_t pos;
int version;
};
@@ -110,9 +113,11 @@ public:
AMFEncoder & operator <<(const AMFValue &value);
const std::string& data() const ;
void clear() ;
private:
void write_key(const std::string &s);
AMFEncoder &write_undefined();
private:
std::string buf;
};