调整目录结构

X64/makefile

@@ -18,8 +18,8 @@ RM := rm -rf
 -include src/Http/subdir.mk
 -include src/H264/subdir.mk
 -include src/Device/subdir.mk
+-include src/Common/subdir.mk
 -include src/Codec/subdir.mk
--include src/subdir.mk
 -include subdir.mk
 -include objects.mk
 

X64/sources.mk

@@ -24,6 +24,7 @@ CPP_DEPS :=
 # Every subdirectory with source files must be described here
 SUBDIRS := \
 src/Codec \
+src/Common \
 src/Device \
 src/H264 \
 src/Http \
@@ -33,6 +34,5 @@ src/RTP \
 src/Rtmp \
 src/Rtsp \
 src/Shell \
-src \
 test \
 

src/Common/config.cpp

@@ -1,4 +1,4 @@
-#include "config.h"
+#include "Common/config.h"
 #include "Util/util.h"
 #include "Util/onceToken.h"
 #include "Network/sockutil.h"

src/Device/PlayerProxy.cpp

@@ -5,7 +5,7 @@
  *      Author: xzl
  */
 
-#include "config.h"
+#include "Common/config.h"
 #include "PlayerProxy.h"
 #include "Util/mini.h"
 #include "Util/MD5.h"

src/Http/HttpSession.cpp

@@ -10,7 +10,7 @@
 #include <algorithm>
 #include <dirent.h>
 
-#include "config.h"
+#include "Common/config.h"
 #include "strCoding.h"
 #include "HttpSession.h"
 #include "Util/File.h"

src/Http/HttpSession.h

@@ -9,7 +9,7 @@
 #define SRC_HTTP_HTTPSESSION_H_
 
 #include <functional>
-#include "config.h"
+#include "Common/config.h"
 #include "Rtsp/Rtsp.h"
 #include "Network/TcpLimitedSession.h"
 

src/MediaFile/HLSMaker.h

@@ -9,7 +9,7 @@
 #define HLSMAKER_H_
 
 #include "TSMaker.h"
-#include "config.h"
+#include "Common/config.h"
 #include "Util/TimeTicker.h"
 #include "Util/File.h"
 #include "Util/util.h"

src/MediaFile/MediaReader.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "MediaReader.h"
-#include "config.h"
+#include "Common/config.h"
 #include "Util/mini.h"
 #include "Http/HttpSession.h"
 

src/MediaFile/MediaRecorder.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "MediaRecorder.h"
-#include "config.h"
+#include "Common/config.h"
 #include "Http/HttpSession.h"
 #include "Util/util.h"
 #include "Util/mini.h"

src/MediaFile/Mp4Maker.cpp

@@ -3,7 +3,7 @@
 
 #include <netinet/in.h>
 #include <sys/stat.h>
-#include "config.h"
+#include "Common/config.h"
 #include "Mp4Maker.h"
 #include "MediaRecorder.h"
 #include "Util/File.h"

src/RTP/RtpMakerAAC.cpp

@@ -6,7 +6,7 @@
  */
 
 #include <netinet/in.h>
-#include "config.h"
+#include "Common/config.h"
 #include "RtpMakerAAC.h"
 #include "Util/mini.h"
 

src/RTP/RtpMakerH264.cpp

@@ -6,7 +6,7 @@
  */
 
 #include <netinet/in.h>
-#include "config.h"
+#include "Common/config.h"
 #include "RtpMakerH264.h"
 #include "Util/mini.h"
 

src/Rtmp/RtmpMediaSource.h

@@ -16,8 +16,8 @@
 #include <unordered_map>
 #include "amf.h"
 #include "Rtmp.h"
-#include "config.h"
-#include "MediaSender.h"
+#include "Common/config.h"
+#include "Common/MediaSender.h"
 #include "Util/util.h"
 #include "Util/logger.h"
 #include "Util/RingBuffer.h"

src/Rtmp/RtmpPlayerImp.h

