opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-21 12:49:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,051 Commits 20 Branches 251 Tags
027b3b8a78dca951603d2daa89bb7012ead39fb3
Commit Graph
2420 Commits
Author SHA1 Message Date
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
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
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
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 62b1911e33 obs-plugins: Check if sources are showing for media hotkeys 2020-04-26 21:57:01 -05:00
Ed Maste c989e22c57 vlc-video: Enable building the plugin on FreeBSD 2020-04-26 20:27:48 -04: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 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
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
jp9000 824a0ec416 obs-browser, obs-vst: Fix formatting 2020-04-23 16:50:13 -07:00
Joel Bethke 14b056539f Merge pull request #2771 from AntowaStrong/virtwish-service 
rtmp-services: Add VirtWish service
 2020-04-22 09:16:55 -05:00
AntowaStrong e0e0860b82 rtmp-services: Add VirtWish service 2020-04-21 16:08:30 +03:00
redcrazyheart fc6ab20109 rtmp-services: Change Stripchat streaming service 2020-04-21 12:36:00 +03:00
Colin Edwards 8b1b6b1e75 Merge pull request #2656 from dbieber/z2020-04-05-mac-capture 
mac-capture: Use window id to identify windows on MacOS
 2020-04-18 18:48:29 -05:00
Colin Edwards 55e2985026 Merge pull request #1944 from WizardCM/windows-rc-definition 
CMake: Build Windows modules with file descriptors
 2020-04-18 18:27:22 -05:00
Colin Edwards c03bad85ef Merge pull request #2658 from hselasky/alsa_support_freebsd 
plugins: Build ALSA plugin for FreeBSD
 2020-04-18 17:39:25 -05:00
Jim 05b66262c8 Merge pull request #1786 from brittneysclark/qsv_texture_based_encoding 
obs-qsv: Enable QSV texture-based encoding
 2020-04-18 12:30:26 -07:00
jp9000 01df98b3aa obs-vst: Fix formatting 2020-04-18 12:28:19 -07:00
jp9000 5d45249d9f obs-browser: Fix formatting 2020-04-18 12:28:05 -07:00
Richard Stanway 4fda6cf846 Merge pull request #2700 from Bennik2000/mantis_0001603 
obs-ffmpeg: Fix media source not closing file when inactive
 2020-04-18 21:24:25 +02:00
wolf247 8a5ad6ac92 rtmp-services: Update ChathostessModels service (#2745) 2020-04-18 01:29:47 -05:00
Ben Torell 97067f853f Merge pull request #2667 from emaste/buildfix 
linux-v4l2: Fix build with Clang 10.0
 2020-04-17 14:42:49 -04:00
brittneysclark cc896b6c03 obs-qsv11: Enable QSV texture-based encoding 
Enables a pipeline for texture-based encoding with QSV. Utilizes OBS
NV12 output for encode to avoid offloading them from GPU, which will
increase performance. The option to select old QSV pipeline still
remains and will fallback if new pipeline fails.
 2020-04-17 09:05:52 -07:00
Keylase 8726425a6c rtmp-services: Add WASDTV (#2697) 2020-04-15 17:29:36 -05:00
Colin Edwards e7636f89a6 obs-vst: Don't allow widget close on macOS 2020-04-13 19:28:55 -05:00
chaselliu 04e76d7d94 linux-jack: Fix conversion from channels to speaker layout 2020-04-13 22:42:31 +08:00
Bennik2000 26810c31b6 obs-ffmpeg: Fix media source not closing file when inactive 2020-04-13 09:13:16 +02:00
Ed Maste ec7fbadcdb linux-v4l2: Fix build with Clang 10.0 
add_control_property() was previously static inline bool, but did not
return a value and failed to build on FreeBSD-CURRENT with Clang 10.0,
with:

error: non-void function 'add_control_property' should return a value
 2020-04-12 18:41:36 -04:00
Richard Stanway 9fffd99661 Merge pull request #2109 from notr1ch/encoder-error-feedback 
obs-ffmpeg: Encoder error feedback
 2020-04-12 17:59:24 +02:00
Richard Stanway 15781073dc obs-ffmpeg: Add error text for NVENC AVERROR_EXTERNAL 
Since new NVENC still falls back, try to make the error from ffmpeg
NVENC more actionable for users.
 2020-04-12 17:35:27 +02:00
Richard Stanway 5e3e9c1f13 obs-ffmpeg: Use new encoder error handling functions 2020-04-12 17:05:19 +02:00
Richard Stanway 6dce4662cf Merge pull request #2682 from koizuka/rtmp-services-niconico 
rtmp-services: Add niconico
 2020-04-12 01:59:39 +02:00
Colin Edwards eb40dbd453 mac-syphon: Move the syphon plugin over to ARC 2020-04-10 20:10:27 -05:00
Richard Stanway 9023a57afc Merge pull request #2598 from sorayuki/bugfix/rtmp-custom-memleak 
rtmp-services: Fix memory leak when updating rtmp-custom-service.
 2020-04-10 00:45:43 +02:00
Richard Stanway 011c760a7a Merge pull request #2641 from kkartaltepe/obs-outputs-warnings 
obs-outputs: Fix warnings WITH_RTMPS=OFF
 2020-04-10 00:42:24 +02:00
Akihiko Koizuka d7dc544a38 rtmp-services: Add niconico 2020-04-10 00:22:57 +09:00
Wahaj Dar e132676d29 rtmp-services: Update castr.io rtmp ingest list 
Closes #2559
 2020-04-09 00:32:32 -05:00
Colin Edwards 414f0ab824 Merge pull request #2571 from bongalive/master 
rtmp-services: Update Bongacams servers and settings
 2020-04-09 00:25:36 -05:00
jp9000 bc7dd6e931 obs-browser: Fix formatting 2020-04-07 23:57:29 -07:00
David Bieber 46979536a1 mac-capture: update owner_pid in update_window 2020-04-07 13:30:53 -04:00
David Bieber 4718e5ecf5 mac-capture: Use int in place of NSNumber for owner_pid 2020-04-07 13:26:46 -04:00