7185 Commits
Author SHA1 Message Date
Jim 22bddd0270 Merge pull request #2010 from wanhongqing123/master
win-dshow: fix H264 to mjpeg issue
24.0.4
2019-12-06 03:02:02 -08:00
Jim 3ff3330f65 Merge pull request #2042 from WizardCM/custom-twitch-docks
UI: Add support for Custom (Legacy) Twitch Dashboard Docks
2019-12-06 03:02:02 -08:00
Jim e99b542b72 Merge pull request #2183 from ratwithacompiler/macos-python-fix-2
obs-scripting: Fix Python in new MacOS .app bundles
2019-12-06 03:02:02 -08:00
Jim 93411e8fc5 Merge pull request #2085 from ratwithacompiler/macos-python-fix
obs-scripting: Fix Python on MacOS
2019-12-06 03:02:01 -08:00
Jim 73cad40a8e Merge pull request #2090 from jpark37/dxgi-refresh-rate
Log display refresh rates, and monitor names on D3D11
2019-12-06 03:02:01 -08:00
Jim dcf17808c6 Merge pull request #2089 from jpark37/dxgi-driver-version
libobs-d3d11: Add GPU driver version to log
2019-12-06 03:02:01 -08:00
jp9000 8614324cbc UI: Delete cookies before connecting account
Fixes an issue where when trying to connect a Twitch account, and the
Twitch two-factor authentication check fails, the user will still
technically be logged in because the cookies will still be present, thus
when they try to click the "Connect" button again, it will skip the
login part (because they're already technically logged in), and just
give them the two-factor failure message without letting them enter in
their login information again.
2019-12-06 03:01:47 -08:00
jp9000 ece731accc UI: Fix bug in untested/unused function code path
In the current user interface code, OBSBasic::AddSceneCollection has a
qname parameter to allow explicitly specifying a name, but that code
path is unused in the UI code itself, and qname is typically empty.  If
qname is not empty, it does not properly generate a file name associated
with that specified scene collection name.  This fixes that issue.
2019-12-06 03:01:47 -08:00
jp9000 772f80d860 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-12-06 03:01:47 -08:00
jp9000 d7b00c095f 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-12-06 03:01:47 -08:00
jp9000 576b7981ac deps/obs-scripting: Fix formatting 2019-12-06 03:01:47 -08:00
Jim cc3c70ba00 Merge pull request #2152 from Rosuav/fix-cursor-position
libobs: Fix cursor draw position bug when cropping a window capture.
2019-12-06 03:01:36 -08:00
jp9000 b7fe32e021 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-12-06 03:01:29 -08:00
Jim 743ac0f4cb Merge pull request #1914 from YouNow/master
rtmp-services: Add YouNow service and implement ingest lookup
2019-12-06 03:01:22 -08:00
Jim e89af8ff0a Merge pull request #2140 from DevWolk/avn-obs
rtmp-services: Add Stars.AVN.com streaming service
2019-12-06 03:01:22 -08:00
Jim 6dc81d9439 Merge pull request #2045 from wolf247/master
rtmp-services: Add ChathostessModels
2019-12-06 03:01:22 -08:00
Jim d920bfcdbb Merge pull request #2179 from WizardCM/remove-help-interact
UI: Remove help icon from Interact titlebars
2019-12-06 03:01:22 -08:00
Jim 3136f69ef1 Merge pull request #2125 from DDRBoxman/appbundle
Fixes to make OBS work on Catalina
2019-12-06 03:01:21 -08:00
Jim 19d140b50a Merge pull request #2168 from kkartaltepe/vaapi-profile-fix
rtmp-services: Type check apply_encoder_settings
2019-12-06 03:01:21 -08:00
Jim 01782d3365 Merge pull request #2148 from eulertour/master
UI: Fall back to XGetWMName if XFetchName fails
2019-12-06 03:01:21 -08:00
Jim 796c6ef3bc Merge pull request #2146 from Fenrirthviti/recording-bitrate-fix
UI: Fix audio bitrate not being set in simple mode
2019-12-06 03:01:21 -08:00
jp9000 f0fa1e1967 libobs: Fix race condition
It is possible for a GPU encoder to be in a destruction state while
still in the GPU encoder list, although very rare.
2019-12-06 03:01:13 -08:00
Jim e334d1daed Merge pull request #2147 from JohannMG/vscode-ignore
git: Add VSCode working dir to .gitignore
2019-12-06 03:01:05 -08:00
Jim 49f9d05af9 Merge pull request #2134 from WizardCM/wasapi-samplerate
Log Sample Rate for WASAPI devices
2019-12-06 03:01:05 -08:00
Jim 6b9302db8f Merge pull request #2129 from Fenrirthviti/win-blacklist-update
win-capture: Add additional exe to window capture blacklist
2019-12-06 03:01:05 -08:00
Jim 8c5d22e12c Merge pull request #2131 from jpark37/input-layout-error
libobs-d3d11: Fix null input layout rebuild
2019-12-06 03:01:05 -08:00
Jim 50fc8acbf5 Merge pull request #2128 from Xaymar/return-to-break
UI: Fix checkable property groups
2019-12-06 03:01:05 -08:00
Jim 596019e682 Merge pull request #2121 from cg2121/fix-warning
rtmp-stream: Fix comparison between signed and unsigned ints
2019-12-06 03:01:05 -08:00
Jim 4182bd5bd7 Merge pull request #2110 from derrod/ffmpeg-output-fix
obs-ffmpeg: Use av_opt_set on context instead of priv_data
2019-12-06 03:01:05 -08:00
Jim 63c45cb18c Merge pull request #2106 from cg2121/fix-preview-bug
UI: Fix issue with preview projector
2019-12-06 03:01:05 -08:00
Joel Bethkeandjp9000 b2f35ca1fe Merge pull request #2126 from Fenrirthviti/linux-ci-fix
CI: Remove dead PPA to fix Linux build failure
2019-12-06 03:01:04 -08:00
Jim 26312486cf Merge pull request #2091 from Programatic/xshm_wrong_windows
linux-capture: Fix bug where multiple 0x0 windows would appear
2019-12-06 03:01:04 -08:00
Colin Edwardsandjp9000 f4fd376e09 Merge pull request #2120 from jpark37/objc-msgsend
libobs: Strict objc_msgSend support
2019-12-06 03:01:04 -08:00
jp9000 d88a5a5a60 obs-browser: Remove "monitor by default" flag
The reasoning behind removing this flag is because the whole point of
having it in was so we could replace chromium's audio output.  But there
are too many obstacles in our path from doing that for now, so it's
better to not have this flag because it just causes a lot of browser
sources to initialize audio monitoring unnecessarily.  We can change
this in the future, but for now, it's best to let the user choose to
turn on audio monitoring for the source if they choose to turn on audio
rerouting to OBS.

Note that this only changes default behavior for newly created sources;
it will not change settings of existing sources the user had before this
change.
24.0.3
2019-10-11 23:42:35 -07:00
jp9000 d6f9ff0406 Revert "libobs/audio-monitoring: Don't init until used"
This reverts commit 22aa66a6eb.

Apparently, starting audio on the fly like this can introduce latency in
to the audio playback, so for now revert it.  It was a bit of a
precautionary thing rather than an actual fix anyway, so it probably
wasn't all that necessary to begin with.
2019-10-11 23:34:27 -07:00
jp9000 dd48a99f03 libobs-d3d11: Fix code styling 2019-10-11 17:40:50 -07:00
jp9000 236ac66121 libobs: Update version to 24.0.3 2019-10-11 17:33:13 -07:00
jp9000 0f75f963ad libobs-d3d11: Fix calling convention of loaded func
Because this did not have WINAPI (stdcall) specified as the calling
convention on the gdi32 export, caused a crash due to stack corruption
on the 32bit version of OBS.
2019-10-11 17:21:11 -07:00
JimandGitHub 76fe77831d Merge pull request #2037 from cg2121/compiler-warnings
UI, libobs: Fix compiler warnings
2019-10-11 16:38:48 -07:00
jp9000 80a1fee70f obs-browser: Only disable NetworkService on macOS
Apparently, using the old chromium network implementation changes the
way cookies are handled, causing cookies to reset.  So instead of doing
that, continue to use the new network implementation on Windows, and
only use the old network implementation on macOS for the time being.
24.0.2
2019-10-11 12:45:42 -07:00
JimandGitHub 29ca28418f Merge pull request #2115 from jpark37/duplicator-ref-count
Fix duplicator ref count
2019-10-10 21:01:16 -07:00
jpark37 471d752d75 libobs-d3d11: Use unordered_map for duplicator collection
Not in love with STL, but lets at least use the semantically-correct
collection. It's also a shame this is a global variable with gross
pre-main allocations, but attaching it to the device instance would
break the interface.
2019-10-10 19:29:15 -07:00
JimandGitHub 9fa1ec3ae9 Merge pull request #2114 from cg2121/fix-multiview
UI: Fix issue where multiview doesn't update
2019-10-10 19:15:07 -07:00
jpark37 1ce61c57c0 win-capture: Fix extra duplicator refs
Make duplicator_capture_tick the sole creater, and reference adder of
IDXGIOutputDuplication objects. This prevents a situation where
duplicator_capture::showing cause be false while
duplicator_capture::duplicator was not null at startup on background
scenes, preventing IDXGIOutputDuplication from being recreated when
DXGI_ERROR_ACCESS_LOST.
2019-10-10 19:03:18 -07:00
Clayton Groeneveld 016d4ee87f UI: Fix issue where multiview doesn't update 2019-10-10 20:12:20 -05:00
jp9000 c43b273f62 libobs: Update version to 24.0.2 2019-10-10 16:19:45 -07:00
Colin EdwardsandGitHub 730fafc72d Merge pull request #2113 from cg2121/exclude-dir
Exclude build dir from clang format
2019-10-10 10:06:27 -05:00
jp9000 b7d094a532 libobs-d3d11: Don't set GPU priority on Intel adapters 2019-10-10 03:03:38 -07:00
jp9000 254947eaa0 libobs/audio-monitoring: Add error logging
Helps diagnose issues if the user is unable to initialize audio
monitoring for whatever reason.
2019-10-10 02:04:59 -07:00
jp9000 22aa66a6eb libobs/audio-monitoring: Don't init until used
This prevents audio monitoring from actually initializing unless audio
is actually played back through the source.  This prevents many browser
sources from initializing audio monitoring all at once needlessly if
audio is not being rerouted to OBS.
2019-10-10 02:04:58 -07:00