From 6436a1a404f27055724ec87ef04c1eb920dcddf1 Mon Sep 17 00:00:00 2001
From: Julian Rother <julianr@fsmpi.rwth-aachen.de>
Date: Mon, 12 Nov 2018 00:32:07 +0100
Subject: [PATCH] Revert "complex_live_transcode: Temporarily disabled 1080p
profile"
This reverts commit 3305fd669b0f21ecc58b1c3cf03ae29e6a1896aa.
---
complex_live_transcode.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/complex_live_transcode.c b/complex_live_transcode.c
index 2d72018..00c8d30 100644
--- a/complex_live_transcode.c
+++ b/complex_live_transcode.c
@@ -49,10 +49,10 @@ int main(int argc, char *argv[])
"-f", src1fmt, "-i", jstr(jlookup(src1, "url"), "smptehdbars,scale=1920:1080[out0]; anullsrc[out1]"),
"-f", src2fmt, "-i", jstr(jlookup(src2, "url"), "smptehdbars,scale=1920:1080[out0]; anullsrc[out1]"),
"-filter_complex",
- mprintf("[0:a]%s[a1]; [1:a]%s[a2]; [a1][a2]amix,%s,asplit=2[lowa][mida];"
+ mprintf("[0:a]%s[a1]; [1:a]%s[a2]; [a1][a2]amix,%s,asplit=3[lowa][mida][higha];"
"[0:v]%s[v1]; [1:v]%s[v2]; [v1][v2]%s,scale=1920:1080[tmp];"
"movie=%s/video-logo-150px-trans.png,scale=w=100:h=100[logo];"
- "[tmp][logo]%s,split=2[lowtmp][midtmp];"
+ "[tmp][logo]%s,split=3[lowtmp][midtmp][high];"
"[lowtmp]scale=640:360[low];"
"[midtmp]scale=1280:720[mid]",
jstr(jlookup(src1, "afilter"), "anull"),
@@ -64,7 +64,8 @@ int main(int argc, char *argv[])
getenv(WORKER_RAW), logo_expr
),
"-map", "[low]", "-map", "[lowa]", OUTPUT_FORMAT("512k"), mprintf("%s_low", dest),
- "-map", "[mid]", "-map", "[mida]", OUTPUT_FORMAT("2024k"), mprintf("%s_mid", dest), 0);
+ "-map", "[mid]", "-map", "[mida]", OUTPUT_FORMAT("2024k"), mprintf("%s_mid", dest),
+ "-map", "[high]", "-map", "[higha]", OUTPUT_FORMAT("6024k"), mprintf("%s_high", dest), 0);
exit(1);
}
close(errpipe[1]);
--
GitLab