設定ファイルのデフォルト値がドキュメントと異なっていたので修正(gid, vaapiDevice)

Chinachu · Mar 29, 2017 · ff25a7f · ff25a7f
1 parent 8059490
commit ff25a7f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/api/script-channel-watch.vm.js b/api/script-channel-watch.vm.js
@@ -68,7 +68,7 @@ Usushio では使わない
 			if (!request.query.debug) args.push('-v', '0');
 
 			if (config.vaapiEnabled === true) {
-				args.push("-vaapi_device", config.vaapiDevice);
+				args.push("-vaapi_device", config.vaapiDevice || '/dev/dri/renderD128');
 				args.push("-hwaccel", "vaapi");
 				args.push("-hwaccel_output_format", "yuv420p");
 			}

diff --git a/api/script-recorded-program-watch.vm.js b/api/script-recorded-program-watch.vm.js
@@ -185,7 +185,7 @@ function main(avinfo) {
 			if (!request.query.debug) args.push('-v', '0');
 
 			if (config.vaapiEnabled === true) {
-				args.push("-vaapi_device", config.vaapiDevice);
+				args.push("-vaapi_device", config.vaapiDevice || '/dev/dri/renderD128');
 				args.push("-hwaccel", "vaapi");
 				args.push("-hwaccel_output_format", "yuv420p");
 			}

diff --git a/api/script-recording-program-watch.vm.js b/api/script-recording-program-watch.vm.js
@@ -75,7 +75,7 @@
 			if (!request.query.debug) args.push('-v', '0');
 
 			if (config.vaapiEnabled === true) {
-				args.push("-vaapi_device", config.vaapiDevice);
+				args.push("-vaapi_device", config.vaapiDevice || '/dev/dri/renderD128');
 				args.push("-hwaccel", "vaapi");
 				args.push("-hwaccel_output_format", "yuv420p");
 			}

diff --git a/app-operator.js b/app-operator.js
@@ -73,6 +73,8 @@ if (process.platform !== "win32") {
 	if (process.getuid() === 0) {
 		if (typeof config.gid === "string" || typeof config.gid === "number") {
 			process.setgid(config.gid);
+		} else {
+			process.setgid('video');
 		}
 		if (typeof config.uid === "string" || typeof config.uid === "number") {
 			process.setuid(config.uid);
@@ -583,4 +585,4 @@ chinachu.jsonWatcher(
 		});
 	},
 	{ create: [], now: false }
-);
+);
diff --git a/app-wui.js b/app-wui.js
@@ -79,6 +79,8 @@ if (process.platform !== "win32") {
 	if (process.getuid() === 0) {
 		if (typeof config.gid === "string" || typeof config.gid === "number") {
 			process.setgid(config.gid);
+		} else {
+			process.setgid('video');
 		}
 		if (typeof config.uid === "string" || typeof config.uid === "number") {
 			process.setuid(config.uid);