Skip to content

Commit

Permalink
TS stability improved
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan McCartney committed Nov 15, 2023
1 parent 3e0ef7d commit ce6ffe0
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 70 deletions.
10 changes: 2 additions & 8 deletions services/audio-srt.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,11 @@ const process = async (options) => {

command = setCodec(command, options?.output);

if (!options.output.vbr) {
command.outputOptions([
`-minrate ${options?.output?.bitrate || "5M"}`,
`-maxrate ${options?.output?.bitrate || "5M"}`,
`-muxrate ${options?.output?.bitrate || "5M"}`,
`-bufsize 500K`,
]);
} else {
if (options?.output?.vbr) {
command.outputOptions([
`-minrate ${options?.output?.minBitrate || "5M"}`,
`-maxrate ${options?.output?.maxBitrate || "5M"}`,
`-muxrate ${options?.output?.bitrate || "5M"}`,
`-bufsize 500K`,
]);
}
Expand Down
9 changes: 2 additions & 7 deletions services/audio-udp.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,11 @@ const process = async (options) => {

command = setCodec(command, options?.output);

if (!options?.output?.vbr) {
command.outputOptions([
`-minrate ${options?.output?.bitrate || "5M"}`,
`-maxrate ${options?.output?.bitrate || "5M"}`,
`-bufsize 500K`,
]);
} else {
if (options?.output?.vbr) {
command.outputOptions([
`-minrate ${options?.output?.minBitrate || "5M"}`,
`-maxrate ${options?.output?.maxBitrate || "5M"}`,
`-muxrate ${options?.output?.bitrate || "5M"}`,
`-bufsize 500K`,
]);
}
Expand Down
2 changes: 1 addition & 1 deletion services/bars-rtp.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const process = async (options) => {

command = setCodec(command, options?.output);

if (!options.output.vbr) {
if (options?.output?.vbr) {
command.outputOptions([
`-minrate ${options?.output?.bitrate || "5M"}`,
`-maxrate ${options?.output?.bitrate || "5M"}`,
Expand Down
12 changes: 3 additions & 9 deletions services/bars-srt.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,18 @@ const process = async (options) => {
options?.output?.mode || "caller"
}&ipttl=${options?.output?.ttl || "64"}&iptos=${options?.output?.tos || "104"}&transtype=${
options?.output?.transtype || "live"
}&maxbw==${options?.output?.maxbw || "-1"}&`
}&maxbw==${options?.output?.maxbw || "-1"}`
)
.outputOptions([`-preset ${options?.output?.encodePreset || "ultrafast"}`, "-f mpegts"])
.outputOptions(`-b:v ${options?.output?.bitrate || "5M"}`);

command = setCodec(command, options?.output);

if (!options.output.vbr) {
command.outputOptions([
`-minrate ${options?.output?.bitrate || "5M"}`,
`-maxrate ${options?.output?.bitrate || "5M"}`,
`-muxrate ${options?.output?.bitrate || "5M"}`,
`-bufsize 500K`,
]);
} else {
if (options?.output?.vbr) {
command.outputOptions([
`-minrate ${options?.output?.minBitrate || "5M"}`,
`-maxrate ${options?.output?.maxBitrate || "5M"}`,
`-muxrate ${options?.output?.bitrate || "5M"}`,
`-bufsize 500K`,
]);
}
Expand Down
10 changes: 2 additions & 8 deletions services/bars-udp.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,11 @@ const process = async (options) => {

command = setCodec(command, options?.output);

if (!options?.output?.vbr) {
command.outputOptions([
`-minrate ${options?.output?.bitrate || "5M"}`,
`-maxrate ${options?.output?.bitrate || "5M"}`,
`-muxrate ${options?.output?.bitrate || "5M"}`,
`-bufsize 500K`,
]);
} else {
if (options?.output?.vbr) {
command.outputOptions([
`-minrate ${options?.output?.minBitrate || "5M"}`,
`-maxrate ${options?.output?.maxBitrate || "5M"}`,
`-muxrate ${options?.output?.bitrate || "5M"}`,
`-bufsize 500K`,
]);
}
Expand Down
14 changes: 3 additions & 11 deletions services/decklink-srt.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ const process = async (options) => {
.input(options?.input?.cardName)
.inputFormat("decklink")
.inputOptions([
"-protocol_whitelist",
"srt,udp,rtp",
"-stats",
"-re",
"-flags low_delay",
Expand All @@ -42,24 +40,18 @@ const process = async (options) => {
options?.output?.mode || "caller"
}&ipttl=${options?.output?.ttl || "64"}&iptos=${options?.output?.tos || "104"}&transtype=${
options?.output?.transtype || "live"
}&maxbw==${options?.output?.maxbw || "-1"}&`
}&maxbw==${options?.output?.maxbw || "-1"}`
)
.outputOptions([`-preset ${options?.output?.encodePreset || "ultrafast"}`, "-f mpegts"])
.outputOptions(`-b:v ${options?.output?.bitrate || "5M"}`);

command = setCodec(command, options?.output);

if (!options.output.vbr) {
command.outputOptions([
`-minrate ${options?.output?.bitrate || "5M"}`,
`-maxrate ${options?.output?.bitrate || "5M"}`,
`-muxrate ${options?.output?.bitrate || "5M"}`,
`-bufsize 500K`,
]);
} else {
if (options?.output?.vbr) {
command.outputOptions([
`-minrate ${options?.output?.minBitrate || "5M"}`,
`-maxrate ${options?.output?.maxBitrate || "5M"}`,
`-muxrate ${options?.output?.bitrate || "5M"}`,
`-bufsize 500K`,
]);
}
Expand Down
10 changes: 2 additions & 8 deletions services/decklink-udp.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,11 @@ const process = async (options) => {

command = setCodec(command, options?.output);

if (!options?.output?.vbr) {
command.outputOptions([
`-minrate ${options?.output?.bitrate || "5M"}`,
`-maxrate ${options?.output?.bitrate || "5M"}`,
`-muxrate ${options?.output?.bitrate || "5M"}`,
`-bufsize 500K`,
]);
} else {
if (options?.output?.vbr) {
command.outputOptions([
`-minrate ${options?.output?.minBitrate || "5M"}`,
`-maxrate ${options?.output?.maxBitrate || "5M"}`,
`-muxrate ${options?.output?.bitrate || "5M"}`,
`-bufsize 500K`,
]);
}
Expand Down
12 changes: 3 additions & 9 deletions services/file-srt.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,18 @@ const process = async (options) => {
options?.output?.mode || "caller"
}&ipttl=${options?.output?.ttl || "64"}&iptos=${options?.output?.tos || "104"}&transtype=${
options?.output?.transtype || "live"
}&maxbw==${options?.output?.maxbw || "-1"}&`
}&maxbw==${options?.output?.maxbw || "-1"}`
)
.outputOptions([`-preset ${options?.output?.encodePreset || "ultrafast"}`, "-f mpegts"])
.outputOptions(`-b:v ${options?.output?.bitrate || "5M"}`);

command = setCodec(command, options?.output);

if (!options?.output?.vbr) {
command.outputOptions([
`-minrate ${options?.output?.bitrate || "5M"}`,
`-maxrate ${options?.output?.bitrate || "5M"}`,
`-muxrate ${options?.output?.bitrate || "5M"}`,
`-bufsize 500K`,
]);
} else {
if (options?.output?.vbr) {
command.outputOptions([
`-minrate ${options?.output?.minBitrate || "5M"}`,
`-maxrate ${options?.output?.maxBitrate || "5M"}`,
`-muxrate ${options?.output?.bitrate || "5M"}`,
`-bufsize 500K`,
]);
}
Expand Down
9 changes: 2 additions & 7 deletions services/file-udp.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,11 @@ const process = async (options) => {

command = setCodec(command, options?.output);

if (!options?.output?.vbr) {
command.outputOptions([
`-minrate ${options?.output?.bitrate || "5M"}`,
`-maxrate ${options?.output?.bitrate || "5M"}`,
`-bufsize 500K`,
]);
} else {
if (options?.output?.vbr) {
command.outputOptions([
`-minrate ${options?.output?.minBitrate || "5M"}`,
`-maxrate ${options?.output?.maxBitrate || "5M"}`,
`-muxrate ${options?.output?.bitrate || "5M"}`,
`-bufsize 500K`,
]);
}
Expand Down
2 changes: 0 additions & 2 deletions utils/set-codec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@ module.exports = (command, output = {}) => {
if (output?.format === "h264") {
command
.videoCodec("libx264")
.outputOptions("-crf", "23")
.outputOptions("-preset", output?.encodePreset || "ultrafast")
.outputOptions("-pass", "1")
//.outputOptions("-profile:v", "baseline")
.outputOptions("-tune zerolatency")
.outputOptions("-max_interleave_delta", "500")
.outputOptions("-max_delay", "100");
Expand Down

0 comments on commit ce6ffe0

Please sign in to comment.