Commit graph

5612 commits

Author SHA1 Message Date
Zachary Lund 308b0add47 UI: Explicitly initialize the crash handler 2018-04-25 12:56:23 -07:00
Zachary Lund 121035346f libobs: Separate crash handler from startup 2018-04-25 12:56:18 -07:00
Cephas Reis ef41dc53e8 UI: Change remux dialog to be non-modal
Closes obsproject/obs-studio#1266
2018-04-25 06:30:00 -07:00
Jim 273482dbe9
Merge pull request #1265 from comex/aframe
obs-ffmpeg: fill in more fields on audio frames
2018-04-25 05:57:44 -07:00
Zachary Lund 189e535014 libobs: Add functions to get output capability flags
Closes obsproject/obs-studio#1263
2018-04-25 03:15:30 -07:00
Zachary Lund 6475a1c000 win-capture: Avoid obs functions in init_hooks 2018-04-24 14:17:28 -07:00
jp9000 c4b482efef libobs: Add functions to get raw video output
Adds obs_add_raw_video_callback() and obs_remove_raw_video_callback()
functions which allow the ability to get raw video frames without
necessarily needing to create an output.
2018-04-23 10:58:30 -07:00
jp9000 45b5291530 libobs: Deactivate unnecessary GPU ops when not encoding
Reduces GPU usage when encoding is not active.  Does not perform color
conversion, frame staging, or frame downloading unless encoding is
explicitly active.
2018-04-23 08:14:18 -07:00
Shaolin 47d920e9a2 libobs: Log *nix window manager
This should ease the support task to help with performance and
xcomposite issues on such systems.

Closes obsproject/obs-studio#1194
2018-04-23 04:48:24 -07:00
Jim 9a1c27accb
Merge pull request #1262 from Andersama/patch-12
UI: Disable paste filters unless a source is selected
2018-04-22 23:59:12 -07:00
Alex Anderson 22520c222c UI: Disable paste filters unless a source is selected
Fixes the paste filters right click option to behave like copy.

See: https://obsproject.com/mantis/view.php?id=1220
and #1261
2018-04-22 12:39:31 -07:00
Colin Edwards bc7a77964e
CI: Add description to OSX deps build script 2018-04-22 14:19:17 -05:00
Jim 6f4985e4d6
Merge pull request #1261 from Andersama/patch-11
libobs: Fix pasting filters crash when missing sources
2018-04-22 06:56:52 -07:00
Ryan Foster ba698f3f98 .gitmodules: Update submodules to new obsproject org
Closes obsproject/obs-studio#1270
2018-04-22 05:43:11 -07:00
Shaolin f61090e1ea UI: Set OBS icon to projector and stats window
Closes obsproject/obs-studio#1259
2018-04-22 04:56:45 -07:00
Jim 0acf7e1a09
Merge pull request #1258 from VodBox/monitor-fix
UI: Change monitoring device on profile change
2018-04-22 04:53:53 -07:00
SuslikV dbfcbac3e4 libobs-d3d11: Do not allow Alt+Enter interception
Prevents Alt-Enter from attempting to automatically fullscreen an OBS
graphics display.

Closes obsproject/obs-studio#1248
2018-04-20 22:34:22 -07:00
Jim 2ebcd49b08
Merge pull request #1246 from pkviet/onMeta
obs-outputs/flv: Fix ECMA array size
2018-04-20 22:27:37 -07:00
Igor Bochkariov 61839d8c94 UI: Sort audio controls by source name
Audio controls in OBS Mixer and Advanced Audio Properties window are not
sorted at all.  Every time OBS is restarted they get shuffled (Jim note:
This is due to json object hashing).  The order of these controls is
additionally not consistent between the mixer and the advanced audio
properties window.

Closes obsproject/obs-studio#1242
2018-04-20 19:49:26 -07:00
jp9000 904ad9be1d libobs: Add function to get last main output texture
Allows the ability to get the last rendered texture of the main output
view.
2018-04-20 05:57:47 -07:00
Jim b4d6f1c996
Merge pull request #1238 from Chiitoo/qt-5.11
[Qt 5.11] Include 'QAction' in 'scripts.cpp' to fix a build failure.
2018-04-20 03:36:11 -07:00
sorayuki fc26e3cfcf libobs: Fix potential filter rendering race condition
The filters array should not be accessed without locking the filter
mutex.  This locks the filter mutex, grabs a reference to the first
filter, unlocks the mutex, renders the filter, and then releases the
reference.

Closes obsproject/obs-studio#1215
2018-04-20 01:55:52 -07:00
Jim 14b7b4790c
Merge pull request #1213 from TheMuso/vth264-fixes
Vth264 fixes
2018-04-19 22:24:35 -07:00
Shaolin 234ed9512d UI: Clean up delete Source/Scene shortcut
The "Delete" shortcut is already set in the UI/forms so the old code
would only change shortcuts in macOS.

Closes obsproject/obs-studio#1212
2018-04-19 21:54:01 -07:00
Murnux 273f5e2bfe UI: Don't close windows for "Always on Top" (win32)
On windows, the "Always on top" state can safely be used without closing
dialogs.

Closes obsproject/obs-studio#1207
2018-04-19 20:47:30 -07:00
jp9000 0d4677f3bc UI: Hold the clip flash for at least one second
Holds the clipping flash for one second to better indicate that clipping
is occurring.

Closes obsproject/obs-studio#1201
2018-04-18 23:49:40 -07:00
Alex Anderson e92b2560b6 UI: Add Selected and Hidden Array Values
Add Selected and Hidden Array Values

