Skip to content

obs-browser: fix rendering errors #80

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

Open
zavitax wants to merge 1 commit into
base: master
Choose a base branch
from
Open

obs-browser: fix rendering errors #80

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
63 changes: 28 additions & 35 deletions browser-client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,7 @@ bool BrowserClient::OnProcessMessageReceived(
const std::string &name = message->GetName();
Json json;

BrowserSource* source = bs;

if (!source) {
if (!bs) {
return false;
}

Expand All @@ -114,20 +112,22 @@ bool BrowserClient::OnProcessMessageReceived(
if (!name)
return false;

json = Json::object {
json = Json::object{
{"name", name},
{"width", (int)obs_source_get_width(current_scene)},
{"height", (int)obs_source_get_height(current_scene)}
};

} else if (name == "getStatus") {
json = Json::object {
}
else if (name == "getStatus") {
json = Json::object{
{"recording", obs_frontend_recording_active()},
{"streaming", obs_frontend_streaming_active()},
{"replaybuffer", obs_frontend_replay_buffer_active()}
};

} else {
}
else {
return streamelementsMessageHandler.OnProcessMessageReceived(
browser, source_process, message, 0);
}
Expand All @@ -151,17 +151,15 @@ bool BrowserClient::GetViewRect(
CefRefPtr<CefBrowser>,
CefRect &rect)
{
BrowserSource* source = bs;

if (!source) {
if (!bs) {
#if CHROME_VERSION_BUILD >= 3578
return;
#else
return false;
#endif
}

rect.Set(0, 0, source->width, source->height);
rect.Set(0, 0, bs->width, bs->height);
#if CHROME_VERSION_BUILD >= 3578
return;
#else
Expand All @@ -187,30 +185,29 @@ void BrowserClient::OnPaint(
}
#endif

BrowserSource* source = bs;

if (!source) {
if (!bs) {
return;
}

if (source->width != width || source->height != height) {
if (bs->width != width || bs->height != height) {
obs_enter_graphics();
source->DestroyTextures();
bs->DestroyTextures();
obs_leave_graphics();
}

if (!source->texture && width && height) {
if (!bs->texture && width && height) {
obs_enter_graphics();
source->texture = gs_texture_create(
bs->texture = gs_texture_create(
width, height, GS_BGRA, 1,
(const uint8_t **)&buffer,
GS_DYNAMIC);
source->width = width;
source->height = height;
bs->width = width;
bs->height = height;
obs_leave_graphics();
} else {
}
else {
obs_enter_graphics();
gs_texture_set_image(source->texture,
gs_texture_set_image(bs->texture,
(const uint8_t *)buffer,
width * 4, false);
obs_leave_graphics();
Expand All @@ -237,9 +234,7 @@ void BrowserClient::OnAcceleratedPaint(
const RectList &,
void *shared_handle)
{
BrowserSource* source = bs;

if (!source) {
if (!bs) {
return;
}

Expand All @@ -249,8 +244,8 @@ void BrowserClient::OnAcceleratedPaint(
gs_texture_destroy(texture);
texture = nullptr;
#endif
gs_texture_destroy(source->texture);
source->texture = nullptr;
gs_texture_destroy(bs->texture);
bs->texture = nullptr;

#if USE_TEXTURE_COPY
texture = gs_texture_open_shared(
Expand All @@ -260,9 +255,9 @@ void BrowserClient::OnAcceleratedPaint(
uint32_t cy = gs_texture_get_height(texture);
gs_color_format format = gs_texture_get_color_format(texture);

source->texture = gs_texture_create(cx, cy, format, 1, nullptr, 0);
bs->texture = gs_texture_create(cx, cy, format, 1, nullptr, 0);
#else
source->texture = gs_texture_open_shared(
bs->texture = gs_texture_open_shared(
(uint32_t)(uintptr_t)shared_handle);
#endif
obs_leave_graphics();
Expand All @@ -271,9 +266,9 @@ void BrowserClient::OnAcceleratedPaint(
}

#if USE_TEXTURE_COPY
if (texture && source->texture) {
if (texture && bs->texture) {
obs_enter_graphics();
gs_copy_texture(source->texture, texture);
gs_copy_texture(bs->texture, texture);
obs_leave_graphics();
}
#endif
Expand All @@ -285,14 +280,12 @@ void BrowserClient::OnLoadEnd(
CefRefPtr<CefFrame> frame,
int)
{
BrowserSource* source = bs;

if (!source) {
if (!bs) {
return;
}

if (frame->IsMain()) {
std::string base64EncodedCSS = base64_encode(source->css);
std::string base64EncodedCSS = base64_encode(bs->css);

std::string href;
href += "data:text/css;charset=utf-8;base64,";
Expand Down