Commit Graph
5895 Commits
Author SHA1 Message Date
jp9000 e3c2202791 cmake: Add release candidate versions/cmake variables
Allows specifying a release candidate version, and outputs release
candidate version variables to libobs/obs-config.h.  Useful for using
cmake to specify a release candidate version.
2018-08-13 01:19:23 -07:00
Richard Stanway 41b7f85332 libobs/media-io: Prevent overwriting of remux input 2018-08-12 17:06:39 +02:00
jp9000 a2bc0f2e4f libobs: Update version from latest tag
Originally, the build numbers 21.1.1 and  21.1.2 weren't added to the
master branch -- only to the two bugfix tag branches.  This is being
added again in order to build some test builds that don't prompt for
update.
2018-08-11 07:09:49 -07:00
Richard Stanway 144d23a9cc obs-qsv11: Protect context variable in clear_data 2018-08-11 02:57:23 +02:00
Richard Stanway 8fdbf60228 rtmp-services: Remove unnecessary null check 2018-08-11 02:54:50 +02:00
Richard Stanway 750f0f2ea4 libobs: Remove unnecessary null check 2018-08-11 01:56:08 +02:00
jp9000 4d38e054e3 UI: Add adv. settings checkbox for browser HW accel
Adds a checkbox to advanced settings that allows the user to
enable/disable browser source hardware acceleration on windows.
2018-08-10 06:33:41 -07:00
jp9000 fc37cbcca4 libobs: Add functions to get/set global private data
Allows the ability to set custom global OBS context private data for
allowing the frontend to communicate variables with plugins in an
indirect way.
2018-08-10 06:09:23 -07:00
jp9000 c43702e335 libobs: Move function declarations to correct spot
These function declarations were in the wrong section.
2018-08-10 06:09:23 -07:00
jp9000 c7a2a674bc UI: Use NVIDIA laptop GPU hint
Changes the default "preferred" GPU to the NVIDIA GPU when running the
program on NVIDIA laptops.
2018-08-10 06:09:23 -07:00
Colin Edwards 62917b503a CI: Update OSX Deps package 2018-08-09 22:29:21 -05:00
sorayuki b3ed50aa08 win-capture: Avoid segfault when retrieve size
When changing size of a game-capture scene item in preview window, 
if the capture target window closed, it may crash.
2018-08-08 16:28:40 +08:00
Shaolin 3f23c1ca7b cmake: Prevent policy CMP0072 warning
This policy was introduced in CMake version 3.11.

The FindOpenGL module provides an OpenGL::GL target and an
OPENGL_LIBRARIES variable for projects to use for legacy GL interfaces.
When both a legacy GL library (e.g. libGL.so) and GLVND libraries for
OpenGL and GLX (e.g. libOpenGL.so and libGLX.so) are available, the
module must choose between them. It documents an OpenGL_GL_PREFERENCE
variable that can be used to specify an explicit preference. When no
such preference is set, the module must choose a default preference.

The default behavior is to default to legacy (OLD) and is deprecated.

https://cmake.org/cmake/help/v3.11/policy/CMP0072.html
https://github.com/NVIDIA/libglvnd
2018-08-07 20:22:00 -03:00
jp9000 8695be6a34 Revert "libobs-d3d11: Initialize variable to zero"
This reverts commit 671b6032e2.

Closes obsproject/obs-studio#1413
2018-08-07 06:16:59 -07:00
Jim a00c487670 Merge pull request #1412 from sorayuki/master
win-capture: Avoid tex size mismatch for cursor
2018-08-07 02:35:30 -07:00
sorayuki ce53c5cc70 win-capture: Avoid tex size mismatch for cursor
Re-fetch texture when cursor's either width or height changed.

When the cursor icon changed and the new one has the same width or height,
it may not recreate the texture and thus cause memory access violation.
2018-08-07 17:15:07 +08:00
Ryan Foster 5fd8ebd14c UI: Make OBS bitness more specific in title bar and log
This commit explicitly puts "32-bit" in the title bar and OBS log for
32-bit versions of OBS. It also changes "64bit" to "64-bit" to match the
string used for Windows version info.
2018-08-07 01:15:03 -04:00
Dmitry-Me ddb239faa1 obs-qsv11: Initialize member variable 2018-08-06 17:18:59 +03:00
Jim abbea9ef7d Merge pull request #1408 from DDRBoxman/deps
CI: Fix building libvpx dep on osx
2018-08-05 20:55:25 -07:00
Colin Edwards 5411d6666e CI: Fix building libvpx dep on osx 2018-08-05 22:23:57 -05:00
Jim 4dc57ef24f Merge pull request #1373 from Xaymar/plugins_enc-amf
enc-amf:  Version 2.4.2
2018-08-05 20:02:06 -07:00
jp9000 be8ddc06a2 rtmp-services: Ensure set URL exists within server list
If the user had a valid service selected, but the server that the user
originally was using is now (for whatever reason) no longer listed, the
rtmp-common service would still use that server rather than any of the
newer servers, and the user would have to physically go in to their
settings to reconfigure to get it to use that new server.

Instead, make sure that the server the user has selected exists within
the server list, and if it doesn't, use the first server in the list
instead by default.
2018-08-05 18:50:13 -07:00
Michael Goulet a17c28223c rtmp-services: Change Facebook stream URL to use RTMPS 2018-08-05 18:50:13 -07:00
Michael Goulet e67e2e12e6 obs-outputs: Add support for and use mbedTLS for SSL
This diff adds mbedTLS support to the obs-outputs plugin.  PolarSSL and
mbedTLS have grown so different between 2015-or-so when libRTMP was
written, and now it's no longer feasible to just use the USE_POLARSSL
flag.

