5036 Commits

Author SHA1 Message Date
Jim
b1f2b72628 Merge pull request #929 from RytoEX/nix-sysinfo
Make *nix system info logging more like Windows/Mac
2017-09-12 01:58:49 -07:00
mntone
9ffdaff984 UI: Add memory usage to Stats window on linux/mac
Closes jp9000/obs-studio#953
2017-09-12 01:56:40 -07:00
mntone
a6318ffdca libobs/util: Add memory usage functions
Closes jp9000/obs-studio#953
2017-09-12 01:49:11 -07:00
Jim
c049dfdf1d Merge pull request #1008 from pkuznets/add_looch_tv_platfom
rtmp-services: Add looch.tv streaming platform
2017-09-11 16:19:17 -07:00
pkuznetsov
03659d8706 rtmp-services: Add looch.tv streaming platform 2017-09-11 16:43:39 +03:00
Jim
67d2292bbc Merge pull request #1026 from Dead133/master
rtmp-services: Update ingest list for Restream.io
2017-09-11 03:33:46 -07:00
Andrew Surzhynskyi
c830f919d7 rtmp-services: Update ingest list for Restream.io 2017-09-11 13:29:26 +03:00
Jim
e8f66d6c18 Merge pull request #998 from ErunamoJAZZ/master
rtmp-services: Fix misspelled country name
2017-09-11 02:47:52 -07:00
cg2121
be77b13e58 vlc-source: Add media control hotkeys
This adds play/pause, restart, stop, next, and previous hotkeys to the
VLC source.

Closes jp9000/obs-studio#972
2017-09-11 01:13:59 -07:00
C. Daniel Sanchez R
06bbd2667f rtmp-services: Fixing misspell in a country name
That had a misspell in a Twitch ingest server:
Col_u_mbia instead Col**o**mbia.
Incremented version.
2017-09-09 13:06:41 -05:00
Richard Stanway
41a1b09988
obs-outputs: Improve new netcode if encoder reports 0 bitrate
Some encoders such as the AMD AMF encoder don't set their bitrate
property, so it gets returned as 0. This causes the new network code to
allocate a tiny buffer, resulting in output starvation and throttling
to the point of uselessness if low latency mode is also enabled.
2017-08-30 00:09:05 +02:00
Jim
4c58dcf65c Merge pull request #1016 from derrod/update-ingests
rtmp-services: Add new twitch ingest servers
2017-08-25 07:17:09 -07:00
derrod
48fc0fc120 rtmp-services: Add new twitch ingest servers 2017-08-25 16:11:18 +02:00
Quinn Damerell
1151c6cede obs-outputs: Fix invalid stream key error
Fixes an issue where it would show the wrong error when the user entered
an invalid stream key, and logs it

Closes jp9000/obs-studio#1015
2017-08-25 02:03:13 -07:00
Quinn Damerell
8111f99854 obs-outputs: Enable FTL logging and reduce verbosity
Closes jp9000/obs-studio#1015
2017-08-25 02:02:50 -07:00
Jim
b2055f0566 Merge pull request #1009 from Dead133/master
rtmp-services: Update ingest list for Restream.io
2017-08-24 14:41:23 -07:00
Andrew Surzhynskyi
354f337e42 rtmp-services: Update ingest list for Restream.io 2017-08-24 12:39:13 +03:00
Jim
8fe0d508fd Merge pull request #1012 from DDRBoxman/cef
obs-browser: version 1.30.1
2017-08-18 20:42:21 -07:00
Colin Edwards
86cea3f48f obs-browser: version 1.30.1 2017-08-18 22:26:47 -05:00
Jim
684db36996 Merge pull request #1011 from DDRBoxman/cef
Build with CEF 3112 on OSX
2017-08-18 20:02:43 -07:00
Colin Edwards
23ea91976f Build with CEF 3112 on OSX 2017-08-18 21:41:31 -05:00
SuslikV
a21da59741 UI: Fix parent window geometry loading
The parent window adjusted according to child object polices and hint 
sizes. Thus, it is possible to disable all docking panes to restore 
true parent geometry first, the docking geometry and settings will be 
restored later in OBSBasic::OBSInit().
2017-08-12 19:45:25 +02:00
Joel Bethke
5576823f24 UI: Allow volume peak to be customized via .qss
With the addition of the peak volume indicator, themes may wish to change
these colors but there was no way to do so. This change updates the
VolumeControl widget to allow a stylesheet to adjust all possible colors
for the volume bar. In addtion, the Rachni theme is updated to demonstrate
this new capability.
2017-08-11 21:07:31 -05:00
jp9000
d3c163b775 UI: Fix Stats not showing stream data until start 2017-08-11 08:52:09 -07:00
SuslikV
650495331d libobs: Add default hotkey id to duplicated item
Fixes https://obsproject.com/mantis/view.php?id=508

The toggle_visibility set only by init_hotkeys() call, but used each
time in obs_sceneitem_destroy() call.  Because zero hotkey_pair_id is
valid - we need to set item property other than zero here.

