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

implements the http api/stream framework

Browse source
This commit is contained in:
winlin 2014-03-27 13:25:08 +08:00
parent ab3c6c92a0
commit 6913efe127
9 changed files with 107 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/app/srs_app_server.cpp
View file

@ -38,6 +38,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_rtmp_conn.hpp>
#include <srs_app_config.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_app_http_api.hpp>
#include <srs_app_http_conn.hpp>
#define SERVER_LISTEN_BACKLOG 512
#define SRS_TIME_RESOLUTION_MS 500
@ -436,7 +438,9 @@ int SrsServer::accept_client(SrsListenerType type, st_netfd_t client_stfd)
if (type == SrsListenerRtmpStream) {
conn = new SrsRtmpConn(this, client_stfd);
} else if (type == SrsListenerHttpApi) {
conn = new SrsHttpApi(this, client_stfd);
} else if (type == SrsListenerHttpStream) {
conn = new SrsHttpConn(this, client_stfd);
} else {
// TODO: FIXME: handler others
}