This commit adds a WITH_RTMPS tri-state CMake variable (auto/on/off),
set to "Auto" by default.  "Auto" will use RTMPS if mbedTLS is found,
otherwise will disable RTMPS.  "On" will make it require mbedTLS,
otherwise fails configuration, and "Off" disables RTMPS support
altogether.

Closes obsproject/obs-studio#1360
2018-08-05 18:40:49 -07:00
Richard Stanway 4e07ac17d9 Merge pull request #1401 from Dmitry-Me/addMissingVaEnd02
UI: Add missing va_end() call
2018-08-05 22:15:10 +02:00
jp9000 8e5a618f03 libobs: When ungrouping groups, duplicate items
Because groups can now be used in multiple scenes at once, it's
important that if the user wishes to ungroup a group, that they must be
able to keep the group intact if it exists in other scenes.  This
requires duplicating all scene items (as well as their hotkey/private
data) instead of just reparenting the subitems.

This fixes an issue where if the user had the group referenced in
multiple scenes, the group would become empty in other scenes.
2018-08-05 04:21:42 -07:00
jp9000 ef40100c64 libobs: Add internal function to dup. scene item data
Adds an internal function to duplicate scene item data.
2018-08-05 04:21:42 -07:00
jp9000 ba4692622e libobs: Add function to save hotkey pair data 2018-08-05 04:21:42 -07:00
Jim 3509b1be88 Merge pull request #1407 from RytoEX/remove-qt5network
UI: Remove QNetworkReply from window-basic-main.hpp
2018-08-04 23:14:35 -07:00
Ryan Foster 3f7458fe51 UI: Remove QNetworkReply from window-basic-main.hpp
QNetworkReply was added here in commit
5ba8b09c9c. Qt5Network was replaced in
commits 13bed1a448 and
39d1cda4e9, but this one line referring to
QNetworkReply remained. Let's finally remove it.
2018-08-05 01:44:12 -04:00
Jim 9a095bde11 Merge pull request #1388 from RytoEX/ci-macos
Update macOS CI build image, target, and deps
2018-08-03 01:48:01 -07:00
jp9000 5b091ce06d UI: Use obsproject.com URL for discord invite 2018-08-03 00:33:06 -07:00
Jim be44b36bd4 Merge pull request #1403 from admshao/gl-improve-error-handling
Improve X error handling
2018-08-02 23:53:34 -07:00
Jim a4150c7d98 Merge pull request #1402 from admshao/compressor-segfault
obs-filters: Fix segfault in Compressor Filter
2018-08-02 23:52:31 -07:00
Shaolin 85c7669ad2 libobs-opengl: Fix segfault on access of invalid window
Once a window is invalid gl-x11::get_window_geometry will return 0
so just check if the returned geometry is a valid pointer before
trying to get its width/height.
2018-08-03 00:55:09 -03:00
Shaolin 4a266dc920 libobs-opengl: Improve X error handler message 2018-08-03 00:52:47 -03:00
Shaolin d5fb5edd93 obs-filters: Fix segfault in Compressor Filter
obs_audio_data* sent to compressor_filter_audio had audio->frames == 0.
The analyze_envelope was trying to access an array at index -1 in result
of that. Just return if no samples are provided.

This fixes Mantis issue: 1261
2018-08-02 15:32:54 -03:00
Dmitry-Me 440baa3147 UI: Add missing va_end() call 2018-08-02 15:57:35 +03:00
Jim 9565f9cd0c Merge pull request #1332 from Andersama/patch-21
UI: Hide preview for sources and filters where possible
2018-08-01 23:05:45 -07:00
Ryan Foster 6dfeeca620 CI: Update macOS dependencies in build script
* Add mbedTLS in brew install
* Update Sparkle from 1.16.0 to 1.20.0
* Update Opus from 1.1.3 to 1.2.1
* Update libogg from 1.3.2 to 1.3.3
* Update libvorbis from 1.3.5 to 1.3.6
* Update libvpx from 1.6.0 to 1.7.0
* Update Jansson from 2.9 to 2.11
* Update FFmpeg from 3.2.2 to 4.0.2
2018-08-02 00:08:24 -04:00
Ryan Foster 3ea16c619f CI: Update Travis scripts to target OSX 10.11+ 2018-08-02 00:08:20 -04:00
Ryan Foster 7fd981c2c0 CI: Update Travis Mac builds to Xcode 9.4 and macOS 10.13 2018-08-02 00:08:17 -04:00
jp9000 16ead25dd3 UI: Add ability to join discord server from help menu 2018-08-01 18:41:57 -07:00
Jim 324071f5a3 Merge pull request #1338 from VodBox/scene-item-colors
UI: Add Color Coding to Source Tree Widget
2018-08-01 17:42:29 -07:00
Jim fbd8d02c77 Merge pull request #1400 from Dmitry-Me/addMissingVaEnd01
win-mf: Add missing va_end() call
2018-08-01 13:31:59 -07:00
VodBox 0dca4318b2 UI: Add Color Coding to Source Tree Widget
This commit adds the ability to select a background color for a
scene-item, whether it's a custom color or one of eight presets.

As this is an initial implementation, it lacks theme customizability,
and it also lacks the ability for the user to set their own preset
colors, so only the hard-coded 8 are available.
2018-08-02 08:23:12 +12:00
Dmitry-Me d3863e837c win-mf: Add missing va_end() call 2018-08-01 18:12:08 +03:00
jp9000 7faad4b467 obs-browser: Add hardware acceleration option (win32) 2018-08-01 02:03:17 -07:00
Jim a7a2f21448 Merge pull request #1399 from Dmitry-Me/missingReturnInAssignment
UI: Add missing return statement
2018-08-01 01:36:03 -07:00
Dmitry-Me a5eb2b8e7e UI: Add missing return statement 2018-08-01 11:04:25 +03:00