OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-01 00:53:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: OBS:035fa5492cf82a1fb32cf9898c38ea56b6161924
Branches Tags
OBS:master
OBS:automated/clean-services
OBS:macos-metal-renderer
OBS:allow-high-precision-images
OBS:release/30.1
OBS:release/30.0
OBS:release/29.1
OBS:release/29.0
OBS:release/28.1
OBS:release/28.0
OBS:release/27.2
OBS:hash-table
OBS:25.0.8-patch
OBS:24.0.4-patch
OBS:metal
OBS:30.2.0-rc1
OBS:30.2.0-beta4
OBS:30.2.0-beta3
OBS:30.2.0-beta2
OBS:30.2.0-beta1
OBS:30.1.2
OBS:30.1.1
OBS:30.1.0
OBS:30.1.0-rc1
OBS:30.1.0-beta3
OBS:30.1.0-beta2
OBS:30.1.0-beta1
OBS:30.0.2
OBS:30.0.1
OBS:30.0.0
OBS:30.0.0-rc2
OBS:30.0.0-rc1
OBS:30.0.0-beta3
OBS:30.0.0-beta2
OBS:30.0.0-beta1
OBS:29.1.3
OBS:29.1.2
OBS:29.1.1
OBS:29.1.0
OBS:29.1.0-rc1
OBS:29.1.0-beta4
OBS:29.1.0-beta3
OBS:29.1.0-beta2
OBS:29.1.0-beta1
OBS:29.0.2
OBS:29.0.1
OBS:29.0.0
OBS:29.0.0-beta3
OBS:29.0.0-beta2
OBS:29.0.0-beta1
OBS:28.1.2
OBS:28.1.1
OBS:28.1.0
OBS:28.1.0-rc1
OBS:28.1.0-beta1
OBS:28.0.3
OBS:28.0.2
OBS:28.0.1
OBS:28.0.0
OBS:28.0.0-rc2
OBS:28.0.0-rc1
OBS:28.0.0-beta2
OBS:28.0.0-beta1
OBS:27.2.4
OBS:27.2.3
OBS:27.2.2
OBS:27.2.1
OBS:27.2.0
OBS:27.2.0-rc4
OBS:27.2.0-rc3
OBS:27.2.0-rc2
OBS:27.2.0-rc1
OBS:27.2.0-beta4
OBS:27.2.0-beta3
OBS:27.2.0-beta2
OBS:27.2.0-beta1
OBS:27.1.3
OBS:27.1.2
OBS:27.1.1
OBS:27.1.0
OBS:27.1.0-rc3
OBS:27.1.0-rc2
OBS:27.1.0-rc1
OBS:27.0.1
OBS:27.0.0
OBS:27.0.0-rc6
OBS:27.0.0-rc5
OBS:27.0.0-rc4
OBS:27.0.0-rc3
OBS:27.0.0-rc2
OBS:27.0.0-rc1
OBS:26.1.2
OBS:26.1.1
OBS:26.1.0
OBS:26.1.0-rc2
OBS:26.1.0-rc1
OBS:26.0.2
OBS:26.0.1
OBS:26.0.0
OBS:26.0.0-rc3
OBS:26.0.0-rc2
OBS:26.0.0-rc1
OBS:25.0.8
OBS:25.0.7
OBS:25.0.6
OBS:25.0.5
OBS:25.0.4
OBS:25.0.3
OBS:25.0.2
OBS:25.0.1
OBS:25.0.0
OBS:25.0.0-rc6
OBS:25.0.0-rc5
OBS:25.0.0-rc4
OBS:25.0.0-rc3
OBS:25.0.0-rc2
OBS:25.0.0-rc1
OBS:24.0.6
OBS:24.0.5
OBS:24.0.4
OBS:24.0.3
OBS:24.0.2
OBS:24.0.1
OBS:24.0.0
OBS:24.0.0-rc5
OBS:24.0.0-rc4
OBS:24.0.0-rc3
OBS:24.0.0-rc2
OBS:24.0.0-rc1
OBS:23.2.1
OBS:23.2.0
OBS:23.2.0-rc1
OBS:23.1.0
OBS:23.1.0-rc1
OBS:23.0.2
OBS:23.0.1
OBS:23.0.0
OBS:23.0.0-rc2
OBS:23.0.0-rc1
OBS:22.0.3
OBS:22.0.2
OBS:22.0.1
OBS:22.0.0
OBS:22.0.0-rc2
OBS:22.0.0-rc1
OBS:21.1.2
OBS:21.1.1
OBS:21.1.0
OBS:21.0.3
OBS:21.0.2
OBS:21.0.1
OBS:21.0.0
OBS:20.1.3
OBS:20.1.2
OBS:20.1.1
OBS:20.1.0
OBS:20.0.1
OBS:20.0.0
OBS:19.0.3
OBS:19.0.2
OBS:19.0.1
OBS:19.0.0
OBS:18.0.2
OBS:18.0.1
OBS:18.0.0
OBS:17.0.2
OBS:17.0.1
OBS:17.0.0
OBS:0.16.6
OBS:0.16.5
OBS:0.16.4
OBS:0.16.3
OBS:0.16.2
OBS:0.16.1
OBS:0.16.0
OBS:0.15.4
OBS:0.15.3
OBS:0.15.2
OBS:0.15.1
OBS:0.15.0
OBS:0.14.2
OBS:0.14.1
OBS:0.14.0
OBS:0.13.4
OBS:0.13.3
OBS:0.13.2
OBS:0.13.1
OBS:0.13.1-rc1
OBS:0.13.0
OBS:0.12.4
OBS:0.12.3
OBS:0.12.2
OBS:0.12.1
OBS:0.12.0
OBS:0.11.4
OBS:0.11.3
OBS:0.11.2
OBS:0.11.1
OBS:0.11.0
OBS:0.10.1
OBS:0.10.0
OBS:0.9.1
OBS:0.9.0
OBS:0.8.3
OBS:0.8.2
OBS:0.8.1
OBS:0.8.0
OBS:0.7.3
OBS:0.7.2
OBS:0.7.1
OBS:0.6.4
OBS:0.6.3
OBS:0.6.2
OBS:0.6.1
OBS:0.6.0
OBS:0.5.1
OBS:0.5.0
OBS:0.4.2
OBS:0.4.1
OBS:0.4.0
OBS:0.3.1
OBS:0.2.4
...
compare: OBS:2df8af85d5e7b906d8fa617d8490a3bb4e01ed75
Branches Tags
OBS:automated/clean-services
OBS:master
OBS:macos-metal-renderer
OBS:allow-high-precision-images
OBS:release/30.1
OBS:release/30.0
OBS:release/29.1
OBS:release/29.0
OBS:release/28.1
OBS:release/28.0
OBS:release/27.2
OBS:hash-table
OBS:25.0.8-patch
OBS:24.0.4-patch
OBS:metal
OBS:30.2.0-rc1
OBS:30.2.0-beta4
OBS:30.2.0-beta3
OBS:30.2.0-beta2
OBS:30.2.0-beta1
OBS:30.1.2
OBS:30.1.1
OBS:30.1.0
OBS:30.1.0-rc1
OBS:30.1.0-beta3
OBS:30.1.0-beta2
OBS:30.1.0-beta1
OBS:30.0.2
OBS:30.0.1
OBS:30.0.0
OBS:30.0.0-rc2
OBS:30.0.0-rc1
OBS:30.0.0-beta3
OBS:30.0.0-beta2
OBS:30.0.0-beta1
OBS:29.1.3
OBS:29.1.2
OBS:29.1.1
OBS:29.1.0
OBS:29.1.0-rc1
OBS:29.1.0-beta4
OBS:29.1.0-beta3
OBS:29.1.0-beta2
OBS:29.1.0-beta1
OBS:29.0.2
OBS:29.0.1
OBS:29.0.0
OBS:29.0.0-beta3
OBS:29.0.0-beta2
OBS:29.0.0-beta1
OBS:28.1.2
OBS:28.1.1
OBS:28.1.0
OBS:28.1.0-rc1
OBS:28.1.0-beta1
OBS:28.0.3
OBS:28.0.2
OBS:28.0.1
OBS:28.0.0
OBS:28.0.0-rc2
OBS:28.0.0-rc1
OBS:28.0.0-beta2
OBS:28.0.0-beta1
OBS:27.2.4
OBS:27.2.3
OBS:27.2.2
OBS:27.2.1
OBS:27.2.0
OBS:27.2.0-rc4
OBS:27.2.0-rc3
OBS:27.2.0-rc2
OBS:27.2.0-rc1
OBS:27.2.0-beta4
OBS:27.2.0-beta3
OBS:27.2.0-beta2
OBS:27.2.0-beta1
OBS:27.1.3
OBS:27.1.2
OBS:27.1.1
OBS:27.1.0
OBS:27.1.0-rc3
OBS:27.1.0-rc2
OBS:27.1.0-rc1
OBS:27.0.1
OBS:27.0.0
OBS:27.0.0-rc6
OBS:27.0.0-rc5
OBS:27.0.0-rc4
OBS:27.0.0-rc3
OBS:27.0.0-rc2
OBS:27.0.0-rc1
OBS:26.1.2
OBS:26.1.1
OBS:26.1.0
OBS:26.1.0-rc2
OBS:26.1.0-rc1
OBS:26.0.2
OBS:26.0.1
OBS:26.0.0
OBS:26.0.0-rc3
OBS:26.0.0-rc2
OBS:26.0.0-rc1
OBS:25.0.8
OBS:25.0.7
OBS:25.0.6
OBS:25.0.5
OBS:25.0.4
OBS:25.0.3
OBS:25.0.2
OBS:25.0.1
OBS:25.0.0
OBS:25.0.0-rc6
OBS:25.0.0-rc5
OBS:25.0.0-rc4
OBS:25.0.0-rc3
OBS:25.0.0-rc2
OBS:25.0.0-rc1
OBS:24.0.6
OBS:24.0.5
OBS:24.0.4
OBS:24.0.3
OBS:24.0.2
OBS:24.0.1
OBS:24.0.0
OBS:24.0.0-rc5
OBS:24.0.0-rc4
OBS:24.0.0-rc3
OBS:24.0.0-rc2
OBS:24.0.0-rc1
OBS:23.2.1
OBS:23.2.0
OBS:23.2.0-rc1
OBS:23.1.0
OBS:23.1.0-rc1
OBS:23.0.2
OBS:23.0.1
OBS:23.0.0
OBS:23.0.0-rc2
OBS:23.0.0-rc1
OBS:22.0.3
OBS:22.0.2
OBS:22.0.1
OBS:22.0.0
OBS:22.0.0-rc2
OBS:22.0.0-rc1
OBS:21.1.2
OBS:21.1.1
OBS:21.1.0
OBS:21.0.3
OBS:21.0.2
OBS:21.0.1
OBS:21.0.0
OBS:20.1.3
OBS:20.1.2
OBS:20.1.1
OBS:20.1.0
OBS:20.0.1
OBS:20.0.0
OBS:19.0.3
OBS:19.0.2
OBS:19.0.1
OBS:19.0.0
OBS:18.0.2
OBS:18.0.1
OBS:18.0.0
OBS:17.0.2
OBS:17.0.1
OBS:17.0.0
OBS:0.16.6
OBS:0.16.5
OBS:0.16.4
OBS:0.16.3
OBS:0.16.2
OBS:0.16.1
OBS:0.16.0
OBS:0.15.4
OBS:0.15.3
OBS:0.15.2
OBS:0.15.1
OBS:0.15.0
OBS:0.14.2
OBS:0.14.1
OBS:0.14.0
OBS:0.13.4
OBS:0.13.3
OBS:0.13.2
OBS:0.13.1
OBS:0.13.1-rc1
OBS:0.13.0
OBS:0.12.4
OBS:0.12.3
OBS:0.12.2
OBS:0.12.1
OBS:0.12.0
OBS:0.11.4
OBS:0.11.3
OBS:0.11.2
OBS:0.11.1
OBS:0.11.0
OBS:0.10.1
OBS:0.10.0
OBS:0.9.1
OBS:0.9.0
OBS:0.8.3
OBS:0.8.2
OBS:0.8.1
OBS:0.8.0
OBS:0.7.3
OBS:0.7.2
OBS:0.7.1
OBS:0.6.4
OBS:0.6.3
OBS:0.6.2
OBS:0.6.1
OBS:0.6.0
OBS:0.5.1
OBS:0.5.0
OBS:0.4.2
OBS:0.4.1
OBS:0.4.0
OBS:0.3.1
OBS:0.2.4

