Files changed (1) hide show
  1. app.py +20 -4
app.py CHANGED
@@ -77,7 +77,7 @@ STALL_TIMEOUT = int(os.environ.get("STALL_TIMEOUT", "20")) # sekunde
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") # bitrate ya video wakati wa re-encode (inatosha kwa 360p)
81
 
82
  # ── MPYA: channel 24/7 (jaynestv) zikigawanywa kati ya Space kadhaa ──
83
  # Kila Space inayoshiriki (jumannendange-iphone-stream, ...1, jaynestv-
@@ -198,11 +198,18 @@ def slugify(name: str) -> str:
198
 
199
 
200
  def input_args(key: str) -> list:
201
- a = ["-protocol_whitelist", "http,https,tcp,tls,crypto", "-user_agent", UA,
 
 
 
 
 
 
202
  "-analyzeduration", "1500000", "-probesize", "1000000",
203
  "-reconnect", "1", "-reconnect_streamed", "1", "-reconnect_at_eof", "1",
204
  "-reconnect_on_network_error", "1", "-reconnect_on_http_error", "4xx,5xx",
205
- "-reconnect_delay_max", "10", "-rw_timeout", "15000000"]
 
206
  if key:
207
  a += [key_option(), key]
208
  return a
@@ -338,7 +345,7 @@ def spawn_ffmpeg(sid: str, mpd: str, key: str, plan, slug: str, reencode: bool =
338
  os.makedirs(d, exist_ok=True)
339
  logp = os.path.join(d, "ffmpeg.log")
340
  master = f"{slug}.m3u8"
341
- cmd = ["ffmpeg", "-hide_banner", "-loglevel", os.environ.get("FFMPEG_LOGLEVEL", "info"),
342
  "-nostdin", "-fflags", "+genpts+discardcorrupt", *input_args(key), "-i", mpd]
343
  seg = lambda v: os.path.join(d, v, "seg_%05d.ts")
344
  if plan:
@@ -389,6 +396,15 @@ def spawn_ffmpeg(sid: str, mpd: str, key: str, plan, slug: str, reencode: bool =
389
  # na 360p badala ya kurithi bitrate kubwa ya chanzo bila sababu.
390
  vcodec_args = [
391
  "-vf", f"scale=-2:{TARGET_HEIGHT}:flags=fast_bilinear",
 
 
 
 
 
 
 
 
 
392
  "-c:v", "libx264", "-preset", "veryfast", "-tune", "zerolatency",
393
  "-profile:v", "main", "-pix_fmt", "yuv420p",
394
  "-b:v", VIDEO_BITRATE, "-maxrate", VIDEO_BITRATE, "-bufsize", _double_rate(VIDEO_BITRATE),
 
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
 
82
  # ── MPYA: channel 24/7 (jaynestv) zikigawanywa kati ya Space kadhaa ──
83
  # Kila Space inayoshiriki (jumannendange-iphone-stream, ...1, jaynestv-
 
198
 
199
 
200
  def input_args(key: str) -> list:
201
+ a = ["-thread_queue_size", "4096", # v2: akiba kubwa zaidi ya packet queue —
202
+ # inazuia 'kuganda' fupi kila ffmpeg
203
+ # inapofungua segment mpya kutoka CDN
204
+ # (tulithibitisha hili kwa Azam One/Crown TV
205
+ # kwa kuangalia 'dup=' burst zinazoambatana
206
+ # na mistari ya '[dash] Opening ... for reading')
207
+ "-protocol_whitelist", "http,https,tcp,tls,crypto", "-user_agent", UA,
208
  "-analyzeduration", "1500000", "-probesize", "1000000",
209
  "-reconnect", "1", "-reconnect_streamed", "1", "-reconnect_at_eof", "1",
210
  "-reconnect_on_network_error", "1", "-reconnect_on_http_error", "4xx,5xx",
211
+ "-reconnect_delay_max", "10", "-rw_timeout", "15000000",
212
+ "-multiple_requests", "1"] # tumia muunganisho ule ule (HTTP keep-alive) badala ya TCP/TLS handshake mpya kila segment mpya
213
  if key:
214
  a += [key_option(), key]
215
  return a
 
345
  os.makedirs(d, exist_ok=True)
346
  logp = os.path.join(d, "ffmpeg.log")
347
  master = f"{slug}.m3u8"
348
+ cmd = ["ffmpeg", "-hide_banner", "-loglevel", os.environ.get("FFMPEG_LOGLEVEL", "info").strip(),
349
  "-nostdin", "-fflags", "+genpts+discardcorrupt", *input_args(key), "-i", mpd]
350
  seg = lambda v: os.path.join(d, v, "seg_%05d.ts")
351
  if plan:
 
396
  # na 360p badala ya kurithi bitrate kubwa ya chanzo bila sababu.
397
  vcodec_args = [
398
  "-vf", f"scale=-2:{TARGET_HEIGHT}:flags=fast_bilinear",
399
+ # v2.1: VFR badala ya CFR ya default — Azam/Crown TV (na huenda
400
+ # vyanzo vingine) vinatuma frame kwa kasi ya chini ya ile
401
+ # 'inayodhaniwa', hivyo CFR ililazimisha ffmpeg kuRudia (dup=)
402
+ # karibu 50-70% ya frame kila mara ili 'kujaza pengo' — hilo
403
+ # ndilo lililoonekana kama 'kuganda'. VFR inatuma frame kama
404
+ # zinavyofika kweli; segment bado zinakatwa sahihi kila
405
+ # HLS_TIME (force_key_frames inategemea muda wa saa, si idadi
406
+ # ya frame), hivyo GOP alignment haiathiriki.
407
+ "-fps_mode", "vfr",
408
  "-c:v", "libx264", "-preset", "veryfast", "-tune", "zerolatency",
409
  "-profile:v", "main", "-pix_fmt", "yuv420p",
410
  "-b:v", VIDEO_BITRATE, "-maxrate", VIDEO_BITRATE, "-bufsize", _double_rate(VIDEO_BITRATE),