From 0f06c65ce2c097ff4fa9198cdd0edb72787c6d10 Mon Sep 17 00:00:00 2001 From: N00MKRAD Date: Fri, 5 Feb 2021 22:30:23 +0100 Subject: [PATCH] Fixed AAC fallback not working, fixed no output if audio merge failed --- Code/IO/IOUtils.cs | 2 +- Code/Media/FFmpegUtils.cs | 2 +- Code/Media/FfmpegAudioAndMetadata.cs | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Code/IO/IOUtils.cs b/Code/IO/IOUtils.cs index c8d06cf..9ffef90 100644 --- a/Code/IO/IOUtils.cs +++ b/Code/IO/IOUtils.cs @@ -222,7 +222,7 @@ namespace Flowframes.IO return true; } - static bool TryMove(string source, string target, bool deleteIfExists = true) + public static bool TryMove(string source, string target, bool deleteIfExists = true) { try { diff --git a/Code/Media/FFmpegUtils.cs b/Code/Media/FFmpegUtils.cs index 1529b43..b69881d 100644 --- a/Code/Media/FFmpegUtils.cs +++ b/Code/Media/FFmpegUtils.cs @@ -137,7 +137,7 @@ namespace Flowframes.Media { containerExt = containerExt.Remove("."); string codec = "aac"; - string bitrate = $"{Config.GetInt("aacBitrate", 160)}k"; + string bitrate = $"{Config.GetInt("aacBitrate", 160)}"; if(containerExt == "webm" || containerExt == "mkv") { diff --git a/Code/Media/FfmpegAudioAndMetadata.cs b/Code/Media/FfmpegAudioAndMetadata.cs index 61c3ad6..8a400a9 100644 --- a/Code/Media/FfmpegAudioAndMetadata.cs +++ b/Code/Media/FfmpegAudioAndMetadata.cs @@ -155,6 +155,7 @@ namespace Flowframes.Media if ((File.Exists(outPath) && IOUtils.GetFilesize(outPath) < 1024) || lastOutputFfmpeg.Contains("Invalid data") || lastOutputFfmpeg.Contains("Error initializing output stream")) { Logger.Log("Failed to merge audio, even with re-encoding. Output will not have audio.", false, false, "ffmpeg"); + IOUtils.TryMove(tempPath, inputFile); // Move temp file back IOUtils.TryDeleteIfExists(tempPath); return; }