代码优化

Hu Chunming
1 parent 1116447e
Showing 2 changed files with 12 additions and 4 deletions
src/decoder/gb28181/DvppGB28181Decoder.cpp
src/decoder/gb28181/rtp/RTPUdpReceiver.cpp
@@ -74,11 +74,12 @@ void DvppGB28181Decoder::close(){
  
     // if (gpu_options) av_dict_free(&gpu_options);
  
-    if (m_post_decode_thread != 0)
-	{
+    if (m_post_decode_thread != 0) {
 		pthread_join(m_post_decode_thread,0);
 	}
  
+    streamDecoder.Close();
+
     m_status = ECLOSED;
  
     LOG_INFO("解码器关闭成功 --{}", m_dec_name);
@@ -137,6 +138,8 @@ bool DvppGB28181Decoder::start() {
         return true;
     }
  
+    close();
+
     LOG_ERROR("[{}] - rtp receiver open failed !", m_dec_name);
  
     return bRet;
@@ -123,8 +123,13 @@ bool RTPUdpReceiver::Open(string channel_id)
 		return false;
 	}
  
-	RequestStream();
-
+	bool bReq = RequestStream();
+	if (!bReq) {
+		LOG_INFO("[{}] RequestStream failed !", m_SipChannelId);
+		Close();
+		return false;
+	}
+	
 	m_bOpened = true;
     LOG_INFO("[{}] Open ok", m_SipChannelId);