amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

整理优化代码

Browse Source
This commit is contained in:
xiongziliang 2019-06-28 17:30:13 +08:00
parent ea131d9740
commit 0b08831f5d
39 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Android/app/src/main/cpp/test_server.cpp
View File

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

2
server/main.cpp
View File

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

4
src/Common/MultiMediaSourceMuxer.h
View File

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

0
src/RtmpMuxer/AACRtmpCodec.cpp → src/Extension/AACRtmpCodec.cpp
View File

2
src/RtmpMuxer/AACRtmpCodec.h → src/Extension/AACRtmpCodec.h
View File

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

0
src/RtspMuxer/AACRtpCodec.cpp → src/Extension/AACRtpCodec.cpp
View File

2
src/RtspMuxer/AACRtpCodec.h → src/Extension/AACRtpCodec.h
View File

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

10
src/Extension/Factory.cpp
View File

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

4
src/Extension/Factory.h
View File

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

0
src/RtmpMuxer/H264RtmpCodec.cpp → src/Extension/H264RtmpCodec.cpp
View File

2
src/RtmpMuxer/H264RtmpCodec.h → src/Extension/H264RtmpCodec.h
View File

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

0
src/RtspMuxer/H264RtpCodec.cpp → src/Extension/H264RtpCodec.cpp
View File

2
src/RtspMuxer/H264RtpCodec.h → src/Extension/H264RtpCodec.h
View File

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

0
src/RtspMuxer/H265RtpCodec.cpp → src/Extension/H265RtpCodec.cpp
View File

2
src/RtspMuxer/H265RtpCodec.h → src/Extension/H265RtpCodec.h
View File

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

2
src/Http/HttpSession.h
View File

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

0
src/RtmpMuxer/FlvMuxer.cpp → src/Rtmp/FlvMuxer.cpp
View File

0
src/RtmpMuxer/FlvMuxer.h → src/Rtmp/FlvMuxer.h
View File

0
src/RtmpMuxer/RtmpCodec.h → src/Rtmp/RtmpCodec.h
View File

0
src/RtmpMuxer/RtmpDemuxer.cpp → src/Rtmp/RtmpDemuxer.cpp
View File

0
src/RtmpMuxer/RtmpDemuxer.h → src/Rtmp/RtmpDemuxer.h
View File

2
src/Rtmp/RtmpMediaSource.h
View File

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

2
src/RtmpMuxer/RtmpMediaSourceMuxer.h → src/Rtmp/RtmpMediaSourceMuxer.h
View File

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

0
src/RtmpMuxer/RtmpMuxer.cpp → src/Rtmp/RtmpMuxer.cpp
View File

0
src/RtmpMuxer/RtmpMuxer.h → src/Rtmp/RtmpMuxer.h
View File

2
src/Rtmp/RtmpPlayerImp.h
View File

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

4
src/Rtmp/RtmpToRtspMediaSource.h
View File

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

0
src/RtspMuxer/RtpCodec.cpp → src/Rtsp/RtpCodec.cpp
View File

0
src/RtspMuxer/RtpCodec.h → src/Rtsp/RtpCodec.h
View File

2
src/Rtsp/RtpReceiver.h
View File

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

0
src/RtspMuxer/RtspDemuxer.cpp → src/Rtsp/RtspDemuxer.cpp
View File

2
src/RtspMuxer/RtspDemuxer.h → src/Rtsp/RtspDemuxer.h
View File

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

2
src/Rtsp/RtspMediaSource.h
View File

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

2
src/RtspMuxer/RtspMediaSourceMuxer.h → src/Rtsp/RtspMediaSourceMuxer.h
View File

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

0
src/RtspMuxer/RtspMuxer.cpp → src/Rtsp/RtspMuxer.cpp
View File

0
src/RtspMuxer/RtspMuxer.h → src/Rtsp/RtspMuxer.h
View File

2
src/Rtsp/RtspPlayerImp.h
View File

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

4
src/Rtsp/RtspToRtmpMediaSource.h
View File

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

2
tests/test_server.cpp
View File

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