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

7265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wanhongqing
9b4d9c6788 win-dshow: Fix format switching issue 
If the format was one encoded format and changes to another encoded
format, it could cause it to continue to treat it as the old format.
 2019-11-12 14:37:32 -08:00
Jim
14d8f86745
Merge pull request #2081 from jpark37/cpp17 
CMake 3.10, C++17, SWIG warnings
 2019-11-11 11:49:40 -08:00
Jim
fc54a3b708
Merge pull request #1974 from DDRBoxman/state 
decklink-ui: Show the state of outputs in the decklink dialog
 2019-11-11 07:13:52 -08:00
Jim
d60c736cb0
Merge pull request #1990 from cg2121/flv-radio-buttons 
UI: Use radio buttons for FLV track selection
 2019-11-10 06:34:14 -08:00
Jim
8703c85d76
Merge pull request #1927 from rxrbln/master 
Just a couple of more X.org / Unix hotkey defines.
 2019-11-10 06:33:22 -08:00
Colin Edwards
a469d14264 decklink-ui: Show the state of outputs in the decklink dialog 2019-11-09 14:48:24 -06:00
Clayton Groeneveld
bab3391ce4 UI: Use radio buttons for FLV track selection 2019-11-09 08:19:41 -08:00
René Rebe
fcbe593134 libobs: Add more X.org / Unix hotkey defines 2019-11-09 07:29:16 -08:00
Jim
768a58771a
Merge pull request #1919 from omkelderman/mask-filter-reload-on-file-change 
obs-filters: Reload the mask image when file change is detected
 2019-11-07 15:45:12 -08:00
Olle Kelderman
5534c46920 obs-filters: Reload the mask image when file change is detected 2019-11-07 11:34:10 -08:00
Jim
3542e4eac1
Merge pull request #1917 from VodBox/scroll-loop-option 
libobs/obs-filters: Add toggle for scroll filter looping
 2019-11-07 11:30:18 -08:00
VodBox
6645eaf1b8 obs-filters: Add toggle for scroll filter looping 
By giving the option to disable the looping in the scroll filter, it
makes it more suitable for tasks like credits sequences, where you don't
want the texture to repeat and for the motion to only be performed once.
 2019-11-07 06:25:36 -08:00
VodBox
e8c1ec4035 libobs: Send activate and show signals to filters 2019-11-07 06:19:34 -08:00
Jim
647e7e24a1
Merge pull request #2144 from cg2121/quick-tr-fix 
UI: Fix main transition being set to the quick one
 2019-11-07 05:37:33 -08:00
Jim
bfaf4889f1
Merge pull request #2168 from kkartaltepe/vaapi-profile-fix 
rtmp-services: Type check apply_encoder_settings
 2019-11-07 05:36:44 -08:00
Kurt Kartaltepe
d9470770a0 rtmp-services: Type check apply_encoder_settings 
This fixes ovewritting hidden "profile" setting in ffmpeg vaapi which is
a number and not a string. It also shouldnt be overwritten as it is
required on some AMD hardware for the encoder to work.
 2019-11-06 20:10:19 -08:00
Clayton Groeneveld
0676c385ba UI: Fix main transition being set to the quick one 
This fixes an issue where using a quick transition, it would change
the main transition as well.
 2019-11-05 23:47:28 -06:00
Jim
f41d0d9d77
Merge pull request #2153 from tujinshu/master 
win-capture: Fix rare crash when OpenGL programs exit with graphics-hook
 2019-11-05 16:28:13 -08:00
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