From d4908c3162242a3289b0c963f2f08327eabd1940 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Wed, 8 Jul 2020 22:29:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E9=AB=98rtsp=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AF=E5=81=A5=E5=A3=AE=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Rtsp/RtspPlayer.cpp | 15 ++++-----------
 src/Rtsp/RtspPusher.cpp |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/Rtsp/RtspPlayer.cpp b/src/Rtsp/RtspPlayer.cpp
index 297266f7..fdfc6a1c 100644
--- a/src/Rtsp/RtspPlayer.cpp
+++ b/src/Rtsp/RtspPlayer.cpp
@@ -464,14 +464,10 @@ void RtspPlayer::onRtpPacket(const char *data, uint64_t len) {
     uint8_t interleaved = data[1];
     if(interleaved %2 == 0){
         trackIdx = getTrackIndexByInterleaved(interleaved);
-        if (trackIdx != -1) {
-            handleOneRtp(trackIdx, _sdp_track[trackIdx], (unsigned char *)data + 4, len - 4);
-        }
+        handleOneRtp(trackIdx, _sdp_track[trackIdx], (unsigned char *)data + 4, len - 4);
     }else{
         trackIdx = getTrackIndexByInterleaved(interleaved - 1);
-        if (trackIdx != -1) {
-            onRtcpPacket(trackIdx, _sdp_track[trackIdx], (unsigned char *) data + 4, len - 4);
-        }
+        onRtcpPacket(trackIdx, _sdp_track[trackIdx], (unsigned char *) data + 4, len - 4);
     }
 }
 
@@ -713,9 +709,6 @@ void RtspPlayer::onRecvRTP_l(const RtpPacket::Ptr &pkt, const SdpTrack::Ptr &tra
     onRecvRTP(pkt, track);
 
     int iTrackIndex = getTrackIndexByInterleaved(pkt->interleaved);
-    if (iTrackIndex == -1) {
-        return;
-    }
     RtcpCounter &counter = _rtcp_counter[iTrackIndex];
     counter.pktCnt = pkt->sequence;
     auto &ticker = _rtcp_send_ticker[iTrackIndex];
@@ -788,7 +781,7 @@ int RtspPlayer::getTrackIndexByInterleaved(int interleaved) const {
     if (_sdp_track.size() == 1) {
         return 0;
     }
-    return -1;
+    throw SockException(Err_shutdown, StrPrinter << "no such track with interleaved:" << interleaved);
 }
 
 int RtspPlayer::getTrackIndexByTrackType(TrackType trackType) const {
@@ -800,7 +793,7 @@ int RtspPlayer::getTrackIndexByTrackType(TrackType trackType) const {
     if (_sdp_track.size() == 1) {
         return 0;
     }
-    return -1;
+    throw SockException(Err_shutdown, StrPrinter << "no such track with type:" << (int) trackType);
 }
 
 } /* namespace mediakit */
diff --git a/src/Rtsp/RtspPusher.cpp b/src/Rtsp/RtspPusher.cpp
index f259a0d6..16dd12b7 100644
--- a/src/Rtsp/RtspPusher.cpp
+++ b/src/Rtsp/RtspPusher.cpp
@@ -347,7 +347,7 @@ inline int RtspPusher::getTrackIndexByTrackType(TrackType type) {
     if(_aTrackInfo.size() == 1){
         return 0;
     }
-    return -1;
+    throw SockException(Err_shutdown, StrPrinter << "no such track with type:" << (int) type);
 }
 
 void RtspPusher::sendRecord() {