整理命名空间 (#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>

tests/tab.cpp

@@ -10,6 +10,7 @@
 
 #include <memory.h>
 #include <set>
+#include <deque>
 #include "Util/CMD.h"
 #include "Util/util.h"
 #include "Util/logger.h"

tests/test_bench_proxy.cpp

@@ -135,7 +135,7 @@ int main(int argc, char *argv[]) {
         for (auto i = 0; i < proxy_count; ++i) {
             auto stream = to_string(i);
             PlayerProxy::Ptr player(new PlayerProxy(DEFAULT_VHOST, "live", stream, false, false));
-            (*player)[kRtpType] = rtp_type;
+            (*player)[Client::kRtpType] = rtp_type;
             player->play(in_url);
             proxyMap.emplace(stream, player);
             //休眠后再启动下一个拉流代理，防止短时间海量链接

tests/test_bench_pull.cpp

@@ -139,9 +139,9 @@ int main(int argc, char *argv[]) {
             player_map.erase(tag);
         });
         //设置为性能测试模式
-        (*player)[kBenchmarkMode] = true;
+        (*player)[Client::kBenchmarkMode] = true;
         //设置rtsp拉流方式(在rtsp拉流时有效)
-        (*player)[kRtpType] = rtp_type;
+        (*player)[Client::kRtpType] = rtp_type;
         //提高压测性能与正确性
         (*player)[Client::kWaitTrackReady] = false;
         //发起播放请求

tests/test_bench_push.cpp

@@ -143,7 +143,7 @@ int main(int argc, char *argv[]) {
     //添加拉流代理
     auto proxy = std::make_shared<PlayerProxy>(DEFAULT_VHOST, "app", "test", false, false);
     //rtsp拉流代理方式
-    (*proxy)[kRtpType] = rtp_type;
+    (*proxy)[Client::kRtpType] = rtp_type;
     //开始拉流代理
     proxy->play(in_url);
 

tests/test_server.cpp

@@ -244,7 +244,7 @@ int main(int argc,char *argv[]) {
 
         PlayerProxy::Ptr player(new PlayerProxy(DEFAULT_VHOST, "live", std::string("chn") + to_string(i).data()));
         //指定RTP over TCP(播放rtsp时有效)
-        (*player)[kRtpType] = Rtsp::RTP_TCP;
+        (*player)[Client::kRtpType] = Rtsp::RTP_TCP;
         //开始播放，如果播放失败或者播放中止，将会自动重试若干次，重试次数在配置文件中配置，默认一直重试
         player->play(url);
         //需要保存PlayerProxy，否则作用域结束就会销毁该对象

tests/test_sortor.cpp

@@ -13,6 +13,7 @@
 #include <iostream>
 #include <functional>
 #include "Rtsp/RtpReceiver.h"
+
 using namespace std;
 using namespace mediakit;
 

tests/test_wsClient.cpp

@@ -14,6 +14,7 @@
 #include "Util/MD5.h"
 #include "Util/logger.h"
 #include "Http/WebSocketClient.h"
+
 using namespace std;
 using namespace toolkit;
 using namespace mediakit;

tests/test_wsServer.cpp

@@ -14,6 +14,7 @@
 #include "Util/MD5.h"
 #include "Util/logger.h"
 #include "Http/WebSocketSession.h"
+
 using namespace std;
 using namespace toolkit;
 using namespace mediakit;