From 06c6654ed5e589898d670b5ad6e04f1071d7b31f Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Sat, 3 Sep 2022 16:27:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 3rdpart/ZLToolKit | 2 +- src/FMP4/FMP4MediaSource.h | 1 - src/Record/HlsMediaSource.h | 1 - src/Rtmp/RtmpMediaSource.h | 2 -- src/Rtsp/RtspMediaSource.h | 1 - src/TS/TSMediaSource.h | 1 - 6 files changed, 1 insertion(+), 7 deletions(-) diff --git a/3rdpart/ZLToolKit b/3rdpart/ZLToolKit index 23575ba8..82f82e72 160000 --- a/3rdpart/ZLToolKit +++ b/3rdpart/ZLToolKit @@ -1 +1 @@ -Subproject commit 23575ba82d00641f8f33851b1d85391da310c378 +Subproject commit 82f82e723eda127777aaf91ad0e4615e8d56e8d5 diff --git a/src/FMP4/FMP4MediaSource.h b/src/FMP4/FMP4MediaSource.h index e4c6a15f..2b4a1504 100644 --- a/src/FMP4/FMP4MediaSource.h +++ b/src/FMP4/FMP4MediaSource.h @@ -114,7 +114,6 @@ private: } strong_self->onReaderChanged(size); }); - onReaderChanged(0); if (!_init_segment.empty()) { regist(); } diff --git a/src/Record/HlsMediaSource.h b/src/Record/HlsMediaSource.h index 5c66f3b5..1e1029fe 100644 --- a/src/Record/HlsMediaSource.h +++ b/src/Record/HlsMediaSource.h @@ -52,7 +52,6 @@ public: strongSelf->onReaderChanged(size); }; _ring = std::make_shared(0, std::move(lam)); - onReaderChanged(0); regist(); } diff --git a/src/Rtmp/RtmpMediaSource.h b/src/Rtmp/RtmpMediaSource.h index f92246c8..8ee954ca 100644 --- a/src/Rtmp/RtmpMediaSource.h +++ b/src/Rtmp/RtmpMediaSource.h @@ -158,8 +158,6 @@ public: //GOP默认缓冲512组RTMP包,每组RTMP包时间戳相同(如果开启合并写了,那么每组为合并写时间内的RTMP包), //每次遇到关键帧第一个RTMP包,则会清空GOP缓存(因为有新的关键帧了,同样可以实现秒开) _ring = std::make_shared(_ring_size,std::move(lam)); - onReaderChanged(0); - if(_metadata){ regist(); } diff --git a/src/Rtsp/RtspMediaSource.h b/src/Rtsp/RtspMediaSource.h index 69e3f93b..adfceca0 100644 --- a/src/Rtsp/RtspMediaSource.h +++ b/src/Rtsp/RtspMediaSource.h @@ -183,7 +183,6 @@ public: //GOP默认缓冲512组RTP包,每组RTP包时间戳相同(如果开启合并写了,那么每组为合并写时间内的RTP包), //每次遇到关键帧第一个RTP包,则会清空GOP缓存(因为有新的关键帧了,同样可以实现秒开) _ring = std::make_shared(_ring_size, std::move(lam)); - onReaderChanged(0); if (!_sdp.empty()) { regist(); } diff --git a/src/TS/TSMediaSource.h b/src/TS/TSMediaSource.h index 101dda9c..d1e18e41 100644 --- a/src/TS/TSMediaSource.h +++ b/src/TS/TSMediaSource.h @@ -98,7 +98,6 @@ private: } strong_self->onReaderChanged(size); }); - onReaderChanged(0); //注册媒体源 regist(); }