JAYNESTV commited on
Commit
88fb11d
·
verified ·
1 Parent(s): b67ee1d

Upload app.py

Browse files
Files changed (1) hide show
  1. app.py +32 -4
app.py CHANGED
@@ -75,7 +75,15 @@ STALL_TIMEOUT = int(os.environ.get("STALL_TIMEOUT", "20")) # sekunde
75
  # (tulivyothibitisha na Azam One/Azam Sports). 360p inapunguza gharama ya
76
  # CPU ya re-encode kiasi cha kutosha kubeba session nyingi 24/7.
77
  FORCE_REENCODE = os.environ.get("FORCE_REENCODE", "true").lower() == "true"
78
- REENCODE_FPS = int(os.environ.get("REENCODE_FPS", "30")) # FPS inayodhaniwa kwa kukokotoa GOP
 
 
 
 
 
 
 
 
79
  TARGET_HEIGHT = int(os.environ.get("TARGET_HEIGHT", "360")) # v2: "360 quality kote" — kikomo cha juu kabisa, hata chanzo kikiwa 720p/1080p
80
  VIDEO_BITRATE = os.environ.get("VIDEO_BITRATE", "800k").strip() # bitrate ya video wakati wa re-encode (inatosha kwa 360p)
81
 
@@ -370,7 +378,8 @@ def spawn_ffmpeg(sid: str, mpd: str, key: str, plan, slug: str, reencode: bool =
370
  logp = os.path.join(d, "ffmpeg.log")
371
  master = f"{slug}.m3u8"
372
  cmd = ["ffmpeg", "-hide_banner", "-loglevel", os.environ.get("FFMPEG_LOGLEVEL", "info").strip(),
373
- "-nostdin", "-fflags", "+genpts+discardcorrupt", *input_args(key), "-i", mpd]
 
374
  seg = lambda v: os.path.join(d, v, "seg_%05d.ts")
375
  if plan:
376
  vs, au = plan["videos"], plan["audios"]
@@ -433,13 +442,24 @@ def spawn_ffmpeg(sid: str, mpd: str, key: str, plan, slug: str, reencode: bool =
433
  # inabaki ili kuzuia x264 kuongeza keyframe za ziada zisizo za lazima
434
  # kwenye scene-cut (ambazo zingeongeza bitrate bila sababu), bila
435
  # kuathiri usahihi wa "-force_key_frames" kwa segment boundaries.
 
 
 
 
 
 
 
 
 
 
 
436
  vcodec_args = [
437
  "-vf", f"scale=-2:{TARGET_HEIGHT}:flags=fast_bilinear",
438
- "-fps_mode", "vfr",
439
  "-c:v", "libx264", "-preset", "veryfast", "-tune", "zerolatency",
440
  "-profile:v", "main", "-pix_fmt", "yuv420p",
441
  "-b:v", VIDEO_BITRATE, "-maxrate", VIDEO_BITRATE, "-bufsize", _double_rate(VIDEO_BITRATE),
442
- "-sc_threshold", "0",
443
  "-force_key_frames", f"expr:gte(t,n_forced*{HLS_TIME})",
444
  ]
445
  else:
@@ -466,6 +486,14 @@ def spawn_ffmpeg(sid: str, mpd: str, key: str, plan, slug: str, reencode: bool =
466
  "master": master, "variants": variants, "ready": False}
467
 
468
 
 
 
 
 
 
 
 
 
469
  def stop_session(sid: str) -> None:
470
  with LOCK:
471
  s = SESSIONS.pop(sid, None)
 
75
  # (tulivyothibitisha na Azam One/Azam Sports). 360p inapunguza gharama ya
76
  # CPU ya re-encode kiasi cha kutosha kubeba session nyingi 24/7.
77
  FORCE_REENCODE = os.environ.get("FORCE_REENCODE", "true").lower() == "true"
78
+ REENCODE_FPS = int(os.environ.get("REENCODE_FPS", "25")) # v2.4: FPS ya output (CFR) kwa vyanzo visivyo kwenye FPS_MAP
79
+ # v2.4: fps ya output kwa kila chanzo (kwa host ya MPD). Ni CFR halisi, kwa hiyo
80
+ # mapengo ya chanzo yanajazwa na frame zilizorudiwa na segments zinabaki 4s kamili.
81
+ # Azam ~15-16fps halisi; Akamai/Fubo ~30. Badilisha kwa env FPS_MAP='{"azamtvltd":15}'.
82
+ try:
83
+ FPS_MAP = json.loads(os.environ.get("FPS_MAP", "")) if os.environ.get("FPS_MAP") else {"azamtvltd": 15, "akamaihd": 30}
84
+ except ValueError:
85
+ FPS_MAP = {"azamtvltd": 15, "akamaihd": 30}
86
+ LIVE_START_INDEX = os.environ.get("LIVE_START_INDEX", "-6") # v2.4: anza nyuma ya ukingo wa live => akiba ya kuziba stall za upakuaji
87
  TARGET_HEIGHT = int(os.environ.get("TARGET_HEIGHT", "360")) # v2: "360 quality kote" — kikomo cha juu kabisa, hata chanzo kikiwa 720p/1080p
88
  VIDEO_BITRATE = os.environ.get("VIDEO_BITRATE", "800k").strip() # bitrate ya video wakati wa re-encode (inatosha kwa 360p)
89
 
 
378
  logp = os.path.join(d, "ffmpeg.log")
379
  master = f"{slug}.m3u8"
380
  cmd = ["ffmpeg", "-hide_banner", "-loglevel", os.environ.get("FFMPEG_LOGLEVEL", "info").strip(),
381
+ "-nostdin", "-fflags", "+genpts+discardcorrupt", *input_args(key),
382
+ "-live_start_index", LIVE_START_INDEX, "-i", mpd]
383
  seg = lambda v: os.path.join(d, v, "seg_%05d.ts")
384
  if plan:
385
  vs, au = plan["videos"], plan["audios"]
 
442
  # inabaki ili kuzuia x264 kuongeza keyframe za ziada zisizo za lazima
443
  # kwenye scene-cut (ambazo zingeongeza bitrate bila sababu), bila
444
  # kuathiri usahihi wa "-force_key_frames" kwa segment boundaries.
445
+ # v2.4: CFR YENYE fps ya kudumu + GOP kwa frame-count + force_key_frames.
446
+ # Sababu: logi ilionyesha segments 7.68s + 0.32s. Chanzo kinapositisha
447
+ # frame kwa ~4s (kuchelewa kwa upakuaji), "vfr" inapitisha pengo kama
448
+ # lilivyo => keyframe inakuja marehemu => segment ndefu, kisha
449
+ # n_forced iliyobaki nyuma inalazimisha keyframe ya pili mara moja.
450
+ # Na CFR, ffmpeg INAJAZA pengo kwa frame zilizorudiwa, timestamps
451
+ # zinabaki mfululizo, na kila segment ni HLS_TIME kamili.
452
+ # fps inachaguliwa kwa host (pick_fps) karibu na kasi halisi ya chanzo,
453
+ # ili dup= iwe ndogo (Azam=15, si 30).
454
+ fps = pick_fps(mpd)
455
+ gop = fps * HLS_TIME
456
  vcodec_args = [
457
  "-vf", f"scale=-2:{TARGET_HEIGHT}:flags=fast_bilinear",
458
+ "-r", str(fps), "-fps_mode", "cfr",
459
  "-c:v", "libx264", "-preset", "veryfast", "-tune", "zerolatency",
460
  "-profile:v", "main", "-pix_fmt", "yuv420p",
461
  "-b:v", VIDEO_BITRATE, "-maxrate", VIDEO_BITRATE, "-bufsize", _double_rate(VIDEO_BITRATE),
462
+ "-g", str(gop), "-keyint_min", str(gop), "-sc_threshold", "0",
463
  "-force_key_frames", f"expr:gte(t,n_forced*{HLS_TIME})",
464
  ]
465
  else:
 
486
  "master": master, "variants": variants, "ready": False}
487
 
488
 
489
+ def pick_fps(mpd: str) -> int:
490
+ host = (urlparse(mpd).hostname or "").lower()
491
+ for needle, fps in FPS_MAP.items():
492
+ if needle in host:
493
+ return max(5, int(fps))
494
+ return max(5, REENCODE_FPS)
495
+
496
+
497
  def stop_session(sid: str) -> None:
498
  with LOCK:
499
  s = SESSIONS.pop(sid, None)