From 37fdb8d135a65e10cf5278c265bda0752bae084b Mon Sep 17 00:00:00 2001
From: ziyue <1213642868@qq.com>
Date: Wed, 10 Nov 2021 10:50:45 +0800
Subject: [PATCH] =?UTF-8?q?MediaSource:=20=E7=BB=A7=E6=89=BF=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E7=A7=81=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/FMP4/FMP4MediaSource.h    | 2 +-
 src/Rtmp/RtmpMediaSource.h    | 2 +-
 src/Rtmp/RtmpMediaSourceImp.h | 2 +-
 src/Rtp/RtpCache.h            | 2 +-
 src/Rtsp/RtspMediaSource.h    | 2 +-
 src/Rtsp/RtspMediaSourceImp.h | 2 +-
 src/TS/TSMediaSource.h        | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/FMP4/FMP4MediaSource.h b/src/FMP4/FMP4MediaSource.h
index 95856434..87c92831 100644
--- a/src/FMP4/FMP4MediaSource.h
+++ b/src/FMP4/FMP4MediaSource.h
@@ -31,7 +31,7 @@ public:
 };
 
 //FMP4直播源
-class FMP4MediaSource : public MediaSource, public RingDelegate<FMP4Packet::Ptr>, public PacketCache<FMP4Packet>{
+class FMP4MediaSource : public MediaSource, public RingDelegate<FMP4Packet::Ptr>, private PacketCache<FMP4Packet>{
 public:
     using Ptr = std::shared_ptr<FMP4MediaSource>;
     using RingDataType = std::shared_ptr<List<FMP4Packet::Ptr> >;
diff --git a/src/Rtmp/RtmpMediaSource.h b/src/Rtmp/RtmpMediaSource.h
index 56494ec1..1c6a302d 100644
--- a/src/Rtmp/RtmpMediaSource.h
+++ b/src/Rtmp/RtmpMediaSource.h
@@ -40,7 +40,7 @@ namespace mediakit {
  * 只要生成了这三要素，那么要实现rtmp推流、rtmp服务器就很简单了
  * rtmp推拉流协议中，先传递metadata，然后传递config帧，然后一直传递普通帧
  */
-class RtmpMediaSource : public MediaSource, public RingDelegate<RtmpPacket::Ptr>, public PacketCache<RtmpPacket>{
+class RtmpMediaSource : public MediaSource, public RingDelegate<RtmpPacket::Ptr>, private PacketCache<RtmpPacket>{
 public:
     typedef std::shared_ptr<RtmpMediaSource> Ptr;
     typedef std::shared_ptr<List<RtmpPacket::Ptr> > RingDataType;
diff --git a/src/Rtmp/RtmpMediaSourceImp.h b/src/Rtmp/RtmpMediaSourceImp.h
index c54426c0..692a7beb 100644
--- a/src/Rtmp/RtmpMediaSourceImp.h
+++ b/src/Rtmp/RtmpMediaSourceImp.h
@@ -27,7 +27,7 @@ using namespace std;
 using namespace toolkit;
 
 namespace mediakit {
-class RtmpMediaSourceImp: public RtmpMediaSource, public TrackListener , public MultiMediaSourceMuxer::Listener {
+class RtmpMediaSourceImp: public RtmpMediaSource, private TrackListener, public MultiMediaSourceMuxer::Listener {
 public:
     typedef std::shared_ptr<RtmpMediaSourceImp> Ptr;
 
diff --git a/src/Rtp/RtpCache.h b/src/Rtp/RtpCache.h
index 6162a1a0..7dcba839 100644
--- a/src/Rtp/RtpCache.h
+++ b/src/Rtp/RtpCache.h
@@ -18,7 +18,7 @@
 
 namespace mediakit{
 
-class RtpCache : public PacketCache<Buffer> {
+class RtpCache : private PacketCache<Buffer> {
 public:
     using onFlushed = function<void(std::shared_ptr<List<Buffer::Ptr> >)>;
     RtpCache(onFlushed cb);
diff --git a/src/Rtsp/RtspMediaSource.h b/src/Rtsp/RtspMediaSource.h
index b77c2bda..d129d712 100644
--- a/src/Rtsp/RtspMediaSource.h
+++ b/src/Rtsp/RtspMediaSource.h
@@ -36,7 +36,7 @@ namespace mediakit {
  * 只要生成了这两要素，那么要实现rtsp推流、rtsp服务器就很简单了
  * rtsp推拉流协议中，先传递sdp，然后再协商传输方式(tcp/udp/组播)，最后一直传递rtp
  */
-class RtspMediaSource : public MediaSource, public RingDelegate<RtpPacket::Ptr>, public PacketCache<RtpPacket> {
+class RtspMediaSource : public MediaSource, public RingDelegate<RtpPacket::Ptr>, private PacketCache<RtpPacket> {
 public:
     typedef ResourcePool<RtpPacket> PoolType;
     typedef std::shared_ptr<RtspMediaSource> Ptr;
diff --git a/src/Rtsp/RtspMediaSourceImp.h b/src/Rtsp/RtspMediaSourceImp.h
index b13dae8f..ab393502 100644
--- a/src/Rtsp/RtspMediaSourceImp.h
+++ b/src/Rtsp/RtspMediaSourceImp.h
@@ -18,7 +18,7 @@
 using namespace toolkit;
 
 namespace mediakit {
-class RtspMediaSourceImp : public RtspMediaSource, public TrackListener, public MultiMediaSourceMuxer::Listener  {
+class RtspMediaSourceImp : public RtspMediaSource, private TrackListener, public MultiMediaSourceMuxer::Listener  {
 public:
     typedef std::shared_ptr<RtspMediaSourceImp> Ptr;
 
diff --git a/src/TS/TSMediaSource.h b/src/TS/TSMediaSource.h
index 5c405fe8..d51dce9e 100644
--- a/src/TS/TSMediaSource.h
+++ b/src/TS/TSMediaSource.h
@@ -31,7 +31,7 @@ public:
 };
 
 //TS直播源
-class TSMediaSource : public MediaSource, public RingDelegate<TSPacket::Ptr>, public PacketCache<TSPacket>{
+class TSMediaSource : public MediaSource, public RingDelegate<TSPacket::Ptr>, private PacketCache<TSPacket>{
 public:
     using Ptr = std::shared_ptr<TSMediaSource>;
     using RingDataType = std::shared_ptr<List<TSPacket::Ptr> >;