0
0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 21:13:04 +02:00
Commit Graph

6095 Commits

Author SHA1 Message Date
Jim
a60b3987fc
Merge pull request #1504 from Xaymar/patch-obs-amd-encoder
enc-amf: Update to 2.5.0.1 and update repository address
2018-09-28 11:31:42 -07:00
Jim
d2d8cc6456
Merge pull request #1503 from cg2121/fix-resizeoutput-typo
UI: Fix typo with resize output text
2018-09-28 11:27:49 -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
Clayton Groeneveld
e8687b0965 UI: Fix typo with resize output text 2018-09-27 18:46:41 -05: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
94e44e698e
Merge pull request #1497 from cg2121/fix-autoremux-warning
UI: Fix auto remux warning
2018-09-25 15:05:54 -07:00
Clayton Groeneveld
c74e70ce49 UI: Fix auto remux warning
This fixes the QAbstractItemModel invalid index warning.
2018-09-25 14:19:50 -05:00
Jim
c786f3cafc
Merge pull request #1496 from cg2121/resize-output-text
UI: Change resize output text
2018-09-25 08:43:51 -07: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
Steve Wills
2f51abf994 libobs: Add pkgconfig support
Based on:

http://dailycommit.blogspot.com/2016/10/how-to-generate-pkg-config-file-with.html
https://people.freedesktop.org/~dbn/pkg-config-guide.html

Should allow third party plugins to find and use libobs more easily.

Closes obsproject/obs-studio#1467
2018-09-24 14:25:41 -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
Clayton Groeneveld
b85f9236d8 UI: Change resize output text
The text for resizing the output based on source is inaccurate
because base and canvas are the same thing.
2018-09-23 20:42:05 -05: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
Jim
e08e3c9c29
Merge pull request #1441 from cg2121/auto-remux-refactor
UI: Add option to auto remux
2018-09-21 15:47:46 -07:00
Jim
249be6c51c
Merge pull request #1494 from wehmoen/master
rtmp-services: Add Vimm.TV
2018-09-21 10:08:26 -07:00
Jim
1d3d24af48
Merge pull request #1493 from TheMuso/truncate-linux-thread-name
libobs: Truncate thread names on Linux
2018-09-21 10:06:23 -07:00
Tom Pichler
04035cec65 rtmp-services: Add Vimm.TV 2018-09-21 09:08:48 +02:00
Luke Yelavich
5fe5027630 libobs: Truncate thread names on Linux
The pthread_setname_np manpage states:

The thread name is a meaningful C language string, whose length is
restricted to 16 characters, including the terminating null byte ('\0').
2018-09-21 08:44:30 +10:00
Jim
b4d179461e
Merge pull request #1458 from cg2121/dynamic-output-size
UI: Add ability to resize output based on source size
2018-09-19 15:56:42 -07:00
cg2121
7f9109091d UI: Add ability to resize output based on source size 2018-09-18 23:13:12 -05:00
cg2121
2fedcab987 UI: Add option to auto remux 2018-09-18 20:55:12 -05:00
jp9000
977a21b684 UI: Remove '?' from remux title bar 2018-09-18 17:00:01 -07:00
Jim
14ae6351d4
Merge pull request #1477 from RytoEX/ci-appveyor-linux
CI: Build on Linux with AppVeyor
2018-09-18 14:07:59 -07:00
Ryan Foster
2bf1f3f5d0 CI: Add mbedTLS dependency for AppVeyor Linux
On Ubuntu 16.04 (Xenial), we have to build mbedTLS from source because
the version available from apt, mbedTLS 2.2.1, does not work with the
RTMPS implementation in OBS, which requires mbedTLS 2.7 at minimum. This
is due to the use of the function mbedtls_ssl_conf_dh_param_bin, which
was introduced in mbedTLS 2.7.
2018-09-18 15:13:40 -04:00
Ryan Foster
c3b2380b13 CI: Build on Linux with AppVeyor
Build on Linux (Ubuntu 16.04) with AppVeyor. Disable PowerShell on
Linux. Ubuntu 16.04's dependencies are different from the existing
Ubuntu 14.04 dependencies, so a separate script for installing those
dependencies has been added.
2018-09-18 15:13:40 -04:00
Ryan Foster
7b81248a30 CI: Use cmd prefix on AppVeyor as needed
AppVeyor commands use cmd/batch by default. Specify cmd for lines meant
for cmd to differentiate them from lines meant for ps/PowerShell or
sh/shell/Bash.
2018-09-18 15:13:39 -04:00
Ryan Foster
dfbf42bfd1 CI: Move AppVeyor install commands to a script file
Move the AppVeyor install scripts to a separate script file. This
shortens the appveyor.yml file and makes it easier to introduce new
install scripts for other build environments.

There is one minor change to the install script, and that was to change
directory back to the obs-studio git root directory.
2018-09-18 15:13:39 -04: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
cb4d2ff7fa cmake: Find Qt first before going to subdirectories 2018-09-18 10:03:07 -07:00
Jim
f23c19fd14
Merge pull request #1492 from Dmitry-Me/properSizeComputation
UI: Fix array length computation
2018-09-18 09:00:20 -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
fdc2464ad0
Merge pull request #1491 from VodBox/doc-fix
docs/sphinx: Add missing obs_sceneitem_get_id info
2018-09-18 08:39:54 -07:00
Dmitry-Me
5b92cee48f UI: Fix array length computation 2018-09-18 16:27:23 +03:00
VodBox
293c97fe78 docs/sphinx: Add missing obs_sceneitem_get_id info 2018-09-18 21:34:44 +12: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
197e63c34f
Merge pull request #1489 from SuslikV/patch-7
UI: Fix scrollbar alignment for themes Dark, Acri
2018-09-17 11:11:28 -07:00
SuslikV
a6c8cdec00
UI: Fix scrollbar misalignment for Acri theme
Fixes an issue with horizontal scrollbar when it was hard to drag it by
mouse in Acri theme, because active area was thinner than the visible
scroll handle.
2018-09-17 14:41:46 +02:00
SuslikV
ac783946d0
UI: Fix scrollbar handle alignment for Dark theme
Fixes an issue when it was hard to drag by mouse the scroll handle in
Dark theme if scroll handle size is close to full size
(https://obsproject.com/mantis/view.php?id=466) or close to minimal
size.

Also, the mouse pointer was misaligned to the scroll handle when
moving: the scroll handle always moves faster than mouse pointer itself
and finishes first.
2018-09-17 14:29:29 +02:00
Jim
31561b3231
Merge pull request #1428 from pantherrui/master
fix heap corruption when video capture thread release the frame before it push into source->async_frames.
2018-09-17 05:19:58 -07:00
wangrui05
26d3f42b89 libobs: Fix heap corruption in obs_source_output_video 2018-09-17 18:46:47 +08: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
Jim
274bf52deb
Merge pull request #1452 from cg2121/slideshow-memory-usage
image-source: Decrease slideshow source memory usage
2018-09-17 02:03:08 -07:00