1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00

Refine typo in files. 3.0.51

This commit is contained in:
winlin 2019-04-30 08:30:13 +08:00
parent 45009785fb
commit 6b2c71d385
33 changed files with 90 additions and 93 deletions

View file

@ -164,6 +164,7 @@ Please select according to languages:
### V3 changes ### 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-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-22, Refine in time unit. 3.0.49
* v3.0, 2019-04-07, Cover ST Coroutine and time unit. 3.0.48 * v3.0, 2019-04-07, Cover ST Coroutine and time unit. 3.0.48

View file

@ -70,7 +70,7 @@ public:
public: public:
virtual srs_error_t start(); virtual srs_error_t start();
virtual void stop(); virtual void stop();
// interface ISrsReusableThreadHandler // Interface ISrsReusableThreadHandler
public: public:
virtual srs_error_t cycle(); virtual srs_error_t cycle();
}; };

View file

@ -60,13 +60,13 @@ public:
virtual ~SrsAppCasterFlv(); virtual ~SrsAppCasterFlv();
public: public:
virtual srs_error_t initialize(); virtual srs_error_t initialize();
// interface ISrsTcpHandler // Interface ISrsTcpHandler
public: public:
virtual srs_error_t on_tcp_client(srs_netfd_t stfd); virtual srs_error_t on_tcp_client(srs_netfd_t stfd);
// interface IConnectionManager // Interface IConnectionManager
public: public:
virtual void remove(ISrsConnection* c); virtual void remove(ISrsConnection* c);
// interface ISrsHttpHandler // Interface ISrsHttpHandler
public: public:
virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r);
}; };

View file

@ -66,7 +66,7 @@ protected:
public: public:
SrsConnection(IConnectionManager* cm, srs_netfd_t c, std::string cip); SrsConnection(IConnectionManager* cm, srs_netfd_t c, std::string cip);
virtual ~SrsConnection(); virtual ~SrsConnection();
// interface ISrsKbpsDelta // Interface ISrsKbpsDelta
public: public:
virtual void remark(int64_t* in, int64_t* out); virtual void remark(int64_t* in, int64_t* out);
public: public:
@ -84,7 +84,7 @@ public:
virtual srs_error_t set_tcp_nodelay(bool v); virtual srs_error_t set_tcp_nodelay(bool v);
// Set socket option SO_SNDBUF in srs_utime_t. // Set socket option SO_SNDBUF in srs_utime_t.
virtual srs_error_t set_socket_buffer(srs_utime_t buffer_v); virtual srs_error_t set_socket_buffer(srs_utime_t buffer_v);
// interface ISrsOneCycleThreadHandler // Interface ISrsOneCycleThreadHandler
public: public:
// The thread cycle function, // The thread cycle function,
// when serve connection completed, terminate the loop which will terminate the thread, // when serve connection completed, terminate the loop which will terminate the thread,

View file

@ -103,7 +103,7 @@ private:
virtual std::string generate_path(); virtual std::string generate_path();
// When update the duration of segment by rtmp msg. // When update the duration of segment by rtmp msg.
virtual srs_error_t on_update_duration(SrsSharedPtrMessage* msg); virtual srs_error_t on_update_duration(SrsSharedPtrMessage* msg);
// interface ISrsReloadHandler // Interface ISrsReloadHandler
public: public:
virtual srs_error_t on_reload_vhost_dvr(std::string vhost); 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); virtual srs_error_t on_video(SrsSharedPtrMessage* shared_video, SrsFormat* format);
private: private:
virtual srs_error_t update_duration(SrsSharedPtrMessage* msg); virtual srs_error_t update_duration(SrsSharedPtrMessage* msg);
// interface ISrsReloadHandler // Interface ISrsReloadHandler
public: public:
virtual srs_error_t on_reload_vhost_dvr(std::string vhost); virtual srs_error_t on_reload_vhost_dvr(std::string vhost);
}; };
@ -267,7 +267,7 @@ public:
// mux the video packets to dvr. // mux the video packets to dvr.
// @param shared_video, directly ptr, copy it if need to save it. // @param shared_video, directly ptr, copy it if need to save it.
virtual srs_error_t on_video(SrsSharedPtrMessage* shared_video, SrsFormat* format); virtual srs_error_t on_video(SrsSharedPtrMessage* shared_video, SrsFormat* format);
// interface ISrsReloadHandler // Interface ISrsReloadHandler
public: public:
virtual srs_error_t on_reload_vhost_dvr_apply(std::string vhost); virtual srs_error_t on_reload_vhost_dvr_apply(std::string vhost);
}; };

View file

