From 9648d655823ed0806b57b8134133dc5f603e3199 Mon Sep 17 00:00:00 2001 From: chenhaibo Date: Thu, 24 Jun 2021 15:55:02 +0800 Subject: [PATCH] fix bug: last segment of ts not trigger 'on_hls', because of 'on_unpublish' earlier than 'segment_close' --- trunk/src/app/srs_app_hls.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp index e035b67af9..1440450643 100644 --- a/trunk/src/app/srs_app_hls.cpp +++ b/trunk/src/app/srs_app_hls.cpp @@ -923,10 +923,6 @@ srs_error_t SrsHlsController::on_unpublish() { srs_error_t err = srs_success; - if ((err = muxer->on_unpublish()) != srs_success) { - return srs_error_wrap(err, "muxer unpublish"); - } - if ((err = muxer->flush_audio(tsmc)) != srs_success) { return srs_error_wrap(err, "hls: flush audio"); } @@ -934,6 +930,10 @@ srs_error_t SrsHlsController::on_unpublish() if ((err = muxer->segment_close()) != srs_success) { return srs_error_wrap(err, "hls: segment close"); } + + if ((err = muxer->on_unpublish()) != srs_success) { + return srs_error_wrap(err, "muxer unpublish"); + } return err; }