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

2568 Commits

Author SHA1 Message Date
Jim
f6ce8f2a32
Merge pull request #2942 from strager/x264-options 
obs-x264: Log when options are ignored
 2020-08-17 05:24:00 -07:00
jp9000
37767b6746 image-source: Transition when restarting slideshow 
Fixes an issue where it would instantly set the image rather than
transition to the first from its current value
 2020-08-17 03:12:59 -07:00
Jim
1849798cb4
Merge pull request #3281 from cg2121/slideshow-cleanup 
image-source: Use media control api for slideshow
 2020-08-16 23:54:15 -07:00
Jim
22e6a040ed
Merge pull request #3223 from NiMO-TV/rtmp-nimotv-auto-server 
rtmp-services: Add Nimo TV auto server
 2020-08-15 08:43:42 -07:00
Clayton Groeneveld
42e7b16fde image-source: Use media control api for slideshow 2020-08-14 14:32:21 -05:00
Clayton Groeneveld
88da9bf693 Revert "image-source: Add proc handler calls to slideshow" 
This reverts commit 1475f756f229ae4428178fa16de3dd6b9cd776b5.
 2020-08-14 13:35:45 -05:00
Jim
c5b3125b75
Merge pull request #3253 from JohannMG/mac-decklink-warnings 
mac-decklink: Fix C++ virtual function warnings
 2020-08-11 18:09:31 -07:00
jp9000
1475f756f2 image-source: Add proc handler calls to slideshow 
Allows manipulation of the slideshow via procedure handlers.
 2020-08-10 12:24:01 -07:00
jp9000
389f7d390f image-source: Play if play_pause() called while stopped 
Causes the slideshow to start back up if it was stopped for whatever
reason previously.
 2020-08-10 12:23:36 -07:00
JohannMG
41b12d7bff mac-decklink: Fix C++ virtual function warnings 
Created another virtual function to override and moves stubbed function
to the header.
 2020-08-06 12:53:30 -07:00
Jim
bfdf5dc947
Merge pull request #2356 from jpark37/sycc-color-space 
Color space refinements
 2020-08-05 08:58:21 -07:00
Ka Ho Ng
b1504b0278 oss-audio: Use util_mul_div64() to do time scaling 
util_mul_div64() is a new helper to do scaling. This commit sweeps the
oss-audio plugin code to generalize the way of doing scaling.
 2020-07-31 02:00:40 +08:00
jp9000
4b17b82aab obs-ffmpeg: Set async video frame immediately when seeking 2020-07-29 13:59:49 -07:00
Jim
80bb9b4675
Merge pull request #3206 from notr1ch/frame-fix-squashed 
Fix preloaded video behavior
 2020-07-29 13:57:52 -07:00
antho
dcb085a0f9 rtmp-services: Add api.video service 
Closes obsproject/obs-studio#3227
 2020-07-29 11:06:05 -07:00
dgeibi
238a44333b rtmp-services: Add Nimo TV auto server 2020-07-28 11:55:18 +08:00
brittneysclark
d04e167ed0 obs-qsv11: Fix bug mapping old qsv settings to new 
Fix for an issue found where new "Latency" and "Subjective Video
Enhancement" options where always using default settings even after
being changed in UI. This issue was introduced when mapping old QSV
settings to new ones.
 2020-07-27 06:12:03 -07:00
jpark37
04b9b9fea3 win-capture: Make Vulkan frame data local to queue 
Prevents multiple queues in the same family from racing on frame data.

Removal of vk_family_data also fixes broken capacity calculation. Two
queue families can share the same index if one is "protected-capable"
and the other isn't.
 2020-07-26 13:33:01 -07:00
jpark37
e6896d79e3 win-capture: Hide Vulkan linked list internals 2020-07-26 13:32:53 -07:00
Jim
3907b2ddd1
Merge pull request #3197 from jpark37/vulkan-cts-harden 
win-capture: Improve Vulkan hook stability
 2020-07-24 20:37:26 -07:00
Rodney
dc0af42f1b
Merge pull request #3091 from derrod/remove-mixer 
UI/CI/rtmp-services: Remove Mixer
 2020-07-24 20:17:38 +02:00
jpark37
44fb61b1f2 win-capture: Improve Vulkan hook stability 
Make fixes mostly to stabilize CTS. Tested on Windows with RTX 2080 Ti.

Use separate linked-list maps for devices and queues.

Process queues upfront in OBS_CreateDevice, and not lazily in
OBS_GetDeviceQueue.

Handle failed node allocation for OBS_CreateInstance, OBS_CreateDevice,
and OBS_CreateSwapchainKHR.

Handle VK_NULL_HANDLE for OBS_DestroySurfaceKHR and
OBS_DestroySwapchainKHR.

Add temporary code path CTS_WORKAROUND to deal with CTS sharing surfaces
between instances.

Fix return value for OBS_DestroyInstance.

Add missing _freea calls, required for _malloca.

Make sure the queue passed to OBS_QueuePresentKHR supports transfer to
safely call vkCmdCopyImage.

Update GetInstanceProcAddr/GetDeviceProcAddr to conform closer to spec.

Remove extra macros because I dislike indirection more than verbosity.
 2020-07-24 09:30:05 -07:00
Richard Stanway
80803aa2f7 obs-ffmpeg: Clear texture when starting playback 
This prevents a stale texture from being visible for a single frame when
there is no preloaded video.
 2020-07-23 23:56:30 +02:00
