Commit Graph
8643 Commits
Author SHA1 Message Date
jp9000 1538b6909f win-dshow: Fix AJA devices crashing 2020-09-07 14:14:40 -07:00
jp9000 af09057395 libobs: Deprecate service multitrack check
This isn't particularly needed, as a service with multiple tracks won't
be using multiple tracks to begin with anyway.  This might change later,
but for now just mark it deprecated.
2020-09-07 13:38:38 -07:00
Jim 86147d9719 Merge pull request #3415 from jpark37/default-color-space
Unify color space settings as 709
2020-09-07 13:29:44 -07:00
jp9000 2ac1ad5290 deps/media-playback: Fix pause continually running loop
Fixes an issue where when paused, the thread loop would continue to
repeat endlessly until unpaused.
2020-09-07 12:36:40 -07:00
jpark37 b3dcb2a0f1 enc-amf: Update AMD encoder submodule 2020-09-07 07:58:54 -07:00
Jim 358f453938 Merge pull request #3400 from cg2121/studio-mode-bug
UI: Fix studio mode load bug
2020-09-07 06:34:15 -07:00
Jim 8696e431af Merge pull request #3425 from Darkhogg/tray-icons
UI: Ensure tray icon is themed in all cases
2020-09-07 06:25:26 -07:00
Jim 2d7801ce16 Merge pull request #3404 from cg2121/media-state-fix
UI: Set restart state when there is no media
2020-09-07 06:22:42 -07:00
Jim 74c2bfa49c Merge pull request #3422 from cg2121/media-arrow-buttons
UI: Allow adjusting media slider with arrow buttons
2020-09-07 06:22:25 -07:00
jpark37 b6afaceeae Update VIDEO_CS_DEFAULT to mean 709 instead of 601
Consistent with modified default UI setting.
2020-09-06 20:51:28 -07:00
Jim bad7b557c5 Merge pull request #3420 from Fenrirthviti/vcam-scripts
win-dshow: Add installer scripts for manual Virtual Cam registration
2020-09-06 18:40:34 -07:00
Joel Bethke a94ede6d00 win-dshow: Add VirtualCam installer scripts
This adds two batch scripts to install and uninstall the virtual cam
devices for installations where the installer could not be used.  Most
commonly, this is for portable installations or those who prefer the
.zip file.
2020-09-06 18:04:44 -07:00
jp9000 dc3839ab74 cmake: Add function for installing data from abs path
Allows the ability to install extra data from a specific absolute path
rather than a path relative to the cmake current source dir.  Useful if
say I want to generate data files in to the cmake binary folder rather
than put them in the data folder of the cmake source dir.
2020-09-06 17:46:03 -07:00
jp9000 da8192544b win-dshow: Use cmake-based GUID for virtualcam 2020-09-06 17:04:06 -07:00
Daniel Escoz c899729c12 UI: Ensure tray icon is themed in all cases 2020-09-07 00:06:33 +02:00
jpark37 bfa0224399 UI: Change the default color setting in the UI from sRGB to 709
It seems like YouTube applies nonlinear-to-linear sRGB, and
linear-to nonlinear-709 transformations to uploaded videos now. This
makes sRGB too dark on their platform for video players that alias 709
as sRGB, which is almost everyone. Make 709 the default to keep peace.
2020-09-06 12:33:02 -07:00
Jim de41bb8763 Merge pull request #3405 from cg2121/media-label-spacing
UI: Refine context bar
2020-09-06 08:43:29 -07:00
Clayton Groeneveld 167a4dce37 UI: Refine context bar
This adds spacing between the timer and duration labels in the media
controls. The vertical alignment of the labels have been fixed as well.
And the width of the source label has also been widened.
2020-09-06 07:44:56 -07:00
Clayton Groeneveld 6ab2768546 UI: Allow adjusting media slider with arrow buttons
This allows the user to adjust the media slider with the left
and right keyboard arrows. It is currently set to adjust
by 5 second increments.
2020-09-05 23:53:54 -05:00
Richard Stanway e1b0d1d984 UI: Use correct constant for CryptDecodeObjectEx 2020-09-04 22:10:06 +02:00
Richard Stanway d7e8f115e8 libobs/media-io: Fix suspicious memset behavior 2020-09-04 21:46:18 +02:00
Clayton Groeneveld ecb71e32d1 UI: Set restart state when there is no media
When there is no media, set the media to the restart state.
Currently, this only affects the VLC source, as the media
source doesn't use the OBS_MEDIA_STATE_NONE, at this time.
2020-09-03 17:09:31 -05:00
Jim ace0faebd8 Merge pull request #3377 from WizardCM/toolbar-fixes
UI: Don't save invalid colors via Source Toolbar (Freetype 2 Source)
2020-09-03 13:42:17 -07:00
Jim a1434fe443 Merge pull request #3397 from cg2121/fix-stats-bug
UI: Fix rec time left not showing in stats
2020-09-03 07:48:51 -07:00
Jim 44bdf60d06 Merge pull request #3394 from cg2121/fix-leak
UI: Fix memory leak when dropping files
2020-09-03 07:45:59 -07:00
Jim a66a8da093 Merge pull request #3383 from Programatic/warning_fix
UI: Fix compiler warning about needing parenthesis
2020-09-03 07:44:24 -07:00
Jim 9af5edc6e2 Merge pull request #3393 from Programatic/crash_fix
UI: Fix source ref bug causing crash on exit
2020-09-03 07:43:46 -07:00
jp9000 7286ee427a UI: Make SetupOutputs virtual instead of ignoring vcam
In 218b936b1d, the virtual camera was ignored when checking the active
state, which is kind of a lackluster solution.  Instead, this makes
SetupOutputs() a virtual function, and calls it before starting the
virtual camera to be more consistent with the rest of the outputs.
2020-09-03 06:56:03 -07:00
Matt Gajownik cefc8cc767 UI: Save Freetype Text source color from Source Toolbar 2020-09-03 23:09:45 +10:00
jp9000 bdd6562a94 win-capture: Put window capture update data in a mutex
Because the window capture source updates its data whenever certain
properties are modified, this would cause a race condition because
source updates normally happen in the graphics thread.  To solve this
for the time being, put access to that data within a mutex when updating
or updating visibility.
2020-09-03 05:49:58 -07:00
jp9000 b99613b677 UI: Fix auto-remux not working w/ slash filesnames
When the feature was added to allow slashes in recording/replay
filenames to automatically create directories, auto-remux was not
accounted for, and all filenames were assumed to be complete.  It used
fi.completeBaseName() to construct the new name which would only add the
last part after the last slash as the filename, causing the remuxed file
to save in the base directory rather than the intended directory.  This
fixes that by simply using the input string as the output string,
removing the extension, appending the new extension.
2020-09-03 05:49:58 -07:00
jp9000 4869167f5c UI: Do not show tray icon if not active
Because the virtual camera stops immediately when you call
obs_output_stop() rather than with a delay like other outputs, it
exposed a bug where the tray icon would show OBS as active when stopping
the source, regardless of the fact that it was stopped.  The bug was
that the expression used to activate the tray icon did not check to make
sure that the output was actually active, so add that to the expression.
2020-09-03 05:49:58 -07:00
jp9000 28f56c0201 UI: Do not show media controls on network media source 2020-09-03 05:49:58 -07:00
jp9000 218b936b1d UI: Fix crash when starting vcam before other outputs
The BasicOutputHandler::Active() function was used for checking whether
outputs had started or not.  However, the virtual camera is not used in
the subclasses; instead it's a part of the base class.  Because of that
fact, when the virtual camera is started, the procedures used to start
up the other outputs are never called, causing outputs to crash because
they hadn't been initialized properly.  For example, starting the
virtual camera, then starting stream/recording would crash.

