Skip to content

Enable building with CEF 6261 & 6367 (Chromium 122 & 124)#434

Merged
RytoEX merged 3 commits into
obsproject:masterfrom
WizardCM:cef-upgrade-122
Jul 30, 2024
Merged

Enable building with CEF 6261 & 6367 (Chromium 122 & 124)#434
RytoEX merged 3 commits into
obsproject:masterfrom
WizardCM:cef-upgrade-122

Conversation

@WizardCM

@WizardCM WizardCM commented Feb 4, 2024 •
edited
Loading

Copy link
Copy Markdown
Member

Description

This allows compiling OBS Browser with Chromium 124-based CEF versions.

This also adds basic support for the new, official, shared textures API on both Windows and macOS.

Sources:

Fun note; Remote debugging now requires --remote-allow-origins=* otherwise Remote Debugging immediately disconnects - even for localhost.

Motivation and Context

At some point we'd like to upgrade to modern CEF. To do that, obs-browser needs to compile.

How Has This Been Tested?

Launch OBS with a CEF 6261 or 6367 build. Have not tested downgrading CEF to our currently supported versions.

Only tested on Windows.

Types of changes

  • Tweak (non-breaking change to improve existing functionality)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

@WizardCM WizardCM added the kind/enhancement Enhancements are not bugs or new features but can improve usability or performance. label Feb 4, 2024
jmickelonis added a commit to jmickelonis/obs-browser that referenced this pull request Feb 7, 2024
@jmickelonis
Merged "Enable building with CEF 6261 (Chromium 122) obsproject#434".
421f408
@jmickelonis

jmickelonis commented Feb 9, 2024 •
edited
Loading

Copy link
Copy Markdown

Slightly off-topic, but you might be interested to know.
I built with 6261 (beta) on Ubuntu 23.10. Browser sources and docks do show up, but calls to ExecuteJavascript fail silently without effect. 6167 stable works fine.

@PatTheMav

PatTheMav commented Feb 20, 2024

Copy link
Copy Markdown
Member

@WizardCM do you want to include the texture flip override for builds above 6261 in this PR as well (as discussed off-thread)?

As the texture shared with us is originally created for video encoding, it's pre-flipped already.

@RytoEX RytoEX mentioned this pull request Apr 2, 2024
Merged
6 tasks
@RytoEX RytoEX requested a review from PatTheMav April 2, 2024 22:53
@RytoEX RytoEX self-assigned this Apr 2, 2024
@RytoEX

RytoEX commented Apr 3, 2024

Copy link
Copy Markdown
Member

@WizardCM do you want to include the texture flip override for builds above 6261 in this PR as well (as discussed off-thread)?

As the texture shared with us is originally created for video encoding, it's pre-flipped already.

Gentle ping, @WizardCM ?

@WizardCM WizardCM changed the title Enable building with CEF 6261 (Chromium 122) Enable building with CEF 6261 & 6367 (Chromium 122 & 124) Apr 28, 2024
@WizardCM

WizardCM commented Apr 28, 2024

Copy link
Copy Markdown
Member Author

@RytoEX @PatTheMav Per prior discussion, this PR now makes the necessary adjustments (including flip) to correctly run shared textures with CEF 6367. I have tested it on Windows 10 with the 6367 CEF build only. I've also kept the two commits separate for easier review, and they can realistically be combined for final merge.

reitowo
reitowo reviewed May 1, 2024
View reviewed changes
Comment thread browser-client.cpp Outdated
Comment thread browser-client.cpp
WizardCM added 3 commits June 9, 2024 17:51
@WizardCM
Enable building with CEF 5938 on macOS
0941026 
At some point between 5563 and 5938, the parameter's type changed.
@WizardCM
Enable building with CEF 6261
c8ef252 
This allows compiling OBS Browser with Chromium 122-based CEF versions.

Sources:
 - https://github.com/chromiumembedded/cef/blame/d3a483ef59f8f40c624967361e05edda413bbf5b/libcef_dll/ctocpp/browser_ctocpp.h#L57
 - https://bitbucket.org/chromiumembedded/cef/commits/f3b570c
@WizardCM
Enable building with CEF 6367
c4c2a7d 
This allows compiling OBS Browser with Chromium 124-based CEF versions.

This also enables basic support for the new, official, shared texture
API, purely because building without it would be *more* difficult.

Sources:
 - https://bitbucket.org/chromiumembedded/cef/commits/260dd0ca2
@WizardCM

WizardCM commented Jun 9, 2024

Copy link
Copy Markdown
Member Author

Alright, commits have been updated. Tested on macOS, and OnScheduleMessagePumpWork changed somewhere between 5563 and 5938, so our code handles that case too. Tested on Linux, and no additional changes were needed on our side (obviously without shared textures).

This now builds and runs on Windows, macOS and Linux without issue, and the first 2 with shared textures. In my opinion this seems good to merge.

For now, I've left the code to set bs->last_handle but it's not read. I'll let others confirm what we want to do there.

@reitowo

reitowo commented Jun 9, 2024

Copy link
Copy Markdown

Great work!

I forgot why, but is there a chance to import gbm in Linux? Seems OBS is the easiest user to make this work because it has a handy render pipeline.

@jpietek

jpietek commented Jun 18, 2024 •
edited
Loading

Copy link
Copy Markdown

Great work!

I forgot why, but is there a chance to import gbm in Linux? Seems OBS is the easiest user to make this work because it has a handy render pipeline.

I tried once (obs discord long discussion), but failed on Nvidia (OK with Intel and AMD) with some old fork of yours. Would it makes sense to try again with 126 chromium? I see the api has changed not void* but some structure with the handle now.

@RytoEX

RytoEX commented Jun 18, 2024

Copy link
Copy Markdown
Member

There are still be open feedback threads. They should be resolved before this can be merged.

PatTheMav
PatTheMav reviewed Jun 19, 2024
View reviewed changes
Comment thread obs-browser-page/obs-browser-page-main.cpp
@WizardCM WizardCM mentioned this pull request Jul 16, 2024
Closed
6 tasks
@RytoEX RytoEX requested review from PatTheMav and RytoEX July 24, 2024 17:33
RytoEX
RytoEX reviewed Jul 24, 2024
View reviewed changes

@RytoEX RytoEX left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The CEF API changes look good to me. I haven't done a local test build of this yet.

RytoEX
RytoEX approved these changes Jul 25, 2024
View reviewed changes

@RytoEX RytoEX left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can confirm that I can build OBS Studio on Windows against both CEF 103 (5060) and 126 (6478) with these changes.

@RytoEX RytoEX merged commit 879a9d2 into obsproject:master Jul 30, 2024
@WizardCM WizardCM deleted the cef-upgrade-122 branch August 10, 2024 03:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RytoEX RytoEX RytoEX approved these changes

@PatTheMav PatTheMav Awaiting requested review from PatTheMav

+1 more reviewer

@reitowo reitowo reitowo approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@RytoEX RytoEX

Labels

kind/enhancement Enhancements are not bugs or new features but can improve usability or performance.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@WizardCM @jmickelonis @PatTheMav @RytoEX @reitowo @jpietek