13 commits
035fa5492c ... 2df8af85d5

Author SHA1 Message Date
Clayton Groeneveld 2df8af85d5
Merge 02f5db4ab2 into 9d67bf2662 2024-06-27 11:04:08 +02:00
Ryan Foster 9d67bf2662 Revert "plugins/win-dshow: Add CUDA decoder" 
This reverts commit ce4c99be4e.

This was causing infinitely looping log errors in systems with no
CUDA-capable hardware when hardware decoding was enabled on video
capture devices with custom config enabled.
 2024-06-26 18:43:09 -04:00
tt2468 8892edde05 libobs: Merge obs_encoder_stop() and ..._stop_internal() 
There is no longer any need for them to be separate functions. This is
just code cleanup.
 2024-06-26 16:42:05 -04:00
tt2468 06291c7201 libobs: Fix race when to-be-destroyed encoder group finishes stopping 
Fixes a crash when the following steps occur:
- Encoder group created and then started with encoders, only the group
owning encoder refs
- Encoder group destroy called: group has `destroy_on_stop` set
without actual destroy
- Outputs holding encoders from stopping are stopped
- `remove_connection()` function destroys encoder group, releasing
encoders and causing the currently processed encoder to be destroyed
early
- parent scopes try to access destroyed encoder pointer and crash

This change moves some logic around to improve the release/destruct
order of `obs_encoder_stop()` to fix the race above.

Note: Cases of encoder errors will not destruct the group if it has
`destroy_on_stop` set, as the encoder is also not destroyed if it also
is set to destroy on stop. This part of the code should be revisited
at a later date and fixed up to prevent memory leaks.
 2024-06-26 16:42:05 -04:00
tt2468 fb5bbc8575 libobs: Set encoder initialized call closer to shutdown 
This is mainly code cleanup.
 2024-06-26 16:42:05 -04:00
Ruwen Hahn 7d19add10b UI: Display dialog for multitrack video output audio channels mismatch 2024-06-26 16:10:15 -04:00
Vainock 4830d6903e UI: Fix capitalization of 'OBS' and 'RTMP' 2024-06-26 15:01:01 -04:00
Warchamp7 47fb194223 UI: Adjust Yami (Classic) styling 2024-06-26 14:58:13 -04:00
derrod edcda5a825 obs-x264: Ignore stats/qp file and multipass options 2024-06-26 13:58:08 -04:00
derrod 2e6e79b4f5 obs-outputs: Skip trak box if track has no data 2024-06-26 13:57:59 -04:00
derrod b34fbb116e obs-ffmpeg: Check if current NVENC configuration supports 4:4:4 encode 2024-06-26 13:57:43 -04:00
Penwywern 4517918c7a cmake: Fix FFmpeg version regex 2024-06-26 12:26:56 -04:00
cg2121 02f5db4ab2 UI: Cleanup frontend event handling 
This adds a function to OBSBasic to call on_event, so every
time a event is called, the api variable doesn't have to be
checked everytime.
 2024-06-18 15:00:13 -05:00
