Commit Graph

8850 Commits

Author SHA1 Message Date
jp9000 97491ee91a UI: Add SetComboItemEnabled
Replaces SetComboItemDisabled in context-bar-controls.cpp with a global
function in qt-wrappers called SetComboItemEnabled, which allows both
enabling and disabling items in a combo box.
2020-11-13 18:07:20 -08:00
jpark37 a164a75ed6 win-capture: Warning fixes
Add explicit casts to convert data pointers to function pointers.

Add references for unused parameters.

Replace accidental BOOL* return values with BOOL.
2020-11-13 13:21:10 -08:00
jpark37 b3405d1f28 libobs-winrt: Fix misnamed function 2020-11-13 13:21:10 -08:00
Jim 70001be8ae Merge pull request #3724 from PatTheMav/macos-bigsur-visuals
UI: Fix tray behaviour and app icon update for macOS
2020-11-13 08:42:25 -08:00
PatTheMav 9ac92f61be UI: Use macOS app icon for Qt app on macOS 2020-11-13 17:17:45 +01:00
PatTheMav 8110b8bd65 UI: Fix tray icon menu handling on macOS 2020-11-13 17:17:45 +01:00
PatTheMav 84b2558995 UI: Update macOS app icon 2020-11-13 17:00:05 +01:00
PatTheMav 35e6f5e17a UI: Update tray icons to use masks on macOS 2020-11-12 23:39:32 +01:00
Richard Stanway 3e7e99e0f3 Merge pull request #3711 from Gol-D-Ace/twitch-audio-bitrate
rtmp-services: Increase twitch audio bitrate
2020-11-11 21:41:24 +01:00
Richard Stanway 7394e10dd0 Merge pull request #3720 from jpark37/win-capture-unused
win-capture: Fix unused variables
2020-11-11 21:40:00 +01:00
jpark37 526c54fbba win-capture: Fix unused variables 2020-11-11 12:02:03 -08:00
jp9000 ade054eeaa UI: Fix compiler-specific error
Return value between ternary options are ambiguous on GCC/clang
2020-11-11 10:19:06 -08:00
jp9000 546dcc7a14 UI: Move "enforce" setting to "ignore" stream section
Moves the "Enforce streaming service bitrate" option from simple output
mode to the stream section, renames it to "Ignore streaming service
setting recommendations" (inverting it). When trying to check it, it
will now also display a message box warning the user that it's generally
a not-so-good idea.

Also displays recommended settings for the service.
2020-11-11 09:48:39 -08:00
jp9000 005863a346 UI: Refactor to make it easier to get service object
Refactors a bit of code to make it easier to get the current stream
service object in the settings
2020-11-11 09:48:10 -08:00
jp9000 fb7747c56e libobs: Implement obs_service func to get max bitrates
(This commit also modifies rtmp-services)

Implements obs_service_get_max_bitrate, which allows retrieving the
maximum audio/video bitrates directly rather than being forced to use
the apply method. Makes it a bit easier to get the bitrate values.
2020-11-11 09:42:26 -08:00
Gol-D-Ace 93ff11a4fc rtmp-services: Increase twitch audio bitrate 2020-11-09 10:44:58 +01:00
Colin Edwards 5f6793676d Merge pull request #3701 from kkartaltepe/decklink-linux-fix
decklink: Fix compiling on linux
2020-11-05 11:23:34 -06:00
Kurt Kartaltepe 17f9414ada decklink: Fix compiling on linux
Typo left headers as source files so required functions were never
compiled in.

fixes #3699
2020-11-05 09:14:42 -08:00
jpark37 3564e446ff rnnoise: Explicit double to float conversions 2020-11-04 04:45:07 -08:00
jpark37 0cf7af35fe rtmp-services: Add missing int cast 2020-11-04 04:45:07 -08:00
jpark37 af8cb162c2 obs-ffmpeg: Add missing int cast 2020-11-04 04:45:07 -08:00
jpark37 c40b98948e libobs-winrt: Fix BOOL/bool mismatch warning 2020-11-04 04:45:07 -08:00
jpark37 86ecaadffb libobs: Fix bad type and size mismatch 2020-11-04 04:45:07 -08:00
jp9000 6b81c106d8 UI: Add VOD track support in advanced output
Adds a VOD track option (specific to Twitch) that allows a user to
specify which audio track to use for their Twitch VODs, which uses a
separate encoder to encode the track. This allows users the ability to
choose what audio goes on their VOD, separately from the live stream.
2020-11-04 00:15:25 -08:00
Colin Edwards 5b8f89d86e decklink: Clean up warnings introduced by caption code 2020-11-03 17:00:14 -08:00
PatTheMav 6bef0a8619 CI: Remove caching of obs-deps for Github CI 2020-11-04 11:54:42 +11:00
Colin Edwards 82abfa42ce Merge pull request #3681 from vixns/decklink-detectfix
decklink: Fix format detection loop
2020-11-03 16:02:43 -06:00
Colin Edwards 613624532d Merge pull request #3676 from vixns/decklink116
decklink: Upgrade sdk to version 11.6
2020-11-03 15:58:32 -06:00
Stéphane Cottin de8cc46795 decklink: Upgrade sdk to version 11.6 2020-11-03 15:56:09 -06:00
Joel Bethke e4ab4f791f Merge pull request #3687 from DDRBoxman/captionoption
Remove BUILD_CAPTIONS build flag
2020-11-02 23:13:50 -06:00
Colin Edwards 7b0d7c6357 Remove BUILD_CAPTIONS build flag 2020-11-02 22:46:55 -06:00
Stéphane Cottin 65daf2c86d decklink: Fix format detection loop
Ignore color space change in format detection to fix endless loop.
Fix #3511
Fix #3277
2020-11-02 22:18:52 +01:00
Colin Edwards 923f06bfa6 decklink: Add ability to ingest/embed cea 708 captions
(This commit also modifies libobs, UI)
2020-11-01 22:28:49 -08:00
Ed Maste b9a1516254 linux-v4l2: avoid OOB write
v4l2_outputparm includes unused fields, defined as
	__u32		reserved[4]

