整理优化代码

Android/app/src/main/cpp/test_server.cpp

@@ -41,7 +41,7 @@
 #include "Rtsp/RtspSession.h"
 #include "Rtmp/RtmpSession.h"
 #include "Shell/ShellSession.h"
-#include "RtmpMuxer/FlvMuxer.h"
+#include "Rtmp/FlvMuxer.h"
 #include "Player/PlayerProxy.h"
 #include "Http/WebSocketSession.h"
 

server/main.cpp

@@ -40,7 +40,7 @@
 #include "Rtsp/RtspSession.h"
 #include "Rtmp/RtmpSession.h"
 #include "Shell/ShellSession.h"
-#include "RtmpMuxer/FlvMuxer.h"
+#include "Rtmp/FlvMuxer.h"
 #include "Player/PlayerProxy.h"
 #include "Http/WebSocketSession.h"
 #include "WebApi.h"

src/Common/MultiMediaSourceMuxer.h

@@ -27,8 +27,8 @@
 #ifndef ZLMEDIAKIT_MULTIMEDIASOURCEMUXER_H
 #define ZLMEDIAKIT_MULTIMEDIASOURCEMUXER_H
 
-#include "RtspMuxer/RtspMediaSourceMuxer.h"
-#include "RtmpMuxer/RtmpMediaSourceMuxer.h"
+#include "Rtsp/RtspMediaSourceMuxer.h"
+#include "Rtmp/RtmpMediaSourceMuxer.h"
 #include "MediaFile/MediaRecorder.h"
 
 class MultiMediaSourceMuxer : public FrameWriterInterface{

src/RtmpMuxer/AACRtmpCodec.h → src/Extension/AACRtmpCodec.h

@@ -27,7 +27,7 @@
 #ifndef ZLMEDIAKIT_AACRTMPCODEC_H
 #define ZLMEDIAKIT_AACRTMPCODEC_H
 
-#include "RtmpCodec.h"
+#include "Rtmp/RtmpCodec.h"
 #include "Extension/Track.h"
 #include "Extension/AAC.h"
 

src/RtspMuxer/AACRtpCodec.h → src/Extension/AACRtpCodec.h

@@ -27,7 +27,7 @@
 #ifndef ZLMEDIAKIT_AACRTPCODEC_H
 #define ZLMEDIAKIT_AACRTPCODEC_H
 
-#include "RtpCodec.h"
+#include "Rtsp/RtpCodec.h"
 #include "Extension/AAC.h"
 namespace mediakit{
 /**

src/Extension/Factory.cpp

@@ -25,11 +25,11 @@
  */
 
 #include "Factory.h"
-#include "RtmpMuxer/H264RtmpCodec.h"
-#include "RtmpMuxer/AACRtmpCodec.h"
-#include "RtspMuxer/H264RtpCodec.h"
-#include "RtspMuxer/AACRtpCodec.h"
-#include "RtspMuxer/H265RtpCodec.h"
+#include "H264RtmpCodec.h"
+#include "AACRtmpCodec.h"
+#include "H264RtpCodec.h"
+#include "AACRtpCodec.h"
+#include "H265RtpCodec.h"
 
 namespace mediakit{
 

src/Extension/Factory.h

@@ -30,8 +30,8 @@
 #include <string>
 #include "Rtmp/amf.h"
 #include "Extension/Track.h"
-#include "RtspMuxer/RtpCodec.h"
-#include "RtmpMuxer/RtmpCodec.h"
+#include "Rtsp/RtpCodec.h"
+#include "Rtmp/RtmpCodec.h"
 
 using namespace std;
 using namespace toolkit;

src/RtmpMuxer/H264RtmpCodec.h → src/Extension/H264RtmpCodec.h

@@ -27,7 +27,7 @@
 #ifndef ZLMEDIAKIT_H264RTMPCODEC_H
 #define ZLMEDIAKIT_H264RTMPCODEC_H
 
-#include "RtmpCodec.h"
+#include "Rtmp/RtmpCodec.h"
 #include "Extension/Track.h"
 #include "Util/ResourcePool.h"
 #include "Extension/H264.h"

src/RtspMuxer/H264RtpCodec.h → src/Extension/H264RtpCodec.h

@@ -27,7 +27,7 @@
 #ifndef ZLMEDIAKIT_H264RTPCODEC_H
 #define ZLMEDIAKIT_H264RTPCODEC_H
 
-#include "RtpCodec.h"
+#include "Rtsp/RtpCodec.h"
 #include "Util/ResourcePool.h"
 #include "Extension/H264.h"
 using namespace toolkit;

src/RtspMuxer/H265RtpCodec.h → src/Extension/H265RtpCodec.h

@@ -27,7 +27,7 @@
 #ifndef ZLMEDIAKIT_H265RTPCODEC_H
 #define ZLMEDIAKIT_H265RTPCODEC_H
 
-#include "RtpCodec.h"
+#include "Rtsp/RtpCodec.h"
 #include "Util/ResourcePool.h"
 #include "Extension/H265.h"
 

src/Http/HttpSession.h

@@ -32,7 +32,7 @@
 #include "Network/TcpSession.h"
 #include "Network/TcpServer.h"
 #include "Rtmp/RtmpMediaSource.h"
-#include "RtmpMuxer/FlvMuxer.h"
+#include "Rtmp/FlvMuxer.h"
 #include "HttpRequestSplitter.h"
 #include "WebSocketSplitter.h"
 #include "HttpCookieManager.h"

src/Rtmp/RtmpMediaSource.h

@@ -34,7 +34,7 @@
 #include <unordered_map>
 #include "amf.h"
 #include "Rtmp.h"
-#include "RtmpMuxer/RtmpDemuxer.h"
+#include "RtmpDemuxer.h"
 #include "Common/config.h"
 #include "Common/MediaSource.h"
 #include "Util/util.h"

src/RtmpMuxer/RtmpMediaSourceMuxer.h → src/Rtmp/RtmpMediaSourceMuxer.h

@@ -27,7 +27,7 @@
 #ifndef ZLMEDIAKIT_RTMPMEDIASOURCEMUXER_H
 #define ZLMEDIAKIT_RTMPMEDIASOURCEMUXER_H
 
-#include "RtmpMuxer/RtmpMuxer.h"
+#include "RtmpMuxer.h"
 #include "Rtmp/RtmpMediaSource.h"
 
 namespace mediakit {

src/Rtmp/RtmpPlayerImp.h

@@ -32,7 +32,7 @@
 #include "Common/config.h"
 #include "RtmpPlayer.h"
 #include "RtmpMediaSource.h"
-#include "RtmpMuxer/RtmpDemuxer.h"
+#include "RtmpDemuxer.h"
 #include "Poller/Timer.h"
 #include "Util/TimeTicker.h"
 using namespace toolkit;

src/Rtmp/RtmpToRtspMediaSource.h

@@ -37,9 +37,9 @@
 #include "amf.h"
 #include "Rtmp.h"
 #include "RtmpMediaSource.h"
-#include "RtmpMuxer/RtmpDemuxer.h"
+#include "RtmpDemuxer.h"
 #include "MediaFile/MediaRecorder.h"
-#include "RtspMuxer/RtspMediaSourceMuxer.h"
+#include "Rtsp/RtspMediaSourceMuxer.h"
 using namespace std;
 using namespace toolkit;
 

src/Rtsp/RtpReceiver.h

@@ -31,7 +31,7 @@
 #include <map>
 #include <string>
 #include <memory>
-#include "RtspMuxer/RtpCodec.h"
+#include "RtpCodec.h"
 #include "RtspMediaSource.h"
 
 using namespace std;

src/RtspMuxer/RtspDemuxer.h → src/Rtsp/RtspDemuxer.h

@@ -30,7 +30,7 @@
 #include <unordered_map>
 #include "Player/PlayerBase.h"
 #include "Util/TimeTicker.h"
-#include "RtspMuxer/RtpCodec.h"
+#include "RtpCodec.h"
 
 using namespace std;
 using namespace toolkit;

src/Rtsp/RtspMediaSource.h

@@ -34,7 +34,7 @@
 #include <unordered_map>
 #include "Common/config.h"
 #include "Common/MediaSource.h"
-#include "RtspMuxer/RtpCodec.h"
+#include "RtpCodec.h"
 
 #include "Util/logger.h"
 #include "Util/RingBuffer.h"

src/RtspMuxer/RtspMediaSourceMuxer.h → src/Rtsp/RtspMediaSourceMuxer.h

@@ -27,7 +27,7 @@
 #ifndef ZLMEDIAKIT_RTSPMEDIASOURCEMUXER_H
 #define ZLMEDIAKIT_RTSPMEDIASOURCEMUXER_H
 
-#include "RtspMuxer/RtspMuxer.h"
+#include "RtspMuxer.h"
 #include "Rtsp/RtspMediaSource.h"
 
 namespace mediakit {

src/Rtsp/RtspPlayerImp.h

@@ -32,7 +32,7 @@
 #include <functional>
 #include "Common/config.h"
 #include "RtspPlayer.h"
-#include "RtspMuxer/RtspDemuxer.h"
+#include "RtspDemuxer.h"
 #include "Poller/Timer.h"
 #include "Util/TimeTicker.h"
 

src/Rtsp/RtspToRtmpMediaSource.h

@@ -31,8 +31,8 @@
 #include "RtspMediaSource.h"
 #include "MediaFile/MediaRecorder.h"
 #include "Rtmp/RtmpMediaSource.h"
-#include "RtspMuxer/RtspDemuxer.h"
-#include "RtmpMuxer/RtmpMediaSourceMuxer.h"
+#include "RtspDemuxer.h"
+#include "Rtmp/RtmpMediaSourceMuxer.h"
 
 using namespace toolkit;
 

tests/test_server.cpp

@@ -41,7 +41,7 @@
 #include "Rtsp/RtspSession.h"
 #include "Rtmp/RtmpSession.h"
 #include "Shell/ShellSession.h"
-#include "RtmpMuxer/FlvMuxer.h"
+#include "Rtmp/FlvMuxer.h"
 #include "Player/PlayerProxy.h"
 #include "Http/WebSocketSession.h"