18 changed files with 349 additions and 186 deletions
Show stats Expand all files Collapse all files

7
UI/data/locale/en-US.ini
View file

@ -1566,10 +1566,10 @@ FailedToStartStream.MissingConfigURL="No config URL available for the current se
FailedToStartStream.NoCustomRTMPURLInSettings="Custom RTMP URL not specified"
FailedToStartStream.InvalidCustomConfig="Invalid custom config"
FailedToStartStream.FailedToCreateMultitrackVideoService="Failed to create multitrack video service"
FailedToStartStream.FailedToCreateMultitrackVideoOutput="Failed to create multitrack video rtmp output"
FailedToStartStream.FailedToCreateMultitrackVideoOutput="Failed to create multitrack video RTMP output"
FailedToStartStream.EncoderNotAvailable="NVENC not available.\n\nFailed to find encoder type '%1'"
FailedToStartStream.FailedToCreateVideoEncoder="Failed to create video encoder '%1' (type: '%2')"
FailedToStartStream.FailedToGetOBSVideoInfo="Failed to get obs video info while creating encoder '%1' (type: '%2')"
FailedToStartStream.FailedToGetOBSVideoInfo="Failed to get OBS video info while creating encoder '%1' (type: '%2')"
FailedToStartStream.FailedToCreateAudioEncoder="Failed to create audio encoder"
FailedToStartStream.NoRTMPURLInConfig="Config does not contain stream target RTMP(S) URL"
FailedToStartStream.FallbackToDefault="Starting the stream using %1 failed; do you want to retry using single encode settings?"
@ -1585,3 +1585,6 @@ MultitrackVideo.IncompatibleSettings.Title="Incompatible Settings"
MultitrackVideo.IncompatibleSettings.Text="%1 is not currently compatible with:\n\n%2\nTo continue streaming with %1, disable incompatible settings:\n\n%3\nand Start Streaming again."
MultitrackVideo.IncompatibleSettings.DisableAndStartStreaming="Disable for this stream and Start Streaming"
MultitrackVideo.IncompatibleSettings.UpdateAndStartStreaming="Update Settings and Start Streaming"
MultitrackVideo.IncompatibleSettings.AudioChannels="%1 is not currently compatible with [Audio → General → Channels] set to '%2', %3"
MultitrackVideo.IncompatibleSettings.AudioChannelsSingle="[Audio → General → Channels] needs to be set to '%1'"
MultitrackVideo.IncompatibleSettings.AudioChannelsMultiple="%1 requires multiple different settings for [Audio → General → Channels]"

15
UI/data/themes/Yami.obt
View file

