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
3,994 Commits 16 Branches 211 Tags 169 MiB
7e5c7da542
Commit Graph

1202 Commits

Author SHA1 Message Date
Cephas Reis
94b6943f27 decklink: Update Blackmagic SDK to 10.8.0 
Updated to help support the newest cards, features, and options.

Closes jp9000/obs-studio#627
 2016-10-16 01:53:51 -07:00
Colin Edwards
a41bdb3bf0 Update obs-browser submodule to a working version 2016-10-14 08:17:28 -05:00
Jim
43c1dce777 Merge pull request #634 from CoDEmanX/master 
rtmp-services: Add Asian Livecoding.tv server and increase video bitrate
 2016-10-09 18:49:34 -07:00
Michael Fabian Dirks
ccbb542eb0 enc-amf: Update to 1.3.3.1 2016-10-07 00:47:06 +02:00
Michael Fabian Dirks
70fc27d34a enc-amf: Update to 1.3.2.3 2016-10-04 20:21:17 +02:00
Jim
dbfb1f9796 Merge pull request #638 from Xaymar/plugin_enc-amf 
enc-amf: Fix warnings caused by warnings( push/pop )
 2016-09-29 12:20:49 -07:00
Michael Fabian Dirks
846db36d6e enc-amf: Fix warnings caused by warnings( push/pop ) 2016-09-29 21:20:01 +02:00
Michael Fabian Dirks
4bafe668ee obs-text: Add gradient feature 
Closes jp9000/obs-studio#636
 2016-09-29 12:15:17 -07:00
Michael Fabian Dirks
832c62e026 enc-amf: Update submodule to 1.3.1.0 2016-09-29 19:59:45 +02:00
Richard Stanway
a8020b37be obs-ffmpeg: Fix possible NVENC crash 
If the codec hasn't even been fully initialized, calling these functions
in the shutdown code could cause a crash.
 2016-09-28 15:24:04 -07:00
CoDEmanX
78d09e6ac2 rtmp-services: Add Asian Livecoding.tv server and increase video bitrate 2016-09-28 21:29:03 +02:00
jp9000
32378124af obs-text: Change file update interval to 1 sec (from 2) 2016-09-28 02:01:30 -07:00
Gol-D-Ace
aadc7263c0 Update translations from Crowdin 2016-09-28 01:17:24 +02:00
jp9000
a8f3351173 enc-amf: Remove unused locale files 2016-09-27 16:13:40 -07:00
Jim
60224b2480 Merge pull request #633 from Xaymar/plugin_enc-amf 
enc-amf: Update submodule to 1.3.0.3
 2016-09-27 16:07:12 -07:00
Michael Fabian Dirks
5bc7003d12 enc-amf: Update submodule to 1.3.0.3 2016-09-27 23:45:08 +02:00
jp9000
677ae3798d obs-browser: Add browser plugin as a submodule 2016-09-27 13:33:57 -07:00
Michael Fabian Dirks
b4f9229cf7 enc-amf: Update submodule to 1.3.0.1 2016-09-27 19:48:52 +02:00
jp9000
66d0e25a86 enc-amf: Update submodule to 1.3.0 2016-09-26 18:53:23 -07:00
Richard Stanway
4d23e84837
librtmp: Remove reconnect on close behavior 
For some reason librtmp treats a close message as a request to reconnect.
It does this syncronously, and uses the same event processing so that
another close request will continue the cycle until the stack is exhausted
and the application crashes.

Fixes https://obsproject.com/mantis/view.php?id=634
 2016-09-27 00:37:59 +02:00
jp9000
7ee3dfe9e4 enc-amf: Update to 1.3.0rc6 2016-09-26 14:46:57 -07:00
jp9000
1e0d5e7b3e obs-ffmpeg: Add b-frame support to NVENC (default: 2) 
It was unintentionally using intra-only before, impacting quality.
 2016-09-26 14:46:56 -07:00
Richard Stanway
7ea59ff3b4
rtmp-services: Remove Twitch H264 profile requirement 
Twitch no longer recommend Main profile on their "Broadcast requirements"
page. The number of devices that can't decode High profile is very small
and limited to old, legacy devices such as the 1st generation iPad (six
years old). Additionally, these devices have limited resolution / FPS
support, so streams are often encoded at levels beyond what they could
decode even disregarding the H264 profile requirement. It's not worth
degrading the quality of streams for modern devices just to support these
legacy decoders. Twitch still provides low-complexity transcodes for
devices which cannot handle Source quality streams.
 2016-09-26 20:32:37 +02:00
