jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,071 Commits
1 Branch
0 Tags
60 MiB
Commit Graph

4071 Commits (35285a26b7014d65d4ae92ac4d39af082ece7ec9)

Author SHA1 Message Date
jp9000 75cd6b4ab4 libobs-d3d11: Correct error message creating blend states 2016-11-03 09:23:12 -07:00
jp9000 66bdf43e44 libobs-d3d11: Correct error message for staging surfaces 2016-11-03 09:23:11 -07:00
jp9000 7321cc38e8 libobs-d3d11: Store shader samplers as pointers 
This allows having them be a part of a linked list later.
 2016-11-03 09:23:10 -07:00
jp9000 d4d0cd479d libobs-d3d11: Correct error message for pixel shaders 2016-11-03 09:23:09 -07:00
jp9000 1ecb1550af libobs-d3d11: Store compiled shader data (for rebuilding) 2016-11-03 09:23:08 -07:00
jp9000 29eea269fc libobs-d3d11: Store dxgi adapter used for device 
Keeping a reference is useful, and additionally allows pruning a bit of
duplicated code in the dupicator object.
 2016-11-03 09:23:07 -07:00
Jim 9b50334806 Merge pull request #676 from wt/fix_some_printf_compiler_warnings 
obs-ffmpeg: Fix a couple printf compiler warnings.
 2016-10-30 20:06:08 -07:00
Warren Turkal 40a5436549 obs-ffmpeg: Fix a couple printf compiler warnings. 2016-10-30 19:56:08 -07:00
Jim 1728a5d1b7 Merge pull request #673 from Xaymar/patch-1 
obs-transitions: Fix inefficient branching in slide_transition.effect
 2016-10-30 08:19:44 -07:00
Michael Fabian Dirks 0edaebe192 obs-transitions: Avoid branching in slide_transition.effect 
Branching is not recommended in shaders and only recently gained
widespread support without causing massive branch misprediction issues. Also sampling inside a branch will cause cache misses and additional texture load instructions.
 2016-10-29 13:09:11 +02:00
Jim 7a077b311a Merge pull request #671 from reboot/fix_missing_profile_end 
libobs: Fix missing call to profile_end() when encoding fails
 2016-10-28 01:28:59 -07:00
jp9000 523e1ace49 libobs: Add date/time to crash handler 2016-10-27 18:39:13 -07:00
Christoph Hohmann e775abaa71 libobs: Fix missing call to profile_end() when encoding fails 
The do_encode() method does not call profile_end() when encoding fails
which causes an error message about mismatching names being logged.
 2016-10-24 13:44:28 +02:00
jp9000 39a91d749c libobs/util: Add Get() function to CoTaskMemPtr 2016-10-23 09:20:54 -07:00
jp9000 405ae6bc7c rtmp-services: Add Picarto 2016-10-23 09:20:53 -07:00
jp9000 d5ad621dd1 UI: Fix --profile option not working on non-windows 
Using "*.*" as a search string is a windows-specific search term.  "*"
should be used instead.
 2016-10-20 12:41:56 -07:00
jp9000 a7ef10f7ea obs-ffmpeg: Add b-frames to NVENC logging 2016-10-20 06:51:21 -07:00
Jim d4a10d2e27 Merge pull request #670 from reboot/fix_full_screen_projector 
UI: Fix full screen projector on screens that have reserved areas
 2016-10-20 06:49:09 -07:00
Christoph Hohmann 623c9dc41a UI: Fix full screen projector on screens that have reserved areas 
QScreen::availableGeometry() does not return the full screen size on X11
if areas of the screen are reserved by the window manager. In this case
the full screen projector does not cover the whole screen. Using
QScreen::geometry() instead fixes this issue.
 2016-10-20 15:32:15 +02:00
jp9000 83fa6e728a UI: Remove unused variable 2016-10-19 06:52:57 -07:00
jp9000 ee7e319a61 UI: Fix improper brace placement for function 2016-10-19 06:49:12 -07:00
jp9000 9081df9708 UI: Fix poor handling of system tray pointers 
The original pull request that added the system tray feature was riddled
with bad pointer usage.  Bare pointers that are never properly freed,
never contained within a QPointer or unique_ptr.

These have now been changed to use QPointer variables, and to always
check when the variables are valid before using.  The order of
destruction for QMenu that uses the actions has now been prioritized
first before the actions.
 2016-10-19 06:48:03 -07:00
jp9000 dadefceccf UI: Fix sys. tray crashes when sys. tray not available 
When the system tray is not available, the system tray variables would
still be used despite not being initialized.

