From 580c94c8c0f03e05ca5460a2e4d68505fe6e7ba2 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 5 Aug 2018 18:58:23 +0800 Subject: [PATCH] Refine code --- trunk/src/app/srs_app_http_stream.cpp | 2 +- trunk/src/app/srs_app_http_stream.hpp | 24 ++++++++++-------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/trunk/src/app/srs_app_http_stream.cpp b/trunk/src/app/srs_app_http_stream.cpp index 15ec0da06..09a8a358b 100755 --- a/trunk/src/app/srs_app_http_stream.cpp +++ b/trunk/src/app/srs_app_http_stream.cpp @@ -776,7 +776,7 @@ srs_error_t SrsHttpStreamServer::http_mount(SrsSource* s, SrsRequest* r) if ((err = entry->cache->start()) != srs_success) { return srs_error_wrap(err, "http: start stream cache failed"); } - srs_trace("http: mount flv stream for vhost=%s, mount=%s", sid.c_str(), mount.c_str()); + srs_trace("http: mount flv stream for sid=%s, mount=%s", sid.c_str(), mount.c_str()); } else { entry = sflvs[sid]; entry->stream->update(s, r); diff --git a/trunk/src/app/srs_app_http_stream.hpp b/trunk/src/app/srs_app_http_stream.hpp index eb37b7c7f..128bcaaa0 100755 --- a/trunk/src/app/srs_app_http_stream.hpp +++ b/trunk/src/app/srs_app_http_stream.hpp @@ -34,9 +34,7 @@ class SrsFlvTransmuxer; class SrsTsTransmuxer; /** - * for the srs http stream cache, - * for example, the audio stream cache to make android(weixin) happy. - * we start a thread to shrink the queue. + * A cache for HTTP Live Streaming encoder, to make android(weixin) happy. */ class SrsBufferCache : public ISrsCoroutineHandler { @@ -60,7 +58,7 @@ public: }; /** - * the stream encoder in some codec, for example, flv or aac. + * The encoder to transmux RTMP stream. */ class ISrsBufferEncoder { @@ -94,7 +92,7 @@ public: }; /** - * the flv stream encoder, remux rtmp stream to flv stream. + * Transmux RTMP to HTTP Live Streaming. */ class SrsFlvStreamEncoder : public ISrsBufferEncoder { @@ -115,7 +113,7 @@ public: #ifdef SRS_PERF_FAST_FLV_ENCODER /** - * the fast flv stream encoder. + * A Fast HTTP FLV Live Streaming, to write multiple tags by writev. * @see https://github.com/ossrs/srs/issues/405 */ class SrsFastFlvStreamEncoder : public SrsFlvStreamEncoder @@ -132,7 +130,7 @@ public: #endif /** - * the ts stream encoder, remux rtmp stream to ts stream. + * Transmux RTMP to HTTP TS Streaming. */ class SrsTsStreamEncoder : public ISrsBufferEncoder { @@ -152,7 +150,7 @@ public: }; /** - * the aac stream encoder, remux rtmp stream to aac stream. + * Transmux RTMP with AAC stream to HTTP AAC Streaming. */ class SrsAacStreamEncoder : public ISrsBufferEncoder { @@ -173,7 +171,7 @@ public: }; /** - * the mp3 stream encoder, remux rtmp stream to mp3 stream. + * Transmux RTMP with MP3 stream to HTTP MP3 Streaming. */ class SrsMp3StreamEncoder : public ISrsBufferEncoder { @@ -215,8 +213,7 @@ public: }; /** - * the flv live stream supports access rtmp in flv over http. - * srs will remux rtmp to flv streaming. + * HTTP Live Streaming, to transmux RTMP to HTTP FLV or other format. */ class SrsLiveStream : public ISrsHttpHandler { @@ -235,7 +232,7 @@ private: }; /** - * the srs live entry + * The Live Entry, to handle HTTP Live Streaming. */ struct SrsLiveEntry { @@ -264,8 +261,7 @@ public: }; /** - * the http stream server instance, - * serve http stream, for example, flv/ts/mp3/aac live stream. + * The HTTP Live Streaming Server, to serve FLV/TS/MP3/AAC stream. */ // TODO: Support multiple stream. class SrsHttpStreamServer : virtual public ISrsReloadHandler