8085 Commits

Author SHA1 Message Date
Ryan Foster
27a3da2e70 UI: Fix GetUnusedSceneCollectionFile filename creation
GetUnusedSceneCollectionFile tries to create a safe, unused filename for
a new scene collection JSON file based on the user-specified scene
collection name. It would check the length of the safe version of the
user-specified name, but then it doesn't consider that the length may
have changed when GetClosestUnusedFileName was called to alter the
filename to prevent filename collisions by adding an incremented integer
to the end of the filename. This could result in OBS thinking a filename
was safe and available, but the resulting filename could be one that
already exists. OBS could then overwrite a scene collection JSON file
with this new file without any indication that the file previously
existed.

Instead of trying to calculate a length based off of the returned
filename, let's just use the length of the config path since it's a
known string.
2020-05-19 08:14:56 -04:00
Jim
efa9ee0f3d
Merge pull request #2947 from cg2121/script-tabs
UI: Hide script tabs if no python settings
2020-05-18 13:04:54 -07:00
Clayton Groeneveld
e9d6847fb6 UI: Hide script tabs if no python settings 2020-05-18 02:50:28 -05:00
Richard Stanway
5ba2d59b3c
Merge pull request #2588 from Vainock/remove-language-region
UI: Remove language region
2020-05-17 23:17:23 +02:00
Richard Stanway
c8aec387c3
Merge pull request #2929 from jpark37/wgc-fail-invalidate
win-capture: Reset WGC fail flag for new window
2020-05-17 22:15:44 +02:00
Ben Torell
07ae6b4ca9
Merge pull request #2930 from tt2468/patch-1
libobs: Return target instead of current in calc_torquef
2020-05-14 03:14:22 -04:00
tt2468
ba0f8de3a0 libobs: Return target instead of current in calc_torquef
If the previously calculated torque value is too close to 1.0
(but not considered 1.0), it would be impossible for the TBar to
finish its transition since it returned the old value, causing desync.
2020-05-13 22:43:11 -07:00
jpark37
477f90620d win-capture: Reset WGC fail flag for new window
WGC will give up on a window that it fails to capture, but that
shouldn't stop it from attempting to capture new windows.

Fixes #2928.
2020-05-13 07:54:41 -07:00
jp9000
7993179466 cmake: Add cmake folders 2020-05-13 06:52:37 -07:00
jp9000
42bbca3d4b UI: Restore theme if settings window exit with [x]
Fixes a bug where if the theme was changed, then wasn't saved, and the
user exits the window with the [x] button, then chooses "No" when asked
to save settings, it would not restore the original theme.
2020-05-12 10:10:58 -07:00
Joel Bethke
0b6cc39510
Merge pull request #2910 from jpark37/unlog-com-success
libobs: Remove log entry for CoInitializeEx pass
2020-05-11 16:54:50 -05:00
jpark37
0a700dbc2a libobs: Remove log entry for CoInitializeEx pass
Remove entry from the top of the log. Always returns S_FALSE, and that's
unlikely to change.
2020-05-10 12:36:20 -07:00
Jim
63cbcc5dcc
Merge pull request #2900 from jpark37/fix-posix-events
libobs/util: Fix POSIX event bugs
2020-05-09 16:00:27 -07:00
Jim
84284fe0ff
Merge pull request #2896 from jpark37/reserve-logic-fix
libobs: Fix da_reserve early return logic
2020-05-09 15:59:06 -07:00
Jim
0c71a9c3f9
Merge pull request #2895 from jpark37/mac-resize
mac-capture: Use resize instead of reserve
2020-05-09 15:58:46 -07:00
jpark37
7ce30ece82 libobs/util: Fix POSIX event bugs
Handle spurious wakeups, and ensure mutex unlock.
2020-05-09 14:21:35 -07:00
jpark37
7dc2782840 libobs: Fix da_reserve early return logic
Test desired capacity against original capacity instead of size.
2020-05-09 09:15:02 -07:00
jpark37
3d6bec6d2d mac-capture: Use resize instead of reserve
Better practice for the tracked size to be nonzero.

This does NOT speed up window capture significantly.
2020-05-09 09:12:48 -07:00
Jim
cc39efc6a4
Merge pull request #2712 from khng300/freebsd-oss-audio
plugins: Add oss-audio input support
2020-05-07 06:56:45 -07:00
Jim
c59ce6981b
Merge pull request #2870 from ePirat/epirat-ffmpeg-frame-tearing-fix
obs-ffmpeg: Fix AVFrame handling in FFmpeg output
2020-05-07 02:49:26 -07:00
Jim
9ae669fe27
Merge pull request #2877 from PatTheMav/ci-update
CI: Update Github Actions with caching and macOS improvements
2020-05-07 02:48:37 -07:00
Jim
8f3104dc06
Merge pull request #2880 from jpark37/wgc-handle-item-closed
libobs-winrt: win-capture: Detect GraphicsCaptureItem closure
2020-05-07 02:33:05 -07:00
jpark37
097ea77488 libobs-winrt: win-capture: Detect GraphicsCaptureItem closure
Make WGC window capture recover from GraphicsCaptureItem closure, which
can occur when following links in fullscreen Chrome for example.
2020-05-06 21:42:26 -07:00
PatTheMav
78db95049a
CI: Update Github Actions with caching and macOS improvements 2020-05-06 18:27:53 +02:00
Marvin Scholz
9ef263f81a obs-ffmpeg: Fix AVFrame handling in FFmpeg output
Fix an issue in the way AVFrames were handled in the FFmpeg
encoder plugin, which could lead to tearing in the encoded
video due to data races in the AVFrame and AVBuffer.

