From 6b2c71d385c6b69497ba3fc4d1098248b9cbca5b Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 30 Apr 2019 08:30:13 +0800 Subject: [PATCH] Refine typo in files. 3.0.51 --- README.md | 1 + trunk/src/app/srs_app_async_call.hpp | 2 +- trunk/src/app/srs_app_caster_flv.hpp | 6 ++-- trunk/src/app/srs_app_conn.hpp | 4 +-- trunk/src/app/srs_app_dvr.hpp | 6 ++-- trunk/src/app/srs_app_edge.hpp | 4 +-- trunk/src/app/srs_app_encoder.hpp | 2 +- trunk/src/app/srs_app_forward.hpp | 2 +- trunk/src/app/srs_app_http_api.hpp | 6 ++-- trunk/src/app/srs_app_http_conn.hpp | 6 ++-- trunk/src/app/srs_app_http_static.hpp | 2 +- trunk/src/app/srs_app_http_stream.hpp | 6 ++-- trunk/src/app/srs_app_ingest.hpp | 4 +-- trunk/src/app/srs_app_kafka.hpp | 6 ++-- trunk/src/app/srs_app_listener.hpp | 4 +-- trunk/src/app/srs_app_log.hpp | 4 +-- trunk/src/app/srs_app_mpegts_udp.hpp | 4 +-- trunk/src/app/srs_app_ng_exec.hpp | 2 +- trunk/src/app/srs_app_recv_thread.hpp | 12 +++---- trunk/src/app/srs_app_rtmp_conn.hpp | 4 +-- trunk/src/app/srs_app_rtsp.hpp | 6 ++-- trunk/src/app/srs_app_server.hpp | 14 ++++---- trunk/src/app/srs_app_source.hpp | 4 +-- trunk/src/app/srs_app_thread.hpp | 4 +-- trunk/src/core/srs_core.hpp | 2 +- trunk/src/main/srs_main_ingest_hls.cpp | 4 +-- trunk/src/main/srs_main_server.cpp | 10 ++---- trunk/src/protocol/srs_http_stack.hpp | 4 +-- trunk/src/protocol/srs_kafka_stack.hpp | 36 ++++++++++----------- trunk/src/protocol/srs_protocol_kbps.hpp | 6 ++-- trunk/src/service/srs_service_http_conn.hpp | 2 +- trunk/src/service/srs_service_log.hpp | 2 +- trunk/src/service/srs_service_st.hpp | 2 +- 33 files changed, 90 insertions(+), 93 deletions(-) diff --git a/README.md b/README.md index 3e5ee0be1..2df020941 100755 --- a/README.md +++ b/README.md @@ -164,6 +164,7 @@ Please select according to languages: ### V3 changes +* v3.0, 2019-04-30, Refine typo in files. 3.0.51 * v3.0, 2019-04-25, Upgrade http-parser from 2.1 to 2.9.2 and cover it. 3.0.50 * v3.0, 2019-04-22, Refine in time unit. 3.0.49 * v3.0, 2019-04-07, Cover ST Coroutine and time unit. 3.0.48 diff --git a/trunk/src/app/srs_app_async_call.hpp b/trunk/src/app/srs_app_async_call.hpp index 183533457..bcadd891f 100644 --- a/trunk/src/app/srs_app_async_call.hpp +++ b/trunk/src/app/srs_app_async_call.hpp @@ -70,7 +70,7 @@ public: public: virtual srs_error_t start(); virtual void stop(); -// interface ISrsReusableThreadHandler +// Interface ISrsReusableThreadHandler public: virtual srs_error_t cycle(); }; diff --git a/trunk/src/app/srs_app_caster_flv.hpp b/trunk/src/app/srs_app_caster_flv.hpp index 8305d86c5..0db9a4588 100644 --- a/trunk/src/app/srs_app_caster_flv.hpp +++ b/trunk/src/app/srs_app_caster_flv.hpp @@ -60,13 +60,13 @@ public: virtual ~SrsAppCasterFlv(); public: virtual srs_error_t initialize(); -// interface ISrsTcpHandler +// Interface ISrsTcpHandler public: virtual srs_error_t on_tcp_client(srs_netfd_t stfd); -// interface IConnectionManager +// Interface IConnectionManager public: virtual void remove(ISrsConnection* c); -// interface ISrsHttpHandler +// Interface ISrsHttpHandler public: virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); }; diff --git a/trunk/src/app/srs_app_conn.hpp b/trunk/src/app/srs_app_conn.hpp index bd5922688..433da688d 100644 --- a/trunk/src/app/srs_app_conn.hpp +++ b/trunk/src/app/srs_app_conn.hpp @@ -66,7 +66,7 @@ protected: public: SrsConnection(IConnectionManager* cm, srs_netfd_t c, std::string cip); virtual ~SrsConnection(); -// interface ISrsKbpsDelta +// Interface ISrsKbpsDelta public: virtual void remark(int64_t* in, int64_t* out); public: @@ -84,7 +84,7 @@ public: virtual srs_error_t set_tcp_nodelay(bool v); // Set socket option SO_SNDBUF in srs_utime_t. virtual srs_error_t set_socket_buffer(srs_utime_t buffer_v); -// interface ISrsOneCycleThreadHandler +// Interface ISrsOneCycleThreadHandler public: // The thread cycle function, // when serve connection completed, terminate the loop which will terminate the thread, diff --git a/trunk/src/app/srs_app_dvr.hpp b/trunk/src/app/srs_app_dvr.hpp index ddbb80c8b..0b66b521b 100644 --- a/trunk/src/app/srs_app_dvr.hpp +++ b/trunk/src/app/srs_app_dvr.hpp @@ -103,7 +103,7 @@ private: virtual std::string generate_path(); // When update the duration of segment by rtmp msg. virtual srs_error_t on_update_duration(SrsSharedPtrMessage* msg); -// interface ISrsReloadHandler +// Interface ISrsReloadHandler public: virtual srs_error_t on_reload_vhost_dvr(std::string vhost); }; @@ -227,7 +227,7 @@ public: virtual srs_error_t on_video(SrsSharedPtrMessage* shared_video, SrsFormat* format); private: virtual srs_error_t update_duration(SrsSharedPtrMessage* msg); -// interface ISrsReloadHandler +// Interface ISrsReloadHandler public: virtual srs_error_t on_reload_vhost_dvr(std::string vhost); }; @@ -267,7 +267,7 @@ public: // mux the video packets to dvr. // @param shared_video, directly ptr, copy it if need to save it. virtual srs_error_t on_video(SrsSharedPtrMessage* shared_video, SrsFormat* format); -// interface ISrsReloadHandler +// Interface ISrsReloadHandler public: virtual srs_error_t on_reload_vhost_dvr_apply(std::string vhost); }; diff --git a/trunk/src/app/srs_app_edge.hpp b/trunk/src/app/srs_app_edge.hpp index 426b47587..24512dc86 100644 --- a/trunk/src/app/srs_app_edge.hpp +++ b/trunk/src/app/srs_app_edge.hpp @@ -125,7 +125,7 @@ public: virtual srs_error_t start(); virtual void stop(); virtual std::string get_curr_origin(); -// interface ISrsReusableThread2Handler +// Interface ISrsReusableThread2Handler public: virtual srs_error_t cycle(); private: @@ -161,7 +161,7 @@ public: virtual srs_error_t initialize(SrsSource* s, SrsPublishEdge* e, SrsRequest* r); virtual srs_error_t start(); virtual void stop(); -// interface ISrsReusableThread2Handler +// Interface ISrsReusableThread2Handler public: virtual srs_error_t cycle(); private: diff --git a/trunk/src/app/srs_app_encoder.hpp b/trunk/src/app/srs_app_encoder.hpp index 4417e5ab7..c66724bcf 100644 --- a/trunk/src/app/srs_app_encoder.hpp +++ b/trunk/src/app/srs_app_encoder.hpp @@ -52,7 +52,7 @@ public: public: virtual srs_error_t on_publish(SrsRequest* req); virtual void on_unpublish(); -// interface ISrsReusableThreadHandler. +// Interface ISrsReusableThreadHandler. public: virtual srs_error_t cycle(); private: diff --git a/trunk/src/app/srs_app_forward.hpp b/trunk/src/app/srs_app_forward.hpp index 785e07add..c23cd8da1 100644 --- a/trunk/src/app/srs_app_forward.hpp +++ b/trunk/src/app/srs_app_forward.hpp @@ -79,7 +79,7 @@ public: // Forward the video packet. // @param shared_video, directly ptr, copy it if need to save it. virtual srs_error_t on_video(SrsSharedPtrMessage* shared_video); -// interface ISrsReusableThread2Handler. +// Interface ISrsReusableThread2Handler. public: virtual srs_error_t cycle(); private: diff --git a/trunk/src/app/srs_app_http_api.hpp b/trunk/src/app/srs_app_http_api.hpp index a7eee7481..62e3aca02 100644 --- a/trunk/src/app/srs_app_http_api.hpp +++ b/trunk/src/app/srs_app_http_api.hpp @@ -187,7 +187,7 @@ public: virtual ~SrsGoApiRaw(); public: virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); -// interface ISrsReloadHandler +// Interface ISrsReloadHandler public: virtual srs_error_t on_reload_http_api_raw_api(); }; @@ -219,14 +219,14 @@ private: public: SrsHttpApi(IConnectionManager* cm, srs_netfd_t fd, SrsHttpServeMux* m, std::string cip); virtual ~SrsHttpApi(); -// interface ISrsKbpsDelta +// Interface ISrsKbpsDelta public: virtual void remark(int64_t* in, int64_t* out); protected: virtual srs_error_t do_cycle(); private: virtual srs_error_t process_request(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); -// interface ISrsReloadHandler +// Interface ISrsReloadHandler public: virtual srs_error_t on_reload_http_api_crossdomain(); }; diff --git a/trunk/src/app/srs_app_http_conn.hpp b/trunk/src/app/srs_app_http_conn.hpp index beaa4d943..40e97f728 100644 --- a/trunk/src/app/srs_app_http_conn.hpp +++ b/trunk/src/app/srs_app_http_conn.hpp @@ -65,7 +65,7 @@ protected: public: SrsHttpConn(IConnectionManager* cm, srs_netfd_t fd, ISrsHttpServeMux* m, std::string cip); virtual ~SrsHttpConn(); -// interface ISrsKbpsDelta +// Interface ISrsKbpsDelta public: virtual void remark(int64_t* in, int64_t* out); protected: @@ -81,7 +81,7 @@ private: // e.g. log msg of connection and report to other system. // @param request: request which is converted by the last http message. virtual srs_error_t on_disconnect(SrsRequest* req); -// interface ISrsReloadHandler +// Interface ISrsReloadHandler public: virtual srs_error_t on_reload_http_stream_crossdomain(); }; @@ -115,7 +115,7 @@ public: virtual ~SrsHttpServer(); public: virtual srs_error_t initialize(); -// interface ISrsHttpServeMux +// Interface ISrsHttpServeMux public: virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); public: diff --git a/trunk/src/app/srs_app_http_static.hpp b/trunk/src/app/srs_app_http_static.hpp index f7e5a2fa0..61e153953 100644 --- a/trunk/src/app/srs_app_http_static.hpp +++ b/trunk/src/app/srs_app_http_static.hpp @@ -57,7 +57,7 @@ public: virtual srs_error_t initialize(); private: virtual srs_error_t mount_vhost(std::string vhost, std::string& pmount); -// interface ISrsReloadHandler. +// Interface ISrsReloadHandler. public: virtual srs_error_t on_reload_vhost_added(std::string vhost); virtual srs_error_t on_reload_vhost_http_updated(); diff --git a/trunk/src/app/srs_app_http_stream.hpp b/trunk/src/app/srs_app_http_stream.hpp index 75ca812bc..d04c05df4 100755 --- a/trunk/src/app/srs_app_http_stream.hpp +++ b/trunk/src/app/srs_app_http_stream.hpp @@ -50,7 +50,7 @@ public: public: virtual srs_error_t start(); virtual srs_error_t dump_cache(SrsConsumer* consumer, SrsRtmpJitterAlgorithm jitter); -// interface ISrsEndlessThreadHandler. +// Interface ISrsEndlessThreadHandler. public: virtual srs_error_t cycle(); }; @@ -255,11 +255,11 @@ public: // HTTP flv/ts/mp3/aac stream virtual srs_error_t http_mount(SrsSource* s, SrsRequest* r); virtual void http_unmount(SrsSource* s, SrsRequest* r); -// interface ISrsReloadHandler. +// Interface ISrsReloadHandler. public: virtual srs_error_t on_reload_vhost_added(std::string vhost); virtual srs_error_t on_reload_vhost_http_remux_updated(std::string vhost); -// interface ISrsHttpMatchHijacker +// Interface ISrsHttpMatchHijacker public: virtual srs_error_t hijack(ISrsHttpMessage* request, ISrsHttpHandler** ph); private: diff --git a/trunk/src/app/srs_app_ingest.hpp b/trunk/src/app/srs_app_ingest.hpp index 79659439f..2314bc726 100644 --- a/trunk/src/app/srs_app_ingest.hpp +++ b/trunk/src/app/srs_app_ingest.hpp @@ -85,7 +85,7 @@ public: virtual void stop(); private: virtual void fast_stop(); -// interface ISrsReusableThreadHandler. +// Interface ISrsReusableThreadHandler. public: virtual srs_error_t cycle(); private: @@ -97,7 +97,7 @@ private: virtual srs_error_t parse_engines(SrsConfDirective* vhost, SrsConfDirective* ingest); virtual srs_error_t initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* vhost, SrsConfDirective* ingest, SrsConfDirective* engine); virtual void show_ingest_log_message(); -// interface ISrsReloadHandler. +// Interface ISrsReloadHandler. public: virtual srs_error_t on_reload_vhost_removed(std::string vhost); virtual srs_error_t on_reload_vhost_added(std::string vhost); diff --git a/trunk/src/app/srs_app_kafka.hpp b/trunk/src/app/srs_app_kafka.hpp index 38e0ca20e..835a09686 100644 --- a/trunk/src/app/srs_app_kafka.hpp +++ b/trunk/src/app/srs_app_kafka.hpp @@ -81,7 +81,7 @@ private: public: SrsKafkaMessage(SrsKafkaProducer* p, int k, SrsJsonObject* j); virtual ~SrsKafkaMessage(); -// interface ISrsAsyncCallTask +// Interface ISrsAsyncCallTask public: virtual srs_error_t call(); virtual std::string to_string(); @@ -168,11 +168,11 @@ public: // @param key the key to map to the partition, user can use cid or hash. // @param obj the json object; user must never free it again. virtual srs_error_t send(int key, SrsJsonObject* obj); -// interface ISrsKafkaCluster +// Interface ISrsKafkaCluster public: virtual srs_error_t on_client(int key, SrsListenerType type, std::string ip); virtual srs_error_t on_close(int key); -// interface ISrsReusableThreadHandler +// Interface ISrsReusableThreadHandler public: virtual srs_error_t cycle(); private: diff --git a/trunk/src/app/srs_app_listener.hpp b/trunk/src/app/srs_app_listener.hpp index 22e84b278..538ecf1b9 100644 --- a/trunk/src/app/srs_app_listener.hpp +++ b/trunk/src/app/srs_app_listener.hpp @@ -87,7 +87,7 @@ public: virtual srs_netfd_t stfd(); public: virtual srs_error_t listen(); -// interface ISrsReusableThreadHandler. +// Interface ISrsReusableThreadHandler. public: virtual srs_error_t cycle(); }; @@ -110,7 +110,7 @@ public: virtual int fd(); public: virtual srs_error_t listen(); -// interface ISrsReusableThreadHandler. +// Interface ISrsReusableThreadHandler. public: virtual srs_error_t cycle(); }; diff --git a/trunk/src/app/srs_app_log.hpp b/trunk/src/app/srs_app_log.hpp index afb58b1cc..c1618243c 100644 --- a/trunk/src/app/srs_app_log.hpp +++ b/trunk/src/app/srs_app_log.hpp @@ -51,7 +51,7 @@ private: public: SrsFastLog(); virtual ~SrsFastLog(); -// interface ISrsLog +// Interface ISrsLog public: virtual srs_error_t initialize(); virtual void reopen(); @@ -60,7 +60,7 @@ public: virtual void trace(const char* tag, int context_id, const char* fmt, ...); virtual void warn(const char* tag, int context_id, const char* fmt, ...); virtual void error(const char* tag, int context_id, const char* fmt, ...); -// interface ISrsReloadHandler. +// Interface ISrsReloadHandler. public: virtual srs_error_t on_reload_utc_time(); virtual srs_error_t on_reload_log_tank(); diff --git a/trunk/src/app/srs_app_mpegts_udp.hpp b/trunk/src/app/srs_app_mpegts_udp.hpp index 403a496ba..b14eb775e 100644 --- a/trunk/src/app/srs_app_mpegts_udp.hpp +++ b/trunk/src/app/srs_app_mpegts_udp.hpp @@ -91,12 +91,12 @@ private: public: SrsMpegtsOverUdp(SrsConfDirective* c); virtual ~SrsMpegtsOverUdp(); -// interface ISrsUdpHandler +// Interface ISrsUdpHandler public: virtual srs_error_t on_udp_packet(const sockaddr* from, const int fromlen, char* buf, int nb_buf); private: virtual srs_error_t on_udp_bytes(std::string host, int port, char* buf, int nb_buf); -// interface ISrsTsHandler +// Interface ISrsTsHandler public: virtual srs_error_t on_ts_message(SrsTsMessage* msg); private: diff --git a/trunk/src/app/srs_app_ng_exec.hpp b/trunk/src/app/srs_app_ng_exec.hpp index d47dc42e2..8cdf1e96d 100644 --- a/trunk/src/app/srs_app_ng_exec.hpp +++ b/trunk/src/app/srs_app_ng_exec.hpp @@ -51,7 +51,7 @@ public: public: virtual srs_error_t on_publish(SrsRequest* req); virtual void on_unpublish(); -// interface ISrsReusableThreadHandler. +// Interface ISrsReusableThreadHandler. public: virtual srs_error_t cycle(); private: diff --git a/trunk/src/app/srs_app_recv_thread.hpp b/trunk/src/app/srs_app_recv_thread.hpp index 940b91564..65206353f 100644 --- a/trunk/src/app/srs_app_recv_thread.hpp +++ b/trunk/src/app/srs_app_recv_thread.hpp @@ -94,7 +94,7 @@ public: virtual srs_error_t start(); virtual void stop(); virtual void stop_loop(); -// interface ISrsReusableThread2Handler +// Interface ISrsReusableThread2Handler public: virtual srs_error_t cycle(); private: @@ -126,7 +126,7 @@ public: virtual int size(); virtual SrsCommonMessage* pump(); virtual srs_error_t error_code(); -// interface ISrsMessagePumper +// Interface ISrsMessagePumper public: virtual srs_error_t consume(SrsCommonMessage* msg); virtual bool interrupted(); @@ -184,19 +184,19 @@ public: public: virtual srs_error_t start(); virtual void stop(); -// interface ISrsMessagePumper +// Interface ISrsMessagePumper public: virtual srs_error_t consume(SrsCommonMessage* msg); virtual bool interrupted(); virtual void interrupt(srs_error_t err); virtual void on_start(); virtual void on_stop(); -// interface IMergeReadHandler +// Interface IMergeReadHandler public: #ifdef SRS_PERF_MERGED_READ virtual void on_read(ssize_t nread); #endif -// interface ISrsReloadHandler +// Interface ISrsReloadHandler public: virtual srs_error_t on_reload_vhost_publish(std::string vhost); virtual srs_error_t on_reload_vhost_realtime(std::string vhost); @@ -220,7 +220,7 @@ public: virtual srs_error_t start(); public: virtual srs_error_t pull(); -// interface ISrsOneCycleThreadHandler +// Interface ISrsOneCycleThreadHandler public: virtual srs_error_t cycle(); }; diff --git a/trunk/src/app/srs_app_rtmp_conn.hpp b/trunk/src/app/srs_app_rtmp_conn.hpp index 0f5cdc932..b84d6f4a8 100644 --- a/trunk/src/app/srs_app_rtmp_conn.hpp +++ b/trunk/src/app/srs_app_rtmp_conn.hpp @@ -127,14 +127,14 @@ public: virtual void dispose(); protected: virtual srs_error_t do_cycle(); -// interface ISrsReloadHandler +// Interface ISrsReloadHandler public: virtual srs_error_t on_reload_vhost_removed(std::string vhost); virtual srs_error_t on_reload_vhost_play(std::string vhost); virtual srs_error_t on_reload_vhost_tcp_nodelay(std::string vhost); virtual srs_error_t on_reload_vhost_realtime(std::string vhost); virtual srs_error_t on_reload_vhost_publish(std::string vhost); -// interface ISrsKbpsDelta +// Interface ISrsKbpsDelta public: virtual void remark(int64_t* in, int64_t* out); private: diff --git a/trunk/src/app/srs_app_rtsp.hpp b/trunk/src/app/srs_app_rtsp.hpp index 28d6014ab..7a1ac77fc 100644 --- a/trunk/src/app/srs_app_rtsp.hpp +++ b/trunk/src/app/srs_app_rtsp.hpp @@ -68,7 +68,7 @@ public: public: virtual int port(); virtual srs_error_t listen(); -// interface ISrsUdpHandler +// Interface ISrsUdpHandler public: virtual srs_error_t on_udp_packet(const sockaddr* from, const int fromlen, char* buf, int nb_buf); }; @@ -148,7 +148,7 @@ private: // internal methods public: virtual srs_error_t on_rtp_packet(SrsRtpPacket* pkt, int stream_id); -// interface ISrsOneCycleThreadHandler +// Interface ISrsOneCycleThreadHandler public: virtual srs_error_t cycle(); private: @@ -188,7 +188,7 @@ public: virtual srs_error_t alloc_port(int* pport); // Free the alloced rtp port. virtual void free_port(int lpmin, int lpmax); -// interface ISrsTcpHandler +// Interface ISrsTcpHandler public: virtual srs_error_t on_tcp_client(srs_netfd_t stfd); // internal methods. diff --git a/trunk/src/app/srs_app_server.hpp b/trunk/src/app/srs_app_server.hpp index 437e99db4..b8366ea21 100644 --- a/trunk/src/app/srs_app_server.hpp +++ b/trunk/src/app/srs_app_server.hpp @@ -100,7 +100,7 @@ public: virtual ~SrsBufferListener(); public: virtual srs_error_t listen(std::string ip, int port); -// interface ISrsTcpHandler +// Interface ISrsTcpHandler public: virtual srs_error_t on_tcp_client(srs_netfd_t stfd); }; @@ -116,7 +116,7 @@ public: virtual ~SrsRtspListener(); public: virtual srs_error_t listen(std::string i, int p); -// interface ISrsTcpHandler +// Interface ISrsTcpHandler public: virtual srs_error_t on_tcp_client(srs_netfd_t stfd); }; @@ -132,7 +132,7 @@ public: virtual ~SrsHttpFlvListener(); public: virtual srs_error_t listen(std::string i, int p); -// interface ISrsTcpHandler +// Interface ISrsTcpHandler public: virtual srs_error_t on_tcp_client(srs_netfd_t stfd); }; @@ -176,7 +176,7 @@ public: public: virtual srs_error_t initialize(); virtual srs_error_t start(); -// interface ISrsEndlessThreadHandler. +// Interface ISrsEndlessThreadHandler. public: virtual srs_error_t cycle(); private: @@ -296,13 +296,13 @@ public: virtual srs_error_t accept_client(SrsListenerType type, srs_netfd_t stfd); private: virtual srs_error_t fd2conn(SrsListenerType type, srs_netfd_t stfd, SrsConnection** pconn); -// interface IConnectionManager +// Interface IConnectionManager public: // A callback for connection to remove itself. // When connection thread cycle terminated, callback this to delete connection. // @see SrsConnection.on_thread_stop(). virtual void remove(ISrsConnection* c); -// interface ISrsReloadHandler. +// Interface ISrsReloadHandler. public: virtual srs_error_t on_reload_listen(); virtual srs_error_t on_reload_pid(); @@ -313,7 +313,7 @@ public: virtual srs_error_t on_reload_http_stream_enabled(); virtual srs_error_t on_reload_http_stream_disabled(); virtual srs_error_t on_reload_http_stream_updated(); -// interface ISrsSourceHandler +// Interface ISrsSourceHandler public: virtual srs_error_t on_publish(SrsSource* s, SrsRequest* r); virtual void on_unpublish(SrsSource* s, SrsRequest* r); diff --git a/trunk/src/app/srs_app_source.hpp b/trunk/src/app/srs_app_source.hpp index bed9850bf..6e730cde6 100644 --- a/trunk/src/app/srs_app_source.hpp +++ b/trunk/src/app/srs_app_source.hpp @@ -382,7 +382,7 @@ public: virtual srs_error_t on_forwarder_start(SrsForwarder* forwarder); // For the SrsDvr to callback to request the sequence headers. virtual srs_error_t on_dvr_request_sh(); -// interface ISrsReloadHandler +// Interface ISrsReloadHandler public: virtual srs_error_t on_reload_vhost_forward(std::string vhost); virtual srs_error_t on_reload_vhost_dash(std::string vhost); @@ -519,7 +519,7 @@ public: public: // Initialize the hls with handlers. virtual srs_error_t initialize(SrsRequest* r, ISrsSourceHandler* h); -// interface ISrsReloadHandler +// Interface ISrsReloadHandler public: virtual srs_error_t on_reload_vhost_play(std::string vhost); public: diff --git a/trunk/src/app/srs_app_thread.hpp b/trunk/src/app/srs_app_thread.hpp index f02deb8d2..2d542d941 100644 --- a/trunk/src/app/srs_app_thread.hpp +++ b/trunk/src/app/srs_app_thread.hpp @@ -46,10 +46,10 @@ public: virtual ~SrsCoroutineManager(); public: srs_error_t start(); -// interface ISrsCoroutineHandler +// Interface ISrsCoroutineHandler public: virtual srs_error_t cycle(); -// interface IConnectionManager +// Interface IConnectionManager public: virtual void remove(ISrsConnection* c); private: diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 27eec767b..56a727ed4 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -27,7 +27,7 @@ // The version config. #define VERSION_MAJOR 3 #define VERSION_MINOR 0 -#define VERSION_REVISION 50 +#define VERSION_REVISION 51 // The macros generated by configure script. #include diff --git a/trunk/src/main/srs_main_ingest_hls.cpp b/trunk/src/main/srs_main_ingest_hls.cpp index e9cdb29dd..1c7f02955 100644 --- a/trunk/src/main/srs_main_ingest_hls.cpp +++ b/trunk/src/main/srs_main_ingest_hls.cpp @@ -662,10 +662,10 @@ private: public: SrsIngestHlsOutput(SrsHttpUri* rtmp); virtual ~SrsIngestHlsOutput(); -// interface ISrsTsHandler +// Interface ISrsTsHandler public: virtual srs_error_t on_ts_message(SrsTsMessage* msg); -// interface IAacHandler +// Interface IAacHandler public: virtual int on_aac_frame(char* frame, int frame_size, double duration); private: diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index 08db48944..25577f7d4 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -373,17 +373,13 @@ string srs_getenv(const char* name) srs_error_t run(SrsServer* svr) { srs_error_t err = srs_success; - - /** - * we do nothing in the constructor of server, - * and use initialize to create members, set hooks for instance the reload handler, - * all initialize will done in this stage. - */ + + // Initialize the whole system, set hooks to handle server level events. if ((err = svr->initialize(NULL)) != srs_success) { return srs_error_wrap(err, "server initialize"); } - // if not deamon, directly run master. + // If not deamon, directly run master. if (!_srs_config->get_deamon()) { if ((err = run_master(svr)) != srs_success) { return srs_error_wrap(err, "run master"); diff --git a/trunk/src/protocol/srs_http_stack.hpp b/trunk/src/protocol/srs_http_stack.hpp index 28a511145..062178d57 100644 --- a/trunk/src/protocol/srs_http_stack.hpp +++ b/trunk/src/protocol/srs_http_stack.hpp @@ -392,7 +392,7 @@ public: // Handle registers the handler for the given pattern. // If a handler already exists for pattern, Handle panics. virtual srs_error_t handle(std::string pattern, ISrsHttpHandler* handler); -// interface ISrsHttpServeMux +// Interface ISrsHttpServeMux public: virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); public: @@ -415,7 +415,7 @@ public: virtual ~SrsHttpCorsMux(); public: virtual srs_error_t initialize(ISrsHttpServeMux* worker, bool cros_enabled); -// interface ISrsHttpServeMux +// Interface ISrsHttpServeMux public: virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); }; diff --git a/trunk/src/protocol/srs_kafka_stack.hpp b/trunk/src/protocol/srs_kafka_stack.hpp index d871bcf95..8665d74fa 100644 --- a/trunk/src/protocol/srs_kafka_stack.hpp +++ b/trunk/src/protocol/srs_kafka_stack.hpp @@ -77,7 +77,7 @@ public: virtual bool empty(); virtual std::string to_str(); virtual void set_value(std::string v); -// interface ISrsCodec +// Interface ISrsCodec public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); @@ -106,7 +106,7 @@ public: virtual void set_value(std::string v); virtual void set_value(const char* v, int nb_v); virtual uint32_t crc32(uint32_t previous); -// interface ISrsCodec +// Interface ISrsCodec public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); @@ -164,7 +164,7 @@ public: { return elems.at(index); } -// interface ISrsCodec +// Interface ISrsCodec public: virtual int nb_bytes() { @@ -251,7 +251,7 @@ public: { return elems.at(index); } -// interface ISrsCodec +// Interface ISrsCodec public: virtual int nb_bytes() { @@ -400,7 +400,7 @@ public: virtual bool is_offset_commit_request(); virtual bool is_offset_fetch_request(); virtual bool is_consumer_metadata_request(); -// interface ISrsCodec +// Interface ISrsCodec public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); @@ -466,7 +466,7 @@ public: * get the correlation id of response message. */ virtual int32_t correlation_id(); -// interface ISrsCodec +// Interface ISrsCodec public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); @@ -533,7 +533,7 @@ private: * get the raw message, bytes after the message_size. */ virtual int raw_message_size(); -// interface ISrsCodec +// Interface ISrsCodec public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); @@ -554,7 +554,7 @@ public: virtual ~SrsKafkaRawMessageSet(); public: virtual void append(SrsKafkaRawMessage* msg); -// interface ISrsCodec +// Interface ISrsCodec public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); @@ -585,7 +585,7 @@ public: * get the api key of request. */ virtual SrsKafkaApiKey api_key(); -// interface ISrsCodec +// Interface ISrsCodec public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); @@ -608,7 +608,7 @@ public: * @param s an int value specifies the size of message in header. */ virtual void update_header(int s); -// interface ISrsCodec +// Interface ISrsCodec public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); @@ -638,7 +638,7 @@ public: virtual ~SrsKafkaTopicMetadataRequest(); public: virtual void add_topic(std::string topic); -// interface ISrsCodec +// Interface ISrsCodec public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); @@ -658,7 +658,7 @@ public: public: SrsKafkaBroker(); virtual ~SrsKafkaBroker(); -// interface ISrsCodec +// Interface ISrsCodec public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); @@ -675,7 +675,7 @@ public: public: SrsKafkaPartitionMetadata(); virtual ~SrsKafkaPartitionMetadata(); -// interface ISrsCodec +// Interface ISrsCodec public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); @@ -690,7 +690,7 @@ public: public: SrsKafkaTopicMetadata(); virtual ~SrsKafkaTopicMetadata(); -// interface ISrsCodec +// Interface ISrsCodec public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); @@ -713,7 +713,7 @@ public: public: SrsKafkaTopicMetadataResponse(); virtual ~SrsKafkaTopicMetadataResponse(); -// interface ISrsCodec +// Interface ISrsCodec public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); @@ -740,7 +740,7 @@ public: * messages in set. */ SrsKafkaRawMessageSet messages; -// interface ISrsCodec +// Interface ISrsCodec public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); @@ -757,7 +757,7 @@ public: * messages of partitions. */ SrsKafkaArray partitions; -// interface ISrsCodec +// Interface ISrsCodec public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); @@ -801,7 +801,7 @@ public: public: SrsKafkaProducerRequest(); virtual ~SrsKafkaProducerRequest(); -// interface ISrsCodec +// Interface ISrsCodec public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); diff --git a/trunk/src/protocol/srs_protocol_kbps.hpp b/trunk/src/protocol/srs_protocol_kbps.hpp index 6dcd15067..64d689307 100644 --- a/trunk/src/protocol/srs_protocol_kbps.hpp +++ b/trunk/src/protocol/srs_protocol_kbps.hpp @@ -221,14 +221,14 @@ public: * use the add_delta() is better solutions. */ virtual void sample(); -// interface ISrsProtocolStatistic +// Interface ISrsProtocolStatistic public: virtual int64_t get_send_bytes(); virtual int64_t get_recv_bytes(); -// interface ISrsKbpsDelta +// Interface ISrsKbpsDelta public: virtual void remark(int64_t* in, int64_t* out); -// interface ISrsMemorySizer +// Interface ISrsMemorySizer public: virtual int size_memory(); }; diff --git a/trunk/src/service/srs_service_http_conn.hpp b/trunk/src/service/srs_service_http_conn.hpp index 633ba8634..3bfdfb4ee 100644 --- a/trunk/src/service/srs_service_http_conn.hpp +++ b/trunk/src/service/srs_service_http_conn.hpp @@ -253,7 +253,7 @@ public: public: // Initialize the response reader with buffer. virtual srs_error_t initialize(SrsFastStream* buffer); -// interface ISrsHttpResponseReader +// Interface ISrsHttpResponseReader public: virtual bool eof(); virtual srs_error_t read(char* data, int nb_data, int* nb_read); diff --git a/trunk/src/service/srs_service_log.hpp b/trunk/src/service/srs_service_log.hpp index fc2d49198..7ed23ba32 100644 --- a/trunk/src/service/srs_service_log.hpp +++ b/trunk/src/service/srs_service_log.hpp @@ -59,7 +59,7 @@ private: public: SrsConsoleLog(SrsLogLevel l, bool u); virtual ~SrsConsoleLog(); -// interface ISrsLog +// Interface ISrsLog public: virtual srs_error_t initialize(); virtual void reopen(); diff --git a/trunk/src/service/srs_service_st.hpp b/trunk/src/service/srs_service_st.hpp index 7c1bcba2c..383b1323d 100644 --- a/trunk/src/service/srs_service_st.hpp +++ b/trunk/src/service/srs_service_st.hpp @@ -170,7 +170,7 @@ private: // Close the connection to server. // @remark User should never use the client when close it. virtual void close(); -// interface ISrsProtocolReadWriter +// Interface ISrsProtocolReadWriter public: virtual bool is_never_timeout(srs_utime_t tm); virtual void set_recv_timeout(srs_utime_t tm);