Update app.py
Browse files
app.py
CHANGED
|
@@ -95,7 +95,7 @@ def start_stream(stream_key, stream_url):
|
|
| 95 |
"nice", "-n", "19", "ffmpeg", "-hide_banner", "-loglevel", "warning",
|
| 96 |
"-thread_queue_size", "4096",
|
| 97 |
"-user_agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
|
| 98 |
-
"-headers", "Referer: https://www.tiktok.com/
|
| 99 |
|
| 100 |
"-reconnect", "1",
|
| 101 |
"-reconnect_at_eof", "1",
|
|
@@ -108,7 +108,7 @@ def start_stream(stream_key, stream_url):
|
|
| 108 |
"-preset", "ultrafast",
|
| 109 |
"-b:v", "2500k", "-maxrate", "2500k", "-bufsize", "5000k",
|
| 110 |
"-pix_fmt", "yuv420p",
|
| 111 |
-
"-g", "60", "-r", "30",
|
| 112 |
|
| 113 |
"-c:a", "aac", "-b:a", "128k", "-ar", "44100",
|
| 114 |
"-af", "aresample=async=1000",
|
|
@@ -122,7 +122,7 @@ def start_stream(stream_key, stream_url):
|
|
| 122 |
return proc
|
| 123 |
|
| 124 |
# ------------------------------------------------------------
|
| 125 |
-
# YouTube API
|
| 126 |
# ------------------------------------------------------------
|
| 127 |
def build_youtube_client():
|
| 128 |
try:
|
|
@@ -169,14 +169,15 @@ def create_new_broadcast():
|
|
| 169 |
bid = new_broadcast["id"]
|
| 170 |
log(f"✅ بث جديد تم إنشاؤه للـ ID: {bid}")
|
| 171 |
|
| 172 |
-
# --- [
|
| 173 |
stream_insert = yt.liveStreams().insert(
|
| 174 |
part="snippet,cdn,contentDetails",
|
| 175 |
body={
|
| 176 |
"snippet": {"title": f"TikTok Stream Key {USER_TAG}"},
|
| 177 |
"cdn": {
|
| 178 |
"ingestionType": "rtmp",
|
| 179 |
-
"resolution": "variable"
|
|
|
|
| 180 |
},
|
| 181 |
"contentDetails": {"isReusable": True}
|
| 182 |
}
|
|
@@ -249,7 +250,6 @@ def monitor_loop():
|
|
| 249 |
if stream_url:
|
| 250 |
consecutive_fails = 0
|
| 251 |
if was_streaming and ffmpeg_proc and ffmpeg_proc.poll() is None:
|
| 252 |
-
# طباعة آخر أسطر لمعرفة حالة تدفق البيانات بشكل حي
|
| 253 |
try:
|
| 254 |
if os.path.exists(FFMPEG_LOG):
|
| 255 |
with open(FFMPEG_LOG, "r") as f:
|
|
@@ -261,17 +261,18 @@ def monitor_loop():
|
|
| 261 |
log("🔄 إعادة تشغيل ffmpeg بسبب توقفه الفجائي...")
|
| 262 |
ffmpeg_proc = start_stream(current_stream_key, stream_url)
|
| 263 |
else:
|
| 264 |
-
|
| 265 |
-
|
| 266 |
-
|
| 267 |
-
if not stream_key: stream_key = CUSTOM_STREAM_KEY
|
| 268 |
current_broadcast_id = bid
|
| 269 |
current_stream_key = stream_key
|
| 270 |
-
|
| 271 |
-
|
|
|
|
|
|
|
| 272 |
|
| 273 |
time.sleep(3)
|
| 274 |
-
if ffmpeg_proc.poll() is not None:
|
| 275 |
log("⚠️ تنبيه: انهار ffmpeg فوراً! تفاصيل الخطأ:")
|
| 276 |
try:
|
| 277 |
with open(FFMPEG_LOG, "r") as f: log(f.read()[-600:])
|
|
|
|
| 95 |
"nice", "-n", "19", "ffmpeg", "-hide_banner", "-loglevel", "warning",
|
| 96 |
"-thread_queue_size", "4096",
|
| 97 |
"-user_agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
|
| 98 |
+
"-headers", "Referer: https://www.tiktok.com/\r\n",
|
| 99 |
|
| 100 |
"-reconnect", "1",
|
| 101 |
"-reconnect_at_eof", "1",
|
|
|
|
| 108 |
"-preset", "ultrafast",
|
| 109 |
"-b:v", "2500k", "-maxrate", "2500k", "-bufsize", "5000k",
|
| 110 |
"-pix_fmt", "yuv420p",
|
| 111 |
+
"-g", "60", "-r", "30",
|
| 112 |
|
| 113 |
"-c:a", "aac", "-b:a", "128k", "-ar", "44100",
|
| 114 |
"-af", "aresample=async=1000",
|
|
|
|
| 122 |
return proc
|
| 123 |
|
| 124 |
# ------------------------------------------------------------
|
| 125 |
+
# YouTube API
|
| 126 |
# ------------------------------------------------------------
|
| 127 |
def build_youtube_client():
|
| 128 |
try:
|
|
|
|
| 169 |
bid = new_broadcast["id"]
|
| 170 |
log(f"✅ بث جديد تم إنشاؤه للـ ID: {bid}")
|
| 171 |
|
| 172 |
+
# --- [الإصلاح الجوهري هنا] ضبط الدقة والفريمات معاً ليكونوا ديناميكيين متوافقين ---
|
| 173 |
stream_insert = yt.liveStreams().insert(
|
| 174 |
part="snippet,cdn,contentDetails",
|
| 175 |
body={
|
| 176 |
"snippet": {"title": f"TikTok Stream Key {USER_TAG}"},
|
| 177 |
"cdn": {
|
| 178 |
"ingestionType": "rtmp",
|
| 179 |
+
"resolution": "variable",
|
| 180 |
+
"frameRate": "variable" # <--- تم الإصلاح ليتوافق مجبراً مع شروط يوتيوب الجديدة
|
| 181 |
},
|
| 182 |
"contentDetails": {"isReusable": True}
|
| 183 |
}
|
|
|
|
| 250 |
if stream_url:
|
| 251 |
consecutive_fails = 0
|
| 252 |
if was_streaming and ffmpeg_proc and ffmpeg_proc.poll() is None:
|
|
|
|
| 253 |
try:
|
| 254 |
if os.path.exists(FFMPEG_LOG):
|
| 255 |
with open(FFMPEG_LOG, "r") as f:
|
|
|
|
| 261 |
log("🔄 إعادة تشغيل ffmpeg بسبب توقفه الفجائي...")
|
| 262 |
ffmpeg_proc = start_stream(current_stream_key, stream_url)
|
| 263 |
else:
|
| 264 |
+
finalize_all_broadcasts()
|
| 265 |
+
stream_key, bid = create_new_broadcast()
|
| 266 |
+
if stream_key and bid:
|
|
|
|
| 267 |
current_broadcast_id = bid
|
| 268 |
current_stream_key = stream_key
|
| 269 |
+
ffmpeg_proc = start_stream(current_stream_key, stream_url)
|
| 270 |
+
was_streaming = True
|
| 271 |
+
else:
|
| 272 |
+
log("⚠️ تخطي دورة التشغيل الحالية بسبب فشل إعداد سيرفر البث في يوتيوب.")
|
| 273 |
|
| 274 |
time.sleep(3)
|
| 275 |
+
if ffmpeg_proc and ffmpeg_proc.poll() is not None:
|
| 276 |
log("⚠️ تنبيه: انهار ffmpeg فوراً! تفاصيل الخطأ:")
|
| 277 |
try:
|
| 278 |
with open(FFMPEG_LOG, "r") as f: log(f.read()[-600:])
|