Try to handle invalid ffmpeg arguments more gracefully (fixes #77)
Instead of outright crashing, if the user has modified the ffmpeg arguments, they are given the chance to re-try with the defaults.
This commit is contained in:
109
src/main/java/com/replaymod/render/gui/GuiExportFailed.java
Normal file
109
src/main/java/com/replaymod/render/gui/GuiExportFailed.java
Normal file
@@ -0,0 +1,109 @@
|
||||
package com.replaymod.render.gui;
|
||||
|
||||
import com.replaymod.render.RenderSettings;
|
||||
import com.replaymod.render.VideoWriter;
|
||||
import de.johni0702.minecraft.gui.container.GuiPanel;
|
||||
import de.johni0702.minecraft.gui.container.GuiScreen;
|
||||
import de.johni0702.minecraft.gui.container.GuiVerticalList;
|
||||
import de.johni0702.minecraft.gui.element.GuiButton;
|
||||
import de.johni0702.minecraft.gui.element.GuiElement;
|
||||
import de.johni0702.minecraft.gui.element.GuiLabel;
|
||||
import de.johni0702.minecraft.gui.layout.CustomLayout;
|
||||
import de.johni0702.minecraft.gui.layout.HorizontalLayout;
|
||||
import de.johni0702.minecraft.gui.layout.VerticalLayout;
|
||||
import net.minecraft.crash.CrashReport;
|
||||
import net.minecraft.crash.CrashReportCategory;
|
||||
import net.minecraft.util.ReportedException;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
import static com.replaymod.render.ReplayModRender.LOGGER;
|
||||
|
||||
public class GuiExportFailed extends GuiScreen {
|
||||
public static GuiExportFailed tryToRecover(VideoWriter.FFmpegStartupException e, Consumer<RenderSettings> doRestart) {
|
||||
// Always log the error first
|
||||
LOGGER.error("Rendering video:", e);
|
||||
|
||||
RenderSettings settings = e.getSettings();
|
||||
// Check whether the user has configured some custom ffmpeg arguments
|
||||
if (settings.getEncodingPreset().getValue().equals(settings.getExportArguments())) {
|
||||
// If they haven't, then this is probably a faulty ffmpeg installation and there's nothing we can do
|
||||
CrashReport crashReport = CrashReport.makeCrashReport(e, "Exporting video");
|
||||
CrashReportCategory details = crashReport.makeCategory("Export details");
|
||||
details.addCrashSection("Settings", settings);
|
||||
details.addCrashSection("FFmpeg log", e.getLog());
|
||||
throw new ReportedException(crashReport);
|
||||
} else {
|
||||
// If they have, ask them whether it was intentional
|
||||
GuiExportFailed gui = new GuiExportFailed(e, doRestart);
|
||||
gui.display();
|
||||
return gui;
|
||||
}
|
||||
}
|
||||
|
||||
private final GuiLabel logLabel = new GuiLabel(this)
|
||||
.setI18nText("replaymod.gui.rendering.error.ffmpeglog");
|
||||
private final GuiVerticalList logList = new GuiVerticalList(this).setDrawShadow(true);
|
||||
private final GuiButton resetButton = new GuiButton().setI18nLabel("gui.yes").setSize(100, 20);
|
||||
private final GuiButton abortButton = new GuiButton().setI18nLabel("gui.no").setSize(100, 20);
|
||||
private final GuiPanel info = new GuiPanel(this)
|
||||
.setLayout(new VerticalLayout().setSpacing(4))
|
||||
.addElements(new VerticalLayout.Data(0.5),
|
||||
new GuiLabel().setI18nText("replaymod.gui.rendering.error.ffmpegargs.1"),
|
||||
new GuiLabel().setI18nText("replaymod.gui.rendering.error.ffmpegargs.2"),
|
||||
new GuiLabel(),
|
||||
new GuiPanel().setLayout(new HorizontalLayout(HorizontalLayout.Alignment.CENTER).setSpacing(5))
|
||||
.addElements(null, resetButton, abortButton)
|
||||
);
|
||||
|
||||
{
|
||||
setLayout(new CustomLayout<GuiScreen>() {
|
||||
@Override
|
||||
protected void layout(GuiScreen container, int width, int height) {
|
||||
pos(info, width/2 - width(info)/2, (height/2 - height(info) - 30) / 2 + 30);
|
||||
pos(logLabel, width/2 - width(logLabel)/2, height/2 + 4);
|
||||
pos(logList, 10, y(logLabel) + height(logLabel) + 4);
|
||||
size(logList, width - 10 - x(logList), height - 10 - y(logList));
|
||||
}
|
||||
});
|
||||
|
||||
setTitle(new GuiLabel().setI18nText("replaymod.gui.rendering.error.title"));
|
||||
setBackground(Background.DIRT);
|
||||
}
|
||||
|
||||
public GuiExportFailed(VideoWriter.FFmpegStartupException e, Consumer<RenderSettings> doRestart) {
|
||||
logList.getListPanel().addElements(null,
|
||||
Arrays.stream(e.getLog().replace("\t", " ").split("\n"))
|
||||
.map(l -> new GuiLabel().setText(l))
|
||||
.toArray(GuiElement[]::new));
|
||||
|
||||
resetButton.onClick(() -> {
|
||||
RenderSettings oldSettings = e.getSettings();
|
||||
doRestart.accept(new RenderSettings(
|
||||
oldSettings.getRenderMethod(),
|
||||
oldSettings.getEncodingPreset(),
|
||||
oldSettings.getVideoWidth(),
|
||||
oldSettings.getVideoHeight(),
|
||||
oldSettings.getFramesPerSecond(),
|
||||
oldSettings.getBitRate(),
|
||||
oldSettings.getOutputFile(),
|
||||
oldSettings.isRenderNameTags(),
|
||||
oldSettings.isStabilizeYaw(),
|
||||
oldSettings.isStabilizePitch(),
|
||||
oldSettings.isStabilizeRoll(),
|
||||
oldSettings.getChromaKeyingColor(),
|
||||
oldSettings.isInject360Metadata(),
|
||||
oldSettings.getAntiAliasing(),
|
||||
oldSettings.getExportCommand(),
|
||||
oldSettings.getEncodingPreset().getValue(),
|
||||
oldSettings.isHighPerformance()
|
||||
));
|
||||
});
|
||||
|
||||
abortButton.onClick(() -> {
|
||||
// Assume they know what they're doing
|
||||
getMinecraft().displayGuiScreen(null);
|
||||
});
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user