From 717e811002bdea8c0e321eccddaa980bf73203be Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 14 May 2021 09:10:41 +0800 Subject: [PATCH] Change virtual public to public. 4.0.109 --- README.md | 1 + trunk/src/app/srs_app_caster_flv.hpp | 6 ++---- trunk/src/app/srs_app_conn.hpp | 10 +++++----- trunk/src/app/srs_app_http_api.hpp | 6 +++--- trunk/src/app/srs_app_http_conn.hpp | 8 ++++---- trunk/src/app/srs_app_http_static.hpp | 2 +- trunk/src/app/srs_app_http_stream.hpp | 4 ++-- trunk/src/app/srs_app_mpegts_udp.hpp | 2 +- trunk/src/app/srs_app_recv_thread.hpp | 4 ++-- trunk/src/app/srs_app_rtc_conn.hpp | 4 ++-- trunk/src/app/srs_app_rtc_dtls.hpp | 2 +- trunk/src/app/srs_app_rtc_source.hpp | 4 ++-- trunk/src/app/srs_app_rtmp_conn.hpp | 4 ++-- trunk/src/app/srs_app_server.hpp | 14 +++++++------- trunk/src/app/srs_app_source.hpp | 2 +- trunk/src/core/srs_core_version4.hpp | 2 +- trunk/src/kernel/srs_kernel_io.hpp | 6 +++--- trunk/src/main/srs_main_ingest_hls.cpp | 2 +- trunk/src/protocol/srs_protocol_io.hpp | 6 +++--- trunk/src/protocol/srs_protocol_kbps.hpp | 2 +- trunk/src/protocol/srs_service_http_client.hpp | 2 +- trunk/src/protocol/srs_service_http_conn.hpp | 2 +- trunk/src/utest/srs_utest_http.cpp | 2 +- trunk/src/utest/srs_utest_http.hpp | 2 +- trunk/src/utest/srs_utest_rtc.cpp | 2 +- 25 files changed, 50 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index b4699a618..bb5ec34b2 100755 --- a/README.md +++ b/README.md @@ -176,6 +176,7 @@ The ports used by SRS: ## V4 changes +* v4.0, 2021-05-14, Change virtual public to public. 4.0.109 * v4.0, 2021-05-14, Refine id and vid for statistic. 4.0.108 * v4.0, 2021-05-09, Refine tid for sdk and demos. 4.0.106 * v4.0, 2021-05-08, Refine shared fast timer. 4.0.105 diff --git a/trunk/src/app/srs_app_caster_flv.hpp b/trunk/src/app/srs_app_caster_flv.hpp index 5042ebf6e..13800d17c 100644 --- a/trunk/src/app/srs_app_caster_flv.hpp +++ b/trunk/src/app/srs_app_caster_flv.hpp @@ -47,8 +47,7 @@ class SrsSimpleRtmpClient; #include // The stream caster for flv stream over HTTP POST. -class SrsAppCasterFlv : virtual public ISrsTcpHandler - , virtual public ISrsResourceManager, virtual public ISrsHttpHandler +class SrsAppCasterFlv : public ISrsTcpHandler, public ISrsResourceManager, public ISrsHttpHandler { private: std::string output; @@ -72,8 +71,7 @@ public: }; // The dynamic http connection, never drop the body. -class SrsDynamicHttpConn : virtual public ISrsStartableConneciton, virtual public ISrsHttpConnOwner - , virtual public ISrsReloadHandler +class SrsDynamicHttpConn : public ISrsStartableConneciton, public ISrsHttpConnOwner, public ISrsReloadHandler { private: // The manager object to manage the connection. diff --git a/trunk/src/app/srs_app_conn.hpp b/trunk/src/app/srs_app_conn.hpp index c992c3fc2..dc6b30669 100644 --- a/trunk/src/app/srs_app_conn.hpp +++ b/trunk/src/app/srs_app_conn.hpp @@ -77,7 +77,7 @@ public: }; // The resource manager remove resource and delete it asynchronously. -class SrsResourceManager : virtual public ISrsCoroutineHandler, virtual public ISrsResourceManager +class SrsResourceManager : public ISrsCoroutineHandler, public ISrsResourceManager { private: std::string label_; @@ -153,8 +153,8 @@ public: }; // Interface for connection that is startable. -class ISrsStartableConneciton : virtual public ISrsConnection - , virtual public ISrsStartable, virtual public ISrsKbpsDelta +class ISrsStartableConneciton : public ISrsConnection + , public ISrsStartable, public ISrsKbpsDelta { public: ISrsStartableConneciton(); @@ -164,7 +164,7 @@ public: // The basic connection of SRS, for TCP based protocols, // all connections accept from listener must extends from this base class, // server will add the connection to manager, and delete it when remove. -class SrsTcpConnection : virtual public ISrsProtocolReadWriter +class SrsTcpConnection : public ISrsProtocolReadWriter { private: // The underlayer st fd handler. @@ -196,7 +196,7 @@ public: }; // The SSL connection over TCP transport, in server mode. -class SrsSslConnection : virtual public ISrsProtocolReadWriter +class SrsSslConnection : public ISrsProtocolReadWriter { private: // The under-layer plaintext transport. diff --git a/trunk/src/app/srs_app_http_api.hpp b/trunk/src/app/srs_app_http_api.hpp index bb19299a5..87d55d5bf 100644 --- a/trunk/src/app/srs_app_http_api.hpp +++ b/trunk/src/app/srs_app_http_api.hpp @@ -185,7 +185,7 @@ public: virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); }; -class SrsGoApiRaw : virtual public ISrsHttpHandler, virtual public ISrsReloadHandler +class SrsGoApiRaw : public ISrsHttpHandler, public ISrsReloadHandler { private: SrsServer* server; @@ -247,8 +247,8 @@ public: #endif // Handle the HTTP API request. -class SrsHttpApi : virtual public ISrsStartableConneciton, virtual public ISrsHttpConnOwner - , virtual public ISrsReloadHandler +class SrsHttpApi : public ISrsStartableConneciton, public ISrsHttpConnOwner + , public ISrsReloadHandler { private: // The manager object to manage the connection. diff --git a/trunk/src/app/srs_app_http_conn.hpp b/trunk/src/app/srs_app_http_conn.hpp index b7c2b7fb3..4331fefe8 100644 --- a/trunk/src/app/srs_app_http_conn.hpp +++ b/trunk/src/app/srs_app_http_conn.hpp @@ -75,8 +75,8 @@ public: }; // The http connection which request the static or stream content. -class SrsHttpConn : virtual public ISrsStartableConneciton, virtual public ISrsCoroutineHandler - , virtual public ISrsExpire +class SrsHttpConn : public ISrsStartableConneciton, public ISrsCoroutineHandler + , public ISrsExpire { protected: SrsHttpParser* parser; @@ -143,8 +143,8 @@ public: }; // Drop body of request, only process the response. -class SrsResponseOnlyHttpConn : virtual public ISrsStartableConneciton, virtual public ISrsHttpConnOwner - , virtual public ISrsReloadHandler +class SrsResponseOnlyHttpConn : public ISrsStartableConneciton, public ISrsHttpConnOwner + , public ISrsReloadHandler { private: // The manager object to manage the connection. diff --git a/trunk/src/app/srs_app_http_static.hpp b/trunk/src/app/srs_app_http_static.hpp index 6852c6588..1595809ee 100644 --- a/trunk/src/app/srs_app_http_static.hpp +++ b/trunk/src/app/srs_app_http_static.hpp @@ -44,7 +44,7 @@ protected: // The http static server instance, // serve http static file and flv/mp4 vod stream. -class SrsHttpStaticServer : virtual public ISrsReloadHandler +class SrsHttpStaticServer : public ISrsReloadHandler { private: SrsServer* server; diff --git a/trunk/src/app/srs_app_http_stream.hpp b/trunk/src/app/srs_app_http_stream.hpp index 82d62db39..de8a25d87 100755 --- a/trunk/src/app/srs_app_http_stream.hpp +++ b/trunk/src/app/srs_app_http_stream.hpp @@ -231,8 +231,8 @@ public: // The HTTP Live Streaming Server, to serve FLV/TS/MP3/AAC stream. // TODO: Support multiple stream. -class SrsHttpStreamServer : virtual public ISrsReloadHandler -, virtual public ISrsHttpMatchHijacker +class SrsHttpStreamServer : public ISrsReloadHandler +, public ISrsHttpMatchHijacker { private: SrsServer* server; diff --git a/trunk/src/app/srs_app_mpegts_udp.hpp b/trunk/src/app/srs_app_mpegts_udp.hpp index c6aeaa27a..64efe84e7 100644 --- a/trunk/src/app/srs_app_mpegts_udp.hpp +++ b/trunk/src/app/srs_app_mpegts_udp.hpp @@ -67,7 +67,7 @@ public: }; // The mpegts over udp stream caster. -class SrsMpegtsOverUdp : virtual public ISrsTsHandler, virtual public ISrsUdpHandler +class SrsMpegtsOverUdp : public ISrsTsHandler, public ISrsUdpHandler { private: SrsTsContext* context; diff --git a/trunk/src/app/srs_app_recv_thread.hpp b/trunk/src/app/srs_app_recv_thread.hpp index d6fb7f8db..792b862c0 100644 --- a/trunk/src/app/srs_app_recv_thread.hpp +++ b/trunk/src/app/srs_app_recv_thread.hpp @@ -138,9 +138,9 @@ public: // The publish recv thread got message and callback the source method to process message. // @see: https://github.com/ossrs/srs/issues/237 -class SrsPublishRecvThread : virtual public ISrsMessagePumper, virtual public ISrsReloadHandler +class SrsPublishRecvThread : public ISrsMessagePumper, public ISrsReloadHandler #ifdef SRS_PERF_MERGED_READ - , virtual public IMergeReadHandler + , public IMergeReadHandler #endif { private: diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 567c47c39..9010f87ae 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -192,7 +192,7 @@ public: }; // A worker coroutine to request the PLI. -class SrsRtcPLIWorker : virtual public ISrsCoroutineHandler +class SrsRtcPLIWorker : public ISrsCoroutineHandler { private: SrsCoroutine* trd_; @@ -419,7 +419,7 @@ private: // A RTC Peer Connection, SDP level object. // -// For performance, we use non-virtual public from resource, +// For performance, we use non-public from resource, // see https://stackoverflow.com/questions/3747066/c-cannot-convert-from-base-a-to-derived-type-b-via-virtual-base-a class SrsRtcConnection : public ISrsResource, public ISrsDisposingHandler { diff --git a/trunk/src/app/srs_app_rtc_dtls.hpp b/trunk/src/app/srs_app_rtc_dtls.hpp index 0938f30c6..30eedb231 100644 --- a/trunk/src/app/srs_app_rtc_dtls.hpp +++ b/trunk/src/app/srs_app_rtc_dtls.hpp @@ -144,7 +144,7 @@ protected: virtual bool is_dtls_client() = 0; }; -class SrsDtlsClientImpl : virtual public SrsDtlsImpl, virtual public ISrsCoroutineHandler +class SrsDtlsClientImpl : public SrsDtlsImpl, public ISrsCoroutineHandler { private: // ARQ thread, for role active(DTLS client). diff --git a/trunk/src/app/srs_app_rtc_source.hpp b/trunk/src/app/srs_app_rtc_source.hpp index bf435996d..1c53d2140 100644 --- a/trunk/src/app/srs_app_rtc_source.hpp +++ b/trunk/src/app/srs_app_rtc_source.hpp @@ -573,7 +573,7 @@ protected: virtual srs_error_t do_check_send_nacks(uint32_t& timeout_nacks); }; -class SrsRtcAudioRecvTrack : virtual public SrsRtcRecvTrack, virtual public ISrsRtpPacketDecodeHandler +class SrsRtcAudioRecvTrack : public SrsRtcRecvTrack, public ISrsRtpPacketDecodeHandler { public: SrsRtcAudioRecvTrack(SrsRtcConnection* session, SrsRtcTrackDescription* track_desc); @@ -585,7 +585,7 @@ public: virtual srs_error_t check_send_nacks(); }; -class SrsRtcVideoRecvTrack : virtual public SrsRtcRecvTrack, virtual public ISrsRtpPacketDecodeHandler +class SrsRtcVideoRecvTrack : public SrsRtcRecvTrack, public ISrsRtpPacketDecodeHandler { public: SrsRtcVideoRecvTrack(SrsRtcConnection* session, SrsRtcTrackDescription* stream_descs); diff --git a/trunk/src/app/srs_app_rtmp_conn.hpp b/trunk/src/app/srs_app_rtmp_conn.hpp index 495e2623c..acfc15c70 100644 --- a/trunk/src/app/srs_app_rtmp_conn.hpp +++ b/trunk/src/app/srs_app_rtmp_conn.hpp @@ -83,8 +83,8 @@ public: }; // The client provides the main logic control for RTMP clients. -class SrsRtmpConn : virtual public ISrsStartableConneciton, virtual public ISrsReloadHandler - , virtual public ISrsCoroutineHandler, virtual public ISrsExpire +class SrsRtmpConn : public ISrsStartableConneciton, public ISrsReloadHandler + , public ISrsCoroutineHandler, public ISrsExpire { // For the thread to directly access any field of connection. friend class SrsPublishRecvThread; diff --git a/trunk/src/app/srs_app_server.hpp b/trunk/src/app/srs_app_server.hpp index 0b007cea8..83b2a9b4c 100644 --- a/trunk/src/app/srs_app_server.hpp +++ b/trunk/src/app/srs_app_server.hpp @@ -101,7 +101,7 @@ public: }; // A buffered TCP listener. -class SrsBufferListener : virtual public SrsListener, virtual public ISrsTcpHandler +class SrsBufferListener : public SrsListener, public ISrsTcpHandler { private: SrsTcpListener* listener; @@ -116,7 +116,7 @@ public: }; // A TCP listener, for rtsp server. -class SrsRtspListener : virtual public SrsListener, virtual public ISrsTcpHandler +class SrsRtspListener : public SrsListener, public ISrsTcpHandler { private: SrsTcpListener* listener; @@ -132,7 +132,7 @@ public: }; // A TCP listener, for flv stream server. -class SrsHttpFlvListener : virtual public SrsListener, virtual public ISrsTcpHandler +class SrsHttpFlvListener : public SrsListener, public ISrsTcpHandler { private: SrsTcpListener* listener; @@ -178,7 +178,7 @@ public: virtual ~SrsGb28181Listener(); }; -class SrsGb28181TcpListener : virtual public SrsListener, virtual public ISrsTcpHandler +class SrsGb28181TcpListener : public SrsListener, public ISrsTcpHandler { private: SrsTcpListener* listener; @@ -261,9 +261,9 @@ public: // TODO: FIXME: Rename to SrsLiveServer. // SRS RTMP server, initialize and listen, start connection service thread, destroy client. -class SrsServer : virtual public ISrsReloadHandler, virtual public ISrsSourceHandler - , virtual public ISrsResourceManager, virtual public ISrsCoroutineHandler - , virtual public ISrsHourGlass +class SrsServer : public ISrsReloadHandler, public ISrsSourceHandler + , public ISrsResourceManager, public ISrsCoroutineHandler + , public ISrsHourGlass { private: // TODO: FIXME: Extract an HttpApiServer. diff --git a/trunk/src/app/srs_app_source.hpp b/trunk/src/app/srs_app_source.hpp index 4a5905895..aad6cd9f7 100644 --- a/trunk/src/app/srs_app_source.hpp +++ b/trunk/src/app/srs_app_source.hpp @@ -183,7 +183,7 @@ public: }; // The consumer for SrsSource, that is a play client. -class SrsConsumer : virtual public ISrsWakable +class SrsConsumer : public ISrsWakable { private: SrsRtmpJitter* jitter; diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index 35a083367..e8ac1ef24 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -26,6 +26,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 108 +#define VERSION_REVISION 109 #endif diff --git a/trunk/src/kernel/srs_kernel_io.hpp b/trunk/src/kernel/srs_kernel_io.hpp index eaba237dc..b567c3200 100644 --- a/trunk/src/kernel/srs_kernel_io.hpp +++ b/trunk/src/kernel/srs_kernel_io.hpp @@ -71,7 +71,7 @@ public: /** * The reader and seeker. */ -class ISrsReadSeeker : virtual public ISrsReader, virtual public ISrsSeeker +class ISrsReadSeeker : public ISrsReader, public ISrsSeeker { public: ISrsReadSeeker(); @@ -115,7 +115,7 @@ public: /** * The generally writer, stream and vector writer. */ -class ISrsWriter : virtual public ISrsStreamWriter, virtual public ISrsVectorWriter +class ISrsWriter : public ISrsStreamWriter, public ISrsVectorWriter { public: ISrsWriter(); @@ -125,7 +125,7 @@ public: /** * The writer and seeker. */ -class ISrsWriteSeeker : virtual public ISrsWriter, virtual public ISrsSeeker +class ISrsWriteSeeker : public ISrsWriter, public ISrsSeeker { public: ISrsWriteSeeker(); diff --git a/trunk/src/main/srs_main_ingest_hls.cpp b/trunk/src/main/srs_main_ingest_hls.cpp index 8bacabb45..225bbd0a8 100644 --- a/trunk/src/main/srs_main_ingest_hls.cpp +++ b/trunk/src/main/srs_main_ingest_hls.cpp @@ -639,7 +639,7 @@ int SrsIngestHlsInput::SrsTsPiece::fetch(string m3u8) } // the context to output to rtmp server -class SrsIngestHlsOutput : virtual public ISrsTsHandler, virtual public ISrsAacHandler +class SrsIngestHlsOutput : public ISrsTsHandler, public ISrsAacHandler { private: SrsHttpUri* out_rtmp; diff --git a/trunk/src/protocol/srs_protocol_io.hpp b/trunk/src/protocol/srs_protocol_io.hpp index 02204c942..38d7585d8 100644 --- a/trunk/src/protocol/srs_protocol_io.hpp +++ b/trunk/src/protocol/srs_protocol_io.hpp @@ -75,7 +75,7 @@ public: /** * the reader for the protocol to read from whatever channel. */ -class ISrsProtocolReader : virtual public ISrsReader, virtual public ISrsProtocolStatistic +class ISrsProtocolReader : public ISrsReader, virtual public ISrsProtocolStatistic { public: ISrsProtocolReader(); @@ -97,7 +97,7 @@ public: /** * the writer for the protocol to write to whatever channel. */ -class ISrsProtocolWriter : virtual public ISrsWriter, virtual public ISrsProtocolStatistic +class ISrsProtocolWriter : public ISrsWriter, virtual public ISrsProtocolStatistic { public: ISrsProtocolWriter(); @@ -114,7 +114,7 @@ public: /** * The reader and writer. */ -class ISrsProtocolReadWriter : virtual public ISrsProtocolReader, virtual public ISrsProtocolWriter +class ISrsProtocolReadWriter : public ISrsProtocolReader, public ISrsProtocolWriter { public: ISrsProtocolReadWriter(); diff --git a/trunk/src/protocol/srs_protocol_kbps.hpp b/trunk/src/protocol/srs_protocol_kbps.hpp index d473a9794..197132d83 100644 --- a/trunk/src/protocol/srs_protocol_kbps.hpp +++ b/trunk/src/protocol/srs_protocol_kbps.hpp @@ -137,7 +137,7 @@ public: * user->set_io(kbps, kbps); * the server never know how many bytes already send/recv, for the connection maybe closed. */ -class SrsKbps : virtual public ISrsProtocolStatistic, virtual public ISrsKbpsDelta +class SrsKbps : public ISrsProtocolStatistic, public ISrsKbpsDelta { private: SrsKbpsSlice is; diff --git a/trunk/src/protocol/srs_service_http_client.hpp b/trunk/src/protocol/srs_service_http_client.hpp index 93e2a05b1..3d9f6adff 100644 --- a/trunk/src/protocol/srs_service_http_client.hpp +++ b/trunk/src/protocol/srs_service_http_client.hpp @@ -46,7 +46,7 @@ class SrsTcpClient; #define SRS_HTTP_CLIENT_TIMEOUT (30 * SRS_UTIME_SECONDS) // The SSL client over TCP transport. -class SrsSslClient : virtual public ISrsReader, virtual public ISrsStreamWriter +class SrsSslClient : public ISrsReader, public ISrsStreamWriter { private: SrsTcpClient* transport; diff --git a/trunk/src/protocol/srs_service_http_conn.hpp b/trunk/src/protocol/srs_service_http_conn.hpp index a1b3e381c..f27308113 100644 --- a/trunk/src/protocol/srs_service_http_conn.hpp +++ b/trunk/src/protocol/srs_service_http_conn.hpp @@ -257,7 +257,7 @@ public: }; // Response reader use st socket. -class SrsHttpResponseReader : virtual public ISrsHttpResponseReader +class SrsHttpResponseReader : public ISrsHttpResponseReader { private: ISrsReader* skt; diff --git a/trunk/src/utest/srs_utest_http.cpp b/trunk/src/utest/srs_utest_http.cpp index 3f53723f4..26f4a994f 100644 --- a/trunk/src/utest/srs_utest_http.cpp +++ b/trunk/src/utest/srs_utest_http.cpp @@ -174,7 +174,7 @@ public: } }; -class MockHttpHandler : virtual public ISrsHttpHandler, virtual public ISrsHttpMatchHijacker +class MockHttpHandler : public ISrsHttpHandler, public ISrsHttpMatchHijacker { public: string bytes; diff --git a/trunk/src/utest/srs_utest_http.hpp b/trunk/src/utest/srs_utest_http.hpp index 71df3aa45..f14a3ed0c 100644 --- a/trunk/src/utest/srs_utest_http.hpp +++ b/trunk/src/utest/srs_utest_http.hpp @@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include using namespace std; -class MockResponseWriter : virtual public ISrsHttpResponseWriter, virtual public ISrsHttpHeaderFilter +class MockResponseWriter : public ISrsHttpResponseWriter, public ISrsHttpHeaderFilter { public: SrsHttpResponseWriter* w; diff --git a/trunk/src/utest/srs_utest_rtc.cpp b/trunk/src/utest/srs_utest_rtc.cpp index 125705870..bfb758170 100644 --- a/trunk/src/utest/srs_utest_rtc.cpp +++ b/trunk/src/utest/srs_utest_rtc.cpp @@ -708,7 +708,7 @@ srs_error_t MockDtls::do_handshake() return err; } -class MockDtlsCallback : virtual public ISrsDtlsCallback, virtual public ISrsCoroutineHandler +class MockDtlsCallback : public ISrsDtlsCallback, public ISrsCoroutineHandler { public: SrsDtls* peer;