Let developers get and set whether items in an editable list are hidden
or selected. May be useful in when editable lists are modified and
handled in a callback. Especially when edit button callbacks are used.

Closes obsproject/obs-studio#1200
2018-04-18 21:06:16 -07:00
jp9000 4fcc2cccfe UI: Move OpenSavedProjecters call to OBSBasic::Load()
Due to the commit 34c14829b6, source loading is now deferred
to after OBSInit(), which would cause saved scene/source projectors to
no longer load on startup.  This fixes that issue by moving the
OpenSavedProjectors call to OBSBasic::Load().
2018-04-18 19:34:18 -07:00
Jim 7481f5b389
Merge pull request #1195 from admshao/fix-save-projectors-on-exit
Save Windowed Projectors on exit
2018-04-18 19:33:49 -07:00
comex c54cc0bf5b obs-ffmpeg: fill in more fields on audio frames
After you call av_frame_alloc(), ffmpeg expects you to fill in certain
fields on the frame, depending on whether it's an audio or video frame.
obs-ffmpeg did this in the two places where it allocates video frames,
but not where it allocates audio frames.  On my system, using trunk
ffmpeg and the Opus codec, this causes OBS to crash while calling
avcodec_send_frame, ultimately because av_frame_copy fails due to
'dst->format < 0' (as 'format' stays at the default of -1), causing a
null pointer to be added to a buffer queue, which later gets
dereferenced.

Oddly, the fields in question can just be copied directly from
corresponding fields in the AVCodecContext, but I don't see any ffmpeg
API to automatically copy all relevant fields, and all the examples I've
seen do it by hand.  So this patch does the same.
2018-04-18 13:13:48 -07:00
Alex Anderson b0cd7fe890 libobs: Fix pasting filters crash when missing sources
Solves crash when a user tries to paste filters without selecting a
source or when pasting filters from a deleted source. This commit
checks if both sources are still valid before pasting.

This addresses Mantis Issue 1220
(https://obsproject.com/mantis/view.php?id=1220).
2018-04-18 09:11:47 -07:00
Shaolin 7fc6ea6ccc UI: Do not generate "already active" logs
When an user launches a multiple instance of obs and don't use the -m
flag, wait until the confirmation to launch to create a new log file.
This avoids a short log with no information when using the Help ->
Update Last Log.

Closes obsproject/obs-studio#1164
2018-04-16 21:31:32 -07:00
jp9000 30d967eafa obs-browser: Update to browser source refactor 2018-04-14 03:45:07 -07:00
jp9000 89a5235ac0 CI: Reduce travis output verbosity
The log output of the travis CI for macOS is unreasonably large.  This
reduces the verbosity of the output and reduces the size of the build
logs significantly.
2018-04-13 22:25:05 -07:00
jp9000 34c14829b6 UI: Defer startup OBSBasic::Load (macOS CEF workaround)
Adds an alternative means of isolating the CEF initialization process
from Qt's initialization process.  This is an unpleasant hack, but is
far more preferable than isolating the entire browser plugin to a
separate process and overly complexifying the browser plugin to the
point to where no one wants to touch the plugin or contribute to it.
2018-04-12 13:42:15 -07:00
VodBox e122a07cdd UI: Change monitoring device on profile change 2018-04-11 23:59:34 +12:00
Ilya M 439b9e4d15 UI: Add frontend API to defer saving
Allows the ability to perform multiple actions that would normally save,
and defer the save until all of those actions are complete.

Closes obsproject/obs-studio#1231
2018-04-06 17:34:10 -07:00
Jim 0dc9151dbd
Merge pull request #1247 from jumoog/master
rtmp-services: Update recommended parameters for Nood.tv
2018-03-31 15:36:14 -07:00
Kilian von Pflugk 531d4cd2a4 rtmp-services: Update recommended parameters for Nood.tv 2018-03-28 20:43:32 +02:00
pkviet ce339ce613 obs-outputs/flv: Fix ECMA array size
Fixes the size of the ECMA array storing onMetadata in flv.
(from 14 to 20).
Fixes ticket 1204.
2018-03-23 19:43:48 +01:00
Colin Edwards fa90926533 CI: change travis osx artifact repo name 2018-03-21 21:16:59 -05:00
Colin Edwards dbc120275c
Merge pull request #1244 from obsproject/osxci
CI: Check out OSX branch of obs-browser
2018-03-19 15:16:59 -05:00
Colin Edwards 92574a778d CI: Check out OSX branch of obs-browser 2018-03-19 14:42:24 -05:00
jp9000 a81de7fb61 cmake: Include windows style DLL when copying Qt files 2018-03-18 17:01:01 -07:00
Colin Edwards 483be6e57c obs-browser: Update submodule to latest version 2018-03-18 14:40:01 -05:00
jp9000 ceadde0838 UI/updater: Delete visual studio runtimes after execution 2018-03-18 11:12:14 -07:00
Shaolin 9211dba267 UI: Save windowed projectors on exit 2018-03-18 05:11:44 -03:00
Shaolin 3390be50ce UI: Remove a second call to OpenSavedProjectors
OpenSavedProjectors is already called from RefreshSceneCollections
earlier by OBSInit.
2018-03-18 05:11:44 -03:00
Shaolin 8b6641d1a8 UI: Clean up OBSProjector creation 2018-03-18 05:11:44 -03:00
Shaolin 372640ff35 UI: Update Projectors title on source name change 2018-03-18 05:11:44 -03:00