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

4827 Commits

Author SHA1 Message Date
jp9000
3a06cb25df libobs: Add ability for transitions to render sources directly
For specific types of transitions (stingers in this case), there is no
blending done of the two targets, so wasting GPU resources rendering
them to textures is unnecessary.
2017-07-19 16:23:06 -07:00
jp9000
cb42f08d1e libobs: Add function to get current transition time 2017-07-19 16:23:06 -07:00
jp9000
e801c766c9 libobs: Add transition callbacks for starting/stopping 2017-07-19 16:23:06 -07:00
jp9000
e37f6b3bd6 libobs: Do not save hotkeys for private sources 2017-07-19 16:23:06 -07:00
jp9000
d68eff6bf6 rtmp-services: Fix incorrect RTMP output ID 2017-07-17 16:44:42 -07:00
jp9000
6b66630198 rmtp-services: Don't display warning for invalid file ver.
The invalid format version warning for service files is an unnecessary
warning which isn't necessary to display because it'll automatically
fall back to the distributed version over the cached remote version.
2017-07-14 12:44:12 -07:00
jp9000
1cff1e40e6 obs-outputs: Fix a few issues with CMakeLists.txt
It's erroneously including an entire directory, including a file that no
longer exists, and the obs-outputs_HEADERS variable had a typo when used
in the add_library call.
2017-07-14 12:44:12 -07:00
jp9000
753bf20ed7 UI: Allow outputs to use different audio codecs
Allows an output to automatically specify which audio codec it requires
and use it instead of AAC.  This change is intended to be
behind-the-scenes and seamless to the user.
2017-07-14 12:44:12 -07:00
jp9000
3491487c71 UI: Allow services to use different outputs
Allows a service to specify the output it needs in order to function as
configured.

NOTE: This functionality should be considered temporary as a seamless
means of implementing support for different output types within the same
service.  Ideally, different services should be used for this
functionality.
2017-07-14 12:43:04 -07:00
jp9000
4d1672719f rtmp-services: Allow services to override bframe count 2017-07-14 12:39:59 -07:00
jp9000
339a0686f6 rtmp-services: Add ability to specify different outputs
Allows the ability for services to specify a different output if needed.

NOTE: This should probably be considered temporary, and services within
this file that use this functionality should probably be moved out of
the file and in to a separate service.
2017-07-14 12:39:20 -07:00
jp9000
e230f77311 obs-qsv11, obs-x264: Allow bframe count overriding
Allows the ability to override bframes (useful for specific protocols)
2017-07-14 12:39:20 -07:00
jp9000
24571599db libobs: Add ability for service to specify its output type
Allows the ability to change the output type in case one service
requires a different output type.

NOTE: This should be considered a temporarily yet simple solution to a
specific problem: support for RTMP-like outputs.  This will allows
seamless integration of supporting different RTMP-like output types
within the same service.  This should probably be replaced with a more
ideal solution later, such as implementing a completely different
service type instead, when time permits.
2017-07-14 12:38:46 -07:00
jp9000
d839c77824 libobs: Add API to specify codec support on encoded outputs
(This commit also modifies obs-outputs)
2017-07-14 08:15:16 -07:00
Richard Stanway
aa78b1bbee
UI: Add missing separator in mediaExtensions initializer 2017-07-12 19:54:27 +02:00
Gol-D-Ace
353a4bc824 rtmp-services: Update twitch.tv ingests 2017-07-08 00:14:49 +02:00
jp9000
ee0236be13 UI: update installer script to latest version 2017-07-05 04:31:39 -07:00
Cephas Reis
f53a595ea2 obs-filters: Optimize and fix alpha in color grade filter
Closes jp9000/obs-studio#945
2017-07-02 15:45:51 -07:00
VodBox
f1588daca0 UI: Ensure theme backward compat. with older OBS vers.
Deprecates "Theme" global config value and uses "CurrentTheme" instead
to ensure backward compatibility with older versions of OBS, which will
fail to load if you have a theme that isn't available.