@ -125,7 +125,7 @@ public:
virtual srs_error_t start(); virtual srs_error_t start();
virtual void stop(); virtual void stop();
virtual std::string get_curr_origin(); virtual std::string get_curr_origin();
// interface ISrsReusableThread2Handler // Interface ISrsReusableThread2Handler
public: public:
virtual srs_error_t cycle(); virtual srs_error_t cycle();
private: private:
@ -161,7 +161,7 @@ public:
virtual srs_error_t initialize(SrsSource* s, SrsPublishEdge* e, SrsRequest* r); virtual srs_error_t initialize(SrsSource* s, SrsPublishEdge* e, SrsRequest* r);
virtual srs_error_t start(); virtual srs_error_t start();
virtual void stop(); virtual void stop();
// interface ISrsReusableThread2Handler // Interface ISrsReusableThread2Handler
public: public:
virtual srs_error_t cycle(); virtual srs_error_t cycle();
private: private:

View file

@ -52,7 +52,7 @@ public:
public: public:
virtual srs_error_t on_publish(SrsRequest* req); virtual srs_error_t on_publish(SrsRequest* req);
virtual void on_unpublish(); virtual void on_unpublish();
// interface ISrsReusableThreadHandler. // Interface ISrsReusableThreadHandler.
public: public:
virtual srs_error_t cycle(); virtual srs_error_t cycle();
private: private:

View file

@ -79,7 +79,7 @@ public:
// Forward the video packet. // Forward the video packet.
// @param shared_video, directly ptr, copy it if need to save it. // @param shared_video, directly ptr, copy it if need to save it.
virtual srs_error_t on_video(SrsSharedPtrMessage* shared_video); virtual srs_error_t on_video(SrsSharedPtrMessage* shared_video);
// interface ISrsReusableThread2Handler. // Interface ISrsReusableThread2Handler.
public: public:
virtual srs_error_t cycle(); virtual srs_error_t cycle();
private: private:

View file

@ -187,7 +187,7 @@ public:
virtual ~SrsGoApiRaw(); virtual ~SrsGoApiRaw();
public: public:
virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r);
// interface ISrsReloadHandler // Interface ISrsReloadHandler
public: public:
virtual srs_error_t on_reload_http_api_raw_api(); virtual srs_error_t on_reload_http_api_raw_api();
}; };
@ -219,14 +219,14 @@ private:
public: public:
SrsHttpApi(IConnectionManager* cm, srs_netfd_t fd, SrsHttpServeMux* m, std::string cip); SrsHttpApi(IConnectionManager* cm, srs_netfd_t fd, SrsHttpServeMux* m, std::string cip);
virtual ~SrsHttpApi(); virtual ~SrsHttpApi();
// interface ISrsKbpsDelta // Interface ISrsKbpsDelta
public: public:
virtual void remark(int64_t* in, int64_t* out); virtual void remark(int64_t* in, int64_t* out);
protected: protected:
virtual srs_error_t do_cycle(); virtual srs_error_t do_cycle();
private: private:
virtual srs_error_t process_request(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); virtual srs_error_t process_request(ISrsHttpResponseWriter* w, ISrsHttpMessage* r);
// interface ISrsReloadHandler // Interface ISrsReloadHandler
public: public:
virtual srs_error_t on_reload_http_api_crossdomain(); virtual srs_error_t on_reload_http_api_crossdomain();
}; };

View file

@ -65,7 +65,7 @@ protected:
public: public:
SrsHttpConn(IConnectionManager* cm, srs_netfd_t fd, ISrsHttpServeMux* m, std::string cip); SrsHttpConn(IConnectionManager* cm, srs_netfd_t fd, ISrsHttpServeMux* m, std::string cip);
virtual ~SrsHttpConn(); virtual ~SrsHttpConn();
// interface ISrsKbpsDelta // Interface ISrsKbpsDelta
public: public:
virtual void remark(int64_t* in, int64_t* out); virtual void remark(int64_t* in, int64_t* out);
protected: protected:
@ -81,7 +81,7 @@ private:
// e.g. log msg of connection and report to other system. // e.g. log msg of connection and report to other system.
// @param request: request which is converted by the last http message. // @param request: request which is converted by the last http message.
virtual srs_error_t on_disconnect(SrsRequest* req); virtual srs_error_t on_disconnect(SrsRequest* req);
// interface ISrsReloadHandler // Interface ISrsReloadHandler
public: public:
virtual srs_error_t on_reload_http_stream_crossdomain(); virtual srs_error_t on_reload_http_stream_crossdomain();
}; };
@ -115,7 +115,7 @@ public:
virtual ~SrsHttpServer(); virtual ~SrsHttpServer();
public: public:
virtual srs_error_t initialize(); virtual srs_error_t initialize();
// interface ISrsHttpServeMux // Interface ISrsHttpServeMux
public: public:
virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r);
public: public:

View file

@ -57,7 +57,7 @@ public:
virtual srs_error_t initialize(); virtual srs_error_t initialize();
private: private:
virtual srs_error_t mount_vhost(std::string vhost, std::string& pmount); virtual srs_error_t mount_vhost(std::string vhost, std::string& pmount);
// interface ISrsReloadHandler. // Interface ISrsReloadHandler.
public: public:
virtual srs_error_t on_reload_vhost_added(std::string vhost); virtual srs_error_t on_reload_vhost_added(std::string vhost);
virtual srs_error_t on_reload_vhost_http_updated(); virtual srs_error_t on_reload_vhost_http_updated();

