jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,244 Commits 1 Branch 0 Tags
Commit Graph

7244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tujinshu
76e6a99124 win-capture: Fix rare crash when GL program exits 
**Commit message modified and clarified by Jim**

When hooking a program that has both DirectX and OpenGL contexts in use,
it is possible to cause a crash on shutdown due to capture_active()
returning true when an OpenGL context is deleted.  Normally, when
capturing an OpenGL program, this would not happen because the 'active'
variable would not be set due to OpenGL capture not being initialized,
but if DirectX is captured while an OpenGL context is available, and
OpenGL could not load these required functions, then GL can crash due to
trying to use unavailable functions.

This case is extremely rare and doesn't happen under normal
circumstances; only if a program is using both DirectX and OpenGL within
the same program simultaneously, and *only* if OpenGL could not load the
required functions.  This likely almost never happens under normal
programs, games, and hardware.  This was apparently produced by hooking
a GL Qt program that used QWebEngine, which used multiple contexts at
once.
 2019-11-05 13:44:15 -08:00
Jim
cbfb779876
Merge pull request #2148 from eulertour/master 
UI: Fall back to XGetWMName if XFetchName fails
 2019-11-05 12:54:50 -08:00
Jim
57669ffcb7
Merge pull request #2146 from Fenrirthviti/recording-bitrate-fix 
UI: Fix audio bitrate not being set in simple mode
 2019-11-05 12:52:15 -08:00
Jim
17ddb8d62d
Merge pull request #2142 from cg2121/fade-to-black 
UI: Add fade to black in studio mode
 2019-11-05 12:50:29 -08:00
jp9000
0a3d2e127f libobs: Fix race condition 
It is possible for a GPU encoder to be in a destruction state while
still in the GPU encoder list, although very rare.
 2019-11-05 12:02:54 -08:00
Jim
e941eb6583
Merge pull request #2145 from JohannMG/UpgradeStream-Link 
UI: Upgrade stream key link into button
 2019-11-01 12:00:26 -07:00
JohannMG
3f6cf0e871 UI: Upgrade stream link hotlink to a button 
Most of the top streaming services now have a link in the stream key
label. Upgrading this button to a button clarifies the assistance
for the important step of setting up a stream.

Creates a new type of button for URL opening simply which also
automatically updates the tootip to the current URL.

Includes addition of Twitter/Periscope URL to make this feature more
complete.
 2019-10-30 12:09:07 -07:00
Jim
b98ea73cdc
Merge pull request #2154 from Vainock/patch-1 
README.rst: Add Crowdin progress badge
 2019-10-30 07:36:03 -07:00
Vainock
b3a3d96323
README.rst: Add Crowdin progress badge 
This adds a badge to the README that shows the progress of the OBS Studio Crowdin Project. This is a more obvious link to the translation project as it is only mentioned in the description far below.
 2019-10-29 15:50:21 +01:00
Jim
05656e56f3
Merge pull request #2147 from JohannMG/vscode-ignore 
git: Add VSCode working dir to .gitignore
 2019-10-28 13:29:21 -07:00
Devin Neal
7e25b0dc1e UI: Fallback to XGetWMName if XFetchName fails 2019-10-27 14:39:58 -07:00
JohannMG
3347c1b3b8 git: Add VSCode working dir to .gitignore 
Ignores additions and changes to any configurations in VSCode.

$sqaushme remove wildcard
 2019-10-25 14:01:48 -07:00
Joel Bethke
63d66c87e4 UI: Fix audio bitrate not being set in simple mode 2019-10-25 10:56:26 -05:00
Clayton Groeneveld
1c005fcb51 UI: Add fade to black in studio mode 2019-10-24 19:00:33 -05:00
Jim
c56de17bdb
Merge pull request #2140 from DevWolk/avn-obs 
rtmp-services: Add Stars.AVN.com streaming service
 2019-10-23 00:42:32 -07:00
Dmitry Vovk
c0a8e86c9c rtmp-services: Add Stars.AVN.com streaming service 2019-10-22 23:53:48 -07:00
Jim
de7ab74370
Merge pull request #2137 from AlexWayfer/revert_desktop_file_renaming 
Fix desktop entry for GNOME shell without file renaming
 2019-10-22 21:28:28 -07:00
Jim
e9a50aa392
Merge pull request #1904 from exeldro/filename_format 
libobs: Add video info to filename formatting
 2019-10-22 04:56:00 -07:00
Exeldro
478bf7c6af libobs: Add video info to filename formatting 2019-10-22 02:50:13 -07:00
Alexander Popov
b83c657cf1 UI: Fix desktop entry for GNOME Shell 
Discussion:
https://github.com/obsproject/obs-studio/pull/2130#issuecomment-544461351
 2019-10-21 23:43:10 -07:00
Alexander Popov
d30ab737a9 Revert "Rename com.obsproject.Studio.desktop to obs.desktop" 
This reverts commit 322b8afddbd1e7d80380e88faacd2d4ba5675dca.
 2019-10-21 23:43:06 -07:00
Jim
6410bc646f
Merge pull request #2136 from cg2121/simplify-fullscreen 
UI: Simplify fullscreen toggle code
 2019-10-21 23:40:46 -07:00