(Jim Edit: Putting this back because I misunderstood the purpose of
jp9000/obs-studio#936)
2017-07-02 13:31:51 -07:00
jp9000
bb8e019c36 rtmp-services: Add LiveEdu (accidentally removed) 2017-07-02 12:50:56 -07:00
VodBox
d1cb3a42f5 UI: Add backwards compatible theme fallback
Closes jp9000/obs-studio#936
2017-07-02 11:54:08 -07:00
jp9000
7acd3be40d UI: Change meter color to red when audio is clipping
Closes jp9000/obs-studio#738
2017-07-01 19:41:18 -07:00
cg2121
14d330c455 libobs: Add obs_volmeter_get_cur_db function 2017-07-01 19:06:58 -07:00
jp9000
16c6e69722 UI: Remove unused function from volume control 2017-07-01 18:58:55 -07:00
Jim
9ad8e0c5f0 Merge pull request #947 from Fenrirthviti/new-theme
UI: Add new theme, update theme capabilities
2017-07-01 15:48:05 -07:00
Richard Stanway
bc3a5cb832
win-capture: Log when game capture compatibilty mode is set 2017-07-01 21:39:20 +02:00
Jim
daaa2741a7 Merge pull request #959 from sorayuki/patch-1
obs-qsv11: change re-enter lock implementation
2017-07-01 11:36:06 -07:00
Jim
127b1ca858 Merge pull request #955 from Skid-Inc/master
obs-text: Fix file reader occasionally not updating
2017-07-01 11:10:58 -07:00
Jim
35474f5b72 Merge pull request #950 from Xaymar/patch_fix-log-stats
libobs: Fix an int underflow in log_frame_info
2017-07-01 10:50:37 -07:00
Jim
cfe77fdaae Merge pull request #938 from admshao/incompatible-pointer-types
plugins: Clear warnings about -Wincompatible-pointer-types
2017-07-01 10:37:32 -07:00
Joseph El-Khouri
8942c18695 UI: Allow zoom with the scroll wheel
Adds the ability to zoom into the preview when fixed scaling mode is
enabled.

(Edit by Jim: Also now saves zoom and scroll position)

Closes jp9000/obs-studio#917
2017-06-30 20:20:56 -07:00
mntone
d70c97db3a UI: Add ability to drop html files
(Edit by Jim: Added a check to make sure that the browser source exists
due to the fact that it's technically optional)

Closes jp9000/obs-studio#905
2017-06-30 00:10:26 -07:00
mntone
41c2f5e13b decklink: Add feature to detect resolution/format
Closes jp9000/obs-studio#879
2017-06-29 15:42:04 -07:00
sorayuki
be2dc31ad1 obs-qsv11: change re-enter locker implementation
Change re-enter lock from mutex to atomic variable.
2017-06-29 12:10:14 +08:00
jp9000
1e7e50114e UI: Fix lock/visibility sub-widget sizes on OSX 2017-06-28 15:19:36 -07:00
jp9000
0d84561dc4 UI: Make lock/unlock icons slightly smaller
Makes them a bit more equal in size to the eye icon in the main window.
2017-06-28 09:20:52 -07:00
jp9000
14e41dc0c1 UI: Make sure "Defaults" buttons aren't default buttons 2017-06-28 09:20:52 -07:00
Jim
aedb85f5d3 Merge pull request #946 from c3r1c3/EditorConfig
.editorconfig: Add file to speed up editor configuration
2017-06-27 22:21:24 -07:00
Shaolin
e5756a922a libobs/plugins/UI: Suppress unused variables warnings
Closes jp9000/obs-studio#937
2017-06-27 21:55:37 -07:00
adocilesloth
4c61ae9513 libobs: Add <> or \| on RT 102-key as hotkey
Closes jp9000/obs-studio#948
2017-06-27 21:35:52 -07:00
jp9000
8770453c09 libobs/util: Make minor optimization to circlebuf pops
If size is 0 after popping data from the front or back, set the
start/end points to 0 as well to ensure that any subsequent buffer
pushes start from the beginning of the buffer rather than the middle of
the buffer.  Reduces potential unnecessary operations in that case.

Additionally, this fixes a bug with circulebuf_pop_back where if start
position was 0, and all the data was popped off the buffer (equal to the
capacity), the end position would be equal to the original size.  As an
example to replicate the bug, push 5, pop 5, then push 10.  The
start/end points will be invalid.

Closes jp9000/obs-studio#954
2017-06-27 21:25:00 -07:00
Jim
27bb2f836d Merge pull request #899 from Palakis/preview-api
UI: Add functions and events for Studio Mode into the Frontend API
2017-06-27 19:39:53 -07:00
Jim
8f71a79640 Merge pull request #919 from craftwar/curl
CI: Download deps if they are outdated
2017-06-27 18:58:16 -07:00
notmark
43885111cd rtmp-services: Update servers for Vaughn Live/Breakers.tv
Removed LAX server, added new NYC server for Vaughn Live & Breakers.TV

Closes jp9000/obs-studio#933
2017-06-27 18:54:46 -07:00
mntone
a6938c11b0 UI, libobs: Add Japanese shortcut keys for Windows
Add Japanese shortcut keys, non-convert (無変換) and convert (変換) and
disable IME for OBSHotkeyEdit.

Closes jp9000/obs-studio#930
2017-06-27 18:14:48 -07:00
cg2121
fce078d997 UI, libobs: Add ability to lock individual scene items
Adds a lock checkbox to allow the user to lock a specific scene item.

Closes jp9000/obs-studio#949
2017-06-27 10:27:57 -07:00
jp9000
5c2328cca2 cmake: Add _CRT_NONSTDC_NO_WARNINGS def to all projects 2017-06-27 09:55:51 -07:00
Skid-Inc
baebfd0ce8 text-freetype2: Fix file reader occasionally not updating 2017-06-27 11:15:00 +01:00
Skid-Inc
2b085da63a obs-text: Fix file reader occasionally not updating
Delayed reading the text file till the update after the timestamp
changes, this should fix a minor issue where if the file updates twice
in one second, only the first change it displayed.
2017-06-27 11:14:26 +01:00
cg2121
2d84da2f7e UI: Add "Defaults" button to filters/properties windows
This adds a "Defaults" button in the source and filter properties, which
will clear and reset all settings.

Closes jp9000/obs-studio#875
2017-06-26 17:44:34 -07:00