From ed1402e9d694ad938ddfd41eb5e8c635a1fa301f Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Wed, 24 Oct 2018 15:55:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9Rtp=E5=B9=B2?=
 =?UTF-8?q?=E8=84=86RtpCodec?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Device/Device.h                    | 4 ++--
 src/Rtmp/RtmpToRtspMediaSource.h       | 4 ++--
 src/{RTP => RtpCodec}/AACRtpCodec.cpp  | 0
 src/{RTP => RtpCodec}/AACRtpCodec.h    | 0
 src/{RTP => RtpCodec}/H264RtpCodec.cpp | 0
 src/{RTP => RtpCodec}/H264RtpCodec.h   | 0
 src/{RTP => RtpCodec}/RtpCodec.h       | 0
 src/{RTP => RtpCodec}/RtpMaker.h       | 0
 src/{RTP => RtpCodec}/RtpMakerAAC.cpp  | 0
 src/{RTP => RtpCodec}/RtpMakerAAC.h    | 0
 src/{RTP => RtpCodec}/RtpMakerH264.cpp | 0
 src/{RTP => RtpCodec}/RtpMakerH264.h   | 0
 src/Rtsp/RtpParser.h                   | 2 +-
 src/Rtsp/RtspMediaSource.h             | 2 +-
 src/Rtsp/RtspSdp.h                     | 4 ++--
 15 files changed, 8 insertions(+), 8 deletions(-)
 rename src/{RTP => RtpCodec}/AACRtpCodec.cpp (100%)
 rename src/{RTP => RtpCodec}/AACRtpCodec.h (100%)
 rename src/{RTP => RtpCodec}/H264RtpCodec.cpp (100%)
 rename src/{RTP => RtpCodec}/H264RtpCodec.h (100%)
 rename src/{RTP => RtpCodec}/RtpCodec.h (100%)
 rename src/{RTP => RtpCodec}/RtpMaker.h (100%)
 rename src/{RTP => RtpCodec}/RtpMakerAAC.cpp (100%)
 rename src/{RTP => RtpCodec}/RtpMakerAAC.h (100%)
 rename src/{RTP => RtpCodec}/RtpMakerH264.cpp (100%)
 rename src/{RTP => RtpCodec}/RtpMakerH264.h (100%)

diff --git a/src/Device/Device.h b/src/Device/Device.h
index eba736e3..cac80ed2 100644
--- a/src/Device/Device.h
+++ b/src/Device/Device.h
@@ -32,8 +32,8 @@
 #include <functional>
 #include "Util/util.h"
 #include "Player/Player.h"
-#include "RTP/RtpMakerAAC.h"
-#include "RTP/RtpMakerH264.h"
+#include "RtpCodec/RtpMakerAAC.h"
+#include "RtpCodec/RtpMakerH264.h"
 #include "Rtsp/RtspToRtmpMediaSource.h"
 #include "Rtsp/RtspSdp.h"
 #include "Util/TimeTicker.h"
diff --git a/src/Rtmp/RtmpToRtspMediaSource.h b/src/Rtmp/RtmpToRtspMediaSource.h
index 3a3cd203..99504743 100644
--- a/src/Rtmp/RtmpToRtspMediaSource.h
+++ b/src/Rtmp/RtmpToRtspMediaSource.h
@@ -36,8 +36,8 @@
 #include "Rtmp.h"
 #include "RtmpParser.h"
 #include "RtmpMediaSource.h"
-#include "RTP/RtpMakerH264.h"
-#include "RTP/RtpMakerAAC.h"
+#include "RtpCodec/RtpMakerH264.h"
+#include "RtpCodec/RtpMakerAAC.h"
 #include "Rtsp/RtpParser.h"
 #include "Rtsp/RtspMediaSource.h"
 #include "Util/util.h"