View file

@ -50,7 +50,7 @@ public:
public: public:
virtual srs_error_t start(); virtual srs_error_t start();
virtual srs_error_t dump_cache(SrsConsumer* consumer, SrsRtmpJitterAlgorithm jitter); virtual srs_error_t dump_cache(SrsConsumer* consumer, SrsRtmpJitterAlgorithm jitter);
// interface ISrsEndlessThreadHandler. // Interface ISrsEndlessThreadHandler.
public: public:
virtual srs_error_t cycle(); virtual srs_error_t cycle();
}; };
@ -255,11 +255,11 @@ public:
// HTTP flv/ts/mp3/aac stream // HTTP flv/ts/mp3/aac stream
virtual srs_error_t http_mount(SrsSource* s, SrsRequest* r); virtual srs_error_t http_mount(SrsSource* s, SrsRequest* r);
virtual void http_unmount(SrsSource* s, SrsRequest* r); virtual void http_unmount(SrsSource* s, SrsRequest* r);
// interface ISrsReloadHandler. // Interface ISrsReloadHandler.
public: public:
virtual srs_error_t on_reload_vhost_added(std::string vhost); virtual srs_error_t on_reload_vhost_added(std::string vhost);
virtual srs_error_t on_reload_vhost_http_remux_updated(std::string vhost); virtual srs_error_t on_reload_vhost_http_remux_updated(std::string vhost);
// interface ISrsHttpMatchHijacker // Interface ISrsHttpMatchHijacker
public: public:
virtual srs_error_t hijack(ISrsHttpMessage* request, ISrsHttpHandler** ph); virtual srs_error_t hijack(ISrsHttpMessage* request, ISrsHttpHandler** ph);
private: private:

View file

@ -85,7 +85,7 @@ public:
virtual void stop(); virtual void stop();
private: private:
virtual void fast_stop(); virtual void fast_stop();
// interface ISrsReusableThreadHandler. // Interface ISrsReusableThreadHandler.
public: public:
virtual srs_error_t cycle(); virtual srs_error_t cycle();
private: private:
@ -97,7 +97,7 @@ private:
virtual srs_error_t parse_engines(SrsConfDirective* vhost, SrsConfDirective* ingest); 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 srs_error_t initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* vhost, SrsConfDirective* ingest, SrsConfDirective* engine);
virtual void show_ingest_log_message(); virtual void show_ingest_log_message();
// interface ISrsReloadHandler. // Interface ISrsReloadHandler.
public: public:
virtual srs_error_t on_reload_vhost_removed(std::string vhost); virtual srs_error_t on_reload_vhost_removed(std::string vhost);
virtual srs_error_t on_reload_vhost_added(std::string vhost); virtual srs_error_t on_reload_vhost_added(std::string vhost);

View file

@ -81,7 +81,7 @@ private:
public: public:
SrsKafkaMessage(SrsKafkaProducer* p, int k, SrsJsonObject* j); SrsKafkaMessage(SrsKafkaProducer* p, int k, SrsJsonObject* j);
virtual ~SrsKafkaMessage(); virtual ~SrsKafkaMessage();
// interface ISrsAsyncCallTask // Interface ISrsAsyncCallTask
public: public:
virtual srs_error_t call(); virtual srs_error_t call();
virtual std::string to_string(); 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 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. // @param obj the json object; user must never free it again.
virtual srs_error_t send(int key, SrsJsonObject* obj); virtual srs_error_t send(int key, SrsJsonObject* obj);
// interface ISrsKafkaCluster // Interface ISrsKafkaCluster
public: public:
virtual srs_error_t on_client(int key, SrsListenerType type, std::string ip); virtual srs_error_t on_client(int key, SrsListenerType type, std::string ip);
virtual srs_error_t on_close(int key); virtual srs_error_t on_close(int key);
// interface ISrsReusableThreadHandler // Interface ISrsReusableThreadHandler
public: public:
virtual srs_error_t cycle(); virtual srs_error_t cycle();
private: private:

View file

@ -87,7 +87,7 @@ public:
virtual srs_netfd_t stfd(); virtual srs_netfd_t stfd();
public: public:
virtual srs_error_t listen(); virtual srs_error_t listen();
// interface ISrsReusableThreadHandler. // Interface ISrsReusableThreadHandler.
public: public:
virtual srs_error_t cycle(); virtual srs_error_t cycle();
}; };
@ -110,7 +110,7 @@ public:
virtual int fd(); virtual int fd();
public: public:
virtual srs_error_t listen(); virtual srs_error_t listen();
// interface ISrsReusableThreadHandler. // Interface ISrsReusableThreadHandler.
public: public:
virtual srs_error_t cycle(); virtual srs_error_t cycle();
}; };

View file