This is fixed by calling av_frame_make_writable which ensures
the frame and its associated buffer are writable. If its not,
it will copy the AVFrame, create a new AVBuffer for it and
decrease the refcount of the old AVFrame and AVBuffer.
This way OBS always ends up with a usable buffer to write into
which is not still used by the encoder while avoiding a copy
when unnecessary.
2020-05-06 02:55:52 +02:00
Richard Stanway
078ea5222d UI/updater: Fix launching OBS as admin post-update
A long standing lack of synchronization on the elevated process handle
made the non-elevated process always exit, so the updater would assume
it was started elevated and launch OBS from the elevated context.

Also applies the altered working directory to the non-elevated code
path so it can find the OBS executable properly.
2020-05-05 03:18:45 +02:00
Jim
3e1b5426e3
Merge pull request #2738 from exeldro/scene_not_duplicate
libobs: Don't allow duplicating scene sources
2020-05-04 01:38:27 -07:00
Jim
8a1429e29e
Merge pull request #2864 from Chiitoo/gcc-10
deps/glad: Fix build with GCC-10
2020-05-04 01:30:46 -07:00
Jimi Huotari
c7f84f8fc4
deps/glad: Fix build with GCC-10
GCC-10 defaults to '-fno-common' [1], which triggers issues with
defining global variables multiple times.  To fix the build, use
'extern' to turn the first definition of 'gladGetProcAddressPtr'
into a declaration.

1. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85678

Closes https://github.com/obsproject/obs-studio/issues/2828
2020-05-04 11:02:49 +03:00
Jim
7b3cf354b5
Merge pull request #2789 from univrsal/vlc-metadata-procs
vlc-video: Add procedure to receive media metadata
2020-05-03 12:29:59 -07:00
univrsal
79c6e0dc13 vlc-video: Allow metadata retrieval through proc_handler 2020-05-03 10:55:52 -07:00
Jim
027b3b8a78
Merge pull request #2818 from nickosmoi/xlove_20200427
rtmp-services: Add Xlovecam.com streaming service
2020-05-03 08:30:19 -07:00
Jim
839cd0bdad
Merge pull request #2831 from henke37/SetThreadDescription
libobs: Additionally use SetThreadDescription if possible
2020-05-03 08:29:39 -07:00
Philipp Bauer
3ec053ef5d rtmp-services: Update Switchboard Live servers
Closes obsproject/obs-studio#2813
2020-05-03 07:06:43 -07:00
Jim
f6dc71089a
Merge pull request #2814 from cg2121/media-hotkeys
obs-plugins: Check if sources are showing for media hotkeys
2020-05-03 06:49:31 -07:00
Jim
3b8dd47fbd
Merge pull request #2817 from cg2121/script-functions
obs-scripting: Expose platform functions to scripts
2020-05-03 06:48:59 -07:00
nico
ffe9bcab15 rtmp-services: Add Xlovecam.com streaming service 2020-05-03 06:45:56 -07:00
Jim
31c3bd5a96
Merge pull request #2830 from h-o-sein/master
rtmp-services: Update GameTips.TV
2020-05-03 06:40:26 -07:00
Henrik "Henke37" Andersson
6fb19a8904 libobs: Use SetThreadDescription if possible
It's the better way to declare thread names, but you need Windows 10,
version 1607 to use it.
2020-05-03 06:37:28 -07:00
Jim
d5d36b2f7a
Merge pull request #2835 from RytoEX/crash-log-win-release-id
libobs: Add Windows 10 release version to crash log
2020-05-03 06:31:29 -07:00
张昆
eb44e05169 libobs: Fix unnecessary duplication
Original code makes duplicated item and bad memory

Closes obsproject/obs-studio#2837
2020-05-03 06:28:21 -07:00
Jim
b0307391e9
Merge pull request #2854 from jpark37/mac-present-lock
libobs-opengl: Lock Mac parent context during present
2020-05-03 06:24:22 -07:00
jp9000
f4f74f0d4f UI: Remove unused variable
Closes obsproject/obs-studio#2843
2020-05-03 06:22:52 -07:00
jp9000
3100cc6234 libobs: Update version to 25.0.8 2020-05-03 05:25:48 -07:00
jpark37
0a296bb12f libobs-opengl: Lock Mac parent context during present
Parent context lock keeps GL commands serialized.

Fixes race that causes crash when resizing multiview.
2020-05-02 12:00:11 -07:00
Ka Ho Ng
a5a8cc261c plugins: Add oss-audio plugin
This implements OSS audio input capturing support for OSS-capable OSes.
FreeBSD and DragonFly (not yet tested on) supports are added as a
starting point.
2020-05-02 17:38:27 +08:00
Ryan Foster
b7f1bf9bc4 libobs: Add Windows 10 release version to crash log
Follow-up to eadb96f.
2020-04-29 20:38:21 -04:00
Ben Torell
2d14ee3e60
Merge pull request #2833 from RytoEX/update-process-packet-error
obs-ffmpeg: Update error message in process_packet
2020-04-29 19:39:12 -04:00
Richard Stanway
5c12c13061
Merge pull request #2793 from NiMO-TV/rtmp-nimo-1
rtmp-services: Add Nimo TV
2020-04-30 01:23:54 +02:00
Ryan Foster
7fdfb847f8 obs-ffmpeg: Update error message in process_packet
The error message in the process_packet function was prefixed with
"receive_audio" because it was previously from code in the encode_audio
function which was called from the receive_audio function. This is just
a string change to avoid being misled to believe that the error is
always audio related.
2020-04-29 19:04:54 -04:00