Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add function to resize the browser source from JavaScript #423

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+39 −7
Open

Add function to resize the browser source from JavaScript #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,15 @@ Permissions required: ALL
window.obsstudio.stopVirtualcam()
```

#### Set the browser size
Permissions required: BASIC
```js
/**
* @param {int} width - Width of the browser size
* @param {int} height - Height of the browser size
*/
window.obsstudio.setBrowserSize(width, height)
```

### Register for visibility callbacks

Expand Down
14 changes: 7 additions & 7 deletions browser-app.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@ void BrowserApp::OnBeforeCommandLineProcessing(
}

std::vector<std::string> exposedFunctions = {
"getControlLevel", "getCurrentScene", "getStatus",
"startRecording", "stopRecording", "startStreaming",
"stopStreaming", "pauseRecording", "unpauseRecording",
"startReplayBuffer", "stopReplayBuffer", "saveReplayBuffer",
"startVirtualcam", "stopVirtualcam", "getScenes",
"setCurrentScene", "getTransitions", "getCurrentTransition",
"setCurrentTransition"};
"getControlLevel", "getCurrentScene", "getStatus",
"startRecording", "stopRecording", "startStreaming",
"stopStreaming", "pauseRecording", "unpauseRecording",
"startReplayBuffer", "stopReplayBuffer", "saveReplayBuffer",
"startVirtualcam", "stopVirtualcam", "getScenes",
"setCurrentScene", "getTransitions", "getCurrentTransition",
"setCurrentTransition", "setBrowserSize"};

void BrowserApp::OnContextCreated(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame>,
Expand Down
23 changes: 23 additions & 0 deletions browser-client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,29 @@ bool BrowserClient::OnProcessMessageReceived(
case ControlLevel::Basic:
if (name == "saveReplayBuffer") {
obs_frontend_replay_buffer_save();
} else if (name == "setBrowserSize") {
int width = input_args->GetInt(1);
int height = input_args->GetInt(2);
if (!width)
width = (int)round(input_args->GetDouble(1));
if (!height)
height = (int)round(input_args->GetDouble(2));
if (width > 0 && height > 0) {
OBSDataAutoRelease s =
obs_source_get_settings(bs->source);
if (s &&
(obs_data_get_int(s, "width") != width ||
obs_data_get_int(s, "height") != height)) {
obs_data_set_int(s, "width", width);
obs_data_set_int(s, "height", height);
obs_source_update(bs->source, s);
}
} else {
blog(LOG_WARNING,
"Browser source '%s' tried to change its size to %ix%i",
obs_source_get_name(bs->source), width,
height);
}
}
[[fallthrough]];
case ControlLevel::ReadUser:
Expand Down