diff --git a/src/RTP/AACRtpCodec.cpp b/src/RtpCodec/AACRtpCodec.cpp
similarity index 100%
rename from src/RTP/AACRtpCodec.cpp
rename to src/RtpCodec/AACRtpCodec.cpp
diff --git a/src/RTP/AACRtpCodec.h b/src/RtpCodec/AACRtpCodec.h
similarity index 100%
rename from src/RTP/AACRtpCodec.h
rename to src/RtpCodec/AACRtpCodec.h
diff --git a/src/RTP/H264RtpCodec.cpp b/src/RtpCodec/H264RtpCodec.cpp
similarity index 100%
rename from src/RTP/H264RtpCodec.cpp
rename to src/RtpCodec/H264RtpCodec.cpp
diff --git a/src/RTP/H264RtpCodec.h b/src/RtpCodec/H264RtpCodec.h
similarity index 100%
rename from src/RTP/H264RtpCodec.h
rename to src/RtpCodec/H264RtpCodec.h
diff --git a/src/RTP/RtpCodec.h b/src/RtpCodec/RtpCodec.h
similarity index 100%
rename from src/RTP/RtpCodec.h
rename to src/RtpCodec/RtpCodec.h
diff --git a/src/RTP/RtpMaker.h b/src/RtpCodec/RtpMaker.h
similarity index 100%
rename from src/RTP/RtpMaker.h
rename to src/RtpCodec/RtpMaker.h
diff --git a/src/RTP/RtpMakerAAC.cpp b/src/RtpCodec/RtpMakerAAC.cpp
similarity index 100%
rename from src/RTP/RtpMakerAAC.cpp
rename to src/RtpCodec/RtpMakerAAC.cpp
diff --git a/src/RTP/RtpMakerAAC.h b/src/RtpCodec/RtpMakerAAC.h
similarity index 100%
rename from src/RTP/RtpMakerAAC.h
rename to src/RtpCodec/RtpMakerAAC.h
diff --git a/src/RTP/RtpMakerH264.cpp b/src/RtpCodec/RtpMakerH264.cpp
similarity index 100%
rename from src/RTP/RtpMakerH264.cpp
rename to src/RtpCodec/RtpMakerH264.cpp
diff --git a/src/RTP/RtpMakerH264.h b/src/RtpCodec/RtpMakerH264.h
similarity index 100%
rename from src/RTP/RtpMakerH264.h
rename to src/RtpCodec/RtpMakerH264.h
diff --git a/src/Rtsp/RtpParser.h b/src/Rtsp/RtpParser.h
index ae8e45c1..060e1dbb 100644
--- a/src/Rtsp/RtpParser.h
+++ b/src/Rtsp/RtpParser.h
@@ -32,7 +32,7 @@
 #include "Player/Player.h"
 #include "Player/PlayerBase.h"
 #include "Util/TimeTicker.h"
-#include "RTP/RtpCodec.h"
+#include "RtpCodec/RtpCodec.h"
 
 using namespace std;
 using namespace ZL::Util;
diff --git a/src/Rtsp/RtspMediaSource.h b/src/Rtsp/RtspMediaSource.h
index e47edc9f..cd3198cd 100644
--- a/src/Rtsp/RtspMediaSource.h
+++ b/src/Rtsp/RtspMediaSource.h
@@ -35,7 +35,7 @@
 #include "Rtsp.h"
 #include "Common/config.h"
 #include "Common/MediaSource.h"
-#include "RTP/RtpCodec.h"
+#include "RtpCodec/RtpCodec.h"
 
 #include "Util/logger.h"
 #include "Util/RingBuffer.h"
diff --git a/src/Rtsp/RtspSdp.h b/src/Rtsp/RtspSdp.h
index c536e2ba..b0300b8d 100644
--- a/src/Rtsp/RtspSdp.h
+++ b/src/Rtsp/RtspSdp.h
@@ -5,8 +5,8 @@
 #ifndef ZLMEDIAKIT_RTSPSDP_H
 #define ZLMEDIAKIT_RTSPSDP_H
 
-#include "RTP/H264RtpCodec.h"
-#include "RTP/AACRtpCodec.h"
+#include "RtpCodec/H264RtpCodec.h"
+#include "RtpCodec/AACRtpCodec.h"
 #include "Util/base64.h"
 #include "Player/Track.h"