implements the ingest framework

trunk/conf/full.conf

@@ -97,7 +97,8 @@ vhost ingest.srs.com {
         # whether enable ingest features
         # default: off
         enable      on;
-        # input file/stream/device, can be multiple input.
+        # input file/stream/device
+        # @remark only support one input.
         input {
             # the type of input.
             # can be file/stream/device, that is,

trunk/src/app/srs_app_config.cpp

@@ -1645,6 +1645,17 @@ string SrsConfig::get_ingest_ffmpeg(SrsConfDirective* ingest)
     return conf->arg0();
 }
 
+string SrsConfig::get_ingest_input(SrsConfDirective* ingest)
+{
+    SrsConfDirective* conf = ingest->get("input");
+    
+    if (!conf) {
+        return "";
+    }
+    
+    return conf->arg0();
+}
+
 string SrsConfig::get_srs_log_file()
 {
     srs_assert(root);

trunk/src/app/srs_app_config.hpp

@@ -190,6 +190,7 @@ public:
     virtual void                get_ingesters(std::string vhost, std::vector<SrsConfDirective*>& ingeters);
     virtual bool                get_ingest_enabled(SrsConfDirective* ingest);
     virtual std::string         get_ingest_ffmpeg(SrsConfDirective* ingest);
+    virtual std::string         get_ingest_input(SrsConfDirective* ingest);
 // log section
 public:
     virtual bool                get_srs_log_tank_file();

trunk/src/app/srs_app_ingest.cpp

@@ -49,15 +49,10 @@ int SrsIngester::start()
 {
     int ret = ERROR_SUCCESS;
     
-    // parse ingesters
-    std::vector<SrsConfDirective*> vhosts;
-    _srs_config->get_vhosts(vhosts);
-    
-    for (int i = 0; i < (int)vhosts.size(); i++) {
-        SrsConfDirective* vhost = vhosts[i];
-        if ((ret = parse_ingesters(vhost)) != ERROR_SUCCESS) {
-            return ret;
-        }
+    if ((ret = parse()) != ERROR_SUCCESS) {
+        clear_engines();
+        ret = ERROR_SUCCESS;
+        return ret;
     }
     
     return ret;
@@ -77,34 +72,55 @@ int SrsIngester::parse_ingesters(SrsConfDirective* vhost)
             continue;
         }
         
-        std::string ffmpeg_bin = _srs_config->get_ingest_ffmpeg(ingest);
-        if (ffmpeg_bin.empty()) {
-            srs_trace("ignore the empty ffmpeg ingest: %s", ingest->arg0().c_str());
-            continue;
+        if ((ret = parse_engines(vhost, ingest)) != ERROR_SUCCESS) {
+            return ret;
         }
+    }
     
-        // get all engines.
-        std::vector<SrsConfDirective*> engines;
-        _srs_config->get_transcode_engines(ingest, engines);
-        if (engines.empty()) {
-            srs_trace("ignore the empty transcode engine: %s", ingest->arg0().c_str());
-            continue;
-        }
+    return ret;
+}
+
+int SrsIngester::parse_engines(SrsConfDirective* vhost, SrsConfDirective* ingest)
+{
+    int ret = ERROR_SUCCESS;
+        
+    std::string ffmpeg_bin = _srs_config->get_ingest_ffmpeg(ingest);
+    if (ffmpeg_bin.empty()) {
+        ret = ERROR_ENCODER_PARSE;
+        srs_trace("empty ffmpeg ret=%d", ret);
+        return ret;
+    }
     
-        // create engine
-        for (int i = 0; i < (int)engines.size(); i++) {
-            SrsConfDirective* engine = engines[i];
-            SrsFFMPEG* ffmpeg = new SrsFFMPEG(ffmpeg_bin);
-            if ((ret = initialize_ffmpeg(ffmpeg, ingest, engine)) != ERROR_SUCCESS) {
-                srs_freep(ffmpeg);
-                if (ret != ERROR_ENCODER_LOOP) {
-                    srs_error("invalid ingest engine: %s %s", ingest->arg0().c_str(), engine->arg0().c_str());
-                }
-                return ret;
+    // get all engines.
+    std::vector<SrsConfDirective*> engines;
+    _srs_config->get_transcode_engines(ingest, engines);
+    if (engines.empty()) {
+        SrsFFMPEG* ffmpeg = new SrsFFMPEG(ffmpeg_bin);
+        if ((ret = initialize_ffmpeg(ffmpeg, ingest, NULL)) != ERROR_SUCCESS) {
+            srs_freep(ffmpeg);
+            if (ret != ERROR_ENCODER_LOOP) {
+                srs_error("invalid ingest engine. ret=%d", ret);
             }
-    
-            ffmpegs.push_back(ffmpeg);
+            return ret;
+        }
+
+        ffmpegs.push_back(ffmpeg);
+        return ret;
+    }
+
+    // create engine
+    for (int i = 0; i < (int)engines.size(); i++) {
+        SrsConfDirective* engine = engines[i];
+        SrsFFMPEG* ffmpeg = new SrsFFMPEG(ffmpeg_bin);
+        if ((ret = initialize_ffmpeg(ffmpeg, ingest, engine)) != ERROR_SUCCESS) {
+            srs_freep(ffmpeg);
+            if (ret != ERROR_ENCODER_LOOP) {
+                srs_error("invalid ingest engine: %s %s", ingest->arg0().c_str(), engine->arg0().c_str());
+            }
+            return ret;
         }
+
+        ffmpegs.push_back(ffmpeg);
     }
     
     return ret;
@@ -136,11 +152,36 @@ void SrsIngester::clear_engines()
     ffmpegs.clear();
 }
 
+int SrsIngester::parse()
+{
+    int ret = ERROR_SUCCESS;
+    
+    // parse ingesters
+    std::vector<SrsConfDirective*> vhosts;
+    _srs_config->get_vhosts(vhosts);
+    
+    for (int i = 0; i < (int)vhosts.size(); i++) {
+        SrsConfDirective* vhost = vhosts[i];
+        if ((ret = parse_ingesters(vhost)) != ERROR_SUCCESS) {
+            return ret;
+        }
+    }
+    
+    return ret;
+}
+
 int SrsIngester::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* ingest, SrsConfDirective* engine)
 {
     int ret = ERROR_SUCCESS;
     
-    if (!_srs_config->get_engine_enabled(engine)) {
+    std::string input = _srs_config->get_ingest_input(ingest);
+    if (input.empty()) {
+        ret = ERROR_ENCODER_NO_INPUT;
+        srs_trace("empty ingest intput. ret=%d", ret);
+        return ret;
+    }
+    
+    if (!engine || !_srs_config->get_engine_enabled(engine)) {
     }
     
     return ret;

trunk/src/app/srs_app_ingest.hpp

@@ -61,7 +61,9 @@ public:
     virtual void on_thread_stop();
 private:
     virtual void clear_engines();
+    virtual int parse();
     virtual int parse_ingesters(SrsConfDirective* vhost);
+    virtual int parse_engines(SrsConfDirective* vhost, SrsConfDirective* ingest);
     virtual int initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* ingest, SrsConfDirective* engine);
 };
 

trunk/src/kernel/srs_kernel_error.hpp

@@ -153,6 +153,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define ERROR_ENCODER_LOOP                  714
 #define ERROR_ENCODER_OPEN                  715
 #define ERROR_ENCODER_DUP2                  716
+#define ERROR_ENCODER_PARSE                 717
+#define ERROR_ENCODER_NO_INPUT              718
 
 #define ERROR_HTTP_PARSE_URI                800
 #define ERROR_HTTP_DATA_INVLIAD             801