@ -51,7 +51,7 @@ private:
public: public:
SrsFastLog(); SrsFastLog();
virtual ~SrsFastLog(); virtual ~SrsFastLog();
// interface ISrsLog // Interface ISrsLog
public: public:
virtual srs_error_t initialize(); virtual srs_error_t initialize();
virtual void reopen(); virtual void reopen();
@ -60,7 +60,7 @@ public:
virtual void trace(const char* tag, int context_id, const char* fmt, ...); 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 warn(const char* tag, int context_id, const char* fmt, ...);
virtual void error(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: public:
virtual srs_error_t on_reload_utc_time(); virtual srs_error_t on_reload_utc_time();
virtual srs_error_t on_reload_log_tank(); virtual srs_error_t on_reload_log_tank();

View file

@ -91,12 +91,12 @@ private:
public: public:
SrsMpegtsOverUdp(SrsConfDirective* c); SrsMpegtsOverUdp(SrsConfDirective* c);
virtual ~SrsMpegtsOverUdp(); virtual ~SrsMpegtsOverUdp();
// interface ISrsUdpHandler // Interface ISrsUdpHandler
public: public:
virtual srs_error_t on_udp_packet(const sockaddr* from, const int fromlen, char* buf, int nb_buf); virtual srs_error_t on_udp_packet(const sockaddr* from, const int fromlen, char* buf, int nb_buf);
private: private:
virtual srs_error_t on_udp_bytes(std::string host, int port, char* buf, int nb_buf); virtual srs_error_t on_udp_bytes(std::string host, int port, char* buf, int nb_buf);
// interface ISrsTsHandler // Interface ISrsTsHandler
public: public:
virtual srs_error_t on_ts_message(SrsTsMessage* msg); virtual srs_error_t on_ts_message(SrsTsMessage* msg);
private: private:

View file

@ -51,7 +51,7 @@ public:
public: public:
virtual srs_error_t on_publish(SrsRequest* req); virtual srs_error_t on_publish(SrsRequest* req);
virtual void on_unpublish(); virtual void on_unpublish();
// interface ISrsReusableThreadHandler. // Interface ISrsReusableThreadHandler.
public: public:
virtual srs_error_t cycle(); virtual srs_error_t cycle();
private: private:

View file

@ -94,7 +94,7 @@ public:
virtual srs_error_t start(); virtual srs_error_t start();
virtual void stop(); virtual void stop();
virtual void stop_loop(); virtual void stop_loop();
// interface ISrsReusableThread2Handler // Interface ISrsReusableThread2Handler
public: public:
virtual srs_error_t cycle(); virtual srs_error_t cycle();
private: private:
@ -126,7 +126,7 @@ public:
virtual int size(); virtual int size();
virtual SrsCommonMessage* pump(); virtual SrsCommonMessage* pump();
virtual srs_error_t error_code(); virtual srs_error_t error_code();
// interface ISrsMessagePumper // Interface ISrsMessagePumper
public: public:
virtual srs_error_t consume(SrsCommonMessage* msg); virtual srs_error_t consume(SrsCommonMessage* msg);
virtual bool interrupted(); virtual bool interrupted();
@ -184,19 +184,19 @@ public:
public: public:
virtual srs_error_t start(); virtual srs_error_t start();
virtual void stop(); virtual void stop();
// interface ISrsMessagePumper // Interface ISrsMessagePumper
public: public:
virtual srs_error_t consume(SrsCommonMessage* msg); virtual srs_error_t consume(SrsCommonMessage* msg);
virtual bool interrupted(); virtual bool interrupted();
virtual void interrupt(srs_error_t err); virtual void interrupt(srs_error_t err);
virtual void on_start(); virtual void on_start();
virtual void on_stop(); virtual void on_stop();
// interface IMergeReadHandler // Interface IMergeReadHandler
public: public:
#ifdef SRS_PERF_MERGED_READ #ifdef SRS_PERF_MERGED_READ
virtual void on_read(ssize_t nread); virtual void on_read(ssize_t nread);
#endif #endif
// interface ISrsReloadHandler // Interface ISrsReloadHandler
public: public:
virtual srs_error_t on_reload_vhost_publish(std::string vhost); virtual srs_error_t on_reload_vhost_publish(std::string vhost);
virtual srs_error_t on_reload_vhost_realtime(std::string vhost); virtual srs_error_t on_reload_vhost_realtime(std::string vhost);
@ -220,7 +220,7 @@ public:
virtual srs_error_t start(); virtual srs_error_t start();
public: public:
virtual srs_error_t pull(); virtual srs_error_t pull();
// interface ISrsOneCycleThreadHandler // Interface ISrsOneCycleThreadHandler
public: public:
virtual srs_error_t cycle(); virtual srs_error_t cycle();
}; };

View file

