Merge pull request #35 from nikukyugamer/fix/error_in_video_without_audio

This commit is contained in:
Tusko Trush 2022-03-07 08:26:58 +02:00 committed by GitHub
commit 62d6d07fe5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -19,18 +19,26 @@ function loadVideo(num, cb) {
const videoData = json.video const videoData = json.video
.sort((v1, v2) => v1.avg_bitrate - v2.avg_bitrate) .sort((v1, v2) => v1.avg_bitrate - v2.avg_bitrate)
.pop(); .pop();
const audioData = json.audio
.sort((a1, a2) => a1.avg_bitrate - a2.avg_bitrate) let audioData = {}
.pop(); if (json.audio !== null) {
audioData = json.audio
.sort((a1, a2) => a1.avg_bitrate - a2.avg_bitrate)
.pop();
}
const videoBaseUrl = url.resolve( const videoBaseUrl = url.resolve(
url.resolve(masterUrl, json.base_url), url.resolve(masterUrl, json.base_url),
videoData.base_url videoData.base_url
); );
const audioBaseUrl = url.resolve(
url.resolve(masterUrl, json.base_url), let audioBaseUrl = "";
audioData.base_url if (json.audio !== null) {
); audioBaseUrl = url.resolve(
url.resolve(masterUrl, json.base_url),
audioData.base_url
);
}
processFile( processFile(
"video", "video",
@ -43,20 +51,22 @@ function loadVideo(num, cb) {
cb(err); cb(err);
} }
processFile( if (json.audio !== null) {
"audio", processFile(
audioBaseUrl, "audio",
audioData.init_segment, audioBaseUrl,
audioData.segments, audioData.init_segment,
list[num].name + ".m4a", audioData.segments,
err => { list[num].name + ".m4a",
if (err) { err => {
cb(err); if (err) {
} cb(err);
}
cb(null, num + 1); cb(null, num + 1);
} }
); );
}
} }
); );
}); });