derrod
b8f91cc4c3 rtmp-services: Remove Mixer servers and checks 2020-07-22 07:47:12 +02:00
jp9000
3691dc536d win-dshow: Fix virtual camera filter name 
The filter name is supposed to be "OBS Virtual Camera"
 2020-07-20 14:22:49 -07:00
Clayton Groeneveld
f4223ad061 win-dshow: Fix virtual camera enable bug 2020-07-20 06:02:16 -05:00
jp9000
ae29ec5239 rtmp-services: Fix memory leak 2020-07-19 22:06:34 -07:00
jpark37
ffbc3ed923 obs-ffmpeg: Fix race and deprecation warnings 
Attempt to simply shutdown sequence to avoid race between vidoe and
write threads. Can no longer join on write thread from write thread.

Also use codecpar instead of deprecated codec member.
 2020-07-19 12:49:53 -07:00
jpark37
de4743e16b obs-x264: Improve color space handling 
Add support for VIDEO_CS_SRGB.

Use SMPTE 170M for 601 instead of undef. This is the American/Chromium
way of handling 601.
 2020-07-18 19:44:13 -07:00
jpark37
37f01b35f6 obs-ffmpeg: Improve color space handling 
Add support for VIDEO_CS_SRGB.

Use SMPTE 170M for 601 instead of undef/BT470BG. This is the
American/Chromium way of handling 601.

Add color metadata to the container file as well via ffmpeg-mux.
 2020-07-18 19:44:13 -07:00
jpark37
be4a859383 obs-ffmpeg: Fix FFmpeg deprecation warnings 2020-07-18 18:47:58 -07:00
Jim
cd865a0be8
Merge pull request #3150 from jpark37/vulkan-dynamic-arrays 
win-capture: Remove fixed-size Vulkan arrays
 2020-07-18 10:46:22 -07:00
Jim
f7ec6043e2
Merge pull request #3179 from pkviet/coreaudio4 
coreaudio-encoder: Fix encoding of 4.0 speaker layout
 2020-07-18 10:45:36 -07:00
Jim
22ea6c5017
Merge pull request #3181 from Dead133/drop-restreamio-ftl-support 
rtmp-services: drop Restream.io FTL support
 2020-07-18 10:20:23 -07:00
Dead133
1a29674840 rtmp-services: drop Restream.io FTL support 2020-07-18 14:16:41 +03:00
Clayton Groeneveld
990a07dc18 UI, obs-ffmpeg, obs-filters: Fix compile warnings 2020-07-16 23:15:13 -05:00
pkv
2ab549e1c1 coreaudio-encoder: Fix encoding of 4.0 speaker layout 
For four channels, coreaudio encoder defaults to quad
(FL FR, BL BR).
So 4.0 needs to be explicitly set for the encoder.
 2020-07-17 04:41:06 +02:00
Jim
2ba2df6e59
Merge pull request #3167 from WizardCM/duplicator-log 
win-capture: Log duplicator display when updating properties
 2020-07-15 06:59:51 -07:00
Matthew
62c776db05 rtmp-services: Update Uscreen service 
rtmp-services: Update Uscreen service

rtmp-services: Update Uscreen service
 2020-07-14 11:38:14 -06:00
Matt Gajownik
0e07e034a0 win-capture: Log duplicator display when updating properties 2020-07-14 22:40:15 +10:00
Juliane Holzt
19890b25ee
linux-v4l2: Fix case of variables to snake_case 
This commit fixes the case of two recently added attributes of the
v4l2_data struct (in PR #2978). The new attributes were named
"frameRateUnchanged" and "resolutionUnchanged", i.e. using CamelCase
while all other attributes use snake_case. This change changes the
name of the two attributes to snake_case.
 2020-07-13 21:20:49 +02:00
Jim
f094369c1d
Merge pull request #3158 from exeldro/obs-ffmpeg_fix 
obs-ffmpeg: Fix play pause crash
 2020-07-12 16:02:00 -07:00
fengyifan
4ffe5859a1 obs-outputs: Use FLV codec IDs for videocodecid/audiocodecid 
Fixes the codec IDs in onMetaData to be compliant with FLV spec.  Using
string representation of these values is non-standard
 2020-07-12 14:00:56 -07:00
Exeldro
663605f650 obs-ffmpeg: Fix play pause crash 2020-07-12 20:11:47 +02:00
Jim
baf55054e6
Merge pull request #3122 from Don-Stive/master 
Add "Taryana - Apachat" streaming service.
 2020-07-10 20:44:00 -07:00
jpark37
afbad3b337 win-capture: Remove fixed-size Vulkan arrays 
Use linked lists in place of fixed-size arrays in an attempt to fix
behavior when programs generate lots of non-resource objects.
 2020-07-10 20:41:00 -07:00
Jim
5728df6cef
Merge pull request #3149 from jpark37/vulkan-32bit 
win-capture Fix 32-bit Vulkan capture
 2020-07-10 20:39:13 -07:00
iRonBot
893d55a694 rtmp-services: Add "Taryana - Apachat" streaming service 2020-07-10 20:22:14 -07:00
Jim
97ecf23df0
Merge pull request #3121 from jpark37/chrome-window-priority 
win-capture: Don't use Chrome classes for priority
 2020-07-10 20:20:26 -07:00
Jim
6c37f6faea
Merge pull request #3113 from jpark37/vulkan-swap-decouple 
win-capture: Decouple swap and frame indices
 2020-07-10 20:15:38 -07:00