media extraction bug fix, cleaned up movie filenames

This commit is contained in:
ad044 2021-03-06 20:05:34 +04:00
parent cad1712a8c
commit 4273edd025
9 changed files with 22126 additions and 132 deletions

22035
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -12,12 +12,13 @@
"@types/node": "^12.12.54",
"@types/react": "^16.9.47",
"@types/react-dom": "^16.9.8",
"@types/three": "^0.126.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-scripts": "^4.0.0",
"react-three-fiber": "^4.2.20",
"react-use-gesture": "^9.0.4",
"three": "^0.119.1",
"three": "^0.126.1",
"three-plain-animator": "^1.0.2",
"typescript": "^3.7.5",
"zustand": "^3.1.3"

View file

@ -24,8 +24,22 @@ export function extract_media(tempdir, jpsxdec_jar, disc1_index, disc2_index) {
{ stdio: "inherit" }
);
const output_movie_folder = join("..", "..", "src", "static", "movie");
const output_audio_folder = join("..", "..", "src", "static", "audio");
const output_movie_folder = join(
"..",
"..",
"src",
"static",
"media",
"movie"
);
const output_audio_folder = join(
"..",
"..",
"src",
"static",
"media",
"audio"
);
// create destination folders
@ -37,39 +51,31 @@ export function extract_media(tempdir, jpsxdec_jar, disc1_index, disc2_index) {
mkdirSync(output_audio_folder);
}
// convert all movies to webm
for (let file of readdirSync(`${join(tempdir, "MOVIE")}`)) {
if (file.endsWith(".wav")) continue;
exec(
`ffmpeg -i "${join(tempdir, "MOVIE", file)}" -n ${join(
output_movie_folder,
file.replace("avi", "webm")
)}`
).stderr.on("data", (data) => console.log(data));
// convert all movies to mp4
for (const movieDir of ["MOVIE", "MOVIE2"]) {
for (let file of readdirSync(`${join(tempdir, movieDir)}`)) {
if (file.endsWith(".wav")) continue;
exec(
`ffmpeg -i "${join(tempdir, movieDir, file)}" -pix_fmt yuv420p -n ${join(
output_movie_folder,
file.replace("avi", "mp4")
)}`
).stderr.on("data", (data) => console.log(data));
}
}
for (let file of readdirSync(`${join(tempdir, "MOVIE2")}`)) {
if (file.endsWith(".wav")) continue;
exec(
`ffmpeg -i "${join(tempdir, "MOVIE", file)}" -n ${join(
output_movie_folder,
file.replace("avi", "webm")
)}`
).stderr.on("data", (data) => console.log(data));
}
// convert all audio to ogg
// convert all audio to mp4
for (let file of readdirSync(`${join(tempdir, "XA")}`)) {
exec(
`ffmpeg -i "${join(tempdir, "XA", file)}" -n ${join(
output_audio_folder,
file.replace("wav", "ogg")
file.replace("wav", "mp4")
)}`
).stderr.on("data", (data) => console.log(data));
}
// cleanup source folders
rmSync(join(tempdir, 'MOVIE'), {recursive: true});
rmSync(join(tempdir, 'MOVIE2'), {recursive: true});
rmSync(join(tempdir, 'XA'), {recursive: true});
rmSync(join(tempdir, "MOVIE"), { recursive: true });
rmSync(join(tempdir, "MOVIE2"), { recursive: true });
rmSync(join(tempdir, "XA"), { recursive: true });
}

View file

