starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-27 01:41:06 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,330 Commits 20 Branches 255 Tags
8c4af0fb7c807407270e68e0594de209271c88bb
Commit Graph
6330 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jp9000 7bbdace1a9 frontend-tools: Increase instant replay playback retry interval 2018-09-15 12:05:45 -07:00
Exeldro 79ff554f90 frontend-tools: Add VLC support to instant replay script 
Add support for using the VLC source to play instant replays.

Closes obsproject/obs-studio#1334
 2018-09-15 12:04:25 -07:00
nleseul 797b3dc121 UI: Batch remux and drag/drop support on remux dialog 
This changes the remux dialog to support a collection of input/output
pairs, presented as a QTableView.  Standard Qt icons are used to
indicate the state of each entry during a remux operation.  Drag/drop
support is added to populate the list quickly.  Both Dark and Rachni
themes are updated to make QTableView look reasonable.

Relevant text is added in the localization files.

Closes obsproject/obs-studio#1153
 2018-09-14 02:04:28 -07:00
Jim 4659efc791 Merge pull request #1486 from cg2121/about-dialog-styling 
UI: Change about dialog bottom color (light theme)
 2018-09-13 19:53:03 -07:00
Clayton Groeneveld 11cd83edf5 UI: Change about dialog bottom color (light theme) 
This changes the bottom area color for the about dialog
for the light theme. This color makes it more consistent
for the theme.
 2018-09-13 19:46:11 -05: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
jp9000 f1aa71bef1 libobs: Don't call width/height funcs if context invalid 
Don't allow calling a source's custom get_width or get_height callbacks
unless the context is valid.  Fixes a bug where a null pointer could be
passed to those functions.
 2018-09-13 06:54:58 -07: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
Jim 179239b471 Merge pull request #1450 from WizardCM/dark-theme-updates 
UI: Dark theme padding and alignment fixes
 2018-09-13 01:09:50 -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
Jim 118dbf9e67 Merge pull request #1481 from Andersama/patch-26 
libobs: Export image-file to c
 2018-09-12 02:05:26 -07:00
Jim e615dffce5 Merge pull request #1323 from Andersama/effect-annotation-parsing 
libobs: Add HLSL annotation parsing
 2018-09-12 01:16:21 -07:00
Kurt Kartaltepe d86c8121ed Plugins: Add descriptions to modules 2018-09-11 18:28:58 -07:00
Alex Anderson b30c843622 libobs: Export image-file to c 
Wraps image-file.h in extern "C" like rest of libobs api.

Prevents unresolved external errors when using in c++.
 2018-09-11 13:31:45 -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
Jim 6c42d07751 Merge pull request #1461 from cg2121/preview-bgcolor 
UI: Add ability to style preview background color
 2018-09-10 03:52:13 -07:00
cg2121 0ae8a7c0ac UI: Add ability to style preview background color 2018-09-10 04:55:15 -05:00
Matt Gajownik 643b2538d7 UI: Dark theme padding and alignment fixes 2018-09-10 19:03:14 +10:00
Jim 8e53932afd Merge pull request #1406 from VodBox/hotkey-search 
UI: Add Search to Hotkeys settings menu
 2018-09-10 01:08:38 -07:00
Jim c69588f286 Merge pull request #1475 from admshao/cmake-scripting-issue 
cmake: Fix an error when SWIG isn't found
 2018-09-10 01:05:04 -07:00
Jim a8f373fa9b Merge pull request #1476 from RytoEX/fix-readme-rst 
Fix README RST
 2018-09-10 01:03:35 -07:00
VodBox 22f6d3fea5 UI: Add Filter to Hotkeys settings menu 
This commit adds a filter bar to the top of the hotkeys settings menu,
with it set to look for matches anywhere in the string label for that
hotkey.
 2018-09-10 09:31:04 +12:00
Ryan Foster 956d684c19 Fix README hyperlinks under Credits 
Change README hyperlinks from Markdown style to RST style. Make URLs
HTTPS. Correct some grammar.
 2018-09-09 02:31:36 -04:00