Robin Hielscher
e3a1ba0c77 rtmp-services: Update Facebook Live recommendations (#629) 
* rtmp-services: Update Facebook Live recommendations

* Update package.json
 2016-09-26 01:31:08 -07:00
jp9000
ff05574654 obs-text: Change default font size to 36 2016-09-22 20:57:43 -07:00
Jim
e92f683ee0 Merge pull request #623 from hwdro/obs-text-bk 
obs-text: Add bk color/opacity properties
 2016-09-22 20:54:58 -07:00
Christoph Hohmann
43dd63aeaf pulse-input: Fix design flaw where source is not created 
When a pulseaudio source is created from existing settings and the
device is not found, then the private data will return NULL, making it
impossible to change the source to use a different device.  NULL should
never be returned when possible, otherwise settings cannot be changed
and properties cannot be displayed.

Closes jp9000/obs-studio#604
 2016-09-22 18:26:56 -07:00
Michael Hoang
7d6bf872e2 linux-alsa: Add ability to specify a custom PCM 
Closes jp9000/obs-studio#599
 2016-09-22 18:18:55 -07:00
jp9000
108a4aa40e obs-outputs: Add max shutdown timeout (30 seconds) 
The maximum shutdown timeout value was added as a setting, but never
actually fully implemented.  This implements it properly, and sets its
default timeout value to 30 seconds.
 2016-09-21 21:51:22 -07:00
Michael Fabian Dirks
d4c4d7b674 enc-amf: Fix locale typo and add VBR_LAT 2016-09-21 08:17:01 -07:00
hwdro
a4cde72698 obs-text: Add bk color/opacity properties 2016-09-21 00:09:53 +03:00
jp9000
69c4dbe4ed enc-amf: Remove superfluous locale text 2016-09-20 09:28:49 -07:00
Michael Fabian Dirks
ed616ac593 enc-amf: Add AMD h.264 encoder 
Closes jp9000/obs-studio#611
 2016-09-20 09:08:21 -07:00
jp9000
84613cecff win-dshow: Disable plugin and warn if submodule not found 2016-09-20 05:07:30 -07:00
jp9000
6736aeebde rtmp-services: Remove forced zerolatency on service 2016-09-19 17:58:15 -07:00
jp9000
ba47bcafc8 Revert "rtmp-services: Add ability to specify tune param" 
This reverts commit 4b0f22d05a.

Services should not force tunes.
 2016-09-19 17:57:59 -07:00
Andrei Nistor
95f364dd29 rtmp-services: Add CAM4 streaming service 
Closes jp9000/obs-studio#606
 2016-09-19 07:33:44 -07:00
Andrei Nistor
4b0f22d05a rtmp-services: Add ability to specify tune param 
Some services need to set up tune=zerolatency
for low-latency streaming
 2016-09-19 07:04:41 -07:00
derrod
3b3933b42f obs-ffmpeg: Fix (put back in) "profile" NVENC setting 
The profile setting may have been unintentionally removed in 0157d02564.

Closes jp9000/obs-studio#616
 2016-09-16 19:55:18 -07:00
jp9000
b2a85a2820 obs-text: Reload whenever file timestamp has changed 
Rather than reload when the timestamp is greater than the previous
timestamp, reload whenever the timestamp has changed.
 2016-09-16 19:47:24 -07:00
Jim
1946ee6443 Merge pull request #617 from RytoEX/master 
image-source: Reload file when timestamp has changed
 2016-09-16 19:46:31 -07:00
jp9000
31f106c1b5 obs-text: Fix typo 2016-09-15 05:20:59 -07:00
jp9000
1bbe152a55 obs-text: Fix call type for GDIObj helper class 
The call type for the deleter function used with the GDIObj helper class
is __stdcall.  Without it, it'll fail to build in 32bit properly.
 2016-09-15 04:52:22 -07:00
jp9000
5af1a2b5bb text-freetype2: Deprecate on windows 2016-09-14 16:59:46 -07:00
jp9000
34eb4cd409 obs-text: Add GDI+ text source 2016-09-14 16:59:46 -07:00
Ryan Foster
c8a81bba72 image-source: Reload file when timestamp has changed 
This commit fixes the issue outlined in the following thread:
https://obsproject.com/forum/threads/50045/

When the image source file was replaced by an outside process, it would
only reload when the file's new timestamp was newer than the file's
previous timestamp.  This fixes that behavior.  Now an image source
will reload any time the file's new timestamp is different than its
previous timestamp.
 2016-09-14 05:43:48 -04:00
jp9000
c5c1e34d09 obs-ffmpeg: Free remaining NVENC frames on exit 
This clears out remaining NVENC frames to ensure that the encoder has
finished processing before shutting down.
 2016-09-13 09:17:07 -07:00
jp9000
001f3c751b win-dshow: Add tooltip to "Use Buffering" option 2016-09-11 04:16:14 -07:00
jp9000
50d7cc8ae6 obs-outputs: Allow forced stop even when stopping 2016-09-09 17:39:20 -07:00
jp9000
9a58772a01 obs-ffmpeg: Allow ffmpeg_mux forced stop even when stopping 2016-09-09 17:39:19 -07:00