@camera.ui/common 0.0.18 → 0.0.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -17,8 +17,8 @@ export async function isFfmpegInstalled(ffmpegPath) {
|
|
|
17
17
|
export async function getHwaccelInfo(go2rtcEndpoint) {
|
|
18
18
|
let hwaccel = 'auto';
|
|
19
19
|
let hwaccelArgs = [];
|
|
20
|
-
let
|
|
21
|
-
|
|
20
|
+
let hwaccelFilters = ['scale=640:-1'];
|
|
21
|
+
let threads = '1';
|
|
22
22
|
try {
|
|
23
23
|
const response = await fetch(`${go2rtcEndpoint}/api/ffmpeg/hardware`);
|
|
24
24
|
if (!response.ok) {
|
|
@@ -28,41 +28,47 @@ export async function getHwaccelInfo(go2rtcEndpoint) {
|
|
|
28
28
|
for (const source of data.sources) {
|
|
29
29
|
if (source.name === 'OK') {
|
|
30
30
|
if (source.url.includes('vaapi')) {
|
|
31
|
+
threads = '2';
|
|
31
32
|
hwaccel = 'vaapi';
|
|
32
33
|
hwaccelArgs = ['-vaapi_device', '/dev/dri/renderD128', '-hwaccel_output_format', 'vaapi'];
|
|
33
|
-
|
|
34
|
+
// hwaccelFilters = 'format=vaapi|nv12,hwupload,scale_vaapi=640:-1';
|
|
35
|
+
hwaccelFilters = ['format=vaapi|nv12', 'hwupload', 'scale_vaapi=640:-1'];
|
|
34
36
|
break;
|
|
35
37
|
}
|
|
36
38
|
else if (source.url.includes('videotoolbox')) {
|
|
39
|
+
threads = '2';
|
|
37
40
|
hwaccel = 'videotoolbox';
|
|
38
41
|
// hwaccelArgs = ['-hwaccel_output_format', 'videotoolbox_vld'];
|
|
39
|
-
//
|
|
42
|
+
// hwaccelFilters = 'scale=640:-1';
|
|
40
43
|
break;
|
|
41
44
|
}
|
|
42
45
|
else if (source.url.includes('dxva2')) {
|
|
46
|
+
threads = '2';
|
|
43
47
|
hwaccel = 'dxva2';
|
|
44
48
|
hwaccelArgs = ['-hwaccel_output_format', 'dxva2_vld'];
|
|
45
|
-
//
|
|
49
|
+
// hwaccelFilters = 'scale=640:-1';
|
|
46
50
|
// threads = '1';
|
|
47
51
|
break;
|
|
48
52
|
}
|
|
49
53
|
else if (source.url.includes('cuda')) {
|
|
54
|
+
threads = '2';
|
|
50
55
|
hwaccel = 'cuda';
|
|
51
56
|
hwaccelArgs = ['-hwaccel_output_format', 'nv12'];
|
|
52
|
-
|
|
57
|
+
// hwaccelFilters = 'hwupload,scale_cuda=640:-1';
|
|
58
|
+
hwaccelFilters = ['hwupload', 'scale_cuda=640:-1'];
|
|
53
59
|
break;
|
|
54
60
|
}
|
|
55
61
|
else if (source.url.includes('v4l2m2m')) {
|
|
56
62
|
// hwaccel = 'v4l2m2m';
|
|
57
63
|
// hwaccelArgs = [];
|
|
58
|
-
//
|
|
64
|
+
// hwaccelFilters = 'scale=640:-1';
|
|
59
65
|
// threads = '1';
|
|
60
66
|
break;
|
|
61
67
|
}
|
|
62
68
|
else if (source.url.includes('rkmpp')) {
|
|
63
69
|
hwaccel = 'rkmpp';
|
|
64
70
|
// hwaccelArgs = [];
|
|
65
|
-
//
|
|
71
|
+
// hwaccelFilters = 'scale=640:-1';
|
|
66
72
|
// threads = '1';
|
|
67
73
|
break;
|
|
68
74
|
}
|
|
@@ -72,6 +78,6 @@ export async function getHwaccelInfo(go2rtcEndpoint) {
|
|
|
72
78
|
catch {
|
|
73
79
|
// Do nothing
|
|
74
80
|
}
|
|
75
|
-
return { hwaccel, hwaccelArgs,
|
|
81
|
+
return { hwaccel, hwaccelArgs, hwaccelFilters, threads };
|
|
76
82
|
}
|
|
77
83
|
//# sourceMappingURL=ffmpeg.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ffmpeg.js","sourceRoot":"","sources":["../../src/cameraUtils/ffmpeg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAItC,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAWlC,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,KAAa,EAAE,UAAkB;IAC5E,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,GAAG,UAAU,UAAU,CAAC,CAAC;IACxD,OAAO,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,UAAkB;IACxD,IAAI,CAAC;QACH,MAAM,SAAS,CAAC,GAAG,UAAU,UAAU,CAAC,CAAC;QACzC,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,cAAsB;IACzD,IAAI,OAAO,GAAG,MAAM,CAAC;IACrB,IAAI,WAAW,GAAa,EAAE,CAAC;IAC/B,IAAI,
|
|
1
|
+
{"version":3,"file":"ffmpeg.js","sourceRoot":"","sources":["../../src/cameraUtils/ffmpeg.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@camera.ui/common",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.19",
|
|
4
4
|
"description": "camera.ui utilities",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -55,12 +55,12 @@
|
|
|
55
55
|
"systeminformation": "^5.23.5"
|
|
56
56
|
},
|
|
57
57
|
"devDependencies": {
|
|
58
|
-
"@camera.ui/types": "^0.0.
|
|
58
|
+
"@camera.ui/types": "^0.0.74",
|
|
59
59
|
"@rushstack/eslint-patch": "^1.10.4",
|
|
60
60
|
"@types/fs-extra": "^11.0.4",
|
|
61
|
-
"@types/node": "^22.
|
|
62
|
-
"@typescript-eslint/eslint-plugin": "^8.
|
|
63
|
-
"@typescript-eslint/parser": "^8.
|
|
61
|
+
"@types/node": "^22.7.4",
|
|
62
|
+
"@typescript-eslint/eslint-plugin": "^8.8.0",
|
|
63
|
+
"@typescript-eslint/parser": "^8.8.0",
|
|
64
64
|
"eslint": "8.57.0",
|
|
65
65
|
"eslint-config-prettier": "^9.1.0",
|
|
66
66
|
"eslint-plugin-prettier": "^5.2.1",
|