jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,550 Commits 1 Branch 0 Tags
Commit Graph

7550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim
431acc4bc6
Merge pull request #2210 from emaste/fix-freebsd-build 
libobs: add missing FreeBSD #include to fix build
 2019-11-29 19:43:44 -08:00
Ed Maste
97c243fdf9 libobs: add missing FreeBSD #include to fix build 
sysctlbyname requires #include <sys/sysctl.h>.  Perhaps this previously
worked due to header pollution that has since been cleaned up in newer
FreeBSD.
 2019-11-29 10:51:00 -05:00
Jim
d35a9abd1d
Merge pull request #2206 from pgwipeout/aarch64 
libobs: fix building modules once installed
 2019-11-27 18:01:49 -08:00
Aaron Boxer
0881b4e722 UI: Use new ffmpeg-encoded-output for non-RTMP urls 2019-11-27 14:40:52 -05:00
Aaron Boxer
b55b1e9bfd obs-ffmpeg: Add new ffmpeg-encoded-output 2019-11-27 14:40:52 -05:00
Aaron Boxer
e13dae8299 obs-ffmpeg: Expose ffmpeg_data_init and ffmpeg_data_free methods 2019-11-27 14:40:52 -05:00
Peter Geis
08b1b66439 libobs: fix building modules once installed 
sse-intrin.h is a required header now, but the implicit path
breaks building addons once the headers are installed.

Fix this by making the path explicit.
 2019-11-27 14:00:15 -05:00
Richard Stanway
2a917531fd
UI: Default stream / record confirm dialogs to "No" 
Helps prevent accidental stream starting if for example a cat walks on
the spacebar while the button has focus.
 2019-11-27 12:34:10 +01:00
Jim
2a6baf9886
Merge pull request #2069 from pgwipeout/aarch64 
Enable Aarch64 support via SIMDe
 2019-11-25 23:56:43 -08:00
jp9000
9826528c31 deps/media-playback: Don't use interrupt cb for local files 
This fixes an issue where local files were using the avformat interrupt
callback, which is only supposed to be use to prevent blocking on
network calls.
 2019-11-25 23:04:06 -08:00
jp9000
2fae85ab4a deps/media-playback: Don't exit thread on AVERROR_EXIT 
The interrupt callback is designed to prevent the media source from
blocking; FFmpeg will internally call it periodically to prevent FFmpeg
function calls from blocking too long, and allow the caller to determine
whether blocking should stop.

The problem with this however is that AVERROR_EXIT causes the thread to
completely exit.  This fixes it so that it treats it as an EOF rather
than as an abnormal error.
 2019-11-25 23:04:06 -08:00
Colin Edwards
3a49d48062
Merge pull request #2199 from VodBox/azure-pr-build 
CI: Keep artifacts for PRs labelled "Seeking Testers"
 2019-11-25 21:06:14 -06:00
VodBox
4d94c4763e CI: Keep artifacts for PRs labelled "Seeking Testers" 2019-11-26 14:48:14 +13:00
Peter Geis
64d0b7fcb4 libobs: Enable compilation on aarch64 
Add arch checks to enable aarch-compat layer on aarch64, retain normal
gcc intrinsics on x86 and ppc64.
 2019-11-25 13:04:21 -05:00
Peter Geis
f96545acf3 libobs: Add aarch64 compatibility layer 
Add a compatibility layer utilizing simde
(https://github.com/nemequ/simde) to allow compilation on aarch64
without modifying existing functions.
 2019-11-25 13:04:01 -05:00
jpark37
f685322a0f win-dshow: Suppress MJPEG error spam 
Only print the first message for this known benign error.
 2019-11-24 23:59:27 -08:00
Jim
f00763d641
Merge pull request #1910 from Rosuav/open-projectors 
UI: Create an API to open projectors
 2019-11-24 23:24:04 -08:00
Chris Angelico
7c540acc11 UI: Create an API for opening projector windows 2019-11-24 22:45:28 -08:00
Chris Angelico
412a75601e UI: Break out the opening of a projector into a slot function 2019-11-24 22:23:16 -08:00
Jim
f81cd29e0b
Merge pull request #2002 from cg2121/source-icons 
UI: Add source icons
 2019-11-24 22:21:27 -08:00
Clayton Groeneveld
82ffcdc827 UI: Add source icons 2019-11-24 20:50:42 -08:00
Jim
226f704e90
Merge pull request #2152 from Rosuav/fix-cursor-position 
libobs: Fix cursor draw position bug when cropping a window capture.
 2019-11-24 19:26:47 -08:00
Jim
c4ac9d47ce
Merge pull request #2195 from jpark37/com-sta 
Clean up COM initialization
 2019-11-24 10:38:18 -08:00
jpark37
66d78275e2 libobs: Robust COM initialization 
Qt seems to force STA, so it's misleading to ask for MTA and ignore the
failure result, so just ask for STA. Also, don't uninitialize COM if
initialization failed.
 2019-11-24 09:46:41 -08:00
jpark37
7d3e086e6f win-wasapi: Verify and balance CoInitializeEx call 2019-11-24 09:43:39 -08:00
Jim
f09c7d0430
Merge pull request #2184 from kkartaltepe/log-ftl 
obs-outputs: Log FTL during configure
 2019-11-24 02:59:31 -08:00
Jim
1d1c9e5fee
Merge pull request #2167 from kkartaltepe/vaapi-ffmpeg-4.2 
obs-ffmpeg: Remove unexposed vaapi parameters
 2019-11-24 02:57:19 -08:00
Jim
87b02924d5
Merge pull request #2102 from cg2121/toggle-projector-mode 
UI: Add ability to change projector type
 2019-11-24 02:39:49 -08:00
Jim
db9bc163b8
Merge pull request #2192 from Programatic/pause_fix 
UI: Fix wrong icon if recording stopped while paused
 2019-11-23 00:46:35 -08:00
Ford Smith
eeafb3dbb3 UI: Fix wrong icon if recording stopped while paused 2019-11-22 23:54:01 -08:00
Jim
c290e81a1a
Merge pull request #2094 from torresam/copy_sources 
UI: Add copy/paste of multiple selected sources
 2019-11-22 23:48:51 -08:00
Jim
fa5454d1b8
Merge pull request #2124 from notr1ch/pci-device-ids 
Use PCI database IDs instead of string matching for devices
 2019-11-22 23:15:55 -08:00
Jim
ef6e574d25
Merge pull request #2151 from RytoEX/vth264-dropped-frames 
mac-vth264: Manually mark priority bits for frames
 2019-11-20 23:45:51 -08:00
Chris Angelico
fd668695db linux-capture: Fix cursor draw bug when cropping window cap. 
When cropping the left or top of a window capture, OBS would misalign
the drawn cursor, placing it as if the entire window were being
captured. Instead, offset the captured cursor by the same number of
pixels, thus placing the cursor back where it belongs.
 2019-11-20 22:09:47 -08:00
jp9000
cafc9995d8 UI: Fix wrong icon if recording stopped while paused 
Fixes pause icon getting stuck if you stream or use replay buffer while
recording, pause, then stop recording while paused.  The icon would get
stuck on the pause icon until all outputs were stopped.
 2019-11-20 15:46:42 -08:00
jp9000
f5e026b38b rtmp-services: Add scenecut=0 to mixer requirements 2019-11-20 15:02:50 -08:00
Jim
317d058bf4
Merge pull request #2107 from cg2121/mantis-1554 
UI: Fix swap scene issue with double click mode
 2019-11-20 01:51:44 -08:00
Jim
7b49eb1d48
Merge pull request #2104 from cg2121/network-string 
UI: Change advanced networking strings
 2019-11-19 22:12:29 -08:00
Clayton Groeneveld
54e7b2c769 UI: Fix swap scene issue with double click mode 2019-11-19 22:10:22 -08:00
Jim
b317f0d27f
Merge pull request #2101 from derrod/bttv-ffz-option 
UI: Add dropdown for Twitch chat extension
 2019-11-19 21:53:50 -08:00
Clayton Groeneveld
e151ce6f2a UI: Change advanced networking strings 2019-11-19 21:27:37 -08:00
derrod
3e841b221d UI: Add setting for Twitch chat add-ons choice 
Both BTTV and FFZ are fairly popular however they do occasionally
interfere.  To give users the option to chose whichever one they like
most we add a new setting that allows BTTV, FFZ, both, or neither.

Defaults to "None" for new users.  Existing users will be migrated to
"Both" as that's the previous behavior.
 2019-11-19 21:06:36 -08:00
jp9000
a03ade631f UI: Fix Twitch panels not using dark first time 
When the panels start up for the very first time, the dark theme is not
used due to the local storage variable not being set by the first panel.
When the program is restarted, it'll be dark from then on out because
it's set by the secondary panels rather than the primary panel.  This
modifies it so that the locale storage variable is properly set by the
primary panel.
 2019-11-19 20:46:44 -08:00
Kurt Kartaltepe
210ebcbda7 obs-outputs: Log FTL during configure 2019-11-18 20:37:33 -08:00
Jim
654508de7c
Merge pull request #2183 from ratwithacompiler/macos-python-fix-2 
obs-scripting: Fix Python in new MacOS .app bundles
 2019-11-18 19:46:09 -08:00
jp9000
c2c049c606 libobs: Remove _WIN32 ifdef from enum 
Ensures that hotkeys cannot become invalid if config data is moved over
to another operating system.
 2019-11-17 20:30:42 -08:00
jp9000
d41536cf02 UI: Fix invalid escape sequences in regex string 2019-11-17 20:29:53 -08:00
Jim
769e5f3f78
Merge pull request #2093 from Programatic/pause_icon 
UI: Implement system tray icon for when the recording is paused
 2019-11-17 19:31:27 -08:00
Jim
374b8d2229
Merge pull request #2092 from ujifgc/add-windows-keys 
libobs: add missing multimedia hotkeys for Windows
 2019-11-17 19:03:01 -08:00
Ford Smith
ac75ec1247 UI: Add system tray icon to indicate when paused 2019-11-17 18:17:07 -08:00