SRT: Merge develop, rename bridger to bridge.

trunk/src/app/srs_app_rtc_source.cpp

@@ -316,7 +316,7 @@ ISrsRtcSourceEventHandler::~ISrsRtcSourceEventHandler()
 {
 }
 
-ISrsRtcSourceBridger::ISrsRtcSourceBridger(SrsBridgeDestType type) : ISrsBridge(type)
+ISrsRtcSourceBridge::ISrsRtcSourceBridge(SrsBridgeDestType type) : ISrsBridge(type)
 {
 }
 
@@ -343,13 +343,14 @@ SrsRtcSource::~SrsRtcSource()
     // for all consumers are auto free.
     consumers.clear();
 
-    srs_freep(req);
-    for (vector<ISrsRtcSourceBridger*>::iterator iter = bridgers_.begin(); iter != bridgers_.end(); ++iter) {
-        ISrsRtcSourceBridger* bridge = *iter;
+    for (vector<ISrsRtcSourceBridge*>::iterator iter = bridges_.begin(); iter != bridges_.end(); ++iter) {
+        ISrsRtcSourceBridge* bridge = *iter;
         srs_freep(bridge);
     }
-    bridgers_.clear();
+    bridges_.clear();
+
     srs_freep(stream_desc_);
+    srs_freep(req);
 }
 
 srs_error_t SrsRtcSource::initialize(SrsRequest* r)
