4259 Commits

Author SHA1 Message Date
Jim
43e4a2e939 Merge pull request #766 from DDRBoxman/osx
CI: Move browser source before building app
2017-01-19 08:17:04 -08:00
Colin Edwards
991c8bd352 CI: Move browser source before building app
The buildapp.py script was modifying the CEF.app when we don't want it to. It was also packaging the plugin inside the OBS.app so the app was not using the one under /Library
2017-01-19 10:15:41 -06:00
Jim
4d5a500990 Merge pull request #765 from DDRBoxman/appveyor
CI: Add in inital appveyor config
2017-01-18 21:04:36 -08:00
Colin Edwards
514f53486d CI: Add in inital appveyor config 2017-01-18 23:01:59 -06:00
jp9000
839e593e77 Revert "Revert "win-capture: Use FindWindowEx to traverse window list""
This reverts commit f4d7f0cbbaf064d66b6945813aae11ce343c713b.

Never thought a revert of a revert would happen.
2017-01-18 20:18:28 -08:00
jp9000
c8d08932fb obs-browser: Update submodule to latest version
Fixes a hang on startup.
2017-01-18 10:55:31 -08:00
jp9000
841dfade55 libobs: Update to 17.0.2 2017-01-18 06:00:41 -08:00
jp9000
5f5582b87e libobs: Update to version 17.0.1 2017-01-17 09:20:49 -08:00
jp9000
bf9048a1a4 obs-x264: Allow opencl through much longer alias
Due to the fact that people follow terrible guides that ignorantly
recommend opencl, the "opencl" custom x264 option was blocked.  However,
because some people still apparently want to use it, it's being renamed
to "opencl_is_experimental_and_potentially_unstable" so that anyone who
uses this option realizes that they should probably think twice about
using the option rather than just follow some terrible guide that tells
them to use it.
2017-01-16 13:22:04 -08:00
jp9000
b1707b18b2 libobs: Add callback for enumerating all scene children
Prevents infinite recursion when adding children to a scene.
2017-01-16 09:55:15 -08:00
jp9000
69ec87b9a5 libobs: Enumerate full tree when adding active child
Fixes a bug that would allow possible infinite recursion within a source
tree.  To fix this, inactive sources must be enumerated as well in order
to prevent infinite recursion.
2017-01-16 09:53:16 -08:00
jp9000
2877f1d553 libobs: Add func to enum active and inactive child tree 2017-01-16 09:53:08 -08:00
jp9000
c30d4f5075 win-capture: Fix game capture size bug when rehooking
When rehooking, even if scaling is off, it'll unintentionally overwrite
the game's backbuffer texture size with the scale size.
2017-01-16 04:19:16 -08:00
shiina424
36bf5988d2 UI: Fix bug with uncopied profile import/export files
streamEncoder.json and recordEncoder.json are missing.  Thess files are
generated when the output mode is advanced, and the user modifies
encoder settings.

Closes jp9000/obs-studio#741
2017-01-16 03:55:20 -08:00
Gol-D-Ace
e4f32aa54a Update translations from Crowdin 2017-01-16 12:44:07 +01:00
Jim
21839374a8 Merge pull request #746 from iblis17/master
obs-outputs: fix build error on freebsd
2017-01-16 03:43:03 -08:00
Cephas Reis
1e17414e8f obs-filters.c: Fix color correction filter saturation
The Saturation option was unbalanced, giving more weight to the color
red and a TON more weight to the color blue.  This patch balances the
colors to provide a more even increase in saturation across the RGB
channels.

Closes jp9000/obs-studio#739
2017-01-16 03:41:57 -08:00
Cephas Reis
10d6d5f0ca obs-filters.c: Fix color correction filter OpenGL crash
When using this filter in/on OpenGL situations can cause crashes with an
"int to vec4" cast.  This fix should resolve that issue.

Closes jp9000/obs-studio#739
2017-01-16 03:41:50 -08:00
Jim
956349fdd3 Merge pull request #759 from derrod/ignore-opencl
obs-x264: ignore opencl param
2017-01-16 03:31:37 -08:00
Jim
b45cf05db9 Merge pull request #753 from Xaymar/feature_amd-encoder
enc-amf: Update to 1.4.3.8
2017-01-16 03:30:29 -08:00
jp9000
f4d7f0cbba Revert "win-capture: Use FindWindowEx to traverse window list"
This reverts commit bd67c18c022f6a01ba054ecd77ba176359f33f73.

