增加预防HLS隐藏式切流的逻辑

CHKZL · Dec 2, 2024 · 878ac4c · 878ac4c
1 parent 60d15bb
commit 878ac4c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/Core/LiveChat/LiveChatListener.cs b/Core/LiveChat/LiveChatListener.cs
@@ -471,6 +471,7 @@ private void _parse(string jsonBody)
             }
             catch (Exception) { return; }
             string cmd = (string)obj["cmd"];
+            //Log.Info("test",$"收到cmd：{cmd}");
             switch (cmd)
             {
 

diff --git a/Core/RuntimeObject/Download/HLS.cs b/Core/RuntimeObject/Download/HLS.cs
@@ -124,13 +124,31 @@ await Task.Run(() =>
                                 {
                                     downloadSizeForThisCycle += WriteToFile(fs, $"{hostClass.host}{hostClass.base_url}{hostClass.eXTM3U.Map_URI}?{hostClass.extra}");
                                 }
-                                foreach (var item in hostClass.eXTM3U.eXTINFs)
+                                if (currentLocation != 0)
                                 {
-                                    if (long.TryParse(item.FileName, out long index) && index > currentLocation)
+                                    //用于处理流悄悄切了，但是没有发现的情况
+                                    bool FileNameTimeout = hostClass.eXTM3U.eXTINFs.All(extinf =>
+                                    {
+                                        if (long.TryParse(extinf.FileName, out long value))
+                                        {
+                                            return value != currentLocation;
+                                        }
+                                        return false; 
+                                    });
+                                    if (FileNameTimeout)
+                                    {
+                                        //如果本次HLS获取到的内容前后都包含上一秒的切片，视为换了全新的切片队列
+                                        hlsState = DlwnloadTaskState.AnchorReStream;
+                                        return;
+                                    }
+                                }
+                                foreach (var item in hostClass.eXTM3U.eXTINFs)
+                                {                               
+                                    if (long.TryParse(item.FileName, out long index) && (index == currentLocation + 1 || currentLocation == 0))
                                     {
                                         downloadSizeForThisCycle += WriteToFile(fs, $"{hostClass.host}{hostClass.base_url}{item.FileName}.{item.ExtensionName}?{hostClass.extra}");
                                         currentLocation = index;
-                                    }
+                                    }        
                                 }
                                 hostClass.eXTM3U.eXTINFs = new();
                                 values.Add((downloadSizeForThisCycle, DateTime.Now));