DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove MP4_HIGH preset (fixes #254)

Browse Source 
It results in unreasonably high bit rates which regularly confuses users.
The Custom preset should generally be preferred.
This commit is contained in:
Jonas Herzig
2020-07-13 13:00:33 +02:00
parent f1f1f5dde2
commit e83805bee6
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/replaymod/render/RenderSettings.java
View File

@@ -52,8 +52,6 @@ public class RenderSettings {
public enum EncodingPreset { public enum EncodingPreset {
MP4_CUSTOM("-an -c:v libx264 -b:v %BITRATE% -pix_fmt yuv420p \"%FILENAME%\"", "mp4"), MP4_CUSTOM("-an -c:v libx264 -b:v %BITRATE% -pix_fmt yuv420p \"%FILENAME%\"", "mp4"),
MP4_HIGH("-an -c:v libx264 -preset ultrafast -qp 1 -pix_fmt yuv420p \"%FILENAME%\"", "mp4"),
MP4_DEFAULT("-an -c:v libx264 -preset ultrafast -pix_fmt yuv420p \"%FILENAME%\"", "mp4"), MP4_DEFAULT("-an -c:v libx264 -preset ultrafast -pix_fmt yuv420p \"%FILENAME%\"", "mp4"),
MP4_POTATO("-an -c:v libx264 -preset ultrafast -crf 51 -pix_fmt yuv420p \"%FILENAME%\"", "mp4"), MP4_POTATO("-an -c:v libx264 -preset ultrafast -crf 51 -pix_fmt yuv420p \"%FILENAME%\"", "mp4"),

16
src/main/java/com/replaymod/render/gui/GuiRenderSettings.java
View File

@@ -490,7 +490,11 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
public void load(RenderSettings settings) { public void load(RenderSettings settings) {
renderMethodDropdown.setSelected(settings.getRenderMethod()); renderMethodDropdown.setSelected(settings.getRenderMethod());
encodingPresetDropdown.setSelected(settings.getEncodingPreset()); RenderSettings.EncodingPreset encodingPreset = settings.getEncodingPreset();
if (encodingPreset == null) {
encodingPreset = getDefaultRenderSettings().getEncodingPreset();
}
encodingPresetDropdown.setSelected(encodingPreset);
videoWidth.setValue(settings.getTargetVideoWidth()); videoWidth.setValue(settings.getTargetVideoWidth());
videoHeight.setValue(settings.getTargetVideoHeight()); videoHeight.setValue(settings.getTargetVideoHeight());
frameRateSlider.setValue(settings.getFramesPerSecond() - 10); frameRateSlider.setValue(settings.getFramesPerSecond() - 10);
@@ -506,14 +510,14 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
} }
File savedOutputFile = settings.getOutputFile(); File savedOutputFile = settings.getOutputFile();
if (savedOutputFile == null || !savedOutputFile.getParentFile().exists()) { if (savedOutputFile == null || !savedOutputFile.getParentFile().exists()) {
this.outputFile = generateOutputFile(settings.getEncodingPreset()); this.outputFile = generateOutputFile(encodingPreset);
userDefinedOutputFileName = false; userDefinedOutputFileName = false;
} else if (savedOutputFile.exists()) { } else if (savedOutputFile.exists()) {
String name = generateOutputFile(settings.getEncodingPreset()).getName(); String name = generateOutputFile(encodingPreset).getName();
this.outputFile = new File(savedOutputFile.isDirectory() ? savedOutputFile : savedOutputFile.getParentFile(), name); this.outputFile = new File(savedOutputFile.isDirectory() ? savedOutputFile : savedOutputFile.getParentFile(), name);
userDefinedOutputFileName = false; userDefinedOutputFileName = false;
} else { } else {
this.outputFile = conformExtension(savedOutputFile, settings.getEncodingPreset()); this.outputFile = conformExtension(savedOutputFile, encodingPreset);
userDefinedOutputFileName = true; userDefinedOutputFileName = true;
} }
outputFileButton.setLabel(this.outputFile.getName()); outputFileButton.setLabel(this.outputFile.getName());
@@ -533,9 +537,9 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
antiAliasingDropdown.setSelected(settings.getAntiAliasing()); antiAliasingDropdown.setSelected(settings.getAntiAliasing());
exportCommand.setText(settings.getExportCommand()); exportCommand.setText(settings.getExportCommand());
String exportArguments = settings.getExportArguments(); String exportArguments = settings.getExportArguments();
if (exportArguments == null) { if (exportArguments == null || settings.getEncodingPreset() == null) {
// backwards compat, see RenderSettings#exportArguments // backwards compat, see RenderSettings#exportArguments
exportArguments = settings.getEncodingPreset().getValue(); exportArguments = encodingPreset.getValue();
} }
this.exportArguments.setText(exportArguments); this.exportArguments.setText(exportArguments);