jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,040 Commits
1 Branch
0 Tags
60 MiB
Commit Graph

8040 Commits (d5d36b2f7a6e0981214bbc1e5b32899b219f2a6a)

Author SHA1 Message Date
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
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
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
jp9000 824a0ec416 obs-browser, obs-vst: Fix formatting 2020-04-23 16:50:13 -07:00
Joel Bethke 9663d3f59f
Merge pull request #2791 from unknowndomain/master 
UI: Update OSX to macOS in English translation
 2020-04-23 18:27:55 -05:00
Tom Lynch 8109183cd9
UI: Update OSX to macOS in English translation 2020-04-23 23:38:54 +01: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
Joel Bethke bcdc97e40e
Merge pull request #2770 from redcrazyheart/changestripchatsources 
rtmp-services: Update Stripchat streaming service
 2020-04-22 09:15:16 -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 22ea90e436
Merge pull request #2767 from Warchamp7/dock-title-buttons 
UI: Add white icons for dock titles
 2020-04-20 17:02:15 -05:00
Warchamp7 e1e7e14dc9 UI: Add white icons for dock titles 
- Add pop-out and close svg icons
- Update all dark themes qss with the new icons
 2020-04-20 17:07:04 -04:00
Colin Edwards d795905138
Merge pull request #2749 from jpark37/gl-viewport-flip 
libobs-opengl: Fix viewport flip
 2020-04-19 15:56:17 -05:00
Colin Edwards 9447a06b05 Revert "UI: Remove unnecessary global variables" 
This reverts commit f91d3baf43.

From @pkv: the reason some of these vars were global is because Qt was not deleting them at all; as a result memory leaks have been reintroduced for: previewProjector, trayMenu, studioProgramProjector, multiviewProjectorMenu ;
 2020-04-19 09:31:18 -05:00
jpark37 44ebde553d libobs-opengl: Fix viewport flip 
Flip viewport in coordination with update_viewproj_matrix.
 2020-04-18 22:13:03 -07:00
Colin Edwards 27a0d9e5b7
Merge pull request #2753 from cg2121/code-cleanup 
UI: Remove unnecessary global variables
 2020-04-18 21:09:00 -05:00
Colin Edwards 19ae677169
Merge pull request #2685 from PatTheMav/ci-github-actions 
CI: Add Github Actions workflow for branch pushes and PRs
 2020-04-18 21:08:29 -05:00
PatTheMav 24e4a256f7 CI: Add main Github Actions workflow for branch pushes and PRs 2020-04-19 04:07:28 +02:00
Clayton Groeneveld f91d3baf43 UI: Remove unnecessary global variables 2020-04-18 18:58:45 -05: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 0f10c0811a
Merge pull request #2720 from Bennik2000/status_icons_streaming_recording 
UI: Add status icons for recording and streaming
 2020-04-18 18:23:32 -05:00
Colin Edwards e15f4e4454
Merge pull request #2732 from cg2121/ui-margins 
UI: Adjust a few margins
 2020-04-18 18:15:09 -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
Clayton Groeneveld f7caa1119c UI: Adjust a few margins 
-Remove 9px margins around central widget. This saves 18px of vertical
space. This will be helpful when the source context menu is added,
which is 24px tall.

-Adjusts margins in transitions dock. The top of the transitions dock
wasn't lined up with the top of the controls dock, which made it look
bad.
 2020-04-18 17:24:59 -05:00
Colin Edwards 8a89dd7a46
Merge pull request #2723 from exeldro/doc_prop_group 
docs/sphinx: Add Property Grouping
 2020-04-18 17:15:57 -05:00
Colin Edwards 47cfe13be2
Merge pull request #2648 from kkartaltepe/fix-previewlabel-styling 
UI: Fix previewLabel styling
 2020-04-18 16:32:43 -05:00
Richard Stanway 9927cf035b
Merge pull request #2746 from exeldro/remove_scenes 
UI: Remove all scenes in ClearSceneData
 2020-04-18 21:37:52 +02: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