So, as a simple fix to this, when checking the active status in the
derived classes, do not factor in the virtual camera.
2020-09-03 05:49:58 -07:00
jp9000 1cdf16bac5 UI: Fix maximum size on image source toolbar
The edit widget on the image source toolbar had a maximum width set,
which caused the layout for the toolbar to look ugly if it hit that
maximum width.
2020-09-03 05:49:58 -07:00
jp9000 55c21319e0 UI: Fix source toolbar color selection on color source
When selecting a color on the color source, if you pressed cancel, it
would cause it to set the color to black.  Instead, make sure to check
isValid() on the returned color value to see if the user pressed cancel
when selecting a color.
2020-09-03 05:49:58 -07:00
Clayton Groeneveld 8a3b3da5e4 UI: Fix studio mode load bug
This fixes a bug where studio mode where it would transition
to the preview scene when loaded instead of using previous
program scene.
2020-09-02 22:53:35 -05:00
Clayton Groeneveld f3501976d7 UI: Fix rec time left not showing in stats
If a user would start recording, then open the stats dialog,
the recording time left would be blank.
2020-09-02 18:49:13 -05:00
Richard Stanway c13357ff91 vlc-video: Fix format conversion typos
Introduced by 8b632fa227
Fixes https://github.com/obsproject/obs-studio/issues/3396
2020-09-03 01:13:33 +02:00
Clayton Groeneveld fd0872d630 UI: Fix memory leak when dropping files
This fixes a memory leak when dropping files when the name
is the same as other sources.
2020-09-02 15:08:32 -05:00
Programatic 642dff054d UI: Fix source ref bug causing crash on exit 2020-09-02 12:50:36 -05:00
Jim 4aa6610bf4 Merge pull request #3386 from jpark37/vulkan-instance-fallback
Vulkan instance fallback, and uninitialized member fix
2020-09-01 21:40:34 -07:00
jpark37 94475b8795 win-capture: Fix Vulkan crash on minimize restore
Set uninitialized data members to avoid crash coming back from minimize.
2020-09-01 20:20:59 -07:00
jpark37 7a66466efc win-capture: Add Vulkan instance creation fallback
Fall back to original arguments if our 1.1 API request doesn't work.
2020-09-01 18:59:13 -07:00
jpark37 e905b4cb6e win-capture: Vulkan variable naming consistency 2020-09-01 18:56:14 -07:00
Programatic e1fd89a4e5 UI: Fix compiler warning about needing parenthesis
It was the only thing blocking me from a clean and satisfying compile.
2020-09-01 12:53:25 -05:00
Dillon Pentz 6df30951f5 Merge pull request #3371 from VodBox/docs-fix
docs/sphinx: Fix errors with scripting and properties.
2020-08-31 12:11:18 +12:00
VodBox a78162991a docs/sphinx: Fix mismatched typedefs 2020-08-31 12:07:19 +12:00
VodBox bc084bc10b docs/sphinx: Fix incorrect callback information 2020-08-31 12:02:11 +12:00
Richard Stanway 288a84dc95 win-dshow: Add file description for virtual camera DLL 26.0.0-rc1 2020-08-29 03:04:44 +02:00