Merge branch 'develop' into merge/develop

trunk/AUTHORS.md

@@ -112,3 +112,7 @@ CONTRIBUTORS ordered by first contribution.
 * `long<liyalong12345@126.com>`
 * `matthew1838<77285055+matthew1838@users.noreply.github.com>`
 * `rise<rise.worlds@outlook.com>`
+* `pyw<PYW1@users.noreply.github.com>`
+* `MatheusMacabu<macabu@users.noreply.github.com>`
+* `Alex.CR<xiaoq_bj@126.com>`
+

trunk/src/app/srs_app_dvr.cpp

@@ -598,8 +598,12 @@ srs_error_t SrsDvrPlan::initialize(SrsOriginHub* h, SrsDvrSegmenter* s, SrsReque
     return err;
 }
 
-srs_error_t SrsDvrPlan::on_publish()
+srs_error_t SrsDvrPlan::on_publish(SrsRequest* r)
 {
+    // @see https://github.com/ossrs/srs/issues/1613#issuecomment-960623359
+    srs_freep(req);
+    req = r->copy();
+
     return srs_success;
 }
 
@@ -687,11 +691,11 @@ SrsDvrSessionPlan::~SrsDvrSessionPlan()
 {
 }
 
-srs_error_t SrsDvrSessionPlan::on_publish()
+srs_error_t SrsDvrSessionPlan::on_publish(SrsRequest* r)
 {
     srs_error_t err = srs_success;
 
-    if ((err = SrsDvrPlan::on_publish()) != srs_success) {
+    if ((err = SrsDvrPlan::on_publish(r)) != srs_success) {
         return err;
     }
     
@@ -762,11 +766,11 @@ srs_error_t SrsDvrSegmentPlan::initialize(SrsOriginHub* h, SrsDvrSegmenter* s, S
     return srs_success;
 }
 
-srs_error_t SrsDvrSegmentPlan::on_publish()
+srs_error_t SrsDvrSegmentPlan::on_publish(SrsRequest* r)
 {
     srs_error_t err = srs_success;
 
-    if ((err = SrsDvrPlan::on_publish()) != srs_success) {
+    if ((err = SrsDvrPlan::on_publish(r)) != srs_success) {
         return err;
     }
     
@@ -913,13 +917,14 @@ SrsDvr::~SrsDvr()
     _srs_config->unsubscribe(this);
     
     srs_freep(plan);
+    srs_freep(req);
 }
 
 srs_error_t SrsDvr::initialize(SrsOriginHub* h, SrsRequest* r)
 {
     srs_error_t err = srs_success;
     
-    req = r;
+    req = r->copy();
     hub = h;
     
     SrsConfDirective* conf = _srs_config->get_dvr_apply(r->vhost);
@@ -945,7 +950,7 @@ srs_error_t SrsDvr::initialize(SrsOriginHub* h, SrsRequest* r)
     return err;
 }
 
-srs_error_t SrsDvr::on_publish()
+srs_error_t SrsDvr::on_publish(SrsRequest* r)
 {
     srs_error_t err = srs_success;
     
@@ -954,10 +959,13 @@ srs_error_t SrsDvr::on_publish()
         return err;
     }
     
-    if ((err = plan->on_publish()) != srs_success) {
+    if ((err = plan->on_publish(r)) != srs_success) {
         return srs_error_wrap(err, "publish");
     }
 
+    srs_freep(req);
+    req = r->copy();
+    
     return err;
 }
 

trunk/src/app/srs_app_dvr.hpp

@@ -167,7 +167,7 @@ public:
     virtual ~SrsDvrPlan();
 public:
     virtual srs_error_t initialize(SrsOriginHub* h, SrsDvrSegmenter* s, SrsRequest* r);
-    virtual srs_error_t on_publish();
+    virtual srs_error_t on_publish(SrsRequest* r);
     virtual void on_unpublish();
     virtual srs_error_t on_meta_data(SrsSharedPtrMessage* shared_metadata);
     virtual srs_error_t on_audio(SrsSharedPtrMessage* shared_audio, SrsFormat* format);
@@ -187,7 +187,7 @@ public:
     SrsDvrSessionPlan();
     virtual ~SrsDvrSessionPlan();
 public:
-    virtual srs_error_t on_publish();
+    virtual srs_error_t on_publish(SrsRequest* r);
     virtual void on_unpublish();
 };
 
@@ -203,7 +203,7 @@ public:
     virtual ~SrsDvrSegmentPlan();
 public:
     virtual srs_error_t initialize(SrsOriginHub* h, SrsDvrSegmenter* s, SrsRequest* r);
-    virtual srs_error_t on_publish();
+    virtual srs_error_t on_publish(SrsRequest* r);
     virtual void on_unpublish();
     virtual srs_error_t on_audio(SrsSharedPtrMessage* shared_audio, SrsFormat* format);
     virtual srs_error_t on_video(SrsSharedPtrMessage* shared_video, SrsFormat* format);
@@ -237,7 +237,7 @@ public:
     // publish stream event,
     // when encoder start to publish RTMP stream.
     // @param fetch_sequence_header whether fetch sequence from source.
-    virtual srs_error_t on_publish();
+    virtual srs_error_t on_publish(SrsRequest* r);
     // the unpublish event.,
     // when encoder stop(unpublish) to publish RTMP stream.
     virtual void on_unpublish();

trunk/src/app/srs_app_source.cpp

@@ -1138,7 +1138,8 @@ srs_error_t SrsOriginHub::on_publish()
         return srs_error_wrap(err, "dash publish");
     }
     
-    if ((err = dvr->on_publish()) != srs_success) {
+    // @see https://github.com/ossrs/srs/issues/1613#issuecomment-961657927
+    if ((err = dvr->on_publish(req)) != srs_success) {
         return srs_error_wrap(err, "dvr publish");
     }
     
@@ -1401,7 +1402,7 @@ srs_error_t SrsOriginHub::on_reload_vhost_dvr(string vhost)
     }
     
     // start to publish by new plan.
-    if ((err = dvr->on_publish()) != srs_success) {
+    if ((err = dvr->on_publish(req)) != srs_success) {
         return srs_error_wrap(err, "dvr publish failed");
     }