starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-27 17:55:42 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,834 Commits 20 Branches 255 Tags
d4e236dd034a0aa35b94378b1e434a9f38a5dc5a
Commit Graph
6834 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jp9000 d4e236dd03 libobs: Fix formatting 2019-07-13 19:01:48 -07:00
Jim 3975a7c42a Merge pull request #1963 from WizardCM/mkv-default 
UI: Change default recording format to MKV
 2019-07-13 18:54:47 -07:00
Colin Edwards f2a0c5275f Merge pull request #1962 from jpark37/default-color-range 
Default color range
 2019-07-13 20:45:53 -05:00
Colin Edwards c64d82530d Merge pull request #1960 from Xaymar/patch-get_defaults2 
libobs: Call both get_defaults and get_defaults2
 2019-07-13 20:40:20 -05:00
Colin Edwards 0767a3d088 Merge pull request #1967 from Xaymar/patch-fix_property_groups_2 
UI: Fix toggled signal of property groups
 2019-07-13 20:32:19 -05:00
Clayton Groeneveld 866e1e15a8 UI: Add enable preview button 
Closes #1966
 2019-07-13 20:27:14 -05:00
Colin Edwards d4a4518a7e Merge pull request #1916 from ElectronicWar/rtmp-add-steam 
rtmp-services: Add Steam
 2019-07-13 19:13:31 -05:00
Manuel Kroeber 6c78f4d222 rtmp-services: Add Steam 2019-07-13 19:09:46 -05:00
Colin Edwards f2f78b98ef Merge pull request #1964 from cg2121/dark-theme-groupbox 
UI: Make Dark theme group box title bold
 2019-07-12 22:10:03 -05:00
Colin Edwards 0e0ec9da12 Merge pull request #1955 from DDRBoxman/clang 
CI: Run clang format on linux and osx CI and fail if changes are made
 2019-07-12 21:59:40 -05:00
Colin Edwards 28243dbc94 CI: Run clang format on linux and osx CI and fail if changes are made 2019-07-12 21:44:33 -05:00
Colin Edwards 4ec072075d Merge pull request #1958 from DDRBoxman/format 
Apply clang-format to objective c code
 2019-07-12 21:43:55 -05:00
Michael Fabian 'Xaymar' Dirks 3f6bbe2d49 libobs: Call both get_defaults and get_defaults2 
Unlike get_properties, there is not reason to not call get_defaults if it is
given in addition to get_defaults2. Additonally this fixes the bug with
'init_encoder' which would only ever call get_defaults, resulting in broken
encoders if those used get_defaults2.
 2019-07-13 00:49:18 +02:00
Michael Fabian 'Xaymar' Dirks d2a71e6b1b UI: Fix toggled signal of property groups 
The signal is actually called toggled(bool) and not just toggled(). Qt considers these two to be different signals.
 2019-07-13 00:37:44 +02:00
jp9000 bda28b242c libobs: Fix formatting 2019-07-12 11:48:41 -07:00
Clayton Groeneveld 71f8a0bd5f UI: Make Dark theme group box title bold 2019-07-12 08:20:11 -05:00
Jim 36c8090492 Merge pull request #1952 from obsproject/pause 
Add the ability to pause and unpause recordings
 2019-07-11 19:56:41 -07:00
jpark37 1b6c55135e linux-v4l2: Add "Default" color range setting 
VIDEO_RANGE_DEFAULT uses partial range for YUV and full range for RGB.
Previous default was always partial.
 2019-07-10 23:40:58 -07:00
jpark37 1fc0a357d2 win-dshow: Add "Default" color range setting 
VIDEO_RANGE_DEFAULT uses partial range for YUV and full range for RGB.
Previous default was always partial.
 2019-07-10 23:40:53 -07:00
Matt Gajownik ca12847aa8 UI: Change default recording format to MKV 2019-07-11 15:39:46 +10:00
Colin Edwards ad85a9fa25 Apply clang-format to objective c code 2019-07-09 13:39:13 -05:00
jp9000 617086b040 obs-ffmpeg: Separate logging code 
Cleans up obs-ffmpeg.c and separates all the logging code to a different
file, which can be enabled with ENABLE_FFMPEG_LOGGING.
 2019-07-09 10:07:24 -07:00
wang-bin 5b6ee6e66b libobs: Clear module variable in case module reloaded 
Closes obsproject/obs-studio#1957
 2019-07-09 08:37:43 -07:00
jp9000 eab10d48b2 UI: Add pause support 
Adds support for pausing recordings.  When settings are eligible for
recordings, a pause button will appear next to the recording button.  If
the settings are not eligible, it will warn the user in the output
settings that they cannot pause recordings if those settings are used.
 2019-07-08 08:11:56 -07:00
jp9000 942ca6f709 obs-ffmpeg: Add support for pausing 2019-07-07 16:38:22 -07:00
jp9000 153fa6337f libobs: Implement pausing of outputs 
This implements pausing of outputs.  To accomplish this, raw audio/video
data is halted to the encoders or raw output.  Pausing is as precisely
timed as possible according to the timing of the obs_output_pause call,
and audio data will be spliced down to the exact audio sample in
accordance to that timing at the start/end marks.