@ -273,7 +273,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F013.STR",
"media_file": "F013.STR[0]",
"node_name": "Dc1009",
"required_final_video_viewcount": 0,
"site": "A",
@ -539,7 +539,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F014.STR",
"media_file": "F014.STR[0]",
"node_name": "Dc1010",
"required_final_video_viewcount": 0,
"site": "A",
@ -1467,7 +1467,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F025.STR",
"media_file": "F025.STR[0]",
"node_name": "Dc1015",
"required_final_video_viewcount": 0,
"site": "A",
@ -1643,7 +1643,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS01.STR",
"media_file": "INS01.STR[0]",
"node_name": "SSkn01",
"required_final_video_viewcount": 0,
"site": "A",
@ -1887,7 +1887,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F029.STR",
"media_file": "F029.STR[0]",
"node_name": "Dc1018",
"required_final_video_viewcount": 0,
"site": "A",
@ -2151,7 +2151,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F004.STR",
"media_file": "F004.STR[0]",
"node_name": "Dc1004",
"required_final_video_viewcount": 0,
"site": "A",
@ -2747,7 +2747,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS02.STR",
"media_file": "INS02.STR[0]",
"node_name": "SSkn02",
"required_final_video_viewcount": 0,
"site": "A",
@ -3079,7 +3079,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F022.STR",
"media_file": "F022.STR[0]",
"node_name": "Dc1013",
"required_final_video_viewcount": 0,
"site": "A",
@ -3809,7 +3809,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F012.STR",
"media_file": "F012.STR[0]",
"node_name": "Dc1008",
"required_final_video_viewcount": 0,
"site": "A",
@ -3941,7 +3941,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F026.STR",
"media_file": "F026.STR[0]",
"node_name": "Dc1016",
"required_final_video_viewcount": 0,
"site": "A",
@ -4737,7 +4737,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F036.STR",
"media_file": "F036.STR[0]",
"node_name": "Dc1022",
"required_final_video_viewcount": 0,
"site": "A",
@ -4891,7 +4891,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS03.STR",
"media_file": "INS03.STR[0]",
"node_name": "SSkn03",
"required_final_video_viewcount": 0,
"site": "A",
@ -5399,7 +5399,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F037.STR",
"media_file": "F037.STR[0]",
"node_name": "Dc1023",
"required_final_video_viewcount": 0,
"site": "A",
@ -5731,7 +5731,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F033.STR",
"media_file": "F033.STR[0]",
"node_name": "Dc1019",
"required_final_video_viewcount": 0,
"site": "A",
@ -6107,7 +6107,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F027.STR",
"media_file": "F027.STR[0]",
"node_name": "Dc1017",
"required_final_video_viewcount": 0,
"site": "A",
@ -6393,7 +6393,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F002.STR",
"media_file": "F002.STR[0]",
"node_name": "Dc1002",
"required_final_video_viewcount": 0,
"site": "A",
@ -6417,7 +6417,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F003.STR",
"media_file": "F003.STR[0]",
"node_name": "Dc1003",
"required_final_video_viewcount": 0,
"site": "A",
@ -6637,7 +6637,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F006.STR",
"media_file": "F006.STR[0]",
"node_name": "Dc1005",
"required_final_video_viewcount": 0,
"site": "A",
@ -6769,7 +6769,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F008.STR",
"media_file": "F008.STR[0]",
"node_name": "Dc1006",
"required_final_video_viewcount": 0,
"site": "A",
@ -6991,7 +6991,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F010.STR",
"media_file": "F010.STR[0]",
"node_name": "Dc1007",
"required_final_video_viewcount": 0,
"site": "A",
@ -7035,7 +7035,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F015.STR",
"media_file": "F015.STR[0]",
"node_name": "Dc1011",
"required_final_video_viewcount": 0,
"site": "A",
@ -7277,7 +7277,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F020.STR",
"media_file": "F020.STR[0]",
"node_name": "Dc1012",
"required_final_video_viewcount": 0,
"site": "A",
@ -7301,7 +7301,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS04.STR",
"media_file": "INS04.STR[0]",
"node_name": "SSkn04",
"required_final_video_viewcount": 0,
"site": "A",
@ -7411,7 +7411,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F034.STR",
"media_file": "F034.STR[0]",
"node_name": "Dc1020",
"required_final_video_viewcount": 0,
"site": "A",
@ -7587,7 +7587,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F024.STR",
"media_file": "F024.STR[0]",
"node_name": "Dc1014",
"required_final_video_viewcount": 0,
"site": "A",
@ -8449,7 +8449,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F035.STR",
"media_file": "F035.STR[0]",
"node_name": "Dc1021",
"required_final_video_viewcount": 0,
"site": "A",
@ -8803,7 +8803,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F042.STR",
"media_file": "F042.STR[0]",
"node_name": "Dc1027",
"required_final_video_viewcount": 0,
"site": "A",
@ -9841,7 +9841,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F038.STR",
"media_file": "F038.STR[0]",
"node_name": "Dc1024",
"required_final_video_viewcount": 0,
"site": "A",
@ -9885,7 +9885,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F043.STR",
"media_file": "F043.STR[0]",
"node_name": "Dc1028",
"required_final_video_viewcount": 0,
"site": "A",

View file

