0
0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Commit Graph

4120 Commits

Author SHA1 Message Date
jp9000
7d6e6eee79 libobs: Use reference counting for encoder packets
Prevents reallocation of encoded packet data.

Deprecates:
obs_duplicate_encoder_packet
obs_free_encoder_packet

Replaces those functions with:
obs_encoder_packet_ref
obs_encoder_packet_release
2016-12-08 03:27:39 -08:00
jp9000
eb6d8e10fa libobs/util: Do not ignore deprecation on windows
On MSVC, deprecated types/functions were being completely ignored by the
compiler due to this pragma.  Any plugins/programs that depended on this
would also have this warning disabled due to it being in this file.
This pragma was most likely originally done due to the MSVC warnings for
C-standard functions, which are now ignored via _CRT_SECURE_NO_WARNINGS
on all projects instead.
2016-12-08 03:27:38 -08:00
jp9000
b29d8a44d1 libobs: Fix deprecated macro
There's no need to have two separate macros to declare something as
deprecated.
2016-12-08 03:27:37 -08:00
jp9000
ca607f8b35 cmake: Add _CRT_SECURE_NO_WARNINGS to all projects
This prevents issues with using standard C functions, where microsoft
would otherwise spit out pointless warnings to encourage using
microsoft-specific functions instead.
2016-12-08 03:27:36 -08:00
jp9000
ec4317dd2b libobs: Fix bug where outputs cannot initialize hotkeys
When an output's context data is being created, it cannot register any
hotkeys because the output has not initialized its reference counting
capability.  This is due to the fact that when a hotkey is registered,
it creates a weak reference to the source/output/service/encoder.

The solution to this is to make sure the output's reference counter data
is created before calling the create callback.
2016-12-08 03:27:35 -08:00
jp9000
b277000f97 libobs/util: Add function to generate formatted filenames
(Note: This commit also modifies the UI)

Being able to generate file names based upon a specification is useful
for more than just the UI; it can also be useful for things such as the
replay buffer where file names need to be generated on the fly.
2016-12-08 03:27:34 -08:00
jp9000
3aa6b50fbe libobs/util: Add function to get circlebuf data offset
Allows getting pointer to an offset at a specific index within the
circlebuf data.  Useful for iterating through circlebuf data.
2016-12-08 03:27:33 -08:00
Richard Stanway
7df46d4a8e
obs-outputs: Fix librtmp IP bind / resolve behavior
Fixes a case where OBS would prefer trying to connect
to an IPv4 address even though you had bound it to an
IPv6 interface for example.
2016-11-30 22:11:17 +01:00
Jim
532c613fba Merge pull request #705 from derrod/purge-services
rtmp-services: remove shut down services
2016-11-25 15:02:24 -08:00
derrod
bfc2987f02 rtmp-services: remove shut down services 2016-11-25 23:55:35 +01:00
Jim
22b1306eb1 Merge pull request #700 from Dead133/master
rtmp-services: Update ingests list for Restream.io
2016-11-25 13:39:50 -08:00
jp9000
e87031f4d6 Revert "obs-transitions: Avoid branching in slide_transition.effect"
This reverts commit 0edaebe192.

The commit was actually less optimal than it was before.  Shaders are
always fully unfolded and both sides of a branch are always executed.
Despite that fact, the "avoid branching" commit actually *added* two
extra unnecessary instructions with the same number of actual sample
instructions, making it arguably less optimal than before.

This was tested via the D3DDissamble function.
2016-11-25 12:20:42 -08:00
jp9000
d2bb7157c2 libobs-d3d11: Add optional macro to log shader disassembly 2016-11-25 12:01:31 -08:00
cg2121
c6c58e55b3 frontend-tools: Add options to start output timers every time
Adds options to start output timers every time streaming or recording
has started.

Closes jp9000/obs-studio#668
2016-11-25 10:05:11 -08:00
Lasse Dalegaard
ebd837d605 libobs-opengl: Add xcb message poll to empty out the queue
The xcb message queue is not currently emptied.  If errors are generated
by any void requests the message queue will simply fill up and messages
will never be deleted.

Due to a (currently unknown) other problem this happens for me, and
results in OBS using up all memory with a queue that will never be
emptied.

Here we add a poll loop that will empty the xcb message queue and
discard the messages.  While this means that errors are still not
handled, OBS wont end up crashing either.

Closes jp9000/obs-studio#675
2016-11-24 12:55:51 -08:00
Serge Paquet
64559a0cb8 cmake: Fix permissions with OSX fixup_bundle.sh
Fixes an issue where the files copied by fixup_bundle.sh will not work
with install_name_tool without proper permissions.

Closes jp9000/obs-studio#618
2016-11-24 07:15:03 -08:00
Serge Paquet
ae9158216e cmake: Fix OSX fixup_bundle.sh to copy non-system deps
Without this fix, the fixup script misses any non-system dependencies
that are not in the /Users or /opt directories.

Closes jp9000/obs-studio#618
2016-11-24 07:13:34 -08:00
jp9000
2f305cb550 win-capture: Use static runtimes for hooks/helpers
(Note: This commit also modifies the ipc-util/seg-service modules)