@ -127,14 +127,14 @@ public:
virtual void dispose(); virtual void dispose();
protected: protected:
virtual srs_error_t do_cycle(); virtual srs_error_t do_cycle();
// interface ISrsReloadHandler // Interface ISrsReloadHandler
public: public:
virtual srs_error_t on_reload_vhost_removed(std::string vhost); 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_play(std::string vhost);
virtual srs_error_t on_reload_vhost_tcp_nodelay(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_realtime(std::string vhost);
virtual srs_error_t on_reload_vhost_publish(std::string vhost); virtual srs_error_t on_reload_vhost_publish(std::string vhost);
// interface ISrsKbpsDelta // Interface ISrsKbpsDelta
public: public:
virtual void remark(int64_t* in, int64_t* out); virtual void remark(int64_t* in, int64_t* out);
private: private:

View file

@ -68,7 +68,7 @@ public:
public: public:
virtual int port(); virtual int port();
virtual srs_error_t listen(); virtual srs_error_t listen();
// interface ISrsUdpHandler // Interface ISrsUdpHandler
public: public:
virtual srs_error_t on_udp_packet(const sockaddr* from, const int fromlen, char* buf, int nb_buf); 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 // internal methods
public: public:
virtual srs_error_t on_rtp_packet(SrsRtpPacket* pkt, int stream_id); virtual srs_error_t on_rtp_packet(SrsRtpPacket* pkt, int stream_id);
// interface ISrsOneCycleThreadHandler // Interface ISrsOneCycleThreadHandler
public: public:
virtual srs_error_t cycle(); virtual srs_error_t cycle();
private: private:
@ -188,7 +188,7 @@ public:
virtual srs_error_t alloc_port(int* pport); virtual srs_error_t alloc_port(int* pport);
// Free the alloced rtp port. // Free the alloced rtp port.
virtual void free_port(int lpmin, int lpmax); virtual void free_port(int lpmin, int lpmax);
// interface ISrsTcpHandler // Interface ISrsTcpHandler
public: public:
virtual srs_error_t on_tcp_client(srs_netfd_t stfd); virtual srs_error_t on_tcp_client(srs_netfd_t stfd);
// internal methods. // internal methods.

View file

@ -100,7 +100,7 @@ public:
virtual ~SrsBufferListener(); virtual ~SrsBufferListener();
public: public:
virtual srs_error_t listen(std::string ip, int port); virtual srs_error_t listen(std::string ip, int port);
// interface ISrsTcpHandler // Interface ISrsTcpHandler
public: public:
virtual srs_error_t on_tcp_client(srs_netfd_t stfd); virtual srs_error_t on_tcp_client(srs_netfd_t stfd);
}; };
@ -116,7 +116,7 @@ public:
virtual ~SrsRtspListener(); virtual ~SrsRtspListener();
public: public:
virtual srs_error_t listen(std::string i, int p); virtual srs_error_t listen(std::string i, int p);
// interface ISrsTcpHandler // Interface ISrsTcpHandler
public: public:
virtual srs_error_t on_tcp_client(srs_netfd_t stfd); virtual srs_error_t on_tcp_client(srs_netfd_t stfd);
}; };
@ -132,7 +132,7 @@ public:
virtual ~SrsHttpFlvListener(); virtual ~SrsHttpFlvListener();
public: public:
virtual srs_error_t listen(std::string i, int p); virtual srs_error_t listen(std::string i, int p);
// interface ISrsTcpHandler // Interface ISrsTcpHandler
public: public:
virtual srs_error_t on_tcp_client(srs_netfd_t stfd); virtual srs_error_t on_tcp_client(srs_netfd_t stfd);
}; };
@ -176,7 +176,7 @@ public:
public: public:
virtual srs_error_t initialize(); virtual srs_error_t initialize();
virtual srs_error_t start(); virtual srs_error_t start();
// interface ISrsEndlessThreadHandler. // Interface ISrsEndlessThreadHandler.
public: public:
virtual srs_error_t cycle(); virtual srs_error_t cycle();
private: private:
@ -296,13 +296,13 @@ public:
virtual srs_error_t accept_client(SrsListenerType type, srs_netfd_t stfd); virtual srs_error_t accept_client(SrsListenerType type, srs_netfd_t stfd);
private: private:
virtual srs_error_t fd2conn(SrsListenerType type, srs_netfd_t stfd, SrsConnection** pconn); virtual srs_error_t fd2conn(SrsListenerType type, srs_netfd_t stfd, SrsConnection** pconn);
// interface IConnectionManager // Interface IConnectionManager
public: public:
// A callback for connection to remove itself. // A callback for connection to remove itself.
// When connection thread cycle terminated, callback this to delete connection. // When connection thread cycle terminated, callback this to delete connection.
// @see SrsConnection.on_thread_stop(). // @see SrsConnection.on_thread_stop().
virtual void remove(ISrsConnection* c); virtual void remove(ISrsConnection* c);
// interface ISrsReloadHandler. // Interface ISrsReloadHandler.
public: public:
virtual srs_error_t on_reload_listen(); virtual srs_error_t on_reload_listen();
virtual srs_error_t on_reload_pid(); 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_enabled();
virtual srs_error_t on_reload_http_stream_disabled(); virtual srs_error_t on_reload_http_stream_disabled();
virtual srs_error_t on_reload_http_stream_updated(); virtual srs_error_t on_reload_http_stream_updated();
// interface ISrsSourceHandler // Interface ISrsSourceHandler
public: public:
virtual srs_error_t on_publish(SrsSource* s, SrsRequest* r); virtual srs_error_t on_publish(SrsSource* s, SrsRequest* r);
virtual void on_unpublish(SrsSource* s, SrsRequest* r); virtual void on_unpublish(SrsSource* s, SrsRequest* r);