Causes performance issues when the window isn't found.  The situation it
fixes is also very rare anyway.
2017-01-16 03:22:12 -08:00
Jim
a95d4d12c6 Merge pull request #763 from DDRBoxman/osx
CI: Install Packages and use the full version
2017-01-15 10:37:19 -08:00
Colin Edwards
e1496ecff9 CI: Install Packages and use the full version 2017-01-15 11:26:58 -06:00
jp9000
21d70fa207 win-capture: Don't use FindWindow for game capture keepalive
Using and creating a window can use issues in game capture if multiple
game captures are active, so revert back to using a mutex, and just
ignore the keepalive check failure if injected inside a UWP program
(only check to see if GetLastError reports that it's not found -- if it
returns access denied or any other error, assume it's in a UWP program,
and ignore the keepalive check).
2017-01-15 09:15:45 -08:00
jp9000
3f976bec8b libobs: Fix scale filtering bug when duplicating scenes
When duplicating scenes, scene item scale filtering options would not be
preserved.
2017-01-15 09:15:44 -08:00
jp9000
b6bde7e026 cmake: Remove unnecessary find_package calls
Fixes a bug in cmake that would cause a libavcodec_dir being set to "not
found", confusing new contributors
2017-01-15 09:15:43 -08:00
Jim
468ea9d3f8 Merge pull request #761 from DDRBoxman/osx
CI: actually call packagesbuild from the right place 😑
2017-01-12 22:21:03 -08:00
Colin Edwards
2132919005 CI: actually call packagesbuild from the right place 😑 2017-01-12 23:13:26 -06:00
Jim
238b1a532d Merge pull request #760 from DDRBoxman/osx
CI: Ability to make packages on travis
2017-01-12 19:43:22 -08:00
Colin Edwards
836031a7ba CI: Ability to make packages on travis 2017-01-12 20:52:42 -06:00
Michael Fabian Dirks
6939bddf8f enc-amf: Update to 1.4.3.8 2017-01-12 19:47:57 +01:00
derrod
dad1e3a01b obs-x264: ignore opencl param
Silently ignores opencl parameter for x264 to protect users
following bad youtube guides.
2017-01-12 07:27:23 +01:00
Jim
d2ee3bb216 Merge pull request #756 from DDRBoxman/osx
CI: Fix zip permission issue on CEF plist files
2017-01-09 20:38:43 -08:00
Colin Edwards
09695ce9b1 CI: Fix zip permission issue on CEF plist files 2017-01-09 20:50:39 -06:00
Jim
09d6022171 Merge pull request #755 from DDRBoxman/osx
CI: Update browser plugin ref and build scripts.
2017-01-09 18:13:23 -08:00
Colin Edwards
770a9b7e67 CI: Update browser plugin ref and build scripts.
Hopefully this will fix a crash from CEF on 10.9
2017-01-09 19:48:32 -06:00
Jim
ca345ca3d8 Merge pull request #754 from DDRBoxman/osx
CI: Build more features into FFMPEG deps
2017-01-08 21:33:57 -08:00
Colin Edwards
1310e0404f CI: Build more features into FFMPEG deps 2017-01-08 22:11:23 -06:00
Jim
2588604751 Merge pull request #752 from DDRBoxman/osx
[CI] Use prebuilt deps so we can build on 10.9
2017-01-08 00:27:14 -08:00
Colin Edwards
0f2e71cdb5 [CI] Use prebuilt deps so we can build on 10.9 2017-01-07 21:05:23 -06:00
Gol-D-Ace
6223ed6520 Update translations from Crowdin 2017-01-07 00:23:16 +01:00
Iblis Lin
7a15f670e1 obs-outputs: fix build error on freebsd
There is a build error on freebsd:
    error: invalid application of 'sizeof' to an incomplete type
    'struct sockaddr_in'

Include proper header file to solve this.

Ref:
https://www.freebsd.org/doc/en/books/developers-handbook/sockets-essential-functions.html
2017-01-04 16:31:50 +08:00
Gol-D-Ace
34f48aa3fc rtmp-services: Increase video bitrate limit for YouTube
YouTube now recommends a max video bitrate of 51.000 Kbps.
2016-12-30 15:35:35 +01:00
jp9000
679c32086d deps/libff: Fix VP8/VP9/webm alpha support
FFmpeg by default decodes VP8/VP9 via its internal encoders, however
those internal encoders do not support alpha.  Encoded alpha is stored
via meta/side data in the container, so the only way to decode it
properly is via forcing FFmpeg to use libvpx for decoding.
2016-12-28 14:25:30 -08:00
jp9000
93e084088f libobs: Update to version 17.0.0 2016-12-24 04:44:14 -08:00
shiina424
5133353d92 frontend-tools: Fix output-timer translation bug
Don't use tr() to translate, use obs_module_text().

Closes jp9000/obs-studio#735
2016-12-24 04:16:31 -08:00
Jim
12f607523d Merge pull request #736 from SuslikV/patch-6
UI: Fix Export QFileDialog parent
2016-12-24 04:07:00 -08:00
jp9000
5cbd34df92 libobs: Eliminate an unnecessary allocation with captions 2016-12-24 03:45:19 -08:00
SuslikV
fae5082b8b UI: Fix Export QFileDialog parent 2016-12-24 13:44:41 +02:00
jp9000
fba152aed9 libobs: Fix bug in AVC encoder packet allocation
Meant to subtract the ref size, not add.  This is what one gets for
"clever" coding tricks.
2016-12-24 03:44:13 -08:00