Closes jp9000/obs-studio#1000
2017-08-11 08:41:22 -07:00
jp9000
0b909a8d9e libobs: Update version to 20.0.1 2017-08-11 08:24:27 -07:00
SuslikV
9bf2318654 UI: Fix conditions for redraw the stats labels
After the commit 3491487c71cb5 obs_frontend_get_streaming_output()
returns NULL if "Start Streaming" button not pressed yet.  The code
would erroneously fail to update the recording/streaming status if
either one of them hadn't been activated yet.

Closes jp9000/obs-studio#999
2017-08-10 21:40:18 -07:00
jp9000
00f6bbe99c image-source: Fix potential crash with slideshow
If there are no slideshow items and this function is called, it would
cause a null pointer dereference.
2017-08-10 21:30:03 -07:00
jp9000
8b315186a7 rtmp-services: Always check service updates on non-windows
This is a workaround for build server cmake build issues on mac/linux.
In the future, the build servers should specify the cmake variable.
2017-08-10 08:11:27 -07:00
Gol-D-Ace
8d8c2e5a22 Update translations from Crowdin 2017-08-10 16:07:40 +02:00
jp9000
0cae0439ff obs-transitions: Rename stinger ID to prevent conflict
Prevents a conflict with potentially existing plugins
2017-08-10 07:04:56 -07:00
jp9000
a4b361de00 rtmp-services: Require cmake var to enable ingest updates
Prevents an issue where forks would continually request data from the
obsproject server for ingest updates.
2017-08-09 12:34:27 -07:00
jp9000
a625448d97 rtmp-services: Initialize mutex/dynamic array
The Twitch ingest lookup file did not initialize the dynamic array or
mutex before using.
2017-08-09 12:33:16 -07:00
jp9000
21d1658925 libobs: Update version to 20.0.0 2017-08-08 23:20:47 -07:00
Richard Stanway
043fea0ab2
UI/updater: Improved handling of failure conditions
Currently if a file is partially written to (eg, the file is opened for
writing but the write fails), the updater won't correctly roll back to the
previous version, leaving the OBS install in an inconsistent state.

We now track failed installs or hash failures on patched files with a new
STATE_INSTALL_FAILED state and properly roll back on errors.
2017-08-09 03:37:39 +02:00
Richard Stanway
e59f969633
UI/updater: Restart progress bar when installing updates
When updating large files such as libcef, the patching process can take a
decent amount of time. Previously the progress bar would remain at 100%
after completing the downloads, so the user may think the updater has
frozen. Now it shows the process of the install / patching process.
2017-08-09 03:37:36 +02:00
Zachary Lund
9941ddb52c libobs: Fix a potential divide by zero crash 2017-08-09 01:07:50 +02:00
Jim
c8c6f07618 Merge pull request #992 from Xaymar/enc-amf
enc-amf: Update to 2.2.2
2017-08-08 15:19:06 -07:00
Michael Fabian Dirks
e74eb6491a enc-amf: Update to 2.2.2
Hotfix 2: Fixed an at-exit crash caused by an AMF trace function.
2017-08-08 23:24:02 +02:00
Jim
13542166ce Merge pull request #991 from derrod/ftl-spam
git obs-outputs: Change loglevel of ftl status thread to debug
2017-08-08 13:19:34 -07:00
derrod
512f041bed obs-outputs: Change loglevel of ftl status thread to debug
The ftl output gets very spammy (3-6 lines every 5 seconds),
this commit changes the loglevel of those messages to debug
so they do not clutter up the logs of users.

In case these messages are needed they can be re-enabled using
the '--verbose' flag.

(also fixes minor formatting issues)
2017-08-08 17:47:39 +02:00
jp9000
4821ab8ae8 obs-transitions: Fix stinger transition locale
Changes "TransitionPoint" back to "Transition Point (milliseconds)" and
adds "TransitionPointFrame" locale when frame index mode is selected.
2017-08-08 08:13:45 -07:00
Jim
3cf12feb1e Merge pull request #989 from derrod/stinger-frames
Add option to use frame instead of timestamp for stinger transition
2017-08-08 07:22:52 -07:00
derrod
aa6bd58ce3 obs-transitions: Add frame transition point option to stinger
Allows the user to specify a frame instead of a timestamp for
the transition point.
2017-08-08 10:08:23 +02:00
derrod
8b3921ffbf obs-ffmpeg: Add proc handler for getting number of frames in video
Allows getting (approximate) number of frames in a media file.
2017-08-08 10:06:56 +02:00
Aidan Epstein
f4a8137412 linux-capture: Watch for VisibilityNotify events
Some window managers like i3 don't issue Expose events when switching
between workspaces, but send VisibilityNotify events. This causes the
stream to freeze even when the workspace is switched back.

Related issue: #863
2017-08-07 12:33:29 +02:00
Tatsuyuki Ishi
7d1fde3529 libobs: Fix XCB keyboard mapping size calculation 2017-08-07 17:48:27 +09:00
Richard Stanway
91c292d394
UI: Show error if empty recording path specified
Same as 937ec4d but for advanced output.
2017-08-07 00:40:20 +02:00
Richard Stanway
0c0ffb341c
UI: Report more detailed output errors if available 2017-08-07 00:32:52 +02:00
Richard Stanway
ca5f123030
obs-ffmpeg: Improved output error handling
Checks the output path is writable and checks for failure to start the
ffmpeg-mux subprocess.
2017-08-07 00:32:49 +02:00