删除多余的Stamp.h和Base64包含

src/Extension/Factory.cpp

@@ -22,6 +22,7 @@
 #include "Opus.h"
 #include "G711.h"
 #include "L16.h"
+#include "Util/base64.h"
 #include "Common/Parser.h"
 #include "Common/config.h"
 

src/Extension/H264.cpp

@@ -11,6 +11,8 @@
 #include "H264.h"
 #include "SPSParser.h"
 #include "Util/logger.h"
+#include "Util/base64.h"
+
 using namespace toolkit;
 using namespace std;
 

src/Extension/H264.h

@@ -13,7 +13,6 @@
 
 #include "Frame.h"
 #include "Track.h"
-#include "Util/base64.h"
 
 #define H264_TYPE(v) ((uint8_t)(v) & 0x1F)
 

src/Extension/H264Rtp.h

@@ -12,8 +12,8 @@
 #define ZLMEDIAKIT_H264RTPCODEC_H
 
 #include "Rtsp/RtpCodec.h"
-#include "Util/ResourcePool.h"
 #include "Extension/H264.h"
+// for DtsGenerator
 #include "Common/Stamp.h"
 
 namespace mediakit{

src/Extension/H265.cpp

@@ -10,6 +10,7 @@
 
 #include "H265.h"
 #include "SPSParser.h"
+#include "Util/base64.h"
 
 using namespace std;
 using namespace toolkit;

src/Extension/H265.h

@@ -13,7 +13,6 @@
 
 #include "Frame.h"
 #include "Track.h"
-#include "Util/base64.h"
 #include "H264.h"
 
 #define H265_TYPE(v) (((uint8_t)(v) >> 1) & 0x3f)

src/Extension/H265Rtp.h

@@ -12,8 +12,8 @@
 #define ZLMEDIAKIT_H265RTPCODEC_H
 
 #include "Rtsp/RtpCodec.h"
-#include "Util/ResourcePool.h"
 #include "Extension/H265.h"
+// for DtsGenerator
 #include "Common/Stamp.h"
 
 namespace mediakit{

src/Http/HlsPlayer.h

@@ -11,7 +11,6 @@
 #ifndef HTTP_HLSPLAYER_H
 #define HTTP_HLSPLAYER_H
 
-#include "Common/Stamp.h"
 #include "Player/PlayerBase.h"
 #include "HttpTSPlayer.h"
 #include "HlsParser.h"

src/Record/MPEG.h

@@ -19,8 +19,7 @@
 #include "Extension/Frame.h"
 #include "Extension/Track.h"
 #include "Common/MediaSink.h"
-#include "Common/Stamp.h"
-
+#include "Util/ResourcePool.h"
 namespace mediakit {
 
 //该类用于产生MPEG-TS/MPEG-PS

src/Rtmp/RtmpSession.h

@@ -19,7 +19,6 @@
 #include "RtmpMediaSourceImp.h"
 #include "Util/TimeTicker.h"
 #include "Network/Session.h"
-#include "Common/Stamp.h"
 
 namespace mediakit {
 

src/Rtp/PSEncoder.cpp

@@ -11,9 +11,10 @@
 #if defined(ENABLE_RTPPROXY)
 
 #include "PSEncoder.h"
-#include "Extension/H264.h"
-#include "Rtsp/RtspMuxer.h"
 #include "Common/config.h"
+#include "Extension/H264.h"
+#include "Extension/CommonRtp.h"
+#include "Rtsp/RtspMuxer.h"
 
 using namespace toolkit;
 

src/Rtp/PSEncoder.h

@@ -15,11 +15,9 @@
 
 #include "Record/MPEG.h"
 #include "Common/MediaSink.h"
-#include "Common/Stamp.h"
-#include "Extension/CommonRtp.h"
 
 namespace mediakit{
-
+class CommonRtpEncoder;
 class PSEncoderImp : public MpegMuxer{
 public:
     PSEncoderImp(uint32_t ssrc, uint8_t payload_type = 96);

src/Rtp/RawEncoder.h

@@ -14,11 +14,9 @@
 #if defined(ENABLE_RTPPROXY)
 
 #include "Common/MediaSink.h"
-#include "Common/Stamp.h"
-#include "Extension/CommonRtp.h"
 
 namespace mediakit {
-
+class RtpCodec;
 class RawEncoderImp : public MediaSinkInterface {
 public:
     RawEncoderImp(uint32_t ssrc, uint8_t payload_type = 96, bool send_audio = true);
@@ -44,13 +42,13 @@ protected:
     virtual void onRTP(toolkit::Buffer::Ptr rtp, bool is_key = false) = 0;
 
 private:
-    RtpCodec::Ptr createRtpEncoder(const Track::Ptr &track);
+    std::shared_ptr<RtpCodec> createRtpEncoder(const Track::Ptr &track);
 
 private:
     bool _send_audio;
     uint8_t _payload_type;
     uint32_t _ssrc;
-    RtpCodec::Ptr _rtp_encoder;
+    std::shared_ptr<RtpCodec> _rtp_encoder;
 };
 
 } // namespace mediakit

src/Rtp/RtpCache.h

@@ -15,8 +15,8 @@
 
 #include "PSEncoder.h"
 #include "RawEncoder.h"
-#include "Extension/CommonRtp.h"
 #include "Common/PacketCache.h"
+
 namespace mediakit{
 
 class RtpCache : protected PacketCache<toolkit::Buffer> {