@@ -10,7 +10,7 @@
 
 #include <memory>
 #include <functional>
-#include "config.h"
+#include "Common/config.h"
 #include "RtmpPlayer.h"
 #include "RtmpParser.h"
 #include "Poller/Timer.h"

src/Rtmp/RtmpSession.h

@@ -13,7 +13,7 @@
 #include "amf.h"
 #include "Rtmp.h"
 #include "utils.h"
-#include "config.h"
+#include "Common/config.h"
 #include "RtmpProtocol.h"
 #include "RtmpToRtspMediaSource.h"
 #include "Util/util.h"

src/Rtmp/RtmpToRtspMediaSource.cpp

@@ -5,7 +5,7 @@
  *      Author: xzl
  */
 
-#include "config.h"
+#include "Common/config.h"
 #include "RtmpToRtspMediaSource.h"
 #include "Util/util.h"
 #include "Device/base64.h"

src/Rtsp/RtpBroadCaster.h

@@ -14,7 +14,7 @@
 #include <memory>
 #include <unordered_set>
 #include <unordered_map>
-#include "config.h"
+#include "Common/config.h"
 #include "RtspMediaSource.h"
 #include "Util/mini.h"
 #include "Network/Socket.h"

src/Rtsp/Rtsp.h

@@ -5,7 +5,7 @@
 #include <string>
 #include <memory>
 #include <unordered_map>
-#include "config.h"
+#include "Common/config.h"
 
 using namespace std;
 

src/Rtsp/RtspMediaSource.h

@@ -13,9 +13,9 @@
 #include <memory>
 #include <functional>
 #include <unordered_map>
-#include "config.h"
 #include "Rtsp.h"
-#include "MediaSender.h"
+#include "Common/config.h"
+#include "Common/MediaSender.h"
 #include "Util/logger.h"
 #include "Util/RingBuffer.h"
 #include "Util/TimeTicker.h"

src/Rtsp/RtspPlayer.cpp

@@ -4,7 +4,7 @@
 #include <algorithm>
 #include <arpa/inet.h>
 
-#include "config.h"
+#include "Common/config.h"
 #include "RtspPlayer.h"
 #include "Device/base64.h"
 #include "H264/SPSParser.h"

src/Rtsp/RtspPlayerImp.h

@@ -11,7 +11,7 @@
 #include <memory>
 #include <algorithm>
 #include <functional>
-#include "config.h"
+#include "Common/config.h"
 #include "RtpParser.h"
 #include "RtspPlayer.h"
 #include "Poller/Timer.h"

src/Rtsp/RtspSession.cpp

@@ -7,7 +7,7 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <atomic>
-#include "config.h"
+#include "Common/config.h"
 #include "UDPServer.h"
 #include "RtspSession.h"
 #include "Device/base64.h"

src/Rtsp/RtspSession.h

@@ -12,7 +12,7 @@
 #include <set>
 #include <vector>
 #include <unordered_map>
-#include "config.h"
+#include "Common/config.h"
 #include "Rtsp.h"
 #include "RtpBroadCaster.h"
 #include "RtspMediaSource.h"

src/Rtsp/RtspToRtmpMediaSource.cpp

@@ -12,7 +12,7 @@
 #include <sys/ioctl.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include "config.h"
+#include "Common/config.h"
 #include "Rtmp/Rtmp.h"
 #include "RtspToRtmpMediaSource.h"
 #include "Util/util.h"

src/Shell/ShellSession.cpp

@@ -5,7 +5,7 @@
  *      Author: xzl
  */
 
-#include "config.h"
+#include "Common/config.h"
 #include "ShellSession.h"
 #include "Util/logger.h"
 #include "Util/util.h"

src/Shell/ShellSession.h

@@ -10,7 +10,7 @@
 
 #include <functional>
 #include "CMD.h"
-#include "config.h"
+#include "Common/config.h"
 #include "Util/TimeTicker.h"
 #include "Network/TcpLimitedSession.h"