Commit Graph

7290 Commits (0adb5b81e7bc5e030fd2512e560736f04046ab31)

Author SHA1 Message Date
Jim 0adb5b81e7
Merge pull request #2180 from ElectronicWar/fix-build-pr-2079
obs-text: add missing include to fix build
2019-11-17 01:24:41 -08:00
Manuel Kroeber 3773c7cc31 obs-text: add missing locale include to fix build
PR 2079 added localization but forgot the needed include
2019-11-16 12:50:42 +01:00
Jim e3f496bf50
Merge pull request #2179 from WizardCM/remove-help-interact
UI: Remove help icon from Interact titlebars
2019-11-16 00:22:03 -08:00
Matt Gajownik 8efb6e92fe UI: Remove help icon from Interact titlebars 2019-11-16 10:23:03 +11:00
Jim e6daa22ab7
Merge pull request #2079 from exeldro/startcase
obs-text: text transform add locale and start case
2019-11-15 02:07:07 -08:00
Jim 9bdb21205d
Merge pull request #2085 from ratwithacompiler/macos-python-fix
obs-scripting: Fix Python on MacOS
2019-11-14 20:38:53 -08:00
Jim 61d959a095
Merge pull request #2077 from brittneysclark/qsv_cust_quant_mat
obs-qsv: Enable option for Custom Quantization Matrix
2019-11-14 18:54:51 -08:00
Jim def6fcb0ee
Merge pull request #2125 from DDRBoxman/appbundle
Fixes to make OBS work on Catalina
2019-11-13 12:21:13 -08:00
Jim 0d140542e4
Merge pull request #2072 from jpark37/dshow-negative-height
win-dshow: Support bottom-up DIBs
2019-11-13 11:42:05 -08:00
Jim 0f8472e8a8
Merge pull request #1914 from YouNow/master
rtmp-services: Add YouNow service and implement ingest lookup
2019-11-13 08:41:13 -08:00
jpark37 f896c773e8 win-dshow: Support bottom-up DIBs
The biHeight field can be negative, leading to crashes on some cards
like VisionRGB-E1S. Adding flip support is fairly straightforward.

There also appears to be a hack to automatically flip for RGB formats,
but I wish to remove it because it seems to fight with this change. We
already have a separate vertical flip checkbox to deal with non
compliant behavior.
2019-11-12 17:59:59 -08:00
Jim b731b3eea0
Merge pull request #2010 from wanhongqing123/master
win-dshow: fix H264 to mjpeg issue
2019-11-12 17:32:36 -08:00
Jim d357e1eb6e
Merge pull request #2042 from WizardCM/custom-twitch-docks
UI: Add support for Custom (Legacy) Twitch Dashboard Docks
2019-11-12 16:45:37 -08:00
wanhongqing 9b4d9c6788 win-dshow: Fix format switching issue
If the format was one encoded format and changes to another encoded
format, it could cause it to continue to treat it as the old format.
2019-11-12 14:37:32 -08:00
Jim 14d8f86745
Merge pull request #2081 from jpark37/cpp17
CMake 3.10, C++17, SWIG warnings
2019-11-11 11:49:40 -08:00
Jim fc54a3b708
Merge pull request #1974 from DDRBoxman/state
decklink-ui: Show the state of outputs in the decklink dialog
2019-11-11 07:13:52 -08:00
Jim d60c736cb0
Merge pull request #1990 from cg2121/flv-radio-buttons
UI: Use radio buttons for FLV track selection
2019-11-10 06:34:14 -08:00
Jim 8703c85d76
Merge pull request #1927 from rxrbln/master
Just a couple of more X.org / Unix hotkey defines.
2019-11-10 06:33:22 -08:00
Colin Edwards a469d14264 decklink-ui: Show the state of outputs in the decklink dialog 2019-11-09 14:48:24 -06:00
Clayton Groeneveld bab3391ce4 UI: Use radio buttons for FLV track selection 2019-11-09 08:19:41 -08:00
René Rebe fcbe593134 libobs: Add more X.org / Unix hotkey defines 2019-11-09 07:29:16 -08:00
Jim 768a58771a
Merge pull request #1919 from omkelderman/mask-filter-reload-on-file-change
obs-filters: Reload the mask image when file change is detected
2019-11-07 15:45:12 -08:00
Olle Kelderman 5534c46920 obs-filters: Reload the mask image when file change is detected 2019-11-07 11:34:10 -08:00
Jim 3542e4eac1
Merge pull request #1917 from VodBox/scroll-loop-option
libobs/obs-filters: Add toggle for scroll filter looping
2019-11-07 11:30:18 -08:00
VodBox 6645eaf1b8 obs-filters: Add toggle for scroll filter looping
By giving the option to disable the looping in the scroll filter, it
makes it more suitable for tasks like credits sequences, where you don't
want the texture to repeat and for the motion to only be performed once.
2019-11-07 06:25:36 -08:00
VodBox e8c1ec4035 libobs: Send activate and show signals to filters 2019-11-07 06:19:34 -08:00
Jim 647e7e24a1
Merge pull request #2144 from cg2121/quick-tr-fix
UI: Fix main transition being set to the quick one
2019-11-07 05:37:33 -08:00
Jim bfaf4889f1
Merge pull request #2168 from kkartaltepe/vaapi-profile-fix
rtmp-services: Type check apply_encoder_settings
2019-11-07 05:36:44 -08:00
Kurt Kartaltepe d9470770a0 rtmp-services: Type check apply_encoder_settings
This fixes ovewritting hidden "profile" setting in ffmpeg vaapi which is
a number and not a string. It also shouldnt be overwritten as it is
required on some AMD hardware for the encoder to work.
2019-11-06 20:10:19 -08:00
Clayton Groeneveld 0676c385ba UI: Fix main transition being set to the quick one
This fixes an issue where using a quick transition, it would change
the main transition as well.
2019-11-05 23:47:28 -06:00
Jim f41d0d9d77
Merge pull request #2153 from tujinshu/master
win-capture: Fix rare crash when OpenGL programs exit with graphics-hook
2019-11-05 16:28:13 -08:00
tujinshu 76e6a99124 win-capture: Fix rare crash when GL program exits
**Commit message modified and clarified by Jim**

When hooking a program that has both DirectX and OpenGL contexts in use,
it is possible to cause a crash on shutdown due to capture_active()
returning true when an OpenGL context is deleted.  Normally, when
capturing an OpenGL program, this would not happen because the 'active'
variable would not be set due to OpenGL capture not being initialized,
but if DirectX is captured while an OpenGL context is available, and
OpenGL could not load these required functions, then GL can crash due to
trying to use unavailable functions.

This case is extremely rare and doesn't happen under normal
circumstances; only if a program is using both DirectX and OpenGL within
the same program simultaneously, and *only* if OpenGL could not load the
required functions.  This likely almost never happens under normal
programs, games, and hardware.  This was apparently produced by hooking
a GL Qt program that used QWebEngine, which used multiple contexts at
once.
2019-11-05 13:44:15 -08:00
Jim cbfb779876
Merge pull request #2148 from eulertour/master
UI: Fall back to XGetWMName if XFetchName fails
2019-11-05 12:54:50 -08:00
Jim 57669ffcb7
Merge pull request #2146 from Fenrirthviti/recording-bitrate-fix
UI: Fix audio bitrate not being set in simple mode
2019-11-05 12:52:15 -08:00
Jim 17ddb8d62d
Merge pull request #2142 from cg2121/fade-to-black
UI: Add fade to black in studio mode
2019-11-05 12:50:29 -08:00
jp9000 0a3d2e127f 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-11-05 12:02:54 -08:00
Colin Edwards 32690926b9 CI: Use custom macdylibbundler for OSX deps 2019-11-03 00:00:38 -05:00
Jim e941eb6583
Merge pull request #2145 from JohannMG/UpgradeStream-Link
UI: Upgrade stream key link into button
2019-11-01 12:00:26 -07:00
JohannMG 3f6cf0e871 UI: Upgrade stream link hotlink to a button
Most of the top streaming services now have a link in the stream key
label. Upgrading this button to a button clarifies the assistance
for the important step of setting up a stream.

Creates a new type of button for URL opening simply which also
automatically updates the tootip to the current URL.

Includes addition of Twitter/Periscope URL to make this feature more
complete.
2019-10-30 12:09:07 -07:00
Roman Sivriver 64d90c28c8 rtmp-services: Add YouNow service and implement ingest lookup 2019-10-30 13:16:13 -04:00
Jim b98ea73cdc
Merge pull request #2154 from Vainock/patch-1
README.rst: Add Crowdin progress badge
2019-10-30 07:36:03 -07:00
Vainock b3a3d96323
README.rst: Add Crowdin progress badge
This adds a badge to the README that shows the progress of the OBS Studio Crowdin Project. This is a more obvious link to the translation project as it is only mentioned in the description far below.
2019-10-29 15:50:21 +01:00
Jim 05656e56f3
Merge pull request #2147 from JohannMG/vscode-ignore
git: Add VSCode working dir to .gitignore
2019-10-28 13:29:21 -07:00
Devin Neal 7e25b0dc1e UI: Fallback to XGetWMName if XFetchName fails 2019-10-27 14:39:58 -07:00
JohannMG 3347c1b3b8 git: Add VSCode working dir to .gitignore
Ignores additions and changes to any configurations in VSCode.

$sqaushme remove wildcard
2019-10-25 14:01:48 -07:00
Joel Bethke 63d66c87e4 UI: Fix audio bitrate not being set in simple mode 2019-10-25 10:56:26 -05:00
Clayton Groeneveld 1c005fcb51 UI: Add fade to black in studio mode 2019-10-24 19:00:33 -05:00
Jim c56de17bdb
Merge pull request #2140 from DevWolk/avn-obs
rtmp-services: Add Stars.AVN.com streaming service
2019-10-23 00:42:32 -07:00
Dmitry Vovk c0a8e86c9c rtmp-services: Add Stars.AVN.com streaming service 2019-10-22 23:53:48 -07:00
Jim de7ab74370
Merge pull request #2137 from AlexWayfer/revert_desktop_file_renaming
Fix desktop entry for GNOME shell without file renaming
2019-10-22 21:28:28 -07:00