View file

@ -382,7 +382,7 @@ public:
virtual srs_error_t on_forwarder_start(SrsForwarder* forwarder); virtual srs_error_t on_forwarder_start(SrsForwarder* forwarder);
// For the SrsDvr to callback to request the sequence headers. // For the SrsDvr to callback to request the sequence headers.
virtual srs_error_t on_dvr_request_sh(); virtual srs_error_t on_dvr_request_sh();
// interface ISrsReloadHandler // Interface ISrsReloadHandler
public: public:
virtual srs_error_t on_reload_vhost_forward(std::string vhost); virtual srs_error_t on_reload_vhost_forward(std::string vhost);
virtual srs_error_t on_reload_vhost_dash(std::string vhost); virtual srs_error_t on_reload_vhost_dash(std::string vhost);
@ -519,7 +519,7 @@ public:
public: public:
// Initialize the hls with handlers. // Initialize the hls with handlers.
virtual srs_error_t initialize(SrsRequest* r, ISrsSourceHandler* h); virtual srs_error_t initialize(SrsRequest* r, ISrsSourceHandler* h);
// interface ISrsReloadHandler // Interface ISrsReloadHandler
public: public:
virtual srs_error_t on_reload_vhost_play(std::string vhost); virtual srs_error_t on_reload_vhost_play(std::string vhost);
public: public:

View file

@ -46,10 +46,10 @@ public:
virtual ~SrsCoroutineManager(); virtual ~SrsCoroutineManager();
public: public:
srs_error_t start(); srs_error_t start();
// interface ISrsCoroutineHandler // Interface ISrsCoroutineHandler
public: public:
virtual srs_error_t cycle(); virtual srs_error_t cycle();
// interface IConnectionManager // Interface IConnectionManager
public: public:
virtual void remove(ISrsConnection* c); virtual void remove(ISrsConnection* c);
private: private:

View file

@ -27,7 +27,7 @@
// The version config. // The version config.
#define VERSION_MAJOR 3 #define VERSION_MAJOR 3
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 50 #define VERSION_REVISION 51
// The macros generated by configure script. // The macros generated by configure script.
#include <srs_auto_headers.hpp> #include <srs_auto_headers.hpp>

View file

@ -662,10 +662,10 @@ private:
public: public:
SrsIngestHlsOutput(SrsHttpUri* rtmp); SrsIngestHlsOutput(SrsHttpUri* rtmp);
virtual ~SrsIngestHlsOutput(); virtual ~SrsIngestHlsOutput();
// interface ISrsTsHandler // Interface ISrsTsHandler
public: public:
virtual srs_error_t on_ts_message(SrsTsMessage* msg); virtual srs_error_t on_ts_message(SrsTsMessage* msg);
// interface IAacHandler // Interface IAacHandler
public: public:
virtual int on_aac_frame(char* frame, int frame_size, double duration); virtual int on_aac_frame(char* frame, int frame_size, double duration);
private: private:

View file