@ -7,7 +7,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS05.STR",
"media_file": "INS05.STR[0]",
"node_name": "SSkn04#",
"required_final_video_viewcount": 0,
"site": "B",
@ -29,7 +29,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS03.STR",
"media_file": "INS03.STR[0]",
"node_name": "Dc1025",
"required_final_video_viewcount": 0,
"site": "B",
@ -405,7 +405,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS04.STR",
"media_file": "INS04.STR[0]",
"node_name": "Dc1026",
"required_final_video_viewcount": 0,
"site": "B",
@ -647,7 +647,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F002.STR",
"media_file": "F002.STR[0]",
"node_name": "Dc1042",
"required_final_video_viewcount": 0,
"site": "B",
@ -1509,7 +1509,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS06.STR",
"media_file": "INS06.STR[0]",
"node_name": "SSkn05",
"required_final_video_viewcount": 0,
"site": "B",
@ -2349,7 +2349,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS15.STR",
"media_file": "INS15.STR[0]",
"node_name": "Dc1040",
"required_final_video_viewcount": 0,
"site": "B",
@ -2591,7 +2591,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F001.STR",
"media_file": "F001.STR[0]",
"node_name": "Dc1041",
"required_final_video_viewcount": 0,
"site": "B",
@ -2967,7 +2967,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS07.STR",
"media_file": "INS07.STR[0]",
"node_name": "SSkn06",
"required_final_video_viewcount": 0,
"site": "B",
@ -3033,7 +3033,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F003.STR",
"media_file": "F003.STR[0]",
"node_name": "Dc1043",
"required_final_video_viewcount": 0,
"site": "B",
@ -3099,7 +3099,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F004.STR",
"media_file": "F004.STR[0]",
"node_name": "Dc1044",
"required_final_video_viewcount": 0,
"site": "B",
@ -3211,7 +3211,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F008.STR",
"media_file": "F008.STR[0]",
"node_name": "Dc1046",
"required_final_video_viewcount": 0,
"site": "B",
@ -3233,7 +3233,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F006.STR",
"media_file": "F006.STR[0]",
"node_name": "Dc1045",
"required_final_video_viewcount": 0,
"site": "B",
@ -3387,7 +3387,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F015.STR",
"media_file": "F015.STR[0]",
"node_name": "Dc1051",
"required_final_video_viewcount": 0,
"site": "B",
@ -3585,7 +3585,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS05.STR",
"media_file": "INS05.STR[0]",
"node_name": "Dc1030",
"required_final_video_viewcount": 0,
"site": "B",
@ -3651,7 +3651,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS06.STR",
"media_file": "INS06.STR[0]",
"node_name": "Dc1031",
"required_final_video_viewcount": 0,
"site": "B",
@ -3741,7 +3741,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS07.STR",
"media_file": "INS07.STR[0]",
"node_name": "Dc1032",
"required_final_video_viewcount": 0,
"site": "B",
@ -3763,7 +3763,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS08.STR",
"media_file": "INS08.STR[0]",
"node_name": "Dc1033",
"required_final_video_viewcount": 0,
"site": "B",
@ -3939,7 +3939,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS09.STR",
"media_file": "INS09.STR[0]",
"node_name": "Dc1034",
"required_final_video_viewcount": 0,
"site": "B",
@ -4093,7 +4093,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS10.STR",
"media_file": "INS10.STR[0]",
"node_name": "Dc1035",
"required_final_video_viewcount": 0,
"site": "B",
@ -4115,7 +4115,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS12.STR",
"media_file": "INS12.STR[0]",
"node_name": "Dc1037",
"required_final_video_viewcount": 0,
"site": "B",
@ -4271,7 +4271,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS13.STR",
"media_file": "INS13.STR[0]",
"node_name": "Dc1038",
"required_final_video_viewcount": 0,
"site": "B",
@ -4293,7 +4293,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS14.STR",
"media_file": "INS14.STR[0]",
"node_name": "Dc1039",
"required_final_video_viewcount": 0,
"site": "B",
@ -4359,7 +4359,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F020.STR",
"media_file": "F020.STR[0]",
"node_name": "Dc1052",
"required_final_video_viewcount": 0,
"site": "B",
@ -4977,7 +4977,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F022.STR",
"media_file": "F022.STR[0]",
"node_name": "Dc1053",
"required_final_video_viewcount": 0,
"site": "B",
@ -5155,7 +5155,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F024.STR",
"media_file": "F024.STR[0]",
"node_name": "Dc1054",
"required_final_video_viewcount": 0,
"site": "B",
@ -5199,7 +5199,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F012.STR",
"media_file": "F012.STR[0]",
"node_name": "Dc1048",
"required_final_video_viewcount": 0,
"site": "B",
@ -5221,7 +5221,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F010.STR",
"media_file": "F010.STR[0]",
"node_name": "Dc1047",
"required_final_video_viewcount": 0,
"site": "B",
@ -5287,7 +5287,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "INS11.STR",
"media_file": "INS11.STR[0]",
"node_name": "Dc1036",
"required_final_video_viewcount": 0,
"site": "B",
@ -5331,7 +5331,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F013.STR",
"media_file": "F013.STR[0]",
"node_name": "Dc1049",
"required_final_video_viewcount": 0,
"site": "B",
@ -5353,7 +5353,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F014.STR",
"media_file": "F014.STR[0]",
"node_name": "Dc1050",
"required_final_video_viewcount": 0,
"site": "B",
@ -5419,7 +5419,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F025.STR",
"media_file": "F025.STR[0]",
"node_name": "Dc1055",
"required_final_video_viewcount": 0,
"site": "B",
@ -5575,7 +5575,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F026.STR",
"media_file": "F026.STR[0]",
"node_name": "Dc1056",
"required_final_video_viewcount": 0,
"site": "B",
@ -5707,7 +5707,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F027.STR",
"media_file": "F027.STR[0]",
"node_name": "Dc1057",
"required_final_video_viewcount": 0,
"site": "B",
@ -5729,7 +5729,7 @@
"2": "-1",
"3": "-1"
},
"media_file": "F029.STR",
"media_file": "F029.STR[0]",
"node_name": "Dc1058",
"required_final_video_viewcount": 0,
"site": "B",

