From 548c918efbb2de5f9651aeb7e6500c85399b0c74 Mon Sep 17 00:00:00 2001
From: runner365 <shi.weibd@hotmail.com>
Date: Tue, 11 Feb 2020 21:36:36 +0800
Subject: [PATCH] mpegts discard header is not 0x47

---
 trunk/src/srt/srt_handle.cpp | 2 +-
 trunk/src/srt/srt_server.cpp | 1 -
 trunk/src/srt/ts_demux.cpp   | 6 +++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/trunk/src/srt/srt_handle.cpp b/trunk/src/srt/srt_handle.cpp
index adc6b95ec..dfba60cd1 100644
--- a/trunk/src/srt/srt_handle.cpp
+++ b/trunk/src/srt/srt_handle.cpp
@@ -188,7 +188,7 @@ void srt_handle::handle_push_data(SRT_SOCKSTATUS status, const std::string& subp
         close_push_conn(conn_fd);
         return;
     }
-    srs_trace("srt read data len:%d", ret);
+
     srt_conn_ptr->update_timestamp(srt_now_ms);
 
     srt2rtmp::get_instance()->insert_data_message(data, ret, subpath);
diff --git a/trunk/src/srt/srt_server.cpp b/trunk/src/srt/srt_server.cpp
index 2e2e44dfc..f34e37fed 100644
--- a/trunk/src/srt/srt_server.cpp
+++ b/trunk/src/srt/srt_server.cpp
@@ -165,7 +165,6 @@ void srt_server::srt_handle_connection(SRT_SOCKSTATUS status, SRTSOCKET input_fd
 }
 
 void srt_server::srt_handle_data(SRT_SOCKSTATUS status, SRTSOCKET input_fd, const std::string& dscr) {
-    srs_trace("status:%d, fd:%d, dscr:%s", status, input_fd, dscr.c_str());
     _handle_ptr->handle_srt_socket(status, input_fd);
     return;
 }
diff --git a/trunk/src/srt/ts_demux.cpp b/trunk/src/srt/ts_demux.cpp
index 4c10f871b..13cee93ec 100644
--- a/trunk/src/srt/ts_demux.cpp
+++ b/trunk/src/srt/ts_demux.cpp
@@ -296,7 +296,11 @@ int ts_demux::decode(SRT_DATA_MSG_PTR data_ptr, TS_DATA_CALLBACK_PTR callback)
     path = data_ptr->get_path();
     for (unsigned int index = 0; index < count; index++)
     {
-        ret = decode_unit(data_ptr->get_data() + 188*index, path, callback);
+        unsigned char* data = data_ptr->get_data() + 188*index;
+        if (data[0] != 0x47) {
+            continue;
+        }
+        ret = decode_unit(data, path, callback);
         if (ret < 0)
         {
             break;