Unified code style (#2137)

src/Rtsp/RtpMultiCaster.h

@@ -41,8 +41,9 @@ private:
 
 class RtpMultiCaster {
 public:
-    typedef std::shared_ptr<RtpMultiCaster> Ptr;
-    typedef std::function<void()> onDetach;
+    using Ptr = std::shared_ptr<RtpMultiCaster>;
+    using onDetach = std::function<void()>;
+
     ~RtpMultiCaster();
 
     static Ptr get(toolkit::SocketHelper &helper, const std::string &local_ip, const std::string &vhost, const std::string &app, const std::string &stream);

src/Rtsp/Rtsp.h

@@ -17,9 +17,7 @@
 #include <unordered_map>
 #include "Common/macros.h"
 #include "Extension/Frame.h"
-namespace toolkit {
-    class Socket;
-}
+#include "Network/Socket.h"
 
 namespace mediakit {
 
@@ -335,7 +333,7 @@ private:
 //创建rtp over tcp4个字节的头
 toolkit::Buffer::Ptr makeRtpOverTcpPrefix(uint16_t size, uint8_t interleaved);
 //创建rtp-rtcp端口对
-void makeSockPair(std::pair<std::shared_ptr<toolkit::Socket>, std::shared_ptr<toolkit::Socket>> &pair, const std::string &local_ip, bool re_use_port = false, bool is_udp = true);
+void makeSockPair(std::pair<toolkit::Socket::Ptr, toolkit::Socket::Ptr> &pair, const std::string &local_ip, bool re_use_port = false, bool is_udp = true);
 //十六进制方式打印ssrc
 std::string printSSRC(uint32_t ui32Ssrc);
 

src/Rtsp/RtspDemuxer.h

@@ -12,13 +12,14 @@
 #define SRC_RTP_RTSPDEMUXER_H_
 
 #include <unordered_map>
+#include "Rtsp/RtpCodec.h"
 #include "Common/MediaSink.h"
 
 namespace mediakit {
-class RtpCodec;
+
 class RtspDemuxer : public Demuxer {
 public:
-    typedef std::shared_ptr<RtspDemuxer> Ptr;
+    using Ptr = std::shared_ptr<RtspDemuxer>;
     RtspDemuxer() = default;
     virtual ~RtspDemuxer() = default;
 
@@ -49,8 +50,8 @@ private:
     float _duration = 0;
     AudioTrack::Ptr _audio_track;
     VideoTrack::Ptr _video_track;
-    std::shared_ptr<RtpCodec> _audio_rtp_decoder;
-    std::shared_ptr<RtpCodec> _video_rtp_decoder;
+    RtpCodec::Ptr _audio_rtp_decoder;
+    RtpCodec::Ptr _video_rtp_decoder;
 };
 
 } /* namespace mediakit */

src/Rtsp/RtspMediaSourceImp.h

@@ -12,6 +12,7 @@
 #define SRC_RTSP_RTSPTORTMPMEDIASOURCE_H_
 
 #include "RtspMediaSource.h"
+#include "RtspDemuxer.h"
 #include "Common/MultiMediaSourceMuxer.h"
 
 namespace mediakit {
@@ -109,7 +110,7 @@ public:
 private:
     bool _all_track_ready = false;
     ProtocolOption _option;
-    std::shared_ptr<RtspDemuxer> _demuxer;
+    RtspDemuxer::Ptr _demuxer;
     MultiMediaSourceMuxer::Ptr _muxer;
 };
 } /* namespace mediakit */

src/Rtsp/RtspMediaSourceMuxer.h

@@ -19,7 +19,7 @@ namespace mediakit {
 class RtspMediaSourceMuxer final : public RtspMuxer, public MediaSourceEventInterceptor,
                                    public std::enable_shared_from_this<RtspMediaSourceMuxer> {
 public:
-    typedef std::shared_ptr<RtspMediaSourceMuxer> Ptr;
+    using Ptr = std::shared_ptr<RtspMediaSourceMuxer>;
 
     RtspMediaSourceMuxer(const std::string &vhost,
                          const std::string &strApp,

src/Rtsp/RtspPlayer.h

@@ -20,9 +20,10 @@
 #include "Network/TcpClient.h"
 #include "RtspSplitter.h"
 #include "RtpReceiver.h"
+#include "Rtcp/RtcpContext.h"
 
 namespace mediakit {
-class RtcpContext;
+
 //实现了rtsp播放器协议部分的功能，及数据接收功能
 class RtspPlayer : public PlayerBase, public toolkit::TcpClient, public RtspSplitter, public RtpReceiver {
 public:
@@ -143,7 +144,7 @@ private:
     //rtcp发送时间,trackid idx 为数组下标
     toolkit::Ticker _rtcp_send_ticker[2];
     //统计rtp并发送rtcp
-    std::vector<std::shared_ptr<RtcpContext>> _rtcp_context;
+    std::vector<RtcpContext::Ptr> _rtcp_context;
 };
 
 } /* namespace mediakit */

src/Rtsp/RtspPlayerImp.h

@@ -15,10 +15,11 @@
 #include <algorithm>
 #include <functional>
 #include "RtspPlayer.h"
+#include "RtspDemuxer.h"
+#include "RtspMediaSource.h"
 
 namespace mediakit {
-class RtspDemuxer;
-class RtspMediaSource;
+
 class RtspPlayerImp : public PlayerImp<RtspPlayer, PlayerBase> ,private TrackListener {
 public:
     using Ptr = std::shared_ptr<RtspPlayerImp>;
@@ -71,8 +72,8 @@ private:
     void addTrackCompleted() override;
 
 private:
-    std::shared_ptr<RtspDemuxer> _demuxer;
-    std::shared_ptr<RtspMediaSource> _rtsp_media_src;
+    RtspDemuxer::Ptr _demuxer;
+    RtspMediaSource::Ptr _rtsp_media_src;
 };
 
 } /* namespace mediakit */

src/Rtsp/RtspPusher.h

@@ -19,12 +19,13 @@
 #include "Network/TcpClient.h"
 #include "RtspSplitter.h"
 #include "Pusher/PusherBase.h"
+#include "Rtcp/RtcpContext.h"
 
 namespace mediakit {
-class RtcpContext;
+
 class RtspPusher : public toolkit::TcpClient, public RtspSplitter, public PusherBase {
 public:
-    typedef std::shared_ptr<RtspPusher> Ptr;
+    using Ptr = std::shared_ptr<RtspPusher>;
     RtspPusher(const toolkit::EventPoller::Ptr &poller,const RtspMediaSource::Ptr &src);
     ~RtspPusher() override;
     void publish(const std::string &url) override;
@@ -83,9 +84,9 @@ private:
     //RTCP端口,trackid idx 为数组下标
     toolkit::Socket::Ptr _rtcp_sock[2];
     //超时功能实现
-    std::shared_ptr<toolkit::Timer> _publish_timer;
+    toolkit::Timer::Ptr _publish_timer;
     //心跳定时器
-    std::shared_ptr<toolkit::Timer> _beat_timer;
+    toolkit::Timer::Ptr _beat_timer;
     std::weak_ptr<RtspMediaSource> _push_src;
     RtspMediaSource::RingType::RingReader::Ptr _rtsp_reader;
     std::function<void(const Parser&)> _on_res_func;
@@ -93,7 +94,7 @@ private:
     //rtcp发送时间,trackid idx 为数组下标
     toolkit::Ticker _rtcp_send_ticker[2];
     //统计rtp并发送rtcp
-    std::vector<std::shared_ptr<RtcpContext>> _rtcp_context;
+    std::vector<RtcpContext::Ptr> _rtcp_context;
 };
 
 using RtspPusherImp = PusherImp<RtspPusher, PusherBase>;

src/Rtsp/RtspSession.h

@@ -17,15 +17,14 @@
 #include "Network/Session.h"
 #include "RtspSplitter.h"
 #include "RtpReceiver.h"
+#include "Rtcp/RtcpContext.h"
 #include "RtspMediaSource.h"
 #include "RtspMediaSourceImp.h"
+#include "RtpMultiCaster.h"
 
 namespace mediakit {
-class RtpMultiCaster;
-class RtspSession;
-class RtcpContext;
-using BufferRtp = toolkit::BufferOffset<toolkit::Buffer::Ptr>;
 
+using BufferRtp = toolkit::BufferOffset<toolkit::Buffer::Ptr>;
 class RtspSession : public toolkit::Session, public RtspSplitter, public RtpReceiver, public MediaSourceEvent {
 public:
     using Ptr = std::shared_ptr<RtspSession>;
@@ -183,7 +182,7 @@ private:
     std::unordered_set<int> _udp_connected_flags;
     ////////RTP over udp_multicast////////
     //共享的rtp组播对象
-    std::shared_ptr<RtpMultiCaster> _multicaster;
+    RtpMultiCaster::Ptr _multicaster;
     ////////RTSP over HTTP  ////////
     //quicktime 请求rtsp会产生两次tcp连接，
     //一次发送 get 一次发送post，需要通过x-sessioncookie关联起来
@@ -193,7 +192,7 @@ private:
     //rtcp发送时间,trackid idx 为数组下标
     toolkit::Ticker _rtcp_send_tickers[2];
     //统计rtp并发送rtcp
-    std::vector<std::shared_ptr<RtcpContext>> _rtcp_context;
+    std::vector<RtcpContext::Ptr> _rtcp_context;
 };
 
 /**