mirror of https://github.com/VERT-sh/VERT.git
fix: vertd custom settings
This commit is contained in:
parent
6980d6dc05
commit
3c5a01f0b2
|
|
@ -183,6 +183,35 @@ const progressEstimate = (
|
||||||
return progress * progressEstimates[type] + previousValues;
|
return progress * progressEstimates[type] + previousValues;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const processSettings = (
|
||||||
|
settings: ConversionSettings,
|
||||||
|
): ConversionSettings => {
|
||||||
|
const newSettings = { ...settings };
|
||||||
|
|
||||||
|
if (newSettings.fps === "custom") {
|
||||||
|
newSettings.fps = newSettings.customFps;
|
||||||
|
delete newSettings.customFps;
|
||||||
|
}
|
||||||
|
if (newSettings.resolution === "custom") {
|
||||||
|
newSettings.resolution = newSettings.customResolution;
|
||||||
|
delete newSettings.customResolution;
|
||||||
|
}
|
||||||
|
if (newSettings.videoBitrate === "custom") {
|
||||||
|
newSettings.videoBitrate = newSettings.customVideoBitrate;
|
||||||
|
delete newSettings.customVideoBitrate;
|
||||||
|
}
|
||||||
|
if (newSettings.audioBitrate === "custom") {
|
||||||
|
newSettings.audioBitrate = newSettings.customAudioBitrate;
|
||||||
|
delete newSettings.customAudioBitrate;
|
||||||
|
}
|
||||||
|
if (newSettings.sampleRate === "custom") {
|
||||||
|
newSettings.sampleRate = newSettings.customSampleRate;
|
||||||
|
delete newSettings.customSampleRate;
|
||||||
|
}
|
||||||
|
|
||||||
|
return newSettings;
|
||||||
|
};
|
||||||
|
|
||||||
const uploadFile = async (file: VertFile): Promise<UploadResponse> => {
|
const uploadFile = async (file: VertFile): Promise<UploadResponse> => {
|
||||||
const apiUrl = await VertdInstance.instance.url();
|
const apiUrl = await VertdInstance.instance.url();
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
|
|
@ -468,7 +497,7 @@ export class VertdConverter extends Converter {
|
||||||
{ value: "18000", label: "18000 kbps" },
|
{ value: "18000", label: "18000 kbps" },
|
||||||
],
|
],
|
||||||
hasCustomInput: true,
|
hasCustomInput: true,
|
||||||
customInputKey: "customBitrate",
|
customInputKey: "customVideoBitrate",
|
||||||
placeholder: m["convert.settings.video.bitrate_placeholder"](),
|
placeholder: m["convert.settings.video.bitrate_placeholder"](),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -490,7 +519,7 @@ export class VertdConverter extends Converter {
|
||||||
: `${b} kbps`,
|
: `${b} kbps`,
|
||||||
})),
|
})),
|
||||||
hasCustomInput: true,
|
hasCustomInput: true,
|
||||||
customInputKey: "customBitrate",
|
customInputKey: "customAudioBitrate",
|
||||||
placeholder: m["convert.settings.audio.bitrate_placeholder"](),
|
placeholder: m["convert.settings.audio.bitrate_placeholder"](),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -558,7 +587,6 @@ export class VertdConverter extends Converter {
|
||||||
if (to.startsWith(".")) to = to.slice(1);
|
if (to.startsWith(".")) to = to.slice(1);
|
||||||
|
|
||||||
let fileUpload = input;
|
let fileUpload = input;
|
||||||
// TODO: replace input of "custom" options with actual (bitrate = customBitrate) before sending to vertd
|
|
||||||
const conversionSettings = // vertd expects object not string json
|
const conversionSettings = // vertd expects object not string json
|
||||||
Object.keys(settings).length > 0
|
Object.keys(settings).length > 0
|
||||||
? settings // user-provided settings
|
? settings // user-provided settings
|
||||||
|
|
@ -627,7 +655,7 @@ export class VertdConverter extends Converter {
|
||||||
jobId: uploadRes.id,
|
jobId: uploadRes.id,
|
||||||
token: uploadRes.auth,
|
token: uploadRes.auth,
|
||||||
to,
|
to,
|
||||||
settings: conversionSettings,
|
settings: processSettings(conversionSettings),
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
ws.send(JSON.stringify(msg));
|
ws.send(JSON.stringify(msg));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue