mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code
6,015 Commits 16 Branches 211 Tags 169 MiB
1db398ad8c
Commit Graph

6015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim
1db398ad8c
Merge pull request #1518 from fredemmott/stopping-on-delay-stop 
ui: Emit STREAMING_STOPPING when stop queued
 2018-12-03 04:27:18 -08:00
jp9000
03cca9d95a libobs: Background color of 0 should not be gray 
When calling obs_display_set_background_color, the value set in the
'color' parameter should always be used as-is.  0 should not indicate a
color other than black.  To do anything otherwise is silly and confusing
for users of the API.

Closes obsproject/obs-studio#1516
 2018-12-03 04:09:30 -08:00
Jim
7df96986dd
Merge pull request #1515 from Dmitry-Me/initMemberVar2 
decklink: Initialize member variable
 2018-12-03 03:43:49 -08:00
Colin Edwards
a347b63447
Merge pull request #1561 from juvester/ci-vlc-dl 
CI: Use proper VLC release tarball
 2018-11-30 21:19:48 -06:00
juvester
98fc5750db CI: Use proper VLC release tarball 
As noted by ePirat, the VLC releases on GitHub are not official
releases, just repo snapshots. Use the official VLC 3.0.4 release
tarball to ensure maximum stability.
 2018-11-30 22:33:04 +02:00
Colin Edwards
53f9544a95
Merge pull request #1560 from juvester/ci-osx-vlc-fix 
CI: Use VLC 3.0.4 instead of master for macOS
 2018-11-30 11:05:22 -06:00
juvester
d10e4cd040 CI: Use VLC 3.0.4 instead of master for macOS 
Fixes an issue where macOS builds on Travis would fail due to changes
in VLC master branch.
 2018-11-30 18:03:48 +02:00
Jim
01e8426981
Merge pull request #1554 from ab22/buffer-fill-fix 
libobs: memset() the correct buff size
 2018-11-26 03:19:47 -08:00
Abelardo E. Mendoza
e345b00120 libobs: memset() the correct buff size 2018-11-25 22:45:11 -06:00
jp9000
0951039322 libobs: Do not process panning if panning centered 
Fixes a bug where audio panning would always be processed even if
panning was centered (and thus inactive).
 2018-11-23 03:24:11 -08:00
Gol-D-Ace
e6ac830247 CI: Update Qt path on Windows 
AppVeyor recently updated their Qt version to 5.11.2 which breaks
builds, because of the outdated path. Using this path should always
ensure that the newest subversion of Qt 5.11 gets used.
 2018-11-13 14:26:42 +01:00
Fred Emmott
bab9d6e96d
UI: Emit STREAMING_STOPPING event immediately 
If there's a delay, it will *also* be ommitted after the appropriate
number of seconds.

I was originally going to add a new event for this, however this is
consistent with STREAMING_STARTING, which is emitted at the start
of the delay, not the end.
 2018-10-17 18:52:20 -07:00
Dmitry-Me
d9ca4d540a decklink: Initialize member variable 2018-10-09 18:00:20 +03:00
pkviet
047e586eaf UI: Add multi-track FFmpeg output support 2018-10-04 20:32:35 -07:00
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
jp9000
b8a3ae1b10 libobs: Add multi-track support to non-encoded outputs 2018-10-04 20:32:35 -07:00
Terje Gundersen
8b98568bbc UI: Don't transition if already transitioning (studio mode) 
Closes obsproject/obs-studio#1304
 2018-10-01 19:37:33 -07:00
Michael Fabian 'Xaymar' Dirks
e55579e63d libobs: Add obs_enum_scenes for enumerating scenes 
Closes obsproject/obs-studio#1507
 2018-10-01 10:24:42 -07:00
jp9000
35dc89f5ca libobs-d3d11: Use mip levels are used in resource view 2018-09-28 16:37:48 -07:00
Alex Anderson
4eac034814 libobs-opengl: Add int2-4 support 
Closes obsproject/obs-studio#1506
 2018-09-28 13:59:49 -07:00
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