Shaolin 1b13e12065 cmake: Fix an error when SWIG isn't found 
obs-scripting CMakeList.txt expects SWIG, Python3 or Luajit to enable
scripting so in case of not finding just return and don't abort
the configuration
 2018-09-09 01:58:11 -03:00
Jim b5f2f4d05f Merge pull request #1474 from cg2121/about-no-resize 
UI: Set about dialog as non-resizable
 2018-09-08 13:39:11 -07:00
cg2121 79aaa32ba2 UI: Set about dialog as non-resizable 2018-09-08 13:28:56 -05:00
Alex Anderson 12f925401f docs/sphinx: Add annotation api functions 
Add documentation for:

size_t gs_param_get_num_annotations(const gs_eparam_t *param)

gs_eparam_t *gs_param_get_annotation_by_idx(const gs_eparam_t *param,
		size_t annotation);

gs_eparam_t *gs_param_get_annotation_by_name(const gs_eparam_t *param,
		const char *name);

void *gs_effect_get_val(gs_eparam_t *param);

void *gs_effect_get_default_val(gs_eparam_t *param);

size_t gs_effect_get_val_size(gs_eparam_t *param);

size_t gs_effect_get_default_val_size(gs_eparam_t *param);
 2018-09-08 05:22:12 -07:00
Alex Anderson e0cd45be9b libobs: Add additional gs_effect_get_ functions 
Adds api functions to extract gs_eparam_t values, including
gs_effect_get_val(), gs_effect_get_val_size(),
gs_effect_get_default_val() and gs_effect_get_default_val_size()
 2018-09-08 05:22:12 -07:00
Alex Anderson af67086912 libobs: Add HLSL annotation parsing 
Gives the ability to retrieve param annotations. Blocks wrapped in <>
following a parameter.

For example:
float slider < float max_value = 10.0; float min_value = 0.0; >;

These blocks are not for shading purposes but to help describe the
shader's gui as in the example above.

Adds graphics api functions for retrieving annotations:
size_t gs_param_get_num_annotations(const gs_eparam_t *param);

gs_eparam_t *gs_param_get_annotation_by_idx(const gs_eparam_t *param,
		size_t annotation);

gs_eparam_t *gs_param_get_annotation_by_name(const gs_eparam_t *param,
		const char *name);
 2018-09-08 05:22:12 -07:00
Jim 78d940e0f4 Merge pull request #1346 from dtcooper/master 
libobs/UI: Allow Access To argc/argv
 2018-09-08 01:29:43 -07:00
Jim 413e8e6a7b Merge pull request #1442 from cg2121/stereo-audio-balancing 
UI: Implement stereo balancing
 2018-09-07 21:28:56 -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
Jim 461acd631c Merge pull request #1435 from cg2121/about-dialog 
UI: Add about dialog
 2018-09-07 18:18:54 -07:00
jp9000 e8eec22d15 libobs/util: Fix undefined behavior and optimize util_mul64_64 
Shifting an integer larger than its bit width can have undefined
behavior.  This not only fixes that issue, but also optimizes the
shift functions.
 2018-09-07 17:28:15 -07:00
cg2121 11f1442a3c UI: Add ability to reset sliders when double clicked 2018-09-07 09:27:20 -05:00
cg2121 a4a7deeed6 UI: Implement stereo balancing 2018-09-07 09:27:14 -05:00
cg2121 8882cfc484 UI: Remove license agreement dialog 2018-09-07 06:08:31 -05:00
cg2121 36b0ef5b7e UI: Add about dialog 2018-09-07 06:08:31 -05:00
jp9000 85d259e05c cmake: Make directory before copying file 
Fixes the install_obs_data_file cmake helper function to be more
consistent across operating systems.
 2018-09-07 03:41:36 -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
jp9000 1ea4da3f98 cmake: Add install_obs_data_file function 
Allows copying an individual file (which may not be in the data dir) to
an specified install location.
 2018-09-07 00:20:14 -07:00