From e4262222f44be871d68e8c53861af21c593721c8 Mon Sep 17 00:00:00 2001
From: alexliyu7352 <liyu7352@gmail.com>
Date: Tue, 5 Apr 2022 19:49:22 +0800
Subject: [PATCH] =?UTF-8?q?hls=E6=8B=89=E6=B5=81=E6=97=B6=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E9=80=82=E5=BD=93=E9=87=8D=E8=AF=95=20=20(#1541)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* hls拉流时应该适当重试

hls拉取索引文件失败时, 不应该直接上报,而应该内部适当重试几次.
避免由于网络抖动造成的客户端播放不流畅.

* Update HlsPlayer.cpp
---
 src/Http/HlsPlayer.cpp | 17 ++++++++++++++++-
 src/Http/HlsPlayer.h   |  2 ++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/Http/HlsPlayer.cpp b/src/Http/HlsPlayer.cpp
index 42e0d9d7..352bd7f2 100644
--- a/src/Http/HlsPlayer.cpp
+++ b/src/Http/HlsPlayer.cpp
@@ -42,7 +42,22 @@ void HlsPlayer::teardown_l(const SockException &ex) {
         _play_result = true;
         onPlayResult(ex);
     } else {
-        onShutdown(ex);
+        //如果不是主动关闭的，则重新拉取索引文件
+        if (ex.getErrCode() != Err_shutdown) {
+            // 当切片列表已空, 且没有正在下载的切片并且重试次数已经达到最大次数时, 则认为失败关闭播放器
+            if (_ts_list.empty() && !(_http_ts_player && _http_ts_player->waitResponse())
+                && _try_fetch_index_times >= MAX_TRY_FETCH_INDEX_TIMES) {
+                onShutdown(ex);
+            } else {
+                _try_fetch_index_times += 1;
+                shutdown(ex);
+                WarnL << "重新尝试拉取索引文件[" << _try_fetch_index_times << "]:" << _play_url;
+                fetchIndexFile();
+                return;
+            }
+        } else {
+            onShutdown(ex);
+        }
     }
     _timer.reset();
     _timer_ts.reset();
diff --git a/src/Http/HlsPlayer.h b/src/Http/HlsPlayer.h
index 4ffb143c..75610dcb 100644
--- a/src/Http/HlsPlayer.h
+++ b/src/Http/HlsPlayer.h
@@ -19,6 +19,7 @@
 
 #define MIN_TIMEOUT_MULTIPLE 2
 #define MAX_TIMEOUT_MULTIPLE 5
+#define MAX_TRY_FETCH_INDEX_TIMES 5
 
 namespace mediakit {
 
@@ -105,6 +106,7 @@ private:
     std::set<std::string, UrlComp> _ts_url_cache;
     HttpTSPlayer::Ptr _http_ts_player;
     int _timeout_multiple = MIN_TIMEOUT_MULTIPLE;
+    int _try_fetch_index_times = 0;
 };
 
 class HlsPlayerImp : public PlayerImp<HlsPlayer, PlayerBase>, private TrackListener {