@ -374,16 +374,12 @@ srs_error_t run(SrsServer* svr)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
/** // Initialize the whole system, set hooks to handle server level events.
* 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.
*/
if ((err = svr->initialize(NULL)) != srs_success) { if ((err = svr->initialize(NULL)) != srs_success) {
return srs_error_wrap(err, "server initialize"); 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 (!_srs_config->get_deamon()) {
if ((err = run_master(svr)) != srs_success) { if ((err = run_master(svr)) != srs_success) {
return srs_error_wrap(err, "run master"); return srs_error_wrap(err, "run master");

View file

@ -392,7 +392,7 @@ public:
// Handle registers the handler for the given pattern. // Handle registers the handler for the given pattern.
// If a handler already exists for pattern, Handle panics. // If a handler already exists for pattern, Handle panics.
virtual srs_error_t handle(std::string pattern, ISrsHttpHandler* handler); virtual srs_error_t handle(std::string pattern, ISrsHttpHandler* handler);
// interface ISrsHttpServeMux // Interface ISrsHttpServeMux
public: public:
virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r);
public: public:
@ -415,7 +415,7 @@ public:
virtual ~SrsHttpCorsMux(); virtual ~SrsHttpCorsMux();
public: public:
virtual srs_error_t initialize(ISrsHttpServeMux* worker, bool cros_enabled); virtual srs_error_t initialize(ISrsHttpServeMux* worker, bool cros_enabled);
// interface ISrsHttpServeMux // Interface ISrsHttpServeMux
public: public:
virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r);
}; };

View file

@ -77,7 +77,7 @@ public:
virtual bool empty(); virtual bool empty();
virtual std::string to_str(); virtual std::string to_str();
virtual void set_value(std::string v); virtual void set_value(std::string v);
// interface ISrsCodec // Interface ISrsCodec
public: public:
virtual int nb_bytes(); virtual int nb_bytes();
virtual srs_error_t encode(SrsBuffer* buf); virtual srs_error_t encode(SrsBuffer* buf);
@ -106,7 +106,7 @@ public:
virtual void set_value(std::string v); virtual void set_value(std::string v);
virtual void set_value(const char* v, int nb_v); virtual void set_value(const char* v, int nb_v);
virtual uint32_t crc32(uint32_t previous); virtual uint32_t crc32(uint32_t previous);
// interface ISrsCodec // Interface ISrsCodec
public: public:
virtual int nb_bytes(); virtual int nb_bytes();
virtual srs_error_t encode(SrsBuffer* buf); virtual srs_error_t encode(SrsBuffer* buf);
@ -164,7 +164,7 @@ public:
{ {
return elems.at(index); return elems.at(index);
} }
// interface ISrsCodec // Interface ISrsCodec
public: public:
virtual int nb_bytes() virtual int nb_bytes()
{ {
@ -251,7 +251,7 @@ public:
{ {
return elems.at(index); return elems.at(index);
} }
// interface ISrsCodec // Interface ISrsCodec
public: public:
virtual int nb_bytes() virtual int nb_bytes()
{ {
@ -400,7 +400,7 @@ public:
virtual bool is_offset_commit_request(); virtual bool is_offset_commit_request();
virtual bool is_offset_fetch_request(); virtual bool is_offset_fetch_request();
virtual bool is_consumer_metadata_request(); virtual bool is_consumer_metadata_request();
// interface ISrsCodec // Interface ISrsCodec
public: public:
virtual int nb_bytes(); virtual int nb_bytes();
virtual srs_error_t encode(SrsBuffer* buf); virtual srs_error_t encode(SrsBuffer* buf);
@ -466,7 +466,7 @@ public:
* get the correlation id of response message. * get the correlation id of response message.
*/ */
virtual int32_t correlation_id(); virtual int32_t correlation_id();
// interface ISrsCodec // Interface ISrsCodec
public: public:
virtual int nb_bytes(); virtual int nb_bytes();
virtual srs_error_t encode(SrsBuffer* buf); virtual srs_error_t encode(SrsBuffer* buf);
@ -533,7 +533,7 @@ private:
* get the raw message, bytes after the message_size. * get the raw message, bytes after the message_size.
*/ */
virtual int raw_message_size(); virtual int raw_message_size();
// interface ISrsCodec // Interface ISrsCodec
public: public:
virtual int nb_bytes(); virtual int nb_bytes();
virtual srs_error_t encode(SrsBuffer* buf); virtual srs_error_t encode(SrsBuffer* buf);
@ -554,7 +554,7 @@ public:
virtual ~SrsKafkaRawMessageSet(); virtual ~SrsKafkaRawMessageSet();
public: public:
virtual void append(SrsKafkaRawMessage* msg); virtual void append(SrsKafkaRawMessage* msg);
// interface ISrsCodec // Interface ISrsCodec
public: public:
virtual int nb_bytes(); virtual int nb_bytes();
virtual srs_error_t encode(SrsBuffer* buf); virtual srs_error_t encode(SrsBuffer* buf);
@ -585,7 +585,7 @@ public:
* get the api key of request. * get the api key of request.
*/ */
virtual SrsKafkaApiKey api_key(); virtual SrsKafkaApiKey api_key();
// interface ISrsCodec // Interface ISrsCodec
public: public:
virtual int nb_bytes(); virtual int nb_bytes();
virtual srs_error_t encode(SrsBuffer* buf); virtual srs_error_t encode(SrsBuffer* buf);
@ -608,7 +608,7 @@ public:
* @param s an int value specifies the size of message in header. * @param s an int value specifies the size of message in header.
*/ */
virtual void update_header(int s); virtual void update_header(int s);
// interface ISrsCodec // Interface ISrsCodec
public: public:
virtual int nb_bytes(); virtual int nb_bytes();
virtual srs_error_t encode(SrsBuffer* buf); virtual srs_error_t encode(SrsBuffer* buf);
@ -638,7 +638,7 @@ public:
virtual ~SrsKafkaTopicMetadataRequest(); virtual ~SrsKafkaTopicMetadataRequest();
public: public:
virtual void add_topic(std::string topic); virtual void add_topic(std::string topic);
// interface ISrsCodec // Interface ISrsCodec
public: public:
virtual int nb_bytes(); virtual int nb_bytes();
virtual srs_error_t encode(SrsBuffer* buf); virtual srs_error_t encode(SrsBuffer* buf);
@ -658,7 +658,7 @@ public:
public: public:
SrsKafkaBroker(); SrsKafkaBroker();
virtual ~SrsKafkaBroker(); virtual ~SrsKafkaBroker();
// interface ISrsCodec // Interface ISrsCodec
public: public:
virtual int nb_bytes(); virtual int nb_bytes();
virtual srs_error_t encode(SrsBuffer* buf); virtual srs_error_t encode(SrsBuffer* buf);
@ -675,7 +675,7 @@ public:
public: public:
SrsKafkaPartitionMetadata(); SrsKafkaPartitionMetadata();
virtual ~SrsKafkaPartitionMetadata(); virtual ~SrsKafkaPartitionMetadata();
// interface ISrsCodec // Interface ISrsCodec
public: public:
virtual int nb_bytes(); virtual int nb_bytes();
virtual srs_error_t encode(SrsBuffer* buf); virtual srs_error_t encode(SrsBuffer* buf);
@ -690,7 +690,7 @@ public:
public: public:
SrsKafkaTopicMetadata(); SrsKafkaTopicMetadata();
virtual ~SrsKafkaTopicMetadata(); virtual ~SrsKafkaTopicMetadata();
// interface ISrsCodec // Interface ISrsCodec
public: public:
virtual int nb_bytes(); virtual int nb_bytes();
virtual srs_error_t encode(SrsBuffer* buf); virtual srs_error_t encode(SrsBuffer* buf);
@ -713,7 +713,7 @@ public:
public: public:
SrsKafkaTopicMetadataResponse(); SrsKafkaTopicMetadataResponse();
virtual ~SrsKafkaTopicMetadataResponse(); virtual ~SrsKafkaTopicMetadataResponse();
// interface ISrsCodec // Interface ISrsCodec
public: public:
virtual int nb_bytes(); virtual int nb_bytes();
virtual srs_error_t encode(SrsBuffer* buf); virtual srs_error_t encode(SrsBuffer* buf);
@ -740,7 +740,7 @@ public:
* messages in set. * messages in set.
*/ */
SrsKafkaRawMessageSet messages; SrsKafkaRawMessageSet messages;
// interface ISrsCodec // Interface ISrsCodec
public: public:
virtual int nb_bytes(); virtual int nb_bytes();
virtual srs_error_t encode(SrsBuffer* buf); virtual srs_error_t encode(SrsBuffer* buf);
@ -757,7 +757,7 @@ public:
* messages of partitions. * messages of partitions.
*/ */
SrsKafkaArray<SrsKafkaProducerPartitionMessages> partitions; SrsKafkaArray<SrsKafkaProducerPartitionMessages> partitions;
// interface ISrsCodec // Interface ISrsCodec
public: public:
virtual int nb_bytes(); virtual int nb_bytes();
virtual srs_error_t encode(SrsBuffer* buf); virtual srs_error_t encode(SrsBuffer* buf);
@ -801,7 +801,7 @@ public:
public: public:
SrsKafkaProducerRequest(); SrsKafkaProducerRequest();
virtual ~SrsKafkaProducerRequest(); virtual ~SrsKafkaProducerRequest();
// interface ISrsCodec // Interface ISrsCodec
public: public:
virtual int nb_bytes(); virtual int nb_bytes();
virtual srs_error_t encode(SrsBuffer* buf); virtual srs_error_t encode(SrsBuffer* buf);

View file

@ -221,14 +221,14 @@ public:
* use the add_delta() is better solutions. * use the add_delta() is better solutions.
*/ */
virtual void sample(); virtual void sample();
// interface ISrsProtocolStatistic // Interface ISrsProtocolStatistic
public: public:
virtual int64_t get_send_bytes(); virtual int64_t get_send_bytes();
virtual int64_t get_recv_bytes(); virtual int64_t get_recv_bytes();
// interface ISrsKbpsDelta // Interface ISrsKbpsDelta
public: public:
virtual void remark(int64_t* in, int64_t* out); virtual void remark(int64_t* in, int64_t* out);
// interface ISrsMemorySizer // Interface ISrsMemorySizer
public: public:
virtual int size_memory(); virtual int size_memory();
}; };

View file

@ -253,7 +253,7 @@ public:
public: public:
// Initialize the response reader with buffer. // Initialize the response reader with buffer.
virtual srs_error_t initialize(SrsFastStream* buffer); virtual srs_error_t initialize(SrsFastStream* buffer);
// interface ISrsHttpResponseReader // Interface ISrsHttpResponseReader
public: public:
virtual bool eof(); virtual bool eof();
virtual srs_error_t read(char* data, int nb_data, int* nb_read); virtual srs_error_t read(char* data, int nb_data, int* nb_read);

View file

@ -59,7 +59,7 @@ private:
public: public:
SrsConsoleLog(SrsLogLevel l, bool u); SrsConsoleLog(SrsLogLevel l, bool u);
virtual ~SrsConsoleLog(); virtual ~SrsConsoleLog();
// interface ISrsLog // Interface ISrsLog
public: public:
virtual srs_error_t initialize(); virtual srs_error_t initialize();
virtual void reopen(); virtual void reopen();

View file

@ -170,7 +170,7 @@ private:
// Close the connection to server. // Close the connection to server.
// @remark User should never use the client when close it. // @remark User should never use the client when close it.
virtual void close(); virtual void close();
// interface ISrsProtocolReadWriter // Interface ISrsProtocolReadWriter
public: public:
virtual bool is_never_timeout(srs_utime_t tm); virtual bool is_never_timeout(srs_utime_t tm);
virtual void set_recv_timeout(srs_utime_t tm); virtual void set_recv_timeout(srs_utime_t tm);