Commit Graph

1801 Commits (047e586eafa43b139a4a605985592be75570fd61)

Author SHA1 Message Date
pkviet 340fb9d669 obs-ffmpeg: Enable multiple audio tracks for FFmpeg output
This allows multiple audio tracks for the FFmpeg output.

Closes obsproject/obs-studio#1351
2018-10-04 20:32:35 -07:00
Michael Fabian 'Xaymar' Dirks 62b748e40e enc-amf: Update to 2.5.0.1 and update repository address 2018-09-28 10:54:19 +02:00
jp9000 7ab488b100 Revert "Merge pull request #1498 from Xaymar/patch-obs-amd-encoder"
This reverts commit 5edeaa3046, reversing
changes made to 0d28081997.
2018-09-26 12:09:15 -07:00
Jim a43a4fac7e
Merge pull request #1043 from DDRBoxman/decklinkout
Decklink: Add decklink output
2018-09-25 18:15:14 -07:00
Colin Edwards 21b67cff64 Decklink: add output support 2018-09-25 19:13:25 -05:00
Jim 5edeaa3046
Merge pull request #1498 from Xaymar/patch-obs-amd-encoder
enc-amf: Update to 2.5.0 and update repository address
2018-09-25 08:41:49 -07:00
Artem Merkulov 0d28081997 rtmp-services: Update liveedu.tv servers
Closes obsproject/obs-studio#1499
2018-09-25 08:38:24 -07:00
Jim 2c0ea84dc6
Merge pull request #1501 from lino-network/feature
rtmp-services: Add DLive
2018-09-25 08:36:19 -07:00
fefine 480f5a81c5 rtmp-services: Add DLive 2018-09-25 16:31:45 +08:00
Thomas Crider a64ae11bce obs-ffmpeg: Add linux VAAPI h.264 encoding support
Closes obsproject/obs-studio#1482
Closes obsproject/obs-studio#1256
2018-09-24 23:12:24 -07:00
Jim 2a08f1d144
Merge pull request #1495 from SingularityAzure/linux-capture-xcompcap-singularity
linux-capture: Fix repeated color-swapping and improve robustness further
2018-09-24 14:55:09 -07:00
Michael Fabian 'Xaymar' Dirks 4b1991c4fc enc-amf: Update to 2.5.0 and update repository address 2018-09-24 06:15:32 +02:00
Philip Haynes c286f0c202 linux-capture: Fix repeated swapping of swapRedBlue and improve robustness further
Previously toggled swapRedBlue every update regardless of settings being set, which resulted in
moving or resizing of windows causing undesired color-swapping behavior. Also now use more direct
method of comparing visualIDs without type-casting and base the glxpixmap attributes on texture
format being used rather than the bit-depth of the window.
2018-09-23 17:54:18 -05:00
Jim 47285c2ba6
Merge pull request #1485 from SingularityAzure/linux-capture-xcompcap-singularity
linux-capture: Improve XComposite capture robustness
2018-09-22 14:20:43 -07:00
Tom Pichler 04035cec65 rtmp-services: Add Vimm.TV 2018-09-21 09:08:48 +02:00
Jim 5cb76c9e79
Merge pull request #1389 from Andersama/scale-filter-variable-resolutions
obs-filters: Add base canvas resolution option
2018-09-18 12:10:04 -07:00
jp9000 8b936a1575 cmake: Fix UI being dependent on browser plugin files
The UI currently is dependent on browser source files being present,
when in actuality the files may not have been fetched (i.e. not fetching
submodules).  This fixes that by using a macro to detect whether it's
available or not.

Closes obsproject/obs-studio#1490
2018-09-18 08:56:34 -07:00
Jim 0f6761468b
Merge pull request #1479 from tompeeters368/master
win-capture: Add option to adjust hook rate for game capture
2018-09-17 13:52:41 -07:00
Jim 8435e581ac
Merge pull request #1377 from Andersama/chroma-key-optimization
obs-filters: Optimize chroma key's box filter
2018-09-17 02:18:41 -07:00
cg2121 4c7e13bb8a image-source: Decrease slideshow source memory usage 2018-09-16 19:31:26 -05:00
Jim af320a0838
Merge pull request #1480 from kkartaltepe/module-descriptions
Plugins: Add descriptions to modules
2018-09-16 15:34:28 -07:00
Jim e29447417c
Merge pull request #1488 from ePirat/cfstring-utils
Consolidate CFString conversions
2018-09-16 14:42:48 -07:00
Marvin Scholz b1e837a18a coreaudio-encoder: Use libobs CFString utils 2018-09-16 22:41:01 +02:00
Marvin Scholz 94b30ec05a decklink: Use libobs CFString utils 2018-09-16 22:41:01 +02:00
Marvin Scholz 26a96c618f mac-capture: Use libobs CFString utils 2018-09-16 22:41:01 +02:00
Marvin Scholz b2ece640e5 mac-vth264: Use libobs CFString utils 2018-09-16 22:41:01 +02:00
Jim 3c22cf35c9
Merge pull request #1418 from cabirdme/qsv_feature_add
obs-qsv: Expose additional QSV encoder settings through GUI
2018-09-16 08:17:12 -07:00
pkviet c7dab6c92b decklink: Remove inactive audio channels (linux, macOs)
Decklink cards accept 2, 8 or 16 audio channels.
If obs audio output is setup to n channels ( 8 >= n > 2), and the
decklink card captures n channels, one needs to squash the silent
channels (n+1, .., 8) or sampling issues occur.
This had been done on windows but is required also on macOs and linux.
The commit adds the fix for macOS and linux.
Some code factoring has also been done.

Closes obsproject/obs-studio#1350
2018-09-15 13:21:21 -07:00
Tom Peeters 6bbeaae02e win-capture: Add option to adjust hook rate for game capture
This option slows down or speeds up the rate at which
the game capture plugin checks for a valid window.
2018-09-13 19:35:37 +02:00
Philip Haynes 5fe6feb59a linux-capture: Improve XComposite capture robustness
Adds support for windows with alpha channels as well as swapping red
and blue when using GS_BGRX. glXFBConfig now attempts to inherit
its format from the captured window when possible.

Change log message
2018-09-13 10:53:20 -05:00
Jim 272925049e
Merge pull request #1484 from abedinpour/update-lahzenegar-rtmp
rtmp-services: Update Lahzenegar settings
2018-09-13 06:11:58 -07:00
mhabedinpour 032a8d09d1 rtmp-services: Update Lahzenegar settings 2018-09-13 14:35:25 +04:30
Philip Loche 7cfbdcf184 obs-filters: Add "Invert Polarity" audio filter
Allows inverting the polarity of the audio data, which can be useful for
ether purposefully canceling out audio or preventing audio cancellation.

Amends pull request obsproject/obs-studio#1404
2018-09-13 02:51:07 -07:00
Alex Anderson 72cf77102c obs-filters: Avoid skewing chroma key's box filter average
Passes the sample directly to the box filter before it is multiplied by color.
2018-09-12 23:52:22 -07:00
Alex Anderson 73d8220f16 obs-filters: Optimize chroma key's box filter
Reduces number of samples taken for same effect.
2018-09-12 23:52:13 -07:00
jp9000 b3ef46d986 cmake: Make static VC runtime libraries consistent
Makes Visual C runtime libraries consistent across
Debug/MinSizeRel/Release/RelWithDebInfo, rather than just changing those
flags for RelWithDebInfo.  Also adds /Zl for statically linked
libraries.

Closes obsproject/obs-studio#1421
2018-09-12 07:49:13 -07:00
Kurt Kartaltepe d86c8121ed Plugins: Add descriptions to modules 2018-09-11 18:28:58 -07:00
jp9000 2c0f65c3ea obs-browser: Fix local macOS build issues
(This also modifies the CI scripts accordingly)

It was difficult to build local obs-browser builds on macOS due to the
way the frameworks work and libraries are linked.  This solves that
issue so that local builds of obs-browser should always work fine.
2018-09-11 01:29:13 -07:00
Bird, Christopher 99b8c8390f obs-qsv: enable High Profile for QSV h264
- New QSV Default -> H264 High profile.  Previous Default -> H264 Main profile
2018-09-10 10:23:43 -07:00
Colin Edwards f8e628ac36 Update decklink SDK to version 10.11 2018-09-07 20:33:12 -05:00
Alex Anderson f8f23a36e7 obs-filters: Add base canvas resolution option
Add a variable resolution to scale to. Requires first commit of #1390.
2018-09-07 18:23:10 -07:00
Jim ef6a83666a
Merge pull request #1392 from Andersama/decklink-deactivate-when-not-shown
decklink: Add deactivate when not showing option to decklink
2018-09-07 18:22:50 -07:00
Alex Anderson a65b369716 decklink: Add deactivate when not showing option to decklink
Adds a deactivate when not showing checkbox to decklink sources.
2018-09-07 03:03:49 -07:00
Jim 06488a55ce
Merge pull request #1416 from admshao/cleanup-macro-declaration
Cleanup Compilation warnings
2018-09-07 00:51:58 -07:00
Shaolin bf72435db8 obs-outputs: Fix unused variable compiler warning
Some security layer libraries code path used by the rtmp output had a
not used variable and not used param on HMAC_finish macro that was
triggering warnings during compilation.
2018-09-06 22:10:29 -03:00
Shaolin d500ef3bb5 obs-outputs: Make rtmp packet alloc code path clearer
On 64bit systems, this check will always evaluate to false due to
SIZE_MAX type and triggers a compiler warning.

This both makes it clearer that its only needed on 32bit system and
clear the compiler warning.
2018-09-06 22:10:24 -03:00
Jim 4e90b61210
Merge pull request #1364 from kkartaltepe/patch-5
[win-capture] Modify log for sharedmem
2018-09-05 23:59:03 -07:00
Jim 15577f8b5f
Merge pull request #1363 from pkviet/img
image-source: Add psd and *.* to file filter.
2018-09-05 23:57:57 -07:00
Jim 3be5e414bc
Merge pull request #1362 from Chiitoo/automagic
cmake: Use less automagic during configure
2018-09-05 23:57:07 -07:00
Dmitry-Me ecf508269d win-ivcam: Remove and prohibit useless member functions 2018-09-04 17:40:54 +03:00