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

2192 Commits

Author SHA1 Message Date
Jim
0d45f4d577
Merge pull request #1748 from boxerab/ffmpeg-streaming 
obs-ffmpeg: UI and back-end for obs-encoded streaming over various protocols such as SRT
 2019-12-18 12:54:10 -08:00
Gary Kramlich
cbe1791362 linux-v4l2: Add support for controls 
Video4Linux exposes controls for capture devices.  This commit adds
those controls to the properties window for v4l2-input devices.
 2019-12-18 09:22:05 -08:00
Daniel Hill
b9ad1ceb64 obs-qsv11: Add all TargetUsage values 
Using terminology from FFmpeg reference, implement:
https://www.intel.com/content/dam/www/public/us/en/documents/white-papers/cloud-computing-quicksync-video-ffmpeg-white-paper.pdf
 2019-12-15 05:20:49 -08:00
Alexander Kozhevin
c11a30e02a rtmp-services: Add YouStreamer 
(This commit also modifies the UI module)
 2019-12-14 12:54:31 -08:00
Jim
9ebc3d1352
Merge pull request #2220 from dionney/rate_control_vaapi 
obs-ffmpeg: Enable VAAPI Rate Control
 2019-12-14 02:11:02 -08:00
Jim
68bedcf1a9
Merge pull request #2240 from JohannMG/new-fb-bitrate 
rtmp-services: Increase FB max bitrate to 6Mbps
 2019-12-13 11:41:16 -08:00
jp9000
eed1a603d1 obs-browser: Disable system flash 2019-12-13 07:04:26 -08:00
JohannMG
0e6afafa67 rtmp-services: Increase FB max bitrate to 6Mbps 
Facebook Live now recommends 6000kbps for most streamers and the auto
capping is clamping users to 4000kpbs. This fixes the new suggested
setting.
 2019-12-12 17:24:45 -08:00
Yves Dionne
2841dfc6db obs-ffmpeg: Enable VAAPI Rate Control 
Enable choosing CBR, CQP and VBR.
 2019-12-11 17:16:29 -05:00
Kraz3D
d34ad717b8 rtmp-services: Add Konduit.live 2019-12-10 08:53:06 -08:00
jpark37
3f58810b0e libdshowcapture: Update to latest submodule 2019-12-08 14:52:00 -08:00
jpark37
592ff852a5 Decklink: Explicit casts for truncation warnings 2019-12-06 22:35:52 -08:00
Jim
c36e3fbc92
Merge pull request #2196 from jpark37/ffmpeg-mjpeg-spam 
win-dshow: Suppress MJPEG error spam
 2019-11-29 20:48:40 -08:00
Aaron Boxer
b55b1e9bfd obs-ffmpeg: Add new ffmpeg-encoded-output 2019-11-27 14:40:52 -05:00
Aaron Boxer
e13dae8299 obs-ffmpeg: Expose ffmpeg_data_init and ffmpeg_data_free methods 2019-11-27 14:40:52 -05:00
Peter Geis
64d0b7fcb4 libobs: Enable compilation on aarch64 
Add arch checks to enable aarch-compat layer on aarch64, retain normal
gcc intrinsics on x86 and ppc64.
 2019-11-25 13:04:21 -05:00
jpark37
f685322a0f win-dshow: Suppress MJPEG error spam 
Only print the first message for this known benign error.
 2019-11-24 23:59:27 -08:00
Clayton Groeneveld
82ffcdc827 UI: Add source icons 2019-11-24 20:50:42 -08:00
Jim
226f704e90
Merge pull request #2152 from Rosuav/fix-cursor-position 
libobs: Fix cursor draw position bug when cropping a window capture.
 2019-11-24 19:26:47 -08:00
jpark37
7d3e086e6f win-wasapi: Verify and balance CoInitializeEx call 2019-11-24 09:43:39 -08:00
Jim
f09c7d0430
Merge pull request #2184 from kkartaltepe/log-ftl 
obs-outputs: Log FTL during configure
 2019-11-24 02:59:31 -08:00