@ -477,7 +477,7 @@ OBSDock > QWidget {
}
#transitionsFrame {
padding: 4px 8px;
padding: var(--padding_large);
}
OBSDock QLabel {
@ -827,7 +827,7 @@ QComboBox::drop-down,
QDateTimeEdit::drop-down {
border:none;
border-left: 1px solid var(--grey6);
width: 32px;
width: var(--input_height);
}
QComboBox::down-arrow,
@ -923,7 +923,7 @@ QDoubleSpinBox::up-button {
subcontrol-origin: padding;
subcontrol-position: top right; /* position at the top right corner */
width: 32px;
width: var(--input_height);
height: var(--spinbox_button_height);
border-left: 1px solid var(--grey6);
border-bottom: 1px solid transparent;
@ -936,7 +936,7 @@ QDoubleSpinBox::down-button {
subcontrol-origin: padding;
subcontrol-position: bottom right; /* position at the top right corner */
width: 32px;
width: var(--input_height);
height: var(--spinbox_button_height);
border-left: 1px solid var(--grey6);
border-top: 1px solid var(--grey6);
@ -1078,6 +1078,8 @@ QPushButton:hover {
QToolButton:hover,
QToolButton:focus,
QPushButton[toolButton="true"]:hover,
QPushButton[toolButton="true"]:focus,
MuteCheckBox::indicator:hover,
MuteCheckBox::indicator:focus {
border-color: var(--button_border);
@ -1104,7 +1106,9 @@ QPushButton:pressed:hover {
}
QToolButton:pressed,
QToolButton:pressed:hover {
QToolButton:pressed:hover,
QPushButton[toolButton="true"]:pressed,
QPushButton[toolButton="true"]:pressed:hover {
background-color: var(--button_bg_down);
border-color: var(--button_border);
}
@ -1275,7 +1279,6 @@ VolControl #volLabel {
#vMixerScrollArea VolControl #volLabel {
padding: var(--padding_base) 0px var(--padding_base);
min-width: var(--volume_slider_label);
max-width: var(--volume_slider_label);
margin-left: var(--padding_xlarge);
text-align: center;
}

59
UI/data/themes/Yami_Classic.ovt
View file

@ -11,7 +11,7 @@
--grey2: rgb(134,135,134);
--grey3: rgb(122,121,122);
--grey4: rgb(76,76,76);
--grey5: rgb(88,87,88);
--grey5: rgb(70,69,70);
--grey6: rgb(31,30,31);
--grey7: rgb(58,57,58);
--grey8: rgb(46,45,46);
@ -31,8 +31,12 @@
/* OS Fixes */
--os_mac_font_base_value: 11;
--font_small: calc(0.8pt * var(--font_base_value));
--icon_base: calc(6px + var(--font_base_value));
--padding_xlarge: calc(2px + calc(0.5px * var(--padding_base_value)));
--padding_wide: calc(18px + calc(0.25 * var(--padding_base_value)));
--padding_menu: calc(8px + calc(1 * var(--padding_base_value)));
@ -45,14 +49,14 @@
--border_radius_large: 2px;
--input_bg: var(--grey4);
--input_bg_hover: var(--grey5);
--input_bg_hover: var(--grey1);
--input_bg_focus: var(--grey6);
--list_item_bg_selected: var(--primary);
--list_item_bg_hover: var(--primary_light);
--input_border: var(--grey4);
--input_border_hover: var(--grey5);
--input_border_hover: var(--grey1);
--input_border_focus: var(--grey6);
--spacing_input: var(--spacing_base);
@ -91,11 +95,17 @@ QStatusBar {
background-color: var(--bg_window);
}
OBSDock > QWidget {
border-top: 1px solid var(--border_color);
padding-top: var(--spacing_large);
}
QDockWidget {
font-weight: normal;
}
QDockWidget::title {
background-color: var(--grey5);
padding: var(--dock_title_padding);
text-align: center;
}
@ -104,6 +114,10 @@ QDockWidget > QWidget {
background: var(--bg_window);
}
#transitionsFrame {
padding: var(--padding_xlarge);
}
SceneTree::item,
SourceTreeItem {
border-width: 0px;
@ -193,12 +207,20 @@ OBSBasicSettings QListWidget::item {
padding: 4px;
}
QPushButton:checked {
border-color: var(--primary);
}
QToolButton,
QPushButton[toolButton="true"] {
background-color: var(--bg_window);
border-color: var(--bg_window);
}
#stackedMixerArea QScrollArea {
background: var(--bg_base);
}
#stackedMixerArea QPushButton {
min-width: var(--icon_base);
padding: var(--padding_large) var(--padding_large);
@ -215,6 +237,33 @@ QPushButton[toolButton="true"] {
border: none;
}
#hMixerScrollArea VolControl {
padding: 0px 2px;
margin-bottom: 1px;
}
#hMixerScrollArea QLabel {
margin: var(--padding_xlarge) 0px;
}
#hMixerScrollArea #volMeterFrame {
margin-top: var(--spacing_large);
}
#vMixerScrollArea VolControl {
padding: 0px var(--padding_xlarge) var(--spacing_large);
border-right: 1px solid var(--bg_window);
}
#vMixerScrollArea QLabel {
font-size: var(--font_small);
margin: var(--padding_xlarge) 0px;
}
#vMixerScrollArea #volLabel {
font-size: var(--font_base);
}
MuteCheckBox::indicator,
MuteCheckBox::indicator:unchecked {
background-color: var(--bg_base);
@ -255,3 +304,7 @@ VolumeMeter {
qproperty-minorTickColor: rgb(122,121,122); /* light */
qproperty-meterThickness: 3;
}
OBSBasicStats {
background: var(--bg_window);
}

24
UI/forms/OBSBasicFilters.ui
View file

@ -128,6 +128,9 @@
<property name="themeID" stdset="0">
<string>addIconSmall</string>
</property>
<property name="toolButton" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -157,6 +160,9 @@
<property name="themeID" stdset="0">
<string>removeIconSmall</string>
</property>
<property name="toolButton" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -186,6 +192,9 @@
<property name="themeID" stdset="0">
<string>upArrowIconSmall</string>
</property>
<property name="toolButton" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -215,6 +224,9 @@
<property name="themeID" stdset="0">
<string>downArrowIconSmall</string>
</property>
<property name="toolButton" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -350,6 +362,9 @@
<property name="themeID" stdset="0">
<string>addIconSmall</string>
</property>
<property name="toolButton" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -379,6 +394,9 @@
<property name="themeID" stdset="0">
<string>removeIconSmall</string>
</property>
<property name="toolButton" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -408,6 +426,9 @@
<property name="themeID" stdset="0">
<string>upArrowIconSmall</string>
</property>
<property name="toolButton" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -437,6 +458,9 @@
<property name="themeID" stdset="0">
<string>downArrowIconSmall</string>
</property>
<property name="toolButton" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
<item>

133
UI/multitrack-video-output.cpp
View file

@ -8,6 +8,7 @@
#include <obs-app.hpp>
#include <obs.hpp>
#include <remote-text.hpp>
#include <window-basic-main.hpp>
#include <algorithm>
#include <cinttypes>
@ -331,7 +332,8 @@ struct OBSOutputs {
};
static OBSOutputs
SetupOBSOutput(obs_data_t *dump_stream_to_file_config,
SetupOBSOutput(QWidget *parent, const QString &multitrack_video_name,
obs_data_t *dump_stream_to_file_config,
const GoLiveApi::Config &go_live_config,
std::vector<OBSEncoderAutoRelease> &audio_encoders,
std::shared_ptr<obs_encoder_group_t> &video_encoder_group,
@ -465,7 +467,8 @@ void MultitrackVideoOutput::PrepareStreaming(
std::vector<OBSEncoderAutoRelease> audio_encoders;
std::shared_ptr<obs_encoder_group_t> video_encoder_group;
auto outputs = SetupOBSOutput(dump_stream_to_file_config, output_config,
auto outputs = SetupOBSOutput(parent, multitrack_video_name,
dump_stream_to_file_config, output_config,
audio_encoders, video_encoder_group,
audio_encoder_id, main_audio_mixer,
vod_track_mixer);
@ -730,8 +733,46 @@ create_audio_encoders(const GoLiveApi::Config &go_live_config,
std::vector<OBSEncoderAutoRelease> &audio_encoders,
obs_output_t *output, obs_output_t *recording_output,
const char *audio_encoder_id, size_t main_audio_mixer,
std::optional<size_t> vod_track_mixer)
std::optional<size_t> vod_track_mixer,
std::vector<speaker_layout> &speaker_layouts,
speaker_layout &current_layout)
{
speaker_layout speakers = SPEAKERS_UNKNOWN;
obs_audio_info oai = {};
if (obs_get_audio_info(&oai))
speakers = oai.speakers;
current_layout = speakers;
auto sanitize_audio_channels = [&](obs_encoder_t *encoder,
uint32_t channels) {
speaker_layout target_speakers = SPEAKERS_UNKNOWN;
for (size_t i = 0; i <= (size_t)SPEAKERS_7POINT1; i++) {
if (get_audio_channels((speaker_layout)i) != channels)
continue;
target_speakers = (speaker_layout)i;
break;
}
if (target_speakers == SPEAKERS_UNKNOWN) {
blog(LOG_WARNING,
"MultitrackVideoOutput: Could not find "
"speaker layout for %" PRIu32 "channels "
"while configuring encoder '%s'",
channels, obs_encoder_get_name(encoder));
return;
}
if (speakers != SPEAKERS_UNKNOWN &&
(channels > get_audio_channels(speakers) ||
speakers == target_speakers))
return;
auto it = std::find(std::begin(speaker_layouts),
std::end(speaker_layouts), target_speakers);
if (it == std::end(speaker_layouts))
speaker_layouts.push_back(target_speakers);
};
using encoder_configs_type =
decltype(go_live_config.audio_configurations.live);
DStr encoder_name_buffer;
@ -757,6 +798,10 @@ create_audio_encoders(const GoLiveApi::Config &go_live_config,
create_audio_encoder(encoder_name_buffer->array,
audio_encoder_id, settings,
mixer_idx);
sanitize_audio_channels(audio_encoder,
configs[i].channels);
obs_output_set_audio_encoder(output, audio_encoder,
output_encoder_index);
if (recording_output)
@ -784,8 +829,80 @@ create_audio_encoders(const GoLiveApi::Config &go_live_config,
return;
}
static const char *speaker_layout_to_string(speaker_layout layout)
{
switch (layout) {
case SPEAKERS_MONO:
return "Mono";
case SPEAKERS_2POINT1:
return "2.1";
case SPEAKERS_4POINT0:
return "4.0";
case SPEAKERS_4POINT1:
return "4.1";
case SPEAKERS_5POINT1:
return "5.1";
case SPEAKERS_7POINT1:
return "7.1";
case SPEAKERS_UNKNOWN:
case SPEAKERS_STEREO:
return "Stereo";
}
return "Stereo";
}
static void handle_speaker_layout_issues(
QWidget *parent, const QString &multitrack_video_name,
const std::vector<speaker_layout> &requested_layouts,
speaker_layout layout)
{
if (requested_layouts.empty())
return;
QString message;
if (requested_layouts.size() == 1) {
message =
QTStr("MultitrackVideo.IncompatibleSettings.AudioChannelsSingle")
.arg(QTStr(speaker_layout_to_string(
requested_layouts.front())));
} else {
message =
QTStr("MultitrackVideo.IncompatibleSettings.AudioChannelsMultiple")
.arg(multitrack_video_name);
}
QMetaObject::invokeMethod(
parent,
[&] {
QMessageBox mb(parent);
mb.setIcon(QMessageBox::Critical);
mb.setWindowTitle(QTStr(
"MultitrackVideo.IncompatibleSettings.Title"));
mb.setText(
QTStr("MultitrackVideo.IncompatibleSettings.AudioChannels")
.arg(multitrack_video_name)
.arg(QTStr(speaker_layout_to_string(
layout)))
.arg(message));
mb.setStandardButtons(
QMessageBox::StandardButton::Cancel);
mb.exec();
},
BlockingConnectionTypeFor(parent));
blog(LOG_INFO,
"MultitrackVideoOutput: Attempted to start stream with incompatible "
"audio channel setting. Action taken: cancel");
throw MultitrackVideoError::cancel();
}
static OBSOutputs
SetupOBSOutput(obs_data_t *dump_stream_to_file_config,
SetupOBSOutput(QWidget *parent, const QString &multitrack_video_name,
obs_data_t *dump_stream_to_file_config,
const GoLiveApi::Config &go_live_config,
std::vector<OBSEncoderAutoRelease> &audio_encoders,
std::shared_ptr<obs_encoder_group_t> &video_encoder_group,
@ -803,9 +920,15 @@ SetupOBSOutput(obs_data_t *dump_stream_to_file_config,
recording_output))
return {nullptr, nullptr};
std::vector<speaker_layout> requested_speaker_layouts;
speaker_layout current_layout = SPEAKERS_UNKNOWN;
create_audio_encoders(go_live_config, audio_encoders, output,
recording_output, audio_encoder_id,
main_audio_mixer, vod_track_mixer);
main_audio_mixer, vod_track_mixer,
requested_speaker_layouts, current_layout);
handle_speaker_layout_issues(parent, multitrack_video_name,
requested_speaker_layouts, current_layout);
return {std::move(output), std::move(recording_output)};
}

31
UI/window-basic-main-profiles.cpp
View file

@ -305,8 +305,8 @@ bool OBSBasic::CreateProfile(const std::string &newName, bool create_new,
return false;
}
if (api && !rename)
api->on_event(OBS_FRONTEND_EVENT_PROFILE_CHANGING);
if (!rename)
OnEvent(OBS_FRONTEND_EVENT_PROFILE_CHANGING);
config_set_string(App()->GlobalConfig(), "Basic", "Profile",
newName.c_str());
@ -355,9 +355,9 @@ bool OBSBasic::CreateProfile(const std::string &newName, bool create_new,
wizard.exec();
}
if (api && !rename) {
api->on_event(OBS_FRONTEND_EVENT_PROFILE_LIST_CHANGED);
api->on_event(OBS_FRONTEND_EVENT_PROFILE_CHANGED);
if (!rename) {
OnEvent(OBS_FRONTEND_EVENT_PROFILE_LIST_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_PROFILE_CHANGED);
}
return true;
}
@ -451,8 +451,7 @@ void OBSBasic::DeleteProfile(const QString &profileName)
DeleteProfile(name.c_str(), profileDir);
RefreshProfiles();
config_save_safe(App()->GlobalConfig(), "tmp", nullptr);
if (api)
api->on_event(OBS_FRONTEND_EVENT_PROFILE_LIST_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_PROFILE_LIST_CHANGED);
}
void OBSBasic::RefreshProfiles()
@ -539,8 +538,7 @@ void OBSBasic::on_actionRenameProfile_triggered()
RefreshProfiles();
}
if (api)
api->on_event(OBS_FRONTEND_EVENT_PROFILE_RENAMED);
OnEvent(OBS_FRONTEND_EVENT_PROFILE_RENAMED);
}
void OBSBasic::on_actionRemoveProfile_triggered(bool skipConfirmation)
@ -589,8 +587,7 @@ void OBSBasic::on_actionRemoveProfile_triggered(bool skipConfirmation)
return;
}
if (api)
api->on_event(OBS_FRONTEND_EVENT_PROFILE_CHANGING);
OnEvent(OBS_FRONTEND_EVENT_PROFILE_CHANGING);
newPath.resize(newPath_len);
@ -626,10 +623,8 @@ void OBSBasic::on_actionRemoveProfile_triggered(bool skipConfirmation)
Auth::Load();
if (api) {
api->on_event(OBS_FRONTEND_EVENT_PROFILE_LIST_CHANGED);
api->on_event(OBS_FRONTEND_EVENT_PROFILE_CHANGED);
}
OnEvent(OBS_FRONTEND_EVENT_PROFILE_LIST_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_PROFILE_CHANGED);
if (needsRestart) {
QMessageBox::StandardButton button = OBSMessageBox::question(
@ -768,8 +763,7 @@ void OBSBasic::ChangeProfile()
return;
}
if (api)
api->on_event(OBS_FRONTEND_EVENT_PROFILE_CHANGING);
OnEvent(OBS_FRONTEND_EVENT_PROFILE_CHANGING);
path.resize(path_len);
@ -811,8 +805,7 @@ void OBSBasic::ChangeProfile()
blog(LOG_INFO, "Switched to profile '%s' (%s)", newName, newDir);
blog(LOG_INFO, "------------------------------------------------");
if (api)
api->on_event(OBS_FRONTEND_EVENT_PROFILE_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_PROFILE_CHANGED);
if (needsRestart) {
QMessageBox::StandardButton button = OBSMessageBox::question(

27
UI/window-basic-main-scene-collections.cpp
View file

@ -168,8 +168,7 @@ bool OBSBasic::AddSceneCollection(bool create_new, const QString &qname)
RefreshSceneCollections();
};
if (api)
api->on_event(OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGING);
OnEvent(OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGING);
new_collection(file, name);
@ -179,10 +178,8 @@ bool OBSBasic::AddSceneCollection(bool create_new, const QString &qname)
UpdateTitleBar();
if (api) {
api->on_event(OBS_FRONTEND_EVENT_SCENE_COLLECTION_LIST_CHANGED);
api->on_event(OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGED);
}
OnEvent(OBS_FRONTEND_EVENT_SCENE_COLLECTION_LIST_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGED);
return true;
}
@ -294,8 +291,7 @@ void OBSBasic::on_actionRenameSceneCollection_triggered()
UpdateTitleBar();
RefreshSceneCollections();
if (api)
api->on_event(OBS_FRONTEND_EVENT_SCENE_COLLECTION_RENAMED);
OnEvent(OBS_FRONTEND_EVENT_SCENE_COLLECTION_RENAMED);
}
void OBSBasic::on_actionRemoveSceneCollection_triggered()
@ -339,8 +335,7 @@ void OBSBasic::on_actionRemoveSceneCollection_triggered()
return;
}
if (api)
api->on_event(OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGING);
OnEvent(OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGING);
oldFile.insert(0, path);
/* os_rename() overwrites if necessary, only the .bak file will remain. */
@ -360,10 +355,8 @@ void OBSBasic::on_actionRemoveSceneCollection_triggered()
UpdateTitleBar();
if (api) {
api->on_event(OBS_FRONTEND_EVENT_SCENE_COLLECTION_LIST_CHANGED);
api->on_event(OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGED);
}
OnEvent(OBS_FRONTEND_EVENT_SCENE_COLLECTION_LIST_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGED);
}
void OBSBasic::on_actionImportSceneCollection_triggered()
@ -461,8 +454,7 @@ void OBSBasic::ChangeSceneCollection()
return;
}
if (api)
api->on_event(OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGING);
OnEvent(OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGING);
SaveProjectNow();
@ -480,6 +472,5 @@ void OBSBasic::ChangeSceneCollection()
UpdateTitleBar();
if (api)
api->on_event(OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGED);
}

4
UI/window-basic-main-screenshot.cpp
View file

@ -56,9 +56,7 @@ ScreenshotObj::~ScreenshotObj()
main->lastScreenshot = path;
if (main->api)
main->api->on_event(
OBS_FRONTEND_EVENT_SCREENSHOT_TAKEN);
main->OnEvent(OBS_FRONTEND_EVENT_SCREENSHOT_TAKEN);
}
}
}

40
UI/window-basic-main-transitions.cpp
View file

@ -267,10 +267,8 @@ void OBSBasic::TransitionStopped()
EnableTransitionWidgets(true);
UpdatePreviewProgramIndicators();
if (api) {
api->on_event(OBS_FRONTEND_EVENT_TRANSITION_STOPPED);
api->on_event(OBS_FRONTEND_EVENT_SCENE_CHANGED);
}
OnEvent(OBS_FRONTEND_EVENT_TRANSITION_STOPPED);
OnEvent(OBS_FRONTEND_EVENT_SCENE_CHANGED);
swapScene = nullptr;
}
@ -371,8 +369,7 @@ void OBSBasic::TransitionToScene(OBSSource source, bool force,
if (force) {
obs_transition_set(transition, source);
if (api)
api->on_event(OBS_FRONTEND_EVENT_SCENE_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_SCENE_CHANGED);
} else {
int duration = ui->transitionDuration->value();
@ -450,8 +447,7 @@ void OBSBasic::SetTransition(OBSSource transition)
ui->transitionRemove->setEnabled(configurable);
ui->transitionProps->setEnabled(configurable);
if (api)
api->on_event(OBS_FRONTEND_EVENT_TRANSITION_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_TRANSITION_CHANGED);
}
OBSSource OBSBasic::GetCurrentTransition()
@ -509,9 +505,7 @@ void OBSBasic::AddTransition(const char *id)
CreatePropertiesWindow(source);
obs_source_release(source);
if (api)
api->on_event(
OBS_FRONTEND_EVENT_TRANSITION_LIST_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_TRANSITION_LIST_CHANGED);
ClearQuickTransitionWidgets();
RefreshQuickTransitions();
@ -566,8 +560,7 @@ void OBSBasic::on_transitionRemove_clicked()
ui->transitions->removeItem(idx);
if (api)
api->on_event(OBS_FRONTEND_EVENT_TRANSITION_LIST_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_TRANSITION_LIST_CHANGED);
ClearQuickTransitionWidgets();
RefreshQuickTransitions();
@ -607,9 +600,7 @@ void OBSBasic::RenameTransition(OBSSource transition)
if (idx != -1) {
ui->transitions->setItemText(idx, QT_UTF8(name.c_str()));
if (api)
api->on_event(
OBS_FRONTEND_EVENT_TRANSITION_LIST_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_TRANSITION_LIST_CHANGED);
ClearQuickTransitionWidgets();
RefreshQuickTransitions();
@ -643,9 +634,7 @@ void OBSBasic::on_transitionProps_clicked()
void OBSBasic::on_transitionDuration_valueChanged()
{
if (api) {
api->on_event(OBS_FRONTEND_EVENT_TRANSITION_DURATION_CHANGED);
}
OnEvent(OBS_FRONTEND_EVENT_TRANSITION_DURATION_CHANGED);
}
QuickTransition *OBSBasic::GetQuickTransition(int id)
@ -714,9 +703,7 @@ void OBSBasic::SetCurrentScene(OBSSource scene, bool force)
outputHandler
->UpdateVirtualCamOutputSource();
if (api)
api->on_event(
OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
break;
}
}
@ -968,8 +955,7 @@ void OBSBasic::TBarChanged(int value)
obs_transition_set_manual_time(transition,
(float)value / T_BAR_PRECISION_F);
if (api)
api->on_event(OBS_FRONTEND_EVENT_TBAR_VALUE_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_TBAR_VALUE_CHANGED);
}
int OBSBasic::GetTbarPosition()
@ -1668,8 +1654,7 @@ void OBSBasic::SetPreviewProgramMode(bool enabled)
ui->previewLayout->setAlignment(programOptions,
Qt::AlignCenter);
if (api)
api->on_event(OBS_FRONTEND_EVENT_STUDIO_MODE_ENABLED);
OnEvent(OBS_FRONTEND_EVENT_STUDIO_MODE_ENABLED);
blog(LOG_INFO, "Switched to Preview/Program mode");
blog(LOG_INFO, "-----------------------------"
@ -1707,8 +1692,7 @@ void OBSBasic::SetPreviewProgramMode(bool enabled)
ui->transitions->setEnabled(true);
tBarActive = false;
if (api)
api->on_event(OBS_FRONTEND_EVENT_STUDIO_MODE_DISABLED);
OnEvent(OBS_FRONTEND_EVENT_STUDIO_MODE_DISABLED);
blog(LOG_INFO, "Switched to regular Preview mode");
blog(LOG_INFO, "-----------------------------"

99
UI/window-basic-main.cpp
View file

@ -617,10 +617,8 @@ OBSBasic::OBSBasic(QWidget *parent)
connect(ui->scenes, &SceneTree::scenesReordered,
[]() { OBSProjector::UpdateMultiviewProjectors(); });
connect(App(), &OBSApp::StyleChanged, this, [this]() {
if (api)
api->on_event(OBS_FRONTEND_EVENT_THEME_CHANGED);
});
connect(App(), &OBSApp::StyleChanged, this,
[this]() { OnEvent(OBS_FRONTEND_EVENT_THEME_CHANGED); });
QActionGroup *actionGroup = new QActionGroup(this);
actionGroup->addAction(ui->actionSceneListMode);
@ -1443,10 +1441,8 @@ retryScene:
if (vcamEnabled)
outputHandler->UpdateVirtualCamOutputSource();
if (api) {
api->on_event(OBS_FRONTEND_EVENT_SCENE_CHANGED);
api->on_event(OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
}
OnEvent(OBS_FRONTEND_EVENT_SCENE_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
}
#define SERVICE_PATH "service.json"
@ -2525,8 +2521,7 @@ void OBSBasic::OBSInit()
void OBSBasic::OnFirstLoad()
{
if (api)
api->on_event(OBS_FRONTEND_EVENT_FINISHED_LOADING);
OnEvent(OBS_FRONTEND_EVENT_FINISHED_LOADING);
#ifdef WHATSNEW_ENABLED
/* Attempt to load init screen if available */
@ -3352,8 +3347,7 @@ void OBSBasic::AddScene(OBSSource source)
OBSProjector::UpdateMultiviewProjectors();
}
if (api)
api->on_event(OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED);
}
void OBSBasic::RemoveScene(OBSSource source)
@ -3388,8 +3382,7 @@ void OBSBasic::RemoveScene(OBSSource source)
OBSProjector::UpdateMultiviewProjectors();
}
if (api)
api->on_event(OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED);
}
static bool select_one(obs_scene_t * /* scene */, obs_sceneitem_t *item,
@ -4481,8 +4474,7 @@ void OBSBasic::RemoveSelectedScene()
RemoveSceneAndReleaseNested(source);
if (api)
api->on_event(OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED);
}
void OBSBasic::ReorderSources(OBSScene scene)
@ -5107,8 +5099,7 @@ void OBSBasic::ClearSceneData()
obs_enum_scenes(cb, nullptr);
obs_enum_sources(cb, nullptr);
if (api)
api->on_event(OBS_FRONTEND_EVENT_SCENE_COLLECTION_CLEANUP);
OnEvent(OBS_FRONTEND_EVENT_SCENE_COLLECTION_CLEANUP);
undo_s.clear();
@ -5287,8 +5278,7 @@ void OBSBasic::closeEvent(QCloseEvent *event)
ClearExtraBrowserDocks();
#endif
if (api)
api->on_event(OBS_FRONTEND_EVENT_SCRIPTING_SHUTDOWN);
OnEvent(OBS_FRONTEND_EVENT_SCRIPTING_SHUTDOWN);
disableSaving++;
@ -5296,8 +5286,7 @@ void OBSBasic::closeEvent(QCloseEvent *event)
* sources, etc) so that all references are released before shutdown */
ClearSceneData();
if (api)
api->on_event(OBS_FRONTEND_EVENT_EXIT);
OnEvent(OBS_FRONTEND_EVENT_EXIT);
// Destroys the frontend API so plugins can't continue calling it
obs_frontend_set_callbacks_internal(nullptr);
@ -5537,8 +5526,7 @@ void OBSBasic::on_scenes_currentItemChanged(QListWidgetItem *current,
if (vcamEnabled && vcamConfig.type == VCamOutputType::PreviewOutput)
outputHandler->UpdateVirtualCamOutputSource();
if (api)
api->on_event(OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
UpdateContextBar();
}
@ -6881,8 +6869,7 @@ void OBSBasic::SceneNameEdited(QWidget *editor)
ui->scenesDock->addAction(renameScene);
if (api)
api->on_event(OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED);
OnEvent(OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED);
}
void OBSBasic::OpenFilters(OBSSource source)
@ -7116,8 +7103,7 @@ void OBSBasic::StartStreaming()
return;
}
if (api)
api->on_event(OBS_FRONTEND_EVENT_STREAMING_STARTING);
OnEvent(OBS_FRONTEND_EVENT_STREAMING_STARTING);
SaveProject();
@ -7472,8 +7458,7 @@ void OBSBasic::StreamDelayStopping(int sec)
ui->statusbar->StreamDelayStopping(sec);
if (api)
api->on_event(OBS_FRONTEND_EVENT_STREAMING_STOPPING);
OnEvent(OBS_FRONTEND_EVENT_STREAMING_STOPPING);
}
void OBSBasic::StreamingStart()
@ -7504,8 +7489,7 @@ void OBSBasic::StreamingStart()
}
#endif
if (api)
api->on_event(OBS_FRONTEND_EVENT_STREAMING_STARTED);
OnEvent(OBS_FRONTEND_EVENT_STREAMING_STARTED);
OnActivate();
@ -7525,8 +7509,7 @@ void OBSBasic::StreamStopping()
sysTrayStream->setText(QTStr("Basic.Main.StoppingStreaming"));
streamingStopping = true;
if (api)
api->on_event(OBS_FRONTEND_EVENT_STREAMING_STOPPING);
OnEvent(OBS_FRONTEND_EVENT_STREAMING_STOPPING);
}
void OBSBasic::StreamingStop(int code, QString last_error)
@ -7587,8 +7570,7 @@ void OBSBasic::StreamingStop(int code, QString last_error)
}
streamingStopping = false;
if (api)
api->on_event(OBS_FRONTEND_EVENT_STREAMING_STOPPED);
OnEvent(OBS_FRONTEND_EVENT_STREAMING_STOPPED);
OnDeactivate();
@ -7720,8 +7702,7 @@ void OBSBasic::StartRecording()
return;
}
if (api)
api->on_event(OBS_FRONTEND_EVENT_RECORDING_STARTING);
OnEvent(OBS_FRONTEND_EVENT_RECORDING_STARTING);
SaveProject();
@ -7736,8 +7717,7 @@ void OBSBasic::RecordStopping()
sysTrayRecord->setText(QTStr("Basic.Main.StoppingRecording"));
recordingStopping = true;
if (api)
api->on_event(OBS_FRONTEND_EVENT_RECORDING_STOPPING);
OnEvent(OBS_FRONTEND_EVENT_RECORDING_STOPPING);
}
void OBSBasic::StopRecording()
@ -7759,8 +7739,7 @@ void OBSBasic::RecordingStart()
sysTrayRecord->setText(QTStr("Basic.Main.StopRecording"));
recordingStopping = false;
if (api)
api->on_event(OBS_FRONTEND_EVENT_RECORDING_STARTED);
OnEvent(OBS_FRONTEND_EVENT_RECORDING_STARTED);
if (!diskFullTimer->isActive())
diskFullTimer->start(1000);
@ -7834,8 +7813,7 @@ void OBSBasic::RecordingStop(int code, QString last_error)
}
}
if (api)
api->on_event(OBS_FRONTEND_EVENT_RECORDING_STOPPED);
OnEvent(OBS_FRONTEND_EVENT_RECORDING_STOPPED);
if (diskFullTimer->isActive())
diskFullTimer->stop();
@ -7906,8 +7884,7 @@ void OBSBasic::StartReplayBuffer()
return;
}
if (api)
api->on_event(OBS_FRONTEND_EVENT_REPLAY_BUFFER_STARTING);
OnEvent(OBS_FRONTEND_EVENT_REPLAY_BUFFER_STARTING);
SaveProject();
@ -7929,8 +7906,7 @@ void OBSBasic::ReplayBufferStopping()
QTStr("Basic.Main.StoppingReplayBuffer"));
replayBufferStopping = true;
if (api)
api->on_event(OBS_FRONTEND_EVENT_REPLAY_BUFFER_STOPPING);
OnEvent(OBS_FRONTEND_EVENT_REPLAY_BUFFER_STOPPING);
}
void OBSBasic::StopReplayBuffer()
@ -7958,8 +7934,7 @@ void OBSBasic::ReplayBufferStart()
QTStr("Basic.Main.StopReplayBuffer"));
replayBufferStopping = false;
if (api)
api->on_event(OBS_FRONTEND_EVENT_REPLAY_BUFFER_STARTED);
OnEvent(OBS_FRONTEND_EVENT_REPLAY_BUFFER_STARTED);
OnActivate();
@ -7998,8 +7973,7 @@ void OBSBasic::ReplayBufferSaved()
lastReplay = path;
calldata_free(&cd);
if (api)
api->on_event(OBS_FRONTEND_EVENT_REPLAY_BUFFER_SAVED);
OnEvent(OBS_FRONTEND_EVENT_REPLAY_BUFFER_SAVED);
AutoRemux(QT_UTF8(path.c_str()));
}
@ -8043,8 +8017,7 @@ void OBSBasic::ReplayBufferStop(int code)
QSystemTrayIcon::Warning);
}
if (api)
api->on_event(OBS_FRONTEND_EVENT_REPLAY_BUFFER_STOPPED);
OnEvent(OBS_FRONTEND_EVENT_REPLAY_BUFFER_STOPPED);
OnDeactivate();
}
@ -8086,8 +8059,7 @@ void OBSBasic::OnVirtualCamStart()
if (sysTrayVirtualCam)
sysTrayVirtualCam->setText(QTStr("Basic.Main.StopVirtualCam"));
if (api)
api->on_event(OBS_FRONTEND_EVENT_VIRTUALCAM_STARTED);
OnEvent(OBS_FRONTEND_EVENT_VIRTUALCAM_STARTED);
OnActivate();
@ -8104,8 +8076,7 @@ void OBSBasic::OnVirtualCamStop(int)
if (sysTrayVirtualCam)
sysTrayVirtualCam->setText(QTStr("Basic.Main.StartVirtualCam"));
if (api)
api->on_event(OBS_FRONTEND_EVENT_VIRTUALCAM_STOPPED);
OnEvent(OBS_FRONTEND_EVENT_VIRTUALCAM_STOPPED);
blog(LOG_INFO, VIRTUAL_CAM_STOP);
@ -10733,8 +10704,7 @@ void OBSBasic::PauseRecording()
trayIconFile));
}
if (api)
api->on_event(OBS_FRONTEND_EVENT_RECORDING_PAUSED);
OnEvent(OBS_FRONTEND_EVENT_RECORDING_PAUSED);
if (os_atomic_load_bool(&replaybuf_active))
ShowReplayBufferPauseWarning();
@ -10771,8 +10741,7 @@ void OBSBasic::UnpauseRecording()
trayIconFile));
}
if (api)
api->on_event(OBS_FRONTEND_EVENT_RECORDING_UNPAUSED);
OnEvent(OBS_FRONTEND_EVENT_RECORDING_UNPAUSED);
}
}
@ -11096,3 +11065,9 @@ float OBSBasic::GetDevicePixelRatio()
{
return dpi;
}
void OBSBasic::OnEvent(enum obs_frontend_event event)
{
if (api)
api->on_event(event);
}

1
UI/window-basic-main.hpp
View file

@ -225,6 +225,7 @@ class OBSBasic : public OBSMainWindow {
private:
obs_frontend_callbacks *api = nullptr;
void OnEvent(enum obs_frontend_event event);
std::shared_ptr<Auth> auth;

2
cmake/finders/FindFFmpeg.cmake
View file

@ -277,7 +277,7 @@ endif()
if(EXISTS "${FFmpeg_avutil_INCLUDE_DIR}/libavutil/ffversion.h")
file(STRINGS "${FFmpeg_avutil_INCLUDE_DIR}/libavutil/ffversion.h" _version_string
REGEX "^.*FFMPEG_VERSION[ \t]+\"n?[0-9a-z\\.-]+\"[ \t]*$")
REGEX "^.*FFMPEG_VERSION[ \t]+\"n?[0-9a-z\\~.-]+\"[ \t]*$")
string(REGEX REPLACE ".*FFMPEG_VERSION[ \t]+\"n?([0-9]+\\.[0-9]).*\".*" "\\1" FFmpeg_VERSION "${_version_string}")
endif()

71
libobs/obs-encoder.c
View file

@ -353,15 +353,9 @@ static void remove_connection(struct obs_encoder *encoder, bool shutdown)
if (encoder->encoder_group) {
pthread_mutex_lock(&encoder->encoder_group->mutex);
if (--encoder->encoder_group->num_encoders_started == 0) {
if (--encoder->encoder_group->num_encoders_started == 0)
encoder->encoder_group->start_timestamp = 0;
if (encoder->encoder_group->destroy_on_stop)
obs_encoder_group_actually_destroy(
encoder->encoder_group);
}
if (encoder->encoder_group)
pthread_mutex_unlock(&encoder->encoder_group->mutex);
pthread_mutex_unlock(&encoder->encoder_group->mutex);
}
/* obs_encoder_shutdown locks init_mutex, so don't call it on encode
@ -371,6 +365,8 @@ static void remove_connection(struct obs_encoder *encoder, bool shutdown)
* up again */
if (shutdown)
obs_encoder_shutdown(encoder);
encoder->initialized = false;
set_encoder_active(encoder, false);
}
@ -790,14 +786,20 @@ void obs_encoder_start(obs_encoder_t *encoder,
pthread_mutex_unlock(&encoder->init_mutex);
}
static inline bool obs_encoder_stop_internal(
obs_encoder_t *encoder,
void (*new_packet)(void *param, struct encoder_packet *packet),
void *param)
void obs_encoder_stop(obs_encoder_t *encoder,
void (*new_packet)(void *param,
struct encoder_packet *packet),
void *param)
{
bool last = false;
size_t idx;
if (!obs_encoder_valid(encoder, "obs_encoder_stop"))
return;
if (!obs_ptr_valid(new_packet, "obs_encoder_stop"))
return;
pthread_mutex_lock(&encoder->init_mutex);
pthread_mutex_lock(&encoder->callbacks_mutex);
idx = get_callback_idx(encoder, new_packet, param);
@ -810,34 +812,32 @@ static inline bool obs_encoder_stop_internal(
if (last) {
remove_connection(encoder, true);
encoder->initialized = false;
pthread_mutex_unlock(&encoder->init_mutex);
if (encoder->destroy_on_stop) {
pthread_mutex_unlock(&encoder->init_mutex);
struct obs_encoder_group *group = encoder->encoder_group;
if (encoder->destroy_on_stop)
obs_encoder_actually_destroy(encoder);
return true;
/* Destroying the group all the way back here prevents a race
* where destruction of the group can prematurely destroy the
* encoder within internal functions. This is the point where it
* is safe to destroy the group, even if the encoder is then
* also destroyed. */
if (group) {
pthread_mutex_lock(&group->mutex);
if (group->destroy_on_stop &&
group->num_encoders_started == 0)
obs_encoder_group_actually_destroy(group);
else
pthread_mutex_unlock(&group->mutex);
}
/* init_mutex already unlocked */
return;
}
return false;
}
void obs_encoder_stop(obs_encoder_t *encoder,
void (*new_packet)(void *param,
struct encoder_packet *packet),
void *param)
{
bool destroyed;
if (!obs_encoder_valid(encoder, "obs_encoder_stop"))
return;
if (!obs_ptr_valid(new_packet, "obs_encoder_stop"))
return;
pthread_mutex_lock(&encoder->init_mutex);
destroyed = obs_encoder_stop_internal(encoder, new_packet, param);
if (!destroyed)
pthread_mutex_unlock(&encoder->init_mutex);
pthread_mutex_unlock(&encoder->init_mutex);
}
const char *obs_encoder_get_codec(const obs_encoder_t *encoder)
@ -1334,7 +1334,6 @@ void full_stop(struct obs_encoder *encoder)
pthread_mutex_unlock(&encoder->callbacks_mutex);
remove_connection(encoder, false);
encoder->initialized = false;
}
}

1
plugins/obs-ffmpeg/data/locale/en-US.ini
View file

@ -40,6 +40,7 @@ NVENC.8bitUnsupportedHdr="OBS does not support 8-bit output of Rec. 2100."
NVENC.I010Unsupported="NVENC does not support I010. Use P010 instead."
NVENC.10bitUnsupported="Cannot perform 10-bit encode on this encoder."
NVENC.16bitUnsupported="Cannot perform 16-bit encode on this encoder."
NVENC.444Unsupported="Cannot perform 4:4:4 encode on this encoder."
NVENC.NoAV1FallbackPossible="AV1 encoding is not available with the current settings. Try disabling any re-scaling or GPU options that may be set. Check the log for more details."
NVENC.Preset2.p1="P1: Fastest (Lowest Quality)"
NVENC.Preset2.p2="P2: Faster (Lower Quality)"

7
plugins/obs-ffmpeg/obs-nvenc.c
View file

@ -1371,12 +1371,19 @@ static bool init_encoder(struct nvenc_data *enc, enum codec_type codec,
int bf = (int)obs_data_get_int(settings, "bf");
const bool support_10bit =
nv_get_cap(enc, NV_ENC_CAPS_SUPPORT_10BIT_ENCODE);
const bool support_444 =
nv_get_cap(enc, NV_ENC_CAPS_SUPPORT_YUV444_ENCODE);
const int bf_max = nv_get_cap(enc, NV_ENC_CAPS_NUM_MAX_BFRAMES);
video_t *video = obs_encoder_video(enc->encoder);
const struct video_output_info *voi = video_output_get_info(video);
enc->in_format = get_preferred_format(voi->format);
if (enc->in_format == VIDEO_FORMAT_I444 && !support_444) {
NV_FAIL(obs_module_text("NVENC.444Unsupported"));
return false;
}
if (is_10_bit(enc) && !support_10bit) {
NV_FAIL(obs_module_text("NVENC.10bitUnsupported"));
return false;

4
plugins/obs-outputs/mp4-mux.c
View file

@ -1718,6 +1718,10 @@ static size_t mp4_write_trak(struct mp4_mux *mux, struct mp4_track *track,
struct serializer *s = mux->serializer;
int64_t start = serializer_get_pos(s);
/* If track has no data, omit it from full moov. */
if (!fragmented && !track->chunks.num)
return 0;
write_box(s, 0, "trak");
// tkhd

4
plugins/obs-x264/obs-x264.c
View file

@ -309,7 +309,9 @@ static inline void set_param(struct obs_x264 *obsx264, struct obs_option option)
if (strcmp(name, "preset") != 0 && strcmp(name, "profile") != 0 &&
strcmp(name, "tune") != 0 && strcmp(name, "fps") != 0 &&
strcmp(name, "force-cfr") != 0 && strcmp(name, "width") != 0 &&
strcmp(name, "height") != 0 && strcmp(name, "opencl") != 0) {
strcmp(name, "height") != 0 && strcmp(name, "opencl") != 0 &&
strcmp(name, "stats") != 0 && strcmp(name, "qpfile") != 0 &&
strcmp(name, "pass") != 0) {
if (strcmp(option.name, OPENCL_ALIAS) == 0)
name = "opencl";
if (x264_param_parse(&obsx264->params, name, val) != 0)

6
plugins/win-dshow/ffmpeg-decode.c
View file

@ -23,8 +23,10 @@
#endif
enum AVHWDeviceType hw_priority[] = {
AV_HWDEVICE_TYPE_CUDA, AV_HWDEVICE_TYPE_D3D11VA, AV_HWDEVICE_TYPE_DXVA2,
AV_HWDEVICE_TYPE_QSV, AV_HWDEVICE_TYPE_NONE,
AV_HWDEVICE_TYPE_D3D11VA,
AV_HWDEVICE_TYPE_DXVA2,
AV_HWDEVICE_TYPE_QSV,
AV_HWDEVICE_TYPE_NONE,
};
static bool has_hw_type(const AVCodec *c, enum AVHWDeviceType type)