JAYNESTV commited on
Commit
7ceb8d6
Β·
verified Β·
1 Parent(s): 8a254d2

Upload app.py

Browse files
Files changed (1) hide show
  1. app.py +41 -4
app.py CHANGED
@@ -67,8 +67,13 @@ MAX_AUDIO = int(os.environ.get("MAX_AUDIO", "2")) # sauti/lugha tofauti
67
 
68
  # ── MPYA: udhibiti wa segment handling (ndiyo chanzo cha kuganda/stutter) ──
69
  HLS_TIME = int(os.environ.get("HLS_TIME", "4")) # muda wa kila segment (sekunde)
70
- HLS_LIST_SIZE = int(os.environ.get("HLS_LIST_SIZE", "8")) # segments ngapi kwenye playlist (dirisha) β€” 8Γ—4s=32s nyuma ya live, badala ya 20Γ—4s=80s
71
  HLS_DELETE_THRESHOLD = int(os.environ.get("HLS_DELETE_THRESHOLD", "5")) # segments za ziada kabla ya kufutwa
 
 
 
 
 
72
  STALL_TIMEOUT = int(os.environ.get("STALL_TIMEOUT", "20")) # sekunde bila segment mpya -> restart
73
  # v2: default sasa ni TRUE β€” "professional, live kweli" inahitaji GOP
74
  # iliyopangwa daima; copy haiaminiki kwa vyanzo vingi vya Afrika Mashariki
@@ -559,7 +564,7 @@ def wait_ready(sid: str) -> None:
559
  # Tayari mara segment ya kwanza ya video ipo (sio kusubiri kila track)
560
  try:
561
  with open(os.path.join(s["dir"], s["variants"][0], "index.m3u8")) as f:
562
- return f.read().count(".ts") >= 1
563
  except FileNotFoundError:
564
  return False
565
 
@@ -769,6 +774,29 @@ async def bridge_stop(sid: str):
769
  return cors(JSONResponse({"ok": True}))
770
 
771
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
772
  HLS_PATH_RE = re.compile(r"[A-Za-z0-9_-]{1,40}\.m3u8|[A-Za-z0-9_-]{1,30}/(?:index\.m3u8|seg_\d{5}\.ts)")
773
 
774
 
@@ -784,8 +812,17 @@ async def hls_file(sid: str, path: str):
784
  return err(404, "Haipatikani")
785
  if path.endswith(".m3u8"):
786
  # no-store: mteja lazima aombe upya kila mara, kamwe asicache playlist
787
- r = FileResponse(full, media_type="application/vnd.apple.mpegurl",
788
- headers={"Cache-Control": "no-store", "Accept-Ranges": "bytes"})
 
 
 
 
 
 
 
 
 
789
  else:
790
  # MPYA: segments ni immutable mara zinapotengenezwa (jina la faili
791
  # halirudiwi) β€” cache ndefu zaidi inapunguza maombi ya mara kwa mara
 
67
 
68
  # ── MPYA: udhibiti wa segment handling (ndiyo chanzo cha kuganda/stutter) ──
69
  HLS_TIME = int(os.environ.get("HLS_TIME", "4")) # muda wa kila segment (sekunde)
70
+ HLS_LIST_SIZE = int(os.environ.get("HLS_LIST_SIZE", "12")) # segments ngapi kwenye playlist (dirisha) β€” 8Γ—4s=32s nyuma ya live, badala ya 20Γ—4s=80s
71
  HLS_DELETE_THRESHOLD = int(os.environ.get("HLS_DELETE_THRESHOLD", "5")) # segments za ziada kabla ya kufutwa
72
+ # v2.5: HOLDBACK = segments za mwisho zinazofichwa kwa mchezaji. Playlist
73
+ # inayotolewa kwa mteja inakatwa mkia; mchezaji anakuwa na HOLDBACK*HLS_TIME
74
+ # sekunde za akiba iliyo tayari kwenye diski (kama buffer ya Shaka). Stall ya
75
+ # ffmpeg/chanzo isiyozidi muda huo haionekani. Gharama: live inachelewa vivyo hivyo.
76
+ HLS_HOLDBACK = int(os.environ.get("HLS_HOLDBACK", "3"))
77
  STALL_TIMEOUT = int(os.environ.get("STALL_TIMEOUT", "20")) # sekunde bila segment mpya -> restart
78
  # v2: default sasa ni TRUE β€” "professional, live kweli" inahitaji GOP
79
  # iliyopangwa daima; copy haiaminiki kwa vyanzo vingi vya Afrika Mashariki
 
564
  # Tayari mara segment ya kwanza ya video ipo (sio kusubiri kila track)
565
  try:
566
  with open(os.path.join(s["dir"], s["variants"][0], "index.m3u8")) as f:
567
+ return f.read().count(".ts") >= HLS_HOLDBACK + 2
568
  except FileNotFoundError:
569
  return False
570
 
 
774
  return cors(JSONResponse({"ok": True}))
775
 
776
 
777
+ def holdback_playlist(text: str, hold: int) -> str:
778
+ """Kata `hold` segments za mwisho kwenye media playlist (acha angalau 1)."""
779
+ if hold <= 0:
780
+ return text
781
+ header, blocks, pending, started = [], [], [], False
782
+ for line in text.splitlines():
783
+ if not started:
784
+ if line.startswith(("#EXTINF", "#EXT-X-DISCONTINUITY")):
785
+ started = True
786
+ else:
787
+ header.append(line)
788
+ continue
789
+ pending.append(line)
790
+ if line and not line.startswith("#"):
791
+ blocks.append(pending)
792
+ pending = []
793
+ if not blocks:
794
+ return text
795
+ keep = blocks[:max(1, len(blocks) - hold)]
796
+ out = header + [l for b in keep for l in b]
797
+ return "\n".join(out) + "\n"
798
+
799
+
800
  HLS_PATH_RE = re.compile(r"[A-Za-z0-9_-]{1,40}\.m3u8|[A-Za-z0-9_-]{1,30}/(?:index\.m3u8|seg_\d{5}\.ts)")
801
 
802
 
 
812
  return err(404, "Haipatikani")
813
  if path.endswith(".m3u8"):
814
  # no-store: mteja lazima aombe upya kila mara, kamwe asicache playlist
815
+ hdr = {"Cache-Control": "no-store"}
816
+ if "/" in path: # media playlist (variant) -> weka holdback; master haibadilishwi
817
+ try:
818
+ with open(full, "r", errors="ignore") as f:
819
+ body = holdback_playlist(f.read(), HLS_HOLDBACK)
820
+ except FileNotFoundError:
821
+ return err(404, "Haipatikani")
822
+ r = Response(content=body, media_type="application/vnd.apple.mpegurl", headers=hdr)
823
+ else:
824
+ r = FileResponse(full, media_type="application/vnd.apple.mpegurl",
825
+ headers={**hdr, "Accept-Ranges": "bytes"})
826
  else:
827
  # MPYA: segments ni immutable mara zinapotengenezwa (jina la faili
828
  # halirudiwi) β€” cache ndefu zaidi inapunguza maombi ya mara kwa mara