Jim
1d1c9e5fee
Merge pull request #2167 from kkartaltepe/vaapi-ffmpeg-4.2 
obs-ffmpeg: Remove unexposed vaapi parameters
 2019-11-24 02:57:19 -08:00
Jim
fa5454d1b8
Merge pull request #2124 from notr1ch/pci-device-ids 
Use PCI database IDs instead of string matching for devices
 2019-11-22 23:15:55 -08:00
Jim
ef6e574d25
Merge pull request #2151 from RytoEX/vth264-dropped-frames 
mac-vth264: Manually mark priority bits for frames
 2019-11-20 23:45:51 -08:00
Chris Angelico
fd668695db linux-capture: Fix cursor draw bug when cropping window cap. 
When cropping the left or top of a window capture, OBS would misalign
the drawn cursor, placing it as if the entire window were being
captured. Instead, offset the captured cursor by the same number of
pixels, thus placing the cursor back where it belongs.
 2019-11-20 22:09:47 -08:00
jp9000
f5e026b38b rtmp-services: Add scenecut=0 to mixer requirements 2019-11-20 15:02:50 -08:00
Kurt Kartaltepe
210ebcbda7 obs-outputs: Log FTL during configure 2019-11-18 20:37:33 -08:00
Manuel Kroeber
3773c7cc31 obs-text: add missing locale include to fix build 
PR 2079 added localization but forgot the needed include
 2019-11-16 12:50:42 +01:00
Jim
e6daa22ab7
Merge pull request #2079 from exeldro/startcase 
obs-text: text transform add locale and start case
 2019-11-15 02:07:07 -08:00
Jim
61d959a095
Merge pull request #2077 from brittneysclark/qsv_cust_quant_mat 
obs-qsv: Enable option for Custom Quantization Matrix
 2019-11-14 18:54:51 -08:00
Jim
0d140542e4
Merge pull request #2072 from jpark37/dshow-negative-height 
win-dshow: Support bottom-up DIBs
 2019-11-13 11:42:05 -08:00
Jim
0f8472e8a8
Merge pull request #1914 from YouNow/master 
rtmp-services: Add YouNow service and implement ingest lookup
 2019-11-13 08:41:13 -08:00
jpark37
f896c773e8 win-dshow: Support bottom-up DIBs 
The biHeight field can be negative, leading to crashes on some cards
like VisionRGB-E1S. Adding flip support is fairly straightforward.

There also appears to be a hack to automatically flip for RGB formats,
but I wish to remove it because it seems to fight with this change. We
already have a separate vertical flip checkbox to deal with non
compliant behavior.
 2019-11-12 17:59:59 -08:00
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
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
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
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
Kurt Kartaltepe
d2f2aeb5d2 obs-ffmpeg: Remove unexposed vaapi parameters 
In ffmepg 4.2 setting qp overrides bitrate, this option isnt exposed
currently so users cannot disable it.
 2019-11-06 18:57:05 -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
Roman Sivriver
64d90c28c8 rtmp-services: Add YouNow service and implement ingest lookup 2019-10-30 13:16:13 -04:00
Ryan Foster
30d29618b1 mac-vth264: Manually mark priority bits for frames 
This commit is the mac-vth264 version of edfc2be in obs-qsv11.
 2019-10-27 01:05:54 -04:00
Dmitry Vovk
c0a8e86c9c rtmp-services: Add Stars.AVN.com streaming service 2019-10-22 23:53:48 -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
Matt Gajownik
a6a86caf21 win-wasapi: Log device sample rate when initialized 2019-10-19 21:53:08 +11: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
Richard Stanway
da31881059 obs-ffmpeg: Use vendor and device ID for NVENC blacklist 2019-10-16 12:19:09 +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