@@ -462,16 +463,16 @@ SrsContextId SrsRtcSource::pre_source_id()
 
 void SrsRtcSource::set_bridge(ISrsRtcSourceBridge *bridge)
 {
-    for (vector<ISrsRtcSourceBridger*>::iterator iter = bridgers_.begin(); iter != bridgers_.end(); ++iter) {
-        ISrsRtcSourceBridger* b = *iter;
-        if (b->get_type() == bridger->get_type()) {
+    for (vector<ISrsRtcSourceBridge*>::iterator iter = bridges_.begin(); iter != bridges_.end(); ++iter) {
+        ISrsRtcSourceBridge* b = *iter;
+        if (b->get_type() == bridge->get_type()) {
             srs_freep(b);
-            *iter = bridger;
+            *iter = bridge;
             return;
         }
     }
 
-    bridgers_.push_back(bridger);
+    bridges_.push_back(bridge);
 }
 
 srs_error_t SrsRtcSource::create_consumer(SrsRtcConsumer*& consumer)
@@ -544,11 +545,11 @@ srs_error_t SrsRtcSource::on_publish()
     }
 
     // If bridge to other source, handle event and start timer to request PLI.
-    if (! bridgers_.empty()) {
-        for (vector<ISrsRtcSourceBridger*>::iterator iter = bridgers_.begin(); iter != bridgers_.end(); ++iter) {
-            ISrsRtcSourceBridger* bridge = *iter;
+    if (! bridges_.empty()) {
+        for (vector<ISrsRtcSourceBridge*>::iterator iter = bridges_.begin(); iter != bridges_.end(); ++iter) {
+            ISrsRtcSourceBridge* bridge = *iter;
             if ((err = bridge->on_publish()) != srs_success) {
-                return srs_error_wrap(err, "bridger on publish");
+                return srs_error_wrap(err, "bridge on publish");
             }
         }
 
@@ -587,17 +588,17 @@ void SrsRtcSource::on_unpublish()
         h->on_unpublish();
     }
 
-    //free bridger resource
-    if (! bridgers_.empty()) {
+    //free bridge resource
+    if (! bridges_.empty()) {
         // For SrsRtcSource::on_timer()
         _srs_hybrid->timer100ms()->unsubscribe(this);
 
-        for (vector<ISrsRtcSourceBridger*>::iterator iter = bridgers_.begin(); iter != bridgers_.end(); ++iter) {
-            ISrsRtcSourceBridger* bridge = *iter;
+        for (vector<ISrsRtcSourceBridge*>::iterator iter = bridges_.begin(); iter != bridges_.end(); ++iter) {
+            ISrsRtcSourceBridge* bridge = *iter;
             bridge->on_unpublish();
             srs_freep(bridge);
         }
-        bridgers_.clear();
+        bridges_.clear();
     }
 
     SrsStatistic* stat = SrsStatistic::instance();
@@ -647,10 +648,10 @@ srs_error_t SrsRtcSource::on_rtp(SrsRtpPacket* pkt)
         }
     }
 
-    for (vector<ISrsRtcSourceBridger*>::iterator iter = bridgers_.begin(); iter != bridgers_.end(); ++iter) {
-        ISrsRtcSourceBridger* bridge = *iter;
+    for (vector<ISrsRtcSourceBridge*>::iterator iter = bridges_.begin(); iter != bridges_.end(); ++iter) {
+        ISrsRtcSourceBridge* bridge = *iter;
         if ((err = bridge->on_rtp(pkt)) != srs_success) {
-            return srs_error_wrap(err, "bridger consume message");
+            return srs_error_wrap(err, "bridge consume message");
         }
     }
 
@@ -724,8 +725,7 @@ srs_error_t SrsRtcSource::on_timer(srs_utime_t interval)
 }
 
 #ifdef SRS_FFMPEG_FIT
-SrsRtcFromRtmpBridger::SrsRtcFromRtmpBridger(SrsRtcSource* source) 
-    : ISrsLiveSourceBridger(SrsBridgeDestTypeRTC)
+SrsRtcFromRtmpBridge::SrsRtcFromRtmpBridge(SrsRtcSource* source) : ISrsLiveSourceBridge(SrsBridgeDestTypeRTC)
 {
     req = NULL;
     source_ = source;
@@ -1292,7 +1292,7 @@ srs_error_t SrsRtcFromRtmpBridge::consume_packets(vector<SrsRtpPacket*>& pkts)
     return err;
 }
 
-SrsRtmpFromRtcBridger::SrsRtmpFromRtcBridger(SrsLiveSource *src) : ISrsRtcSourceBridger(SrsBridgeDestTypeRtmp)
+SrsRtmpFromRtcBridge::SrsRtmpFromRtcBridge(SrsLiveSource *src) : ISrsRtcSourceBridge(SrsBridgeDestTypeRtmp)
 {
     source_ = src;
     codec_ = NULL;

trunk/src/app/srs_app_rtc_source.hpp

@@ -144,11 +144,11 @@ class ISrsRtcSourceEventHandler
 };
 
 // SrsRtcSource bridge to SrsLiveSource
-class ISrsRtcSourceBridger : public ISrsBridge
+class ISrsRtcSourceBridge : public ISrsBridge
 {
 public:
-    ISrsRtcSourceBridger(SrsBridgeDestType type);
-    virtual ~ISrsRtcSourceBridger();
+    ISrsRtcSourceBridge(SrsBridgeDestType type);
+    virtual ~ISrsRtcSourceBridge();
 public:
     virtual srs_error_t on_publish() = 0;
     virtual srs_error_t on_rtp(SrsRtpPacket *pkt) = 0;
@@ -170,8 +170,8 @@ class SrsRtcSource : public ISrsFastTimer
     ISrsRtcPublishStream* publish_stream_;
     // Steam description for this steam.
     SrsRtcSourceDescription* stream_desc_;
-    // The Source bridger, bridger stream to other source.
-    std::vector<ISrsRtcSourceBridger*> bridgers_;
+    // The Source bridge, bridge stream to other source.
+    std::vector<ISrsRtcSourceBridge*> bridges_;
 private:
     // To delivery stream to clients.
     std::vector<SrsRtcConsumer*> consumers;

trunk/src/app/srs_app_source.cpp

@@ -1923,7 +1923,7 @@ SrsBridgeDestType ISrsBridge::get_type() const
     return type_;
 }
 
-ISrsLiveSourceBridger::ISrsLiveSourceBridger(SrsBridgeDestType type) : ISrsBridge(type)
+ISrsLiveSourceBridge::ISrsLiveSourceBridge(SrsBridgeDestType type) : ISrsBridge(type)
 {
 }
 
@@ -1942,7 +1942,7 @@ SrsLiveSource::SrsLiveSource()
     die_at = 0;
 
     handler = NULL;
-    
+
     play_edge = new SrsPlayEdge();
     publish_edge = new SrsPublishEdge();
     gop_cache = new SrsGopCache();
@@ -1973,11 +1973,11 @@ SrsLiveSource::~SrsLiveSource()
     srs_freep(gop_cache);
 
     srs_freep(req);
-    for (vector<ISrsLiveSourceBridger*>::iterator iter = bridgers_.begin(); iter != bridgers_.end(); ++iter) {
-        ISrsLiveSourceBridger* bridge = *iter;
+    for (vector<ISrsLiveSourceBridge*>::iterator iter = bridges_.begin(); iter != bridges_.end(); ++iter) {
+        ISrsLiveSourceBridge* bridge = *iter;
         srs_freep(bridge);
     }
-    bridgers_.clear();
+    bridges_.clear();
 }
 
 void SrsLiveSource::dispose()
@@ -2055,16 +2055,16 @@ srs_error_t SrsLiveSource::initialize(SrsRequest* r, ISrsLiveSourceHandler* h)
 
 void SrsLiveSource::set_bridge(ISrsLiveSourceBridge* v)
 {
-    for (vector<ISrsLiveSourceBridger*>::iterator iter = bridgers_.begin(); iter != bridgers_.end(); ++iter) {
-        ISrsLiveSourceBridger* bridge = *iter;
+    for (vector<ISrsLiveSourceBridge*>::iterator iter = bridges_.begin(); iter != bridges_.end(); ++iter) {
+        ISrsLiveSourceBridge* bridge = *iter;
         if (v->get_type() == bridge->get_type()) {
             srs_freep(bridge);
             *iter = v;
             return;
         }
     }
 
-    bridgers_.push_back(v);
+    bridges_.push_back(v);
 }
 
 srs_error_t SrsLiveSource::on_reload_vhost_play(string vhost)
@@ -2316,11 +2316,11 @@ srs_error_t SrsLiveSource::on_audio_imp(SrsSharedPtrMessage* msg)
         return srs_error_wrap(err, "consume audio");
     }
 
-    // For bridger to consume the message.
-    for (vector<ISrsLiveSourceBridger*>::iterator iter = bridgers_.begin(); iter != bridgers_.end(); ++iter) {
-        ISrsLiveSourceBridger* bridge = *iter;
+    // For bridge to consume the message.
+    for (vector<ISrsLiveSourceBridge*>::iterator iter = bridges_.begin(); iter != bridges_.end(); ++iter) {
+        ISrsLiveSourceBridge* bridge = *iter;
         if ((err = bridge->on_audio(msg)) != srs_success) {
-            return srs_error_wrap(err, "bridger consume audio");
+            return srs_error_wrap(err, "bridge consume audio");
         }
     }
 
@@ -2449,11 +2449,11 @@ srs_error_t SrsLiveSource::on_video_imp(SrsSharedPtrMessage* msg)
         return srs_error_wrap(err, "hub consume video");
     }
 
-    // For bridger to consume the message.
-    for (vector<ISrsLiveSourceBridger*>::iterator iter = bridgers_.begin(); iter != bridgers_.end(); ++iter) {
-        ISrsLiveSourceBridger* bridge = *iter;
+    // For bridge to consume the message.
+    for (vector<ISrsLiveSourceBridge*>::iterator iter = bridges_.begin(); iter != bridges_.end(); ++iter) {
+        ISrsLiveSourceBridge* bridge = *iter;
         if ((err = bridge->on_video(msg)) != srs_success) {
-            return srs_error_wrap(err, "bridger consume video");
+            return srs_error_wrap(err, "bridge consume video");
         }
     }
 
@@ -2617,10 +2617,10 @@ srs_error_t SrsLiveSource::on_publish()
         return srs_error_wrap(err, "handle publish");
     }
 
-    for (vector<ISrsLiveSourceBridger*>::iterator iter = bridgers_.begin(); iter != bridgers_.end(); ++iter) {
-        ISrsLiveSourceBridger* bridge = *iter;
+    for (vector<ISrsLiveSourceBridge*>::iterator iter = bridges_.begin(); iter != bridges_.end(); ++iter) {
+        ISrsLiveSourceBridge* bridge = *iter;
         if ((err = bridge->on_publish()) != srs_success) {
-            return srs_error_wrap(err, "bridger publish");
+            return srs_error_wrap(err, "bridge publish");
         }
     }
 
@@ -2665,12 +2665,12 @@ void SrsLiveSource::on_unpublish()
 
     handler->on_unpublish(this, req);
 
-    for (vector<ISrsLiveSourceBridger*>::iterator iter = bridgers_.begin(); iter != bridgers_.end(); ++iter) {
-        ISrsLiveSourceBridger* bridge = *iter;
+    for (vector<ISrsLiveSourceBridge*>::iterator iter = bridges_.begin(); iter != bridges_.end(); ++iter) {
+        ISrsLiveSourceBridge* bridge = *iter;
         bridge->on_unpublish();
         srs_freep(bridge);
     }
-    bridgers_.clear();
+    bridges_.clear();
 
     // no consumer, stream is die.
     if (consumers.empty()) {

trunk/src/app/srs_app_source.hpp

@@ -486,11 +486,11 @@ class ISrsBridge {
 };
 
 // For RTMP2RTC, bridge SrsLiveSource to SrsRtcSource
-class ISrsLiveSourceBridger : public ISrsBridge
+class ISrsLiveSourceBridge : public ISrsBridge
 {
 public:
-    ISrsLiveSourceBridger(SrsBridgeDestType type);
-    virtual ~ISrsLiveSourceBridger();
+    ISrsLiveSourceBridge(SrsBridgeDestType type);
+    virtual ~ISrsLiveSourceBridge();
 public:
     virtual srs_error_t on_publish() = 0;
     virtual srs_error_t on_audio(SrsSharedPtrMessage* audio) = 0;
@@ -531,8 +531,8 @@ class SrsLiveSource : public ISrsReloadHandler
     int64_t last_packet_time;
     // The event handler.
     ISrsLiveSourceHandler* handler;
-    // The source bridger for other source.
-    std::vector<ISrsLiveSourceBridger*> bridgers_;
+    // The source bridge for other source.
+    std::vector<ISrsLiveSourceBridge*> bridges_;
     // The edge control service
     SrsPlayEdge* play_edge;
     SrsPublishEdge* publish_edge;

trunk/src/app/srs_app_srt_conn.cpp

@@ -333,13 +333,13 @@ srs_error_t SrsMpegtsSrtConn::acquire_publish()
             return srs_error_wrap(err, "create source");
         }
 
-        SrsRtmpFromSrtBridge *bridger = new SrsRtmpFromSrtBridge(live_source);
-        if ((err = bridger->initialize(req_)) != srs_success) {
-            srs_freep(bridger);
-            return srs_error_wrap(err, "create bridger");
+        SrsRtmpFromSrtBridge *bridge = new SrsRtmpFromSrtBridge(live_source);
+        if ((err = bridge->initialize(req_)) != srs_success) {
+            srs_freep(bridge);
+            return srs_error_wrap(err, "create bridge");
         }
 
-        srt_source_->set_bridger(bridger);
+        srt_source_->set_bridge(bridge);
     }
 
     if ((err = srt_source_->on_publish()) != srs_success) {

trunk/src/app/srs_app_srt_source.cpp

@@ -653,11 +653,11 @@ SrsSrtSource::~SrsSrtSource()
     // for all consumers are auto free.
     consumers.clear();
 
-    for (vector<ISrsSrtSourceBridge*>::iterator iter = bridgers_.begin(); iter != bridgers_.end(); ++iter) {
+    for (vector<ISrsSrtSourceBridge*>::iterator iter = bridges_.begin(); iter != bridges_.end(); ++iter) {
         ISrsSrtSourceBridge* bridge = *iter;
         srs_freep(bridge);
     }
-    bridgers_.clear();
+    bridges_.clear();
 }
 
 srs_error_t SrsSrtSource::initialize(SrsRequest* r)
@@ -707,18 +707,18 @@ void SrsSrtSource::update_auth(SrsRequest* r)
     req->update_auth(r);
 }
 
-void SrsSrtSource::set_bridger(ISrsSrtSourceBridge *bridger)
+void SrsSrtSource::set_bridge(ISrsSrtSourceBridge *bridge)
 {
-    for (vector<ISrsSrtSourceBridge*>::iterator iter = bridgers_.begin(); iter != bridgers_.end(); ++iter) {
+    for (vector<ISrsSrtSourceBridge*>::iterator iter = bridges_.begin(); iter != bridges_.end(); ++iter) {
         ISrsSrtSourceBridge* b = *iter;
-        if (b->get_type() == bridger->get_type()) {
+        if (b->get_type() == bridge->get_type()) {
             srs_freep(b);
-            *iter = bridger;
+            *iter = bridge;
             return;
         }
     }
 
-    bridgers_.push_back(bridger);
+    bridges_.push_back(bridge);
 }
 
 srs_error_t SrsSrtSource::create_consumer(SrsSrtConsumer*& consumer)
@@ -765,10 +765,10 @@ srs_error_t SrsSrtSource::on_publish()
         return srs_error_wrap(err, "source id change");
     }
 
-    for (vector<ISrsSrtSourceBridge*>::iterator iter = bridgers_.begin(); iter != bridgers_.end(); ++iter) {
+    for (vector<ISrsSrtSourceBridge*>::iterator iter = bridges_.begin(); iter != bridges_.end(); ++iter) {
         ISrsSrtSourceBridge* bridge = *iter;
         if ((err = bridge->on_publish()) != srs_success) {
-            return srs_error_wrap(err, "bridger on publish");
+            return srs_error_wrap(err, "bridge on publish");
         }
     }
 
@@ -787,12 +787,12 @@ void SrsSrtSource::on_unpublish()
 
     can_publish_ = true;
 
-    for (vector<ISrsSrtSourceBridge*>::iterator iter = bridgers_.begin(); iter != bridgers_.end(); ++iter) {
+    for (vector<ISrsSrtSourceBridge*>::iterator iter = bridges_.begin(); iter != bridges_.end(); ++iter) {
         ISrsSrtSourceBridge* bridge = *iter;
         bridge->on_unpublish();
         srs_freep(bridge);
     }
-    bridgers_.clear();
+    bridges_.clear();
 }
 
 srs_error_t SrsSrtSource::on_packet(SrsSrtPacket* packet)
@@ -806,10 +806,10 @@ srs_error_t SrsSrtSource::on_packet(SrsSrtPacket* packet)
         }
     }
 
-    for (vector<ISrsSrtSourceBridge*>::iterator iter = bridgers_.begin(); iter != bridgers_.end(); ++iter) {
+    for (vector<ISrsSrtSourceBridge*>::iterator iter = bridges_.begin(); iter != bridges_.end(); ++iter) {
         ISrsSrtSourceBridge* bridge = *iter;
         if ((err = bridge->on_packet(packet)) != srs_success) {
-            return srs_error_wrap(err, "bridger consume message");
+            return srs_error_wrap(err, "bridge consume message");
         }
     }