Outputs that support this (outputs used for recording) can set the
OBS_OUTPUT_CAN_PAUSE capability flag.
 2019-07-07 16:38:22 -07:00
jp9000 3b581a3727 obs-ffmpeg: Remove unnecessary function 
This terrible boilerplate code is no longer necessary, as it is now
fixed by the previous commit.
 2019-07-07 16:38:21 -07:00
jp9000 85ca1b6918 libobs: Correct raw output starting audio data 
If the audio subsystem was buffered to any extent, the audio of a raw
output would start off at a negative offset, requiring each raw output
to implement a "prepare_audio" function (as seen in the FFmpeg output)
in order to ensure proper synchronization with video.  This did not
apply to encoded outputs because it was already being performed by the
obs-encoder code.
 2019-07-07 16:38:21 -07:00
jp9000 70ecbcd5d4 libobs: Add obs_get_frame_interval_ns 
Returns the current video frame interval between frames, in nanoseconds.
 2019-07-07 16:38:21 -07:00
jp9000 3a6a1a4ff8 UI: Don't display MP4/MOV warning if lossless 2019-07-06 09:27:40 -07:00
jp9000 8caa4f938c obs-ffmpeg: Check for replay buffer button press 
The replay buffer was triggering on both button press and button
release, which is redundant.
 2019-07-06 09:27:40 -07:00
jp9000 be8c063346 UI: Make adv. streaming audio encoder independent 
Allows the ability to pause when streaming and recording use the same
tracks in advanced output mode.
 2019-07-06 09:27:40 -07:00
Richard Stanway ad233330f3 Merge pull request #1948 from derrod/purge-services 
rtmp-services: Update and prune services
 2019-07-01 22:02:49 +02:00
derrod d954853ce9 rtmp-services: Update and prune services 2019-07-01 19:56:31 +02:00
Jim 39dcdae2de Merge pull request #1940 from bc-lee/feature/git-hyper-blame 
.git-blame-ignore-revs: Add file to handle mass reformatting
 2019-07-01 02:44:59 -07:00
Jim ae021213f5 Merge pull request #1945 from jpark37/fix-source-format 
libobs: Fix format selection
 2019-07-01 02:38:43 -07:00
Jim 84369f60e4 Merge pull request #1946 from jpark37/ternary-type-conversion 
libobs-d3d11: Unnecessary type conversions
 2019-07-01 02:37:51 -07:00
Richard Stanway 7f1f97a61f libobs-d3d11: Set texture using initializer list 2019-06-29 01:28:16 +02:00
Richard Stanway 0e77a2c75b obs-outputs: Minor pointer fixes 2019-06-29 01:28:16 +02:00
Richard Stanway 183cc920c8 UI: Avoid ternary operator for mixed types 2019-06-29 01:28:16 +02:00
jpark37 2ef25ceb85 libobs: Fix format selection 
Fix ternary test to use BGRX render targets for YUV to RGB
conversions. The previous behavior may have been fine though since
the shaders fill the alpha channel with 1.0 anyway.
 2019-06-27 08:57:41 -05:00
jpark37 8c4d98195f libobs-d3d11: Unnecessary type conversions 
Use raw pointer on both sides of ternary test result to remove
conversions.
 2019-06-27 08:55:26 -05:00
Byoungchan Lee 95154a17c3 .git-blame-ignore-revs: Add file to handle mass reformatting 
Google's git-hyper-blame command is a variant of git-blame,
but it can ignore certain commits like mass reformatting in f53df7d .
To use git-hyper-blame, it is better to make a .git-blame-ignore-revs file
in the repository root directory and put commits in the file to ignore such
commits.

Ref: https://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/git-hyper-blame.html
https://chromium.googlesource.com/chromium/src.git/+/437b870/.git-blame-ignore-revs
https://github.com/mozilla/gecko-dev/commits/03c48ac/.git-blame-ignore-revs
 2019-06-27 01:09:31 +09:00
Jim cff0d6800f Merge pull request #1938 from Dead133/master 
rtmp-services: Update ingest list for Restream.io
 2019-06-25 18:35:46 -07:00
Jim c558b81f34 Merge pull request #1936 from jpark37/empty-vao 
libobs-opengl: Empty VAO
 2019-06-25 18:34:29 -07:00
jp9000 841bac4981 clang-format: Remove redundant params 2019-06-25 15:52:33 -07:00
Dead133 e0c8aac485 rtmp-services: Update ingest list for Restream.io 2019-06-25 17:18:02 +03:00
jpark37 b8e5cf3a95 libobs-opengl: Empty VAO 
Use an empty VAO for shaders that generate their own vertices.
 2019-06-24 23:13:04 -05:00
Jim c938ea712b Merge pull request #1935 from obsproject/clang-format 
Apply clang-format to the project
 2019-06-24 19:41:51 -07:00
Richard Stanway 80e9bb4ec7 libobs-d3d11: Fix missing vertex buffer clear in NV12 check 2019-06-25 00:51:01 +02:00