Jim
4c85ac65a3
Merge pull request #2134 from WizardCM/wasapi-samplerate 
Log Sample Rate for WASAPI devices
 2019-10-21 23:30:18 -07:00
Jim
86006ca726
Merge pull request #2129 from Fenrirthviti/win-blacklist-update 
win-capture: Add additional exe to window capture blacklist
 2019-10-21 23:23:23 -07:00
Jim
f3bbe4849e
Merge pull request #2132 from derrod/ffmpeg-playground 
obs-ffmpeg: use avcodec_find_best_pix_fmt_of_list
 2019-10-21 23:22:52 -07:00
Jim
92e1d5365d
Merge pull request #2131 from jpark37/input-layout-error 
libobs-d3d11: Fix null input layout rebuild
 2019-10-21 23:15:09 -07:00
Clayton Groeneveld
52a3a61a6e UI: Simplify fullscreen toggle code 2019-10-21 15:17:26 -05:00
Matt Gajownik
a6a86caf21 win-wasapi: Log device sample rate when initialized 2019-10-19 21:53:08 +11:00
Matt Gajownik
acf2eae1e5 UI: Display Sample Rate with proper formatting 2019-10-19 19:10:39 +11:00
jpark37
1e2542ad6f libobs-d3d11: Fix null input layout rebuild 
Don't build input layout without VS inputs. Matches creation logic.
 2019-10-17 09:24:13 -07:00
derrod
5e183ff9a7 obs-ffmpeg: use avcodec_find_best_pix_fmt_of_list 
The built-in format selector failed in certain cases like UtVideo now
using a differently packeg RGB format. FFmpeg has a format selection
functionality built-in that does pick the correct format however
(avcodec_find_best_pix_fmt_of_list), so we can simply use that instead.
 2019-10-17 08:07:27 +02:00
Joel Bethke
6fb3552d70 win-capture: Add additional exe to window capture blacklist 
These are additional internal windows processes that should not
be listed in the window capture dropdown.
 2019-10-16 19:47:43 -05:00
Jim
156e2f3aec
Merge pull request #2128 from Xaymar/return-to-break 
UI: Fix checkable property groups
 2019-10-16 03:57:36 -07:00
Jim
f8a0bd6440
Merge pull request #2127 from cg2121/stats-hotkey 
UI: Add stats reset hotkey
 2019-10-15 23:06:21 -07:00
Michael Fabian 'Xaymar' Dirks
fefcf5468a UI: Fix checkable property groups 2019-10-16 07:26:21 +02:00
Jim
1ae588f3be
Merge pull request #2121 from cg2121/fix-warning 
rtmp-stream: Fix comparison between signed and unsigned ints
 2019-10-15 22:24:10 -07:00
Jim
3e01fdf3e5
Merge pull request #2116 from jpark37/begin-frame 
libobs: Add gs_begin_frame for duplicators
 2019-10-15 22:23:34 -07:00
Jim
86a5d43173
Merge pull request #2110 from derrod/ffmpeg-output-fix 
obs-ffmpeg: Use av_opt_set on context instead of priv_data
 2019-10-15 22:21:04 -07:00
Jim
09cbbd5487
Merge pull request #2108 from cg2121/mantis-1557 
obs-filters: Fix sharpness not being translated
 2019-10-15 22:19:27 -07:00
Jim
7ed8f05f21
Merge pull request #2106 from cg2121/fix-preview-bug 
UI: Fix issue with preview projector
 2019-10-15 22:16:11 -07:00
Joel Bethke
f3a054e308
Merge pull request #2126 from Fenrirthviti/linux-ci-fix 
CI: Remove dead PPA to fix Linux build failure
 2019-10-15 23:27:49 -05:00
Clayton Groeneveld
c4169ba15a UI: Add stats reset hotkey 2019-10-15 23:20:35 -05:00
Joel Bethke
404dc6a84d CI: Remove dead PPA to fix Linux build failure 2019-10-15 14:24:28 -05:00
Jim
7d34034ee2
Merge pull request #2099 from ioangogo/LinuxCaptionFix 
cmake: Compile option to fix libcaption linking
 2019-10-15 11:25:05 -07:00
Jim
8a1ff1c475
Merge pull request #2103 from cg2121/rename-filters-shortcut 
UI: Add ability to rename filters with F2 (Return on Mac)
 2019-10-15 10:31:35 -07:00
Jim
b524774254
Merge pull request #2100 from AlexWayfer/patch-2 
Rename com.obsproject.Studio.desktop to obs.desktop
 2019-10-15 10:24:38 -07:00
Jim
53661d90ce
Merge pull request #2096 from cg2121/unused-code 
UI: Remove unused code from visibility item widget
 2019-10-15 10:19:46 -07:00
Jim
ba6472fa1c
Merge pull request #2095 from jpark37/amf-upgrade 
enc-amf: Reinstate AMF 1.4.14 with driver version check
 2019-10-15 10:18:18 -07:00
Jim
bbe4e13c2d
Merge pull request #2082 from exeldro/obs_group_from_source 
libobs: Export obs_group_from_source
 2019-10-15 10:09:40 -07:00
Jim
5cbc23c195
Merge pull request #2091 from Programatic/xshm_wrong_windows 
linux-capture: Fix bug where multiple 0x0 windows would appear
 2019-10-15 10:09:03 -07:00