整理命名空间 (#1409)

* 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

View File

@@ -72,7 +72,7 @@ private:
int track_id = -1;
Stamp stamp;
};
unordered_map<int, track_info> _codec_to_trackid;
std::unordered_map<int, track_info> _codec_to_trackid;
FrameMerger _frame_merger{FrameMerger::mp4_nal_size};
};
@@ -92,7 +92,7 @@ public:
* 打开mp4
* @param file 文件完整路径
*/
void openMP4(const string &file);
void openMP4(const std::string &file);
/**
* 手动关闭文件(对象析构时会自动关闭)
@@ -103,7 +103,7 @@ protected:
MP4FileIO::Writer createWriter() override;
private:
string _file_name;
std::string _file_name;
MP4FileDisk::Ptr _mp4_file;
};
@@ -125,23 +125,23 @@ public:
/**
* 获取fmp4 init segment
*/
const string &getInitSegment();
const std::string &getInitSegment();
protected:
/**
* 输出fmp4切片回调函数
* @param string 切片内容
* @param std::string 切片内容
* @param stamp 切片末尾时间戳
* @param key_frame 是否有关键帧
*/
virtual void onSegmentData(string string, uint32_t stamp, bool key_frame) = 0;
virtual void onSegmentData(std::string string, uint32_t stamp, bool key_frame) = 0;
protected:
MP4FileIO::Writer createWriter() override;
private:
bool _key_frame = false;
string _init_segment;
std::string _init_segment;
MP4FileMemory::Ptr _memory_file;
};