Skip to content

Commit 9814187

Browse files
Merge pull request #29 from WeibelLab/release_polish
Merge release_polish into main
2 parents caf1994 + a7fee75 commit 9814187

File tree

12 files changed

+61
-1257
lines changed

12 files changed

+61
-1257
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

JS_Files/audio_recorder.js

Lines changed: 0 additions & 85 deletions
This file was deleted.

JS_Files/avRecorder.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ const { spawn } = require("child_process");
22
const Stream = require("stream");
33
const path = require('path');
44
const fs = require("fs");
5+
var isWin = process.platform === "win32";
56

67
const CHRONOSENSE_ROOT_DIR = path.join(path.resolve(__dirname), '../');
78
const FFMPEG_DIR = path.join(CHRONOSENSE_ROOT_DIR, '/ffmpeg/');
89

910

10-
1111
export class AVRecorder {
1212

1313
#mediaStream = null;
@@ -106,11 +106,20 @@ export class AVRecorder {
106106
*/
107107
async postProcessVideoFile() {
108108

109-
var subprocess = spawn(FFMPEG_DIR.concat("ffmpeg.exe"), [
110-
"-i",
111-
this.#dirName.concat("raw/").concat(this.#fileName),
112-
this.#dirName.concat(this.#fileName.substring(0, this.#fileName.length - 5)).concat(".mp4")
113-
], {detached: true});
109+
if (!isWin) {
110+
spawn("ffmpeg", [
111+
"-i",
112+
this.#dirName.concat("raw/").concat(this.#fileName),
113+
this.#dirName.concat(this.#fileName.substring(0, this.#fileName.length - 5)).concat(".mp4")
114+
], {detached: true});
115+
}
116+
else {
117+
spawn(FFMPEG_DIR.concat("ffmpeg.exe"), [
118+
"-i",
119+
this.#dirName.concat("raw/").concat(this.#fileName),
120+
this.#dirName.concat(this.#fileName.substring(0, this.#fileName.length - 5)).concat(".mp4")
121+
], {detached: true});
122+
}
114123

115124
}
116125

JS_Files/generic_device.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Description: File used as a generic device communication class for devices
33
* without drivers, sdks, or that use network communcation to send data.
4-
*
4+
*
55
*
66
*/
77
// ! CURRENTLY DATA TRANSFER OVER LOCAL TCP WORKING !

JS_Files/jointwriter.js

Lines changed: 0 additions & 249 deletions
This file was deleted.

0 commit comments

Comments
 (0)