View file

@ -3,10 +3,10 @@ import * as THREE from "three";
import { useFrame } from "react-three-fiber";
import { useStore } from "../store";
import EndSelectionScreen from "../components/EndScene/EndSelectionScreen";
import endroll from "../static/media/movie/ENDROLL1.STR[0].webm";
import endroll from "../static/media/movie/ENDROLL1.STR[0].mp4";
import endrollVtt from "../static/media/webvtt/Endroll.vtt";
import Xa0001 from "../static/media/audio/Xa0001.mp4";
import Xa0006 from "../static/media/audio/Xa0006.mp4";
import introSpeech from "../static/media/audio/LAIN21.XA[31].mp4";
import outroSpeech from "../static/media/audio/LAIN21.XA[16].mp4";
import LainSpeak from "../components/LainSpeak";
import EndSphere from "../components/EndScene/EndSphere";
import EndCylinder from "../components/EndScene/EndCylinder";
@ -54,7 +54,7 @@ const EndScene = () => {
setIsIntro(true);
await sleep(3800);
mediaElement.src = Xa0001;
mediaElement.src = introSpeech;
mediaElement.load();
mediaElement.play();
@ -77,7 +77,7 @@ const EndScene = () => {
}
if (playedMediaCountRef.current === playerNameVoices.length + 1) {
mediaElement.src = Xa0006;
mediaElement.src = outroSpeech;
mediaElement.load();
mediaElement.play();

View file

@ -43,13 +43,13 @@ const IdleMediaScene = () => {
}
if (idleMedia.includes("XA")) {
import("../static/media/audio/" + idleMedia + ".ogg").then((media) => {
import("../static/media/audio/" + idleMedia + ".mp4").then((media) => {
mediaElement.src = media.default;
mediaElement.load();
mediaElement.play();
});
} else {
import("../static/media/movie/" + idleMedia + "[0].webm").then((media) => {
import("../static/media/movie/" + idleMedia + ".mp4").then((media) => {
mediaElement.src = media.default;
mediaElement.load();
mediaElement.play();

View file

@ -53,7 +53,7 @@ const MediaScene = () => {
});
if (activeNode.media_file.includes("XA")) {
import("../static/media/audio/" + activeNode.media_file + ".ogg").then(
import("../static/media/audio/" + activeNode.media_file + ".mp4").then(
(media) => {
mediaElement.src = media.default;
mediaElement.load();
@ -61,7 +61,7 @@ const MediaScene = () => {
);
} else {
import(
"../static/media/movie/" + activeNode.media_file + "[0].webm"
"../static/media/movie/" + activeNode.media_file + ".mp4"
).then((media) => {
mediaElement.src = media.default;
mediaElement.load();

View file

@ -47,23 +47,13 @@ const TaKScene = () => {
trackElement.removeAttribute("src");
});
if (activeNode.media_file.includes("XA")) {
import(
"../static/media/audio/" + activeNode.media_file + ".ogg"
).then((media) => {
import("../static/media/audio/" + activeNode.media_file + ".mp4").then(
(media) => {
mediaElement.src = media.default;
mediaElement.load();
mediaElement.play();
});
} else {
import(
"../static/media/movie/" + activeNode.media_file + "[0].webm"
).then((media) => {
mediaElement.src = media.default;
mediaElement.load();
mediaElement.play();
});
}
}
);
setIsIntro(false);
}
}, 3800);