Fixes mantis bug 640 on linux systems in particular that may not always
have system tray available.
 2016-10-19 05:32:01 -07:00
Jim 65da3fbaa2 Merge pull request #666 from cg2121/output-timer-fix 
frontend-tools: Add ability to start timer if output is already active
 2016-10-18 04:07:08 -07:00
cg2121 6639847017 frontend-tools: Add ability to start timer if output is already active 
This adds the ability to start the output timer if streaming or recording is already active.
 2016-10-17 22:20:24 -05:00
Jim 4505d5ac33 Merge pull request #665 from reboot/cleanup_output_timers_code 
frontend-tools: Code cleanup of output timers
 2016-10-17 10:42:55 -07:00
Christoph Hohmann a1ea6e4f51 frontend-tools: Code cleanup of output timers 2016-10-17 17:28:05 +02:00
cg2121 7e5c7da542 frontend-tools: Add output timers 
This adds streaming and recording timers to the frontend tools.

Closes jp9000/obs-studio#625
 2016-10-17 02:47:29 -07:00
jp9000 971dd4945c UI: Fix bug in frontend API event 
Was using main->outputHandler->StreamingActive() for the
obs_frontend_recording_active function.
 2016-10-17 02:45:28 -07:00
Jim 6d5b23b37c Merge pull request #664 from DDRBoxman/osxnightly 
CI: Build on OSX 10.10 on travis
 2016-10-17 00:09:48 -07:00
Colin Edwards d160cedbc3 CI: Build on OSX 10.10 on travis 2016-10-17 00:49:55 -05:00
Cephas Reis 94b6943f27 decklink: Update Blackmagic SDK to 10.8.0 
Updated to help support the newest cards, features, and options.

Closes jp9000/obs-studio#627
 2016-10-16 01:53:51 -07:00
Younes SERRAJ f029ec821e cmake: Fix FFmpeg search path on debian 
Although FFmpeg is installed, OBS currently fails to build on debian
(tested on Debian Jessie 8.6).  It looks for libavcodec.a in
/usr/local/lib and not /usr/lib.

Closes jp9000/obs-studio#661
 2016-10-16 01:01:34 -07:00
jp9000 e2af0eec04 obs-frontend-api: Add library version 2016-10-16 00:08:49 -07:00
Jim 37269933af Merge pull request #663 from DDRBoxman/osxnightly 
Update obs-browser submodule to a working version
 2016-10-14 06:19:10 -07:00
Colin Edwards a41bdb3bf0 Update obs-browser submodule to a working version 2016-10-14 08:17:28 -05:00
Jim 8d491f15a9 Merge pull request #656 from DDRBoxman/osxnightly 
Build browser plugin on travis for OSX
 2016-10-13 19:27:52 -07:00
Colin Edwards 947d04012f Build browser plugin on travis for OSX 2016-10-13 19:36:55 -05:00
Jim 60576d0cf3 Merge pull request #662 from DDRBoxman/osxpackage 
CI: Use python2 to run package script
 2016-10-13 17:35:37 -07:00
Colin Edwards 522c43f827 CI: Use python2 to run package script 2016-10-13 19:32:19 -05:00
Jim 925c229312 Merge pull request #660 from DDRBoxman/buildapp 
CI: Package OSX build into an actual app
 2016-10-11 21:12:24 -07:00
Colin Edwards a0b4439893 CI: Package OSX build into an actual app 2016-10-11 22:43:17 -05:00
Jim 3db1f62133 Merge pull request #659 from DDRBoxman/travisirc 
CI: Reduce travis irc notice to one line
 2016-10-11 15:56:06 -07:00
Colin Edwards 30b813564e CI: Reduce travis irc notice to one line 2016-10-11 17:54:28 -05:00
Jim 7d4fa4a650 Merge pull request #657 from DDRBoxman/travisirc 
CI: Add irc notifications to travis config
 2016-10-11 13:43:44 -07:00
Colin Edwards 5f65739606 CI: Add irc notifications to travis config 2016-10-11 15:43:00 -05:00
Jim b84fd6bc2e Merge pull request #658 from DDRBoxman/archivepushes 
CI: Upload artifacts on all pushes
 2016-10-11 13:19:11 -07:00
Colin Edwards 720f8cd6a2 CI: Upload artifacts on all pushes 2016-10-11 15:15:21 -05:00
Jim 9e2e183c04 Merge pull request #655 from DDRBoxman/osxnightly 
OSX Travis build
 2016-10-09 22:42:33 -07:00
Colin Edwards 47c8365cdd OSX Travis build 2016-10-10 00:39:55 -05:00