@remotion/renderer 4.0.310 → 4.0.312

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.
@@ -2682,6 +2682,18 @@ var videoCodecOption = {
2682
2682
  };
2683
2683
  }
2684
2684
  if (derivedOutNameCodecs.possible.length > 0) {
2685
+ if (compositionCodec && derivedOutNameCodecs.possible.includes(compositionCodec)) {
2686
+ return {
2687
+ value: compositionCodec,
2688
+ source: "derived from out name + compositionCodec from calculateMetadata"
2689
+ };
2690
+ }
2691
+ if (configFile && derivedOutNameCodecs.possible.includes(configFile)) {
2692
+ return {
2693
+ value: configFile,
2694
+ source: "derived from out name + config file"
2695
+ };
2696
+ }
2685
2697
  return {
2686
2698
  value: derivedOutNameCodecs.default,
2687
2699
  source: "derived from out name"
@@ -5093,7 +5093,7 @@ var getAvailableMemory = (logLevel) => {
5093
5093
  if (cgroupMemory !== null) {
5094
5094
  const nodeMemory = freemem();
5095
5095
  const _procInfo = getFreeMemoryFromProcMeminfo(logLevel);
5096
- if (cgroupMemory > nodeMemory * 1.25) {
5096
+ if (cgroupMemory > nodeMemory * 1.25 && Number.isFinite(cgroupMemory)) {
5097
5097
  Log.warn({ indent: false, logLevel }, "Detected differing memory amounts:");
5098
5098
  Log.warn({ indent: false, logLevel }, `Memory reported by CGroup: ${(cgroupMemory / 1024 / 1024).toFixed(2)} MB`);
5099
5099
  if (_procInfo !== null) {
@@ -23,7 +23,7 @@ const getAvailableMemory = (logLevel) => {
23
23
  // If cgroup limit is higher than global memory, the global memory limit still applies
24
24
  const nodeMemory = (0, node_os_1.freemem)();
25
25
  const _procInfo = (0, from_proc_meminfo_1.getFreeMemoryFromProcMeminfo)(logLevel);
26
- if (cgroupMemory > nodeMemory * 1.25) {
26
+ if (cgroupMemory > nodeMemory * 1.25 && Number.isFinite(cgroupMemory)) {
27
27
  logger_1.Log.warn({ indent: false, logLevel }, 'Detected differing memory amounts:');
28
28
  logger_1.Log.warn({ indent: false, logLevel }, `Memory reported by CGroup: ${(cgroupMemory / 1024 / 1024).toFixed(2)} MB`);
29
29
  if (_procInfo !== null) {
@@ -71,6 +71,19 @@ exports.videoCodecOption = {
71
71
  };
72
72
  }
73
73
  if (derivedOutNameCodecs.possible.length > 0) {
74
+ if (compositionCodec &&
75
+ derivedOutNameCodecs.possible.includes(compositionCodec)) {
76
+ return {
77
+ value: compositionCodec,
78
+ source: 'derived from out name + compositionCodec from calculateMetadata',
79
+ };
80
+ }
81
+ if (configFile && derivedOutNameCodecs.possible.includes(configFile)) {
82
+ return {
83
+ value: configFile,
84
+ source: 'derived from out name + config file',
85
+ };
86
+ }
74
87
  return {
75
88
  value: derivedOutNameCodecs.default,
76
89
  source: 'derived from out name',
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "url": "https://github.com/remotion-dev/remotion/tree/main/packages/renderer"
4
4
  },
5
5
  "name": "@remotion/renderer",
6
- "version": "4.0.310",
6
+ "version": "4.0.312",
7
7
  "description": "Render Remotion videos using Node.js or Bun",
8
8
  "main": "dist/index.js",
9
9
  "types": "dist/index.d.ts",
@@ -18,8 +18,8 @@
18
18
  "extract-zip": "2.0.1",
19
19
  "source-map": "^0.8.0-beta.0",
20
20
  "ws": "8.17.1",
21
- "remotion": "4.0.310",
22
- "@remotion/streaming": "4.0.310"
21
+ "@remotion/streaming": "4.0.312",
22
+ "remotion": "4.0.312"
23
23
  },
24
24
  "peerDependencies": {
25
25
  "react": ">=16.8.0",
@@ -33,17 +33,17 @@
33
33
  "react-dom": "19.0.0",
34
34
  "@types/ws": "8.5.10",
35
35
  "eslint": "9.19.0",
36
- "@remotion/example-videos": "4.0.310",
37
- "@remotion/eslint-config-internal": "4.0.310"
36
+ "@remotion/example-videos": "4.0.312",
37
+ "@remotion/eslint-config-internal": "4.0.312"
38
38
  },
39
39
  "optionalDependencies": {
40
- "@remotion/compositor-darwin-arm64": "4.0.310",
41
- "@remotion/compositor-darwin-x64": "4.0.310",
42
- "@remotion/compositor-linux-x64-gnu": "4.0.310",
43
- "@remotion/compositor-linux-arm64-musl": "4.0.310",
44
- "@remotion/compositor-linux-x64-musl": "4.0.310",
45
- "@remotion/compositor-win32-x64-msvc": "4.0.310",
46
- "@remotion/compositor-linux-arm64-gnu": "4.0.310"
40
+ "@remotion/compositor-darwin-arm64": "4.0.312",
41
+ "@remotion/compositor-linux-arm64-gnu": "4.0.312",
42
+ "@remotion/compositor-linux-arm64-musl": "4.0.312",
43
+ "@remotion/compositor-linux-x64-gnu": "4.0.312",
44
+ "@remotion/compositor-win32-x64-msvc": "4.0.312",
45
+ "@remotion/compositor-linux-x64-musl": "4.0.312",
46
+ "@remotion/compositor-darwin-x64": "4.0.312"
47
47
  },
48
48
  "keywords": [
49
49
  "remotion",