When compiling the final project, always compile
ipc-util/get-graphics-offsets/graphics-hook/inject-helper/seg-service
with static MSVC runtimes to prevent the need of requiring the MSVC
runtimes for both architectures.
2016-11-23 06:03:00 -08:00
Jim
e438347237 Merge pull request #704 from DDRBoxman/fixtravis
Revert "CI: Build on OSX 10.10 on travis"
2016-11-22 04:37:30 -08:00
Colin Edwards
e361855dc1 Remove python dep 2016-11-21 22:35:57 -06:00
Colin Edwards
3667c6c3ba Revert "CI: Build on OSX 10.10 on travis"
This reverts commit d160cedbc3.
2016-11-21 22:21:15 -06:00
Jim
b7b8ad476f Merge pull request #703 from Xaymar/feature_amd-encoder
enc-amf: Avoid using C++17 for VS2013 compatibility
2016-11-20 08:49:19 -08:00
Michael Fabian Dirks
f792846c83 enc-amf: Avoid using C++17 for VS2013 compatibility 2016-11-20 17:46:13 +01:00
Gol-D-Ace
2d47dc4e2c Update translations from Crowdin 2016-11-20 12:22:26 +01:00
Jim
e87a819fe1 Merge pull request #694 from Savestate2A03/preview_scrolling_while_locked
UI: Enable scrolling while preview is locked
2016-11-20 03:02:17 -08:00
jp9000
234fddcf56 libobs-opengl: Add warning when used on windows 2016-11-20 01:48:16 -08:00
jp9000
d73303a9f9 UI: Update installer script to latest version 2016-11-19 11:02:22 -08:00
jp9000
4c4025a242 win-ivcam: Add Intel RealSense plugin 2016-11-19 03:15:21 -08:00
jp9000
5d332de45c cmake: Add macro to compile .tlb files via midl 2016-11-19 03:04:45 -08:00
jp9000
9f551d11b4 cmake: Add module to find RSSDK 2016-11-19 03:04:44 -08:00
Andrew Surzhynskyi
072e24eb9e rtmp-services: Update ingest list for Restream.io 2016-11-18 17:40:21 +02:00
Jim
4388ab36c4 Merge pull request #696 from TotalCaesar659/master
UI: tray icons are redrawn for better visibility and contrast
2016-11-17 10:24:04 -08:00
Jim
36b5527667 Merge pull request #698 from Xaymar/feature_amd-encoder
enc-amf: Update to 1.4.2.3
2016-11-17 05:57:59 -08:00
Michael Fabian Dirks
920d41220b enc-amf: Update to 1.4.2.3 2016-11-17 13:43:39 +01:00
Jim
80f1a19c62 Merge pull request #692 from RytoEX/youtube-recs
rtmp-services: Change YouTube keyint from 4 to 2
2016-11-16 20:51:30 -08:00
Jim
8d86f49003 Merge pull request #682 from Xaymar/cmd_verbose_unfiltered
UI: Add --verbose and --unfiltered_log command line options
2016-11-16 20:50:01 -08:00
Jim
b8aaab0040 Merge pull request #697 from Xaymar/feature_amd-encoder
enc-amf: Update to 1.4.2.2 and fix preset and settings in simple mode
2016-11-16 20:49:01 -08:00
Michael Fabian Dirks
1e9ace42af enc-amf: Update to 1.4.2.2 2016-11-17 05:19:11 +01:00
Michael Fabian Dirks
949400118e UI: Update settings and fix presets for simple AMD encoder 2016-11-17 04:40:49 +01:00
Grigorii Chirkov
481ba29c69 UI: tray icons are redrawn for better visibility and contrast 2016-11-17 00:57:58 +03:00
Gol-D-Ace
90e805ad9b Update translations from CrowdIn 2016-11-16 00:32:47 +01:00
jp9000
cf2a05ed88 libobs: Update to 0.16.6 2016-11-14 22:20:23 -08:00
jp9000
4c2a49285e Revert "libobs: Ensure AVC priority is always highest for keyframes"
This reverts commit 66525632a0.
2016-11-14 17:43:37 -08:00
jp9000
edfc2bed05 obs-qsv11: Manually mark priority bits for QSV frames
QSV frame priority bits are not being marked correctly; their priorities
are always marked either low or disposable, whereas I-frames should be
marked as highest (3), P-frames should be marked as high (2), and other
frames should be marked as either low or disposable.  This helps ensure
that the correct frames are dropped when frames need to be dropped.
2016-11-14 17:34:46 -08:00
jp9000
53eb817d43 text-freetype2: Defer loading of plugin until source created
Helps significantly boost initialization time.
2016-11-14 17:34:45 -08:00
jp9000
eaa32c20be win-capture: Defer hook offset loading to separate thread
Boosts startup time significantly to defer this to a separate thread.
2016-11-14 17:34:44 -08:00
jp9000
35285a26b7 win-capture: Do not load 64bit hook offsets on 32bit systems 2016-11-14 17:34:32 -08:00
jp9000
67e9cafaba enc-amf: Update to temporary fix branch
Fixes the previous submodule commit, which is broken.  The temporary
branch used here ensures that users with multi-GPU laptops won't crash
on startup.
2016-11-14 17:34:31 -08:00
jp9000
b0054a16d0 enc-amf: Update to commit which prevents crash on startup
On certain switchable laptops with AMD graphics, due to a driver
bug/issue, the program will crash when querying capabilities.  The
commit this updates to fixes that by not querying capabilities on
startup.
2016-11-14 14:17:38 -08:00
jp9000
c5706d726b obs-outputs: Use correct variable for drop priority
There are two variables used for 'priority', the general marked frame
priority, and the drop priority.  They can sometimes be different
because some encoders don't always use the correct frame priority.
2016-11-13 16:29:23 -08:00