Accesses to reserved[4] was out of bounds.  Fix this and simplify by
just zeroing the entire struct v4l2_streamparm instead.
2020-11-01 20:47:35 -08:00
Kurt Kartaltepe dc7d829751 linux-v4l2: Hide modinfo from terminal
Using modinfo dumps all the output into the terminal instead redirect
all output to dev/null.
2020-10-31 21:00:51 -07:00
Richard Stanway 9a64adb4d1 UI: Don't update source context bar when hidden 2020-10-31 20:59:12 -07:00
Matt Gajownik 737481c09e vlc-video: Use case insensitive compare for valid extension check
It's possible for files to have some/all characters uppercase.

Fixes #3562
2020-10-31 20:45:31 -07:00
Joel Bethke 5662ec6991 Merge pull request #3674 from RytoEX/update-contributing-doc
CONTRIBUTING.rst: Update CONTRIBUTING doc
2020-10-31 18:39:37 -05:00
Ryan Foster 4a890e1da9 CONTRIBUTING.rst: Update CONTRIBUTING doc
Update link to compiling and building instructions to point to the
GitHub repo at the "obsproject" org URL. Replace link to Mantis with
link to GitHub Issues for our bug tracker to mirror the contents in
README.rst.
2020-10-31 19:30:01 -04:00
Ryan Foster 7f4e375e12 UI: Disable stream encoder setting in simple output with active output
We disable the stream encoder setting in Advanced Output Mode when an
output is active, so let's also disable the stream encoder setting in
Simple Output Mode when an output is active.
2020-10-31 02:52:24 -07:00
John Boiles 2700db9ff9 Add virtualcam plugin to OBS codebase
Co-authored-by: lvsti <lvsti@users.noreply.github.com>
Co-authored-by: Sebastian Beckmann <beckmann.sebastian@outlook.de>
Co-authored-by: Stefan Huber <sh@signalwerk.ch>
Co-authored-by: Ryohei Ikegami <iofg2100@gmail.com>
Co-authored-by: Colin Dean <colin.dean@target.com>
Co-authored-by: Wolfgang Ladermann <extern.ladermann_wolfgang@allianz.de>
Co-authored-by: Simon Eves <simon.eves@omnisci.com>
Co-authored-by: Colin Nelson <colnnelson@google.com>
Co-authored-by: Yoshimasa Niwa <niw@niw.at>
Co-authored-by: Michael Karliner <mike@modern-industry.com>
Co-authored-by: Jason Grout <jgrout6@bloomberg.net>
Co-authored-by: Alfredo Inostroza <jadenguy@gmail.com>
Co-authored-by: Daniel Kennett <daniel@cascable.se>
Co-authored-by: Gary Ewan Park <gep13@gep13.co.uk>
Co-authored-by: José Carlos Cieni Júnior <cienijr@outlook.com>
2020-10-30 23:36:57 -07:00
Jim b32abbe33f Merge pull request #3083 from pkviet/srtfix4
UI: Enable sps/pps (video headers) repetition (for srt/mpegts)
2020-10-30 23:25:24 -07:00
Christian Lockley ad528bef17 UI: Detect other instances of obs on Linux
fixes: obsproject#3053
2020-10-30 11:50:47 -07:00
Richard Stanway 57bed7923e UI/installer: Use random temp directory for security
Using a fixed path would allow malware on a compromised system to
perform a DLL planting attack. Reported by Erik Wynter.
2020-10-30 17:10:34 +01:00
Florian Zwoch 0c39fd08c7 libobs: Add desktop session type to Linux log
Add the content of the XDG_SESSION_TYPE environment variable to
the output log if it is set. This is usually set on modern Linux
distributions and typically carry either "x11" or "wayland" when
run from a desktop environment.

This is independent from the QT_QPA_PLATFORM environment variable
which would allow OBS Studio to run inside a wayland session. The
session type it runs on does have an implication on the behavior of
some plugins like screen and window capture. So having this
information exposed here is extremely helpful for diagnosing
issues.
2020-10-30 02:19:21 -07:00
Maya Venkatraman 1920571fdf rtmp-services: Add YouTube RTMPS beta service
Add YouTube RTMPS service to services.json as a beta.
2020-10-30 02:18:43 -07:00
Joan Miquel Fuster 0f1be8705c rmtp-services: Add Viloud service
Viloud is an online video platform for creating and streaming live,
linear and on-demand TV channels.
2020-10-30 02:18:10 -07:00
Clayton Groeneveld 6af8726c74 linux-v4l2: Add virtual camera output 2020-10-30 02:00:14 -07:00
jp9000 4b3639972b win-dshow: Fix virtualcam crash and reference bug
Fixes a null pointer dereference in the output filter, and fixes a bug
where the output filter would incorrectly hold a reference to the filter
graph.
2020-10-30 01:55:55 -07:00
jp9000 6af26d3290 UI: Add max cx/cy/fps clamp (if service specifies) 2020-10-30 00:28:44 -07:00