Skip to content

Commit da363d1

Browse files
committed
use correct encoder for the OS x264/obs_x264
1 parent 4c19c84 commit da363d1

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

tests/osn-tests/src/test_nodeobs_settings.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ describe(testName, function() {
121121
obs.setSetting(EOBSSettingsCategories.Output, 'Mode', 'Simple');
122122
obs.setSetting(EOBSSettingsCategories.Output, 'RecQuality', 'Stream');
123123
obs.setSetting(EOBSSettingsCategories.Output, 'RecRB', true);
124+
// Use correct SIMPLE_ENCODER_X264 value based on OS since obs_x264 is used for macOS while x264 is used for Windows
125+
const streamEncoder = (obs.os === 'win32' ? 'x264' : 'obs_x264');
124126

125127
// Getting simple output settings container with same as stream and replay buffer settings
126128
let sameAsStreamRBuffOutputSettings = obs.getSettingsContainer(EOBSSettingsCategories.Output);
@@ -138,7 +140,7 @@ describe(testName, function() {
138140
break;
139141
}
140142
case 'StreamEncoder': {
141-
parameter.currentValue = 'x264';
143+
parameter.currentValue = streamEncoder;
142144
break;
143145
}
144146
case 'ABitrate': {
@@ -201,7 +203,7 @@ describe(testName, function() {
201203
break;
202204
}
203205
case 'StreamEncoder': {
204-
expect(parameter.currentValue).to.equal('x264', GetErrorMessage(ETestErrorMsg.SingleOutputSetting, parameter.name));
206+
expect(parameter.currentValue).to.equal(streamEncoder, GetErrorMessage(ETestErrorMsg.SingleOutputSetting, parameter.name));
205207
break;
206208
}
207209
case 'ABitrate': {
@@ -256,7 +258,7 @@ describe(testName, function() {
256258
break;
257259
}
258260
case 'StreamEncoder': {
259-
expect(parameter.currentValue).to.equal('x264', GetErrorMessage(ETestErrorMsg.SingleOutputSetting, parameter.name));
261+
expect(parameter.currentValue).to.equal(streamEncoder, GetErrorMessage(ETestErrorMsg.SingleOutputSetting, parameter.name));
260262
break;
261263
}
262264
case 'ABitrate': {
@@ -277,7 +279,7 @@ describe(testName, function() {
277279
break;
278280
}
279281
case 'RecEncoder': {
280-
expect(parameter.currentValue).to.equal('x264', GetErrorMessage(ETestErrorMsg.SingleOutputSetting, parameter.name));
282+
expect(parameter.currentValue).to.equal(streamEncoder, GetErrorMessage(ETestErrorMsg.SingleOutputSetting, parameter.name));
281283
break;
282284
}
283285
}
@@ -311,7 +313,7 @@ describe(testName, function() {
311313
break;
312314
}
313315
case 'StreamEncoder': {
314-
expect(parameter.currentValue).to.equal('x264', GetErrorMessage(ETestErrorMsg.SingleOutputSetting, parameter.name));
316+
expect(parameter.currentValue).to.equal(streamEncoder, GetErrorMessage(ETestErrorMsg.SingleOutputSetting, parameter.name));
315317
break;
316318
}
317319
case 'ABitrate': {

0 commit comments

Comments
 (0)