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

Refine code

Browse source
This commit is contained in:
winlin 2018-08-05 18:58:23 +08:00
parent 31945c244d
commit 580c94c8c0
2 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_http_stream.cpp
View file

@ -776,7 +776,7 @@ srs_error_t SrsHttpStreamServer::http_mount(SrsSource* s, SrsRequest* r)
if ((err = entry->cache->start()) != srs_success) { if ((err = entry->cache->start()) != srs_success) {
return srs_error_wrap(err, "http: start stream cache failed"); 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 { } else {
entry = sflvs[sid]; entry = sflvs[sid];
entry->stream->update(s, r); entry->stream->update(s, r);

24
trunk/src/app/srs_app_http_stream.hpp
View file

@ -34,9 +34,7 @@ class SrsFlvTransmuxer;
class SrsTsTransmuxer; class SrsTsTransmuxer;
/** /**
* for the srs http stream cache, * A cache for HTTP Live Streaming encoder, to make android(weixin) happy.
* for example, the audio stream cache to make android(weixin) happy.
* we start a thread to shrink the queue.
*/ */
class SrsBufferCache : public ISrsCoroutineHandler 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 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 class SrsFlvStreamEncoder : public ISrsBufferEncoder
{ {
@ -115,7 +113,7 @@ public:
#ifdef SRS_PERF_FAST_FLV_ENCODER #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 * @see https://github.com/ossrs/srs/issues/405
*/ */
class SrsFastFlvStreamEncoder : public SrsFlvStreamEncoder class SrsFastFlvStreamEncoder : public SrsFlvStreamEncoder
@ -132,7 +130,7 @@ public:
#endif #endif
/** /**
* the ts stream encoder, remux rtmp stream to ts stream. * Transmux RTMP to HTTP TS Streaming.
*/ */
class SrsTsStreamEncoder : public ISrsBufferEncoder 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 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 class SrsMp3StreamEncoder : public ISrsBufferEncoder
{ {
@ -215,8 +213,7 @@ public:
}; };
/** /**
* the flv live stream supports access rtmp in flv over http. * HTTP Live Streaming, to transmux RTMP to HTTP FLV or other format.
* srs will remux rtmp to flv streaming.
*/ */
class SrsLiveStream : public ISrsHttpHandler class SrsLiveStream : public ISrsHttpHandler
{ {
@ -235,7 +232,7 @@ private:
}; };
/** /**
* the srs live entry * The Live Entry, to handle HTTP Live Streaming.
*/ */
struct SrsLiveEntry struct SrsLiveEntry
{ {
@ -264,8 +261,7 @@ public:
}; };
/** /**
* the http stream server instance, * The HTTP Live Streaming Server, to serve FLV/TS/MP3/AAC stream.
* serve http stream, for example, flv/ts/mp3/aac live stream.
*/ */
// TODO: Support multiple stream. // TODO: Support multiple stream.
class SrsHttpStreamServer : virtual public ISrsReloadHandler class SrsHttpStreamServer : virtual public ISrsReloadHandler