Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-07-06 11:38:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化接口

Browse Source
This commit is contained in:
xiongziliang
2018-10-25 16:55:48 +08:00
parent 0839ddb681
commit 3d83a236b6
10 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Rtsp/RtspMediaSource.h
View File

@@ -85,7 +85,8 @@ public:
_strSdp = sdp;
regist();
}
virtual void onGetRTP(const RtpPacket::Ptr &rtppt, bool keyPos) {
void onWrite(const RtpPacket::Ptr &rtppt, bool keyPos) override {
auto &trackRef = _mapTracks[rtppt->type];
trackRef.seq = rtppt->sequence;
trackRef.timeStamp = rtppt->timeStamp;
@@ -93,11 +94,6 @@ public:
trackRef.type = rtppt->type;
_pRing->write(rtppt,keyPos);
}
private:
void onWrite(const RtpPacket::Ptr &rtppt, bool keyPos) override {
onGetRTP(rtppt,keyPos);
}
protected:
unordered_map<int, RtspTrack> _mapTracks;
string _strSdp; //媒体描述信息

2
src/Rtsp/RtspPlayerImp.h
View File

@@ -84,7 +84,7 @@ private:
}
if(_pRtspMediaSrc){
_pRtspMediaSrc->onGetRTP(rtppt,true);
_pRtspMediaSrc->onWrite(rtppt,true);
}
}

8
src/Rtsp/RtspToRtmpMediaSource.cpp
View File

@@ -86,7 +86,7 @@ void RtspToRtmpMediaSource::makeVideoConfigPkt() {
rtmpPkt->streamId = STREAM_MEDIA;
rtmpPkt->timeStamp = 0;
rtmpPkt->typeId = MSG_VIDEO;
_pRtmpSrc->onGetMedia(rtmpPkt);
_pRtmpSrc->onWrite(rtmpPkt);
}
void RtspToRtmpMediaSource::onGetH264(const H264Frame& frame) {
if(_pRecorder){
@@ -120,7 +120,7 @@ void RtspToRtmpMediaSource::onGetH264(const H264Frame& frame) {
rtmpPkt->streamId = STREAM_MEDIA;
rtmpPkt->timeStamp = frame.timeStamp;
rtmpPkt->typeId = MSG_VIDEO;
_pRtmpSrc->onGetMedia(rtmpPkt);
_pRtmpSrc->onWrite(rtmpPkt);
}
void RtspToRtmpMediaSource::onGetAAC(const AACFrame& frame) {
if(_pRecorder){
@@ -139,7 +139,7 @@ void RtspToRtmpMediaSource::onGetAAC(const AACFrame& frame) {
rtmpPkt->streamId = STREAM_MEDIA;
rtmpPkt->timeStamp = frame.timeStamp;
rtmpPkt->typeId = MSG_AUDIO;
_pRtmpSrc->onGetMedia(rtmpPkt);
_pRtmpSrc->onWrite(rtmpPkt);
}
void RtspToRtmpMediaSource::makeAudioConfigPkt() {
@@ -181,7 +181,7 @@ void RtspToRtmpMediaSource::makeAudioConfigPkt() {
rtmpPkt->streamId = STREAM_MEDIA;
rtmpPkt->timeStamp = 0;
rtmpPkt->typeId = MSG_AUDIO;
_pRtmpSrc->onGetMedia(rtmpPkt);
_pRtmpSrc->onWrite(rtmpPkt);
#endif
}

4
src/Rtsp/RtspToRtmpMediaSource.h
View File

@@ -61,11 +61,11 @@ public:
}
RtspMediaSource::onGetSDP(strSdp);
}
virtual void onGetRTP(const RtpPacket::Ptr &pRtppkt, bool bKeyPos) override{
virtual void onWrite(const RtpPacket::Ptr &pRtppkt, bool bKeyPos) override{
if (_pParser) {
bKeyPos = _pParser->inputRtp(pRtppkt);
}
RtspMediaSource::onGetRTP(pRtppkt, bKeyPos);
RtspMediaSource::onWrite(pRtppkt, bKeyPos);
}
int readerCount(){