opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-19 09:41:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,067 Commits 20 Branches 251 Tags
6df8dcd9607abcb67acd6efeabfc3cda65c4cbdb
Commit Graph
8067 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
PatTheMav 6df8dcd960 CI: Add all-in-one macOS build script 2020-05-08 23:43:12 +02: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
Hosein 9429ba0480 rtmp-services: Update GameTips.TV 2020-04-29 16:49:58 +04:30
Clayton Groeneveld a149b1df88 obs-scripting: Expose platform functions to scripts 2020-04-27 09:33:43 -05:00
Clayton Groeneveld 62b1911e33 obs-plugins: Check if sources are showing for media hotkeys 2020-04-26 21:57:01 -05:00
Joel Bethke b20e71cddf Merge pull request #2811 from emaste/freebsd-vlc-video 
vlc-video: Enable building the plugin on FreeBSD
 2020-04-26 19:38:34 -05:00
Ed Maste c989e22c57 vlc-video: Enable building the plugin on FreeBSD 2020-04-26 20:27:48 -04:00
Colin Edwards 1ea9943a09 CI: Update macOS deps to fix lua 2020-04-26 18:30:53 -05:00
Richard Stanway 6fac77b69f obs-ffmpeg: Add error message for non-zero GPU 2020-04-27 01:22:34 +02:00
Richard Stanway 35e218e05b obs-ffmpeg: Add localization for NVENC error messages 2020-04-27 01:22:05 +02:00
Richard Stanway 0ea39baf95 libobs: Clear last error on encoder shutdown 
This fixes an issue where an encoder may error out on a path that
doesn't use obs_encoder_set_last_error, resulting in a stale error being
used.
 2020-04-27 01:15:53 +02:00
Richard Stanway 6b441a180c obs-ffmpeg: Preserve error message from new NVENC 
If we fallback to ffmpeg NVENC, the error from new NVENC might still be
present in the encoder structure. Given that this provides a lot more
actionable information to the user, let's use it if possible.
 2020-04-26 23:35:28 +02:00
Richard Stanway aa97534057 obs-ffmpeg: Log why new NVENC might not be used 2020-04-26 23:32:51 +02:00
Richard Stanway efc23bb1ee UI: Remove requirement for replay buffer hotkey 
Fixes https://github.com/obsproject/obs-studio/issues/2807
 2020-04-26 16:56:36 +02:00
Joel Bethke dac1f7ddac Merge pull request #2797 from GeorgesStavracas/gbsneto/color-grade-filter 
obs-filters: Add a user label to the LUT filter
 2020-04-25 16:23:49 -05:00
Georges Basile Stavracas Neto bbf08b34d2 obs-filters: Add a user label to the LUT filter 
While discussing the Flatpak RFC [1], it was spotted that the
LUT filter couldn't open the file selection dialog. It was
explained, then, that the proper formats were either composed
of "User Label (file extensions)", or "file extensions", and
the LUT filter was setting "(file extensions)" without the
actual user label.

While this works on a standard Qt file selection dialog, it
cannot be properly formatted as a set of D-Bus filters, thus
breaking the sandbox integration.

Add a simple user label to the LUT file filter.

[1] https://github.com/obsproject/rfcs/pull/21#issuecomment-619106757
 2020-04-24 17:18:47 -03:00
dgeibi 4a4d33cc2a rtmp-services: Add Nimo TV 2020-04-24 10:28:25 +08:00
Colin Edwards b35c3a21f7 Merge pull request #2792 from PatTheMav/azure-pipelines-swig-fix 
CI: Fix Azure Pipelines macOS runs
 2020-04-23 21:27:16 -05:00
PatTheMav 1bada2d8e7 CI: Fix Azure Pipelines macOS runs 2020-04-24 03:43:51 +02:00