From 4a7378b77a7e5d0626a8f6154e4bba05177671c0 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 7 Apr 2014 08:41:32 +0800 Subject: [PATCH] ingest stream when server cycle --- trunk/src/app/srs_app_server.cpp | 15 +++++++++++++++ trunk/src/app/srs_app_server.hpp | 1 + 2 files changed, 16 insertions(+) diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp index e3bd84082..446b7021d 100644 --- a/trunk/src/app/srs_app_server.cpp +++ b/trunk/src/app/srs_app_server.cpp @@ -368,6 +368,12 @@ int SrsServer::cycle() { int ret = ERROR_SUCCESS; + // ingest streams + if ((ret = ingest_streams()) != ERROR_SUCCESS) { + srs_error("ingest streams failed. ret=%d", ret); + return ret; + } + // the deamon thread, update the time cache while (true) { st_usleep(SRS_TIME_RESOLUTION_MS * 1000); @@ -439,6 +445,15 @@ void SrsServer::on_signal(int signo) } } +int SrsServer::ingest_streams() +{ + int ret = ERROR_SUCCESS; +#ifdef SRS_INGEST + +#endif + return ret; +} + void SrsServer::close_listeners() { std::vector::iterator it; diff --git a/trunk/src/app/srs_app_server.hpp b/trunk/src/app/srs_app_server.hpp index 4a65c7dac..3c14f1b6b 100644 --- a/trunk/src/app/srs_app_server.hpp +++ b/trunk/src/app/srs_app_server.hpp @@ -100,6 +100,7 @@ public: virtual void remove(SrsConnection* conn); virtual void on_signal(int signo); private: + virtual int ingest_streams(); virtual void close_listeners(); virtual int accept_client(SrsListenerType type, st_netfd_t client_stfd); public: