mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-03-16 21:47:45 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,905 Commits 18 Branches 241 Tags
21dc1f573bbf9c22ebe10fad4e29478dee1ebee8
Commit Graph

7905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jpark37
21dc1f573b win-capture: Cleaner COM usage 
Remove hard-coded GUIDs, call correct functions, and clean up
unnecessary casts.
 2020-03-29 10:00:36 -07:00
Richard Stanway
b9f7702378 Merge pull request #2563 from skyboy/skyboy-patch-1 
Fix QuickSync LA_ICQ encoder settings
 2020-03-28 23:06:05 +01:00
Matt Gajownik
7ee1bb2df6 docs/sphinx: Bump major OBS version 2020-03-28 23:17:20 +11:00
Matt Gajownik
a9a19cf351 UI: Use Qt dialogs for Font & Color Pickers on Linux 
This fixes a hang on Ubuntu when closing the
dialogs after leaving them open for a time.
 2020-03-28 23:15:25 +11:00
skyboy
0c87670ee8 obs-qsv11: Fix QuickSync LA_ICQ encoder settings 2020-03-28 07:31:22 -04:00
Richard Stanway
094edda866 Merge pull request #2578 from sebastinas/json-executable-bits 
rtmp-services: Remove executable bits from json files
 2020-03-28 01:17:28 +01:00
Richard Stanway
f4cf9b3b66 Merge pull request #2580 from jpark37/remux-fix 
UI: Fix text handling for dialogs
 2020-03-28 01:16:41 +01:00
Richard Stanway
4c1a6e0097 Merge pull request #2574 from jpark37/winrt-catch-all 
libobs-winrt: Stronger exception handling
 2020-03-28 01:14:04 +01:00
Jim
b078d9197d Merge pull request #2582 from notr1ch/win7-nvenc 
obs-ffmpeg: Expose old NVENC on Windows 7
 2020-03-27 17:06:34 -07:00
Dillon Pentz
402c292cc4 Merge pull request #2555 from VodBox/sl-volume-fix 
UI: Fix silent scenes with imported SL scenes
 2020-03-28 13:03:59 +13:00
Sebastian Ramacher
fe4818ada1 rtmp-services: Remove executable bits from json files 
The bits were set in c0a8e86c9c, but they
are not needed.
 2020-03-27 22:14:24 +01:00
Richard Stanway
75d1f74838 obs-ffmpeg: Expose old NVENC on Windows 7 
New NVENC isn't available on Windows 7 and the old encoder was marked as
internal, giving users no option to use NVENC at all.
 2020-03-27 00:17:49 +01:00
jpark37
36e2a9fa33 UI: Fix text handling for dialogs 
Signal only needs to be connected once, not every keystroke.

Also commit data only when text widget focus is lost to fix cursor
moving to the end of the string after every keystroke.
 2020-03-25 17:13:10 -07:00
jpark37
36b7ac432d libobs-winrt: Stronger exception handling 
Exceptions were still leaking through somehow.
 2020-03-25 08:50:01 -07:00
jp9000
3c78a8aa8d libobs: Update to 25.0.3 (linux hotfix once again) 25.0.3 2020-03-23 19:16:54 -07:00
Jim
488e25fc3d Merge pull request #2550 from kkartaltepe/v4l2-fix-for-real 
linux-v4l2: Fixup invalid id
 2020-03-23 18:40:25 -07:00
Kurt Kartaltepe
b822faf73b linux-v4l2: Fixup invalid id 
Previous fix in #2547 altered id before they were handed off to
callbacks and v4l2 wont strip its own flags from ids resulting in
invalid ids in the ioctl.

Instead add cleanup section and jump all branches there before looping.

(Jim edit: I'm changing this entire function so that it isn't horrible.)
 2020-03-23 18:12:14 -07:00
Richard Stanway
54c5ac250f libobs-d3d11: Log device PCI IDs 
This will help identify devices sharing the same names (eg "Intel HD
Graphics") for potentially adding to the blacklists should they have
issues.
 2020-03-23 20:54:38 +01:00
Richard Stanway
1dc2c6a3be obs-outputs: Fix mbed TLS build issues 
Version test macro was using the wrong version, and the non-crypto
MD5 only code was accidentally moved into an #ifdef which ended up
disabling it.

Fixes https://github.com/obsproject/obs-studio/issues/2426
 2020-03-23 17:32:39 +01:00
VodBox
6319973b2f UI: Fix silent scenes with imported SL scenes 
Previously, the importer assumed scenes had fields that sources did for
audio, namely volume, sync, mute and monitoring type. SL scenes do not
have these fields. This resulted in mistakes in importing, such as
imported scenes having a volume of 0.0.

This change gets rid of the non-existent fields, and explicitly sets the
volume of the scenes to 1.0 as a precaution.
 2020-03-23 23:32:02 +13:00
Jim
a0e8adbc42 Merge pull request #2547 from kkartaltepe/v4l2-control-inf-loop 
linux-v4l2: readonly controls cause infinite loop
25.0.2 		2020-03-22 11:42:32 -07:00
Kurt Kartaltepe
7b71a3b33d linux-v4l2: readonly controls cause infinite loop 
v4l2_ioctl will clear the V4L2_CTRL_FLAG_NEXT_CTRL flag resulting in
infinite loops for any driver that reported readonly, disabled, or
volitile controls.
 2020-03-22 10:48:36 -07:00
jp9000
4e43329269 libobs: Update version to 25.0.2 (linux hotfix) 2020-03-22 09:57:12 -07:00
VodBox
62c7eb489d UI: Set correct window title for fullscreen projector 
Before this change, opening up a fullscreen projector would have the
wrong window title (Windowed Projector). This was because the call to
update the window title was called before a monitor is set, and the
title is determined by whether a monitor is set.

This change moves the update title call to after the geometry or monitor
gets set, ensuring the window title is correct.
 2020-03-22 22:59:27 +13:00
Jim
f8391dae31 Merge pull request #2545 from RytoEX/ci-update-linux 
CI: Update Linux CI from Ubuntu 16.04 to 18.04
 2020-03-22 02:30:44 -07:00
Ryan Foster
cda4859653 CI: Update Linux CI from Ubuntu 16.04 to 18.04 2020-03-22 00:31:36 -04:00
Jim
8e7481fb75 Merge pull request #2497 from keith-packard/linux-capture-randr-monitors 
linux-capture: Use RandR monitors for screen information
 2020-03-21 19:46:41 -07:00
Jim
f44bfc23a3 Merge pull request #2534 from WizardCM/update-clickable 
UI: Make links in updater dialog clickable
 2020-03-20 23:11:35 -07:00
Matt Gajownik
9fe8ef293f UI: Make links in updater clickable 2020-03-21 15:34:28 +11:00
Jim
b94506e84a Merge pull request #2533 from jpark37/lut-file-filter 
obs-filters: Fix LUT file extension filter on Linux
 2020-03-20 19:06:11 -07:00
Jim
09370e8599 Merge pull request #2528 from RytoEX/fix-qsv-target-usages 
obs-qsv11: Fix target usage values
 2020-03-20 19:05:35 -07:00
Jim
6a609676ee Merge pull request #2524 from kkartaltepe/settings-crash 
UI: Fix crash on settings update
 2020-03-20 19:03:29 -07:00
Jim
0be6208839 Merge pull request #2523 from jpark37/warnings-20200319 
Warning pass 2020-03-19
 2020-03-20 19:02:19 -07:00
Jim
413896a227 Merge pull request #2520 from WizardCM/mixrelixr 
UI: Add setting for Mixer add-on choice (MixrElixr)
 2020-03-20 19:00:56 -07:00
jpark37
f3b2fc37c1 obs-filters: Fix LUT file extension filter on Linux 2020-03-20 17:41:18 -07:00
Richard Stanway
4563e03442 win-wasapi: Fix leaking IPropertyStore 2020-03-20 17:58:14 +01:00
Richard Stanway
21737d5f7a win-wasapi: Fix crash on certain devices 
Not all devices return PKEY_AudioEngine_DeviceFormat properties.

Per MSDN, if the PROPERTYKEY referenced in key is not present in
the property store, this method returns S_OK and the vt member of
the structure pointed to by pv is set to VT_EMPTY.
 2020-03-20 17:53:18 +01:00
Ryan Foster
56348a0b46 obs-qsv11: Fix target usage values 
PR #1937 (commit b9ad1ce) added QSV target usage options, but there was
a comma missing between two of the array entries. This resulted in
"faster" and "veryfast" becoming "fasterveryfast", which is not valid.

Code style changes were required by .clang-format.
 2020-03-20 05:30:18 -04:00
Kurt Kartaltepe
fe079c03ab UI: Fix crash on settings update 2020-03-19 20:36:55 -07:00
jpark37
f83c4a8582 libobs: Add move assignment operator for BPtr 2020-03-19 16:18:51 -07:00
jpark37
19c6d06a3b libobs: Fix missing assignment operator return 2020-03-19 14:03:56 -07:00
jpark37
b12ab46e62 libobs: Fix size mismatch warning 
memcpy unlikely to exceed 4 GB, but just make VS happy.
 2020-03-19 11:22:15 -07:00
jpark37
d383efc065 libobs: Handle noexcept warnings 
VC++ wants noexcept for move assignment operators, and move contructors.
 2020-03-19 11:20:44 -07:00
jpark37
27fa979d73 UI: Make Importer destructor virtual 
Allows unique_ptr to clean up without warnings.
 2020-03-19 11:19:26 -07:00
jp9000
b19ea6fe35 libobs: Update version to 25.0.1 25.0.1 2020-03-19 09:51:06 -07:00
Richard Stanway
59d72437b4 libobs-winrt: Fix missing parentheses 2020-03-19 15:50:32 +01:00
Richard Stanway
4570fcbc72 UI: Fix memory leak 2020-03-19 15:50:32 +01:00
jp9000
8ecfb405ce Revert "win-capture, libobs: Show names of displays in Display Capture" 
This reverts commit 9931f22ff4.
 2020-03-19 06:43:57 -07:00
jp9000
06377bec46 obs-browser: Fix a few crashes 
Fixes a crash with size somehow becoming 0x0 for a source, and fixes a
crash when specific local file settings are used.
 2020-03-19 06:13:56 -07:00
jp9000
dff05d9fcc UI: Fix preview state when minimizing to tray 
Makes sure preview is properly enabled/disabled when minimizing to tray,
when restoring from tray, or when starting the program up minimized to
tray
 2020-03-19 05:33:07 -07:00