OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
obs-studio/obs/window-basic-status-bar.cpp

332 lines
8 KiB
C++
Raw Normal View History

Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
#include <QLabel>
#include "obs-app.hpp"
#include "window-basic-main.hpp"
#include "window-basic-status-bar.hpp"
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
#include "window-basic-main-outputs.hpp"
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
OBSBasicStatusBar::OBSBasicStatusBar(QWidget *parent)
: QStatusBar (parent),
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
delayInfo (new QLabel),
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
droppedFrames (new QLabel),
sessionTime (new QLabel),
cpuUsage (new QLabel),
kbps (new QLabel)
{
sessionTime->setText(QString("00:00:00"));
cpuUsage->setText(QString("CPU: 0.0%"));
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
delayInfo->setAlignment(Qt::AlignRight);
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
droppedFrames->setAlignment(Qt::AlignRight);
sessionTime->setAlignment(Qt::AlignRight);
cpuUsage->setAlignment(Qt::AlignRight);
kbps->setAlignment(Qt::AlignRight);
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
delayInfo->setIndent(20);
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
droppedFrames->setIndent(20);
sessionTime->setIndent(20);
cpuUsage->setIndent(20);
kbps->setIndent(10);
addPermanentWidget(droppedFrames);
addPermanentWidget(sessionTime);
addPermanentWidget(cpuUsage);
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
addPermanentWidget(delayInfo);
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
addPermanentWidget(kbps);
}
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
void OBSBasicStatusBar::Activate()
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
{
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
if (!active) {
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
refreshTimer = new QTimer(this);
connect(refreshTimer, SIGNAL(timeout()),
this, SLOT(UpdateStatusBar()));
UI: Warn if high resource usage when encoding Shows a warning stating that encoding is stalling, and shows the number and percentage of frames that were skipped due to encoding.
2016-01-23 09:59:16 +00:00
int skipped = video_output_get_skipped_frames(obs_get_video());
int total = video_output_get_total_frames(obs_get_video());
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
totalSeconds = 0;
UI: Warn if high resource usage when encoding Shows a warning stating that encoding is stalling, and shows the number and percentage of frames that were skipped due to encoding.
2016-01-23 09:59:16 +00:00
lastSkippedFrameCount = 0;
startSkippedFrameCount = skipped;
startTotalFrameCount = total;
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
UI: Warn if high resource usage when encoding Shows a warning stating that encoding is stalling, and shows the number and percentage of frames that were skipped due to encoding.
2016-01-23 09:59:16 +00:00
refreshTimer->start(1000);
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
active = true;
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
}
}
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
void OBSBasicStatusBar::Deactivate()
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
{
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
OBSBasic *main = qobject_cast<OBSBasic*>(parent());
if (!main)
return;
if (!main->outputHandler->Active()) {
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
delete refreshTimer;
sessionTime->setText(QString("00:00:00"));
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
delayInfo->setText("");
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
droppedFrames->setText("");
kbps->setText("");
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
delaySecTotal = 0;
delaySecStarting = 0;
delaySecStopping = 0;
UI: Clear reconnect timeout if reconnect canceled
2015-09-11 15:23:03 +00:00
reconnectTimeout = 0;
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
active = false;
}
}
void OBSBasicStatusBar::UpdateDelayMsg()
{
QString msg;
if (delaySecTotal) {
if (delaySecStarting && !delaySecStopping) {
msg = QTStr("Basic.StatusBar.DelayStartingIn");
msg = msg.arg(QString::number(delaySecStarting));
} else if (!delaySecStarting && delaySecStopping) {
msg = QTStr("Basic.StatusBar.DelayStoppingIn");
msg = msg.arg(QString::number(delaySecStopping));
} else if (delaySecStarting && delaySecStopping) {
msg = QTStr("Basic.StatusBar.DelayStartingStoppingIn");
msg = msg.arg(QString::number(delaySecStopping),
QString::number(delaySecStarting));
} else {
msg = QTStr("Basic.StatusBar.Delay");
msg = msg.arg(QString::number(delaySecTotal));
}
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
}
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
delayInfo->setText(msg);
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
}
#define BITRATE_UPDATE_SECONDS 2
void OBSBasicStatusBar::UpdateBandwidth()
{
if (!streamOutput)
return;
if (++bitrateUpdateSeconds < BITRATE_UPDATE_SECONDS)
return;
uint64_t bytesSent = obs_output_get_total_bytes(streamOutput);
uint64_t bytesSentTime = os_gettime_ns();
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
if (bytesSent == 0)
lastBytesSent = 0;
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
uint64_t bitsBetween = (bytesSent - lastBytesSent) * 8;
double timePassed = double(bytesSentTime - lastBytesSentTime) /
1000000000.0;
double kbitsPerSec = double(bitsBetween) / timePassed / 1000.0;
QString text;
Change "kbp/s" to "kb/s" As pointed out by da_coder
2014-07-08 05:06:06 +00:00
text += QString("kb/s: ") +
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
QString::number(kbitsPerSec, 'f', 0);
kbps->setText(text);
kbps->setMinimumWidth(kbps->width());
lastBytesSent = bytesSent;
lastBytesSentTime = bytesSentTime;
bitrateUpdateSeconds = 0;
}
void OBSBasicStatusBar::UpdateCPUUsage()
{
OBSBasic *main = qobject_cast<OBSBasic*>(parent());
if (!main)
return;
QString text;
text += QString("CPU: ") +
QString::number(main->GetCPUUsage(), 'f', 1) + QString("%");
cpuUsage->setText(text);
cpuUsage->setMinimumWidth(cpuUsage->width());
}
void OBSBasicStatusBar::UpdateSessionTime()
{
totalSeconds++;
int seconds = totalSeconds % 60;
int totalMinutes = totalSeconds / 60;
int minutes = totalMinutes % 60;
int hours = totalMinutes / 60;
QString text;
text.sprintf("%02d:%02d:%02d", hours, minutes, seconds);
sessionTime->setText(text);
sessionTime->setMinimumWidth(sessionTime->width());
UI: Show remaining reconnect timeout duration When a reconnect is occurring, the user doesn't really know that the program is waiting to reconnect to the server or not, nor does the user know how many seconds are remaining until that next attempt. This will show the reconnect timeout countdown as it's occurring.
2015-05-10 23:18:11 +00:00
if (reconnectTimeout > 0) {
QString msg = QTStr("Basic.StatusBar.Reconnecting");
showMessage(msg.arg(QString::number(retries),
QString::number(reconnectTimeout)));
reconnectTimeout--;
} else if (retries > 0) {
QString msg = QTStr("Basic.StatusBar.AttemptingReconnect");
showMessage(msg.arg(QString::number(retries)));
}
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
if (delaySecStopping > 0 || delaySecStarting > 0) {
if (delaySecStopping > 0)
--delaySecStopping;
if (delaySecStarting > 0)
--delaySecStarting;
UpdateDelayMsg();
}
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
}
void OBSBasicStatusBar::UpdateDroppedFrames()
{
if (!streamOutput)
return;
int totalDropped = obs_output_get_frames_dropped(streamOutput);
int totalFrames = obs_output_get_total_frames(streamOutput);
double percent = (double)totalDropped / (double)totalFrames * 100.0;
if (!totalFrames)
return;
QString text = QTStr("DroppedFrames");
text = text.arg(QString::number(totalDropped),
QString::number(percent, 'f', 1));
droppedFrames->setText(text);
droppedFrames->setMinimumWidth(droppedFrames->width());
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
void OBSBasicStatusBar::OBSOutputReconnect(void *data, calldata_t *params)
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
{
OBSBasicStatusBar *statusBar =
reinterpret_cast<OBSBasicStatusBar*>(data);
UI: Show remaining reconnect timeout duration When a reconnect is occurring, the user doesn't really know that the program is waiting to reconnect to the server or not, nor does the user know how many seconds are remaining until that next attempt. This will show the reconnect timeout countdown as it's occurring.
2015-05-10 23:18:11 +00:00
int seconds = (int)calldata_int(params, "timeout_sec");
QMetaObject::invokeMethod(statusBar, "Reconnect", Q_ARG(int, seconds));
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
UNUSED_PARAMETER(params);
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
void OBSBasicStatusBar::OBSOutputReconnectSuccess(void *data, calldata_t *params)
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
{
OBSBasicStatusBar *statusBar =
reinterpret_cast<OBSBasicStatusBar*>(data);
QMetaObject::invokeMethod(statusBar, "ReconnectSuccess");
UNUSED_PARAMETER(params);
}
UI: Show remaining reconnect timeout duration When a reconnect is occurring, the user doesn't really know that the program is waiting to reconnect to the server or not, nor does the user know how many seconds are remaining until that next attempt. This will show the reconnect timeout countdown as it's occurring.
2015-05-10 23:18:11 +00:00
void OBSBasicStatusBar::Reconnect(int seconds)
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
{
retries++;
UI: Show remaining reconnect timeout duration When a reconnect is occurring, the user doesn't really know that the program is waiting to reconnect to the server or not, nor does the user know how many seconds are remaining until that next attempt. This will show the reconnect timeout countdown as it's occurring.
2015-05-10 23:18:11 +00:00
reconnectTimeout = seconds;
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
if (streamOutput) {
delaySecTotal = obs_output_get_active_delay(streamOutput);
UpdateDelayMsg();
}
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
}
void OBSBasicStatusBar::ReconnectSuccess()
{
showMessage(QTStr("Basic.StatusBar.ReconnectSuccessful"), 4000);
retries = 0;
UI: Show remaining reconnect timeout duration When a reconnect is occurring, the user doesn't really know that the program is waiting to reconnect to the server or not, nor does the user know how many seconds are remaining until that next attempt. This will show the reconnect timeout countdown as it's occurring.
2015-05-10 23:18:11 +00:00
reconnectTimeout = 0;
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
bitrateUpdateSeconds = -1;
lastBytesSent = 0;
lastBytesSentTime = os_gettime_ns();
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
if (streamOutput) {
delaySecTotal = obs_output_get_active_delay(streamOutput);
UpdateDelayMsg();
}
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
}
void OBSBasicStatusBar::UpdateStatusBar()
{
UpdateBandwidth();
UpdateSessionTime();
UpdateDroppedFrames();
UI: Warn if high resource usage when encoding Shows a warning stating that encoding is stalling, and shows the number and percentage of frames that were skipped due to encoding.
2016-01-23 09:59:16 +00:00
int skipped = video_output_get_skipped_frames(obs_get_video());
int total = video_output_get_total_frames(obs_get_video());
skipped -= startSkippedFrameCount;
total -= startTotalFrameCount;
int diff = skipped - lastSkippedFrameCount;
double percentage = double(skipped) / double(total) * 100.0;
UI: Don't alert user of encode lag if skip count < 10 Sometimes encoders might have a tiny insignificant amount of lag unintentionally for whatever reason (for example VP9 sometimes lags on startup by a frame or two), so don't warn the user if the skip count is below 10.
2016-04-25 21:34:21 +00:00
if (diff > 10 && percentage >= 0.1f)
UI: Warn if high resource usage when encoding Shows a warning stating that encoding is stalling, and shows the number and percentage of frames that were skipped due to encoding.
2016-01-23 09:59:16 +00:00
showMessage(QTStr("HighResourceUsage"), 4000);
lastSkippedFrameCount = skipped;
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
}
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
void OBSBasicStatusBar::StreamDelayStarting(int sec)
{
OBSBasic *main = qobject_cast<OBSBasic*>(parent());
if (!main || !main->outputHandler)
return;
streamOutput = main->outputHandler->streamOutput;
delaySecTotal = delaySecStarting = sec;
UpdateDelayMsg();
Activate();
}
void OBSBasicStatusBar::StreamDelayStopping(int sec)
{
delaySecTotal = delaySecStopping = sec;
UpdateDelayMsg();
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
void OBSBasicStatusBar::StreamStarted(obs_output_t *output)
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
{
streamOutput = output;
(API Change) Use 'get' convention in libobs (base) Instead of having functions like obs_signal_handler() that can fail to properly specify their actual intent in the name (does it signal a handler, or does it return a signal handler?), always prefix functions that are meant to get information with 'get' to make its functionality more explicit. Previous names: New names: ----------------------------------------------------------- obs_audio obs_get_audio obs_video obs_get_video obs_signalhandler obs_get_signal_handler obs_prochandler obs_get_proc_handler obs_source_signalhandler obs_source_get_signal_handler obs_source_prochandler obs_source_get_proc_handler obs_output_signalhandler obs_output_get_signal_handler obs_output_prochandler obs_output_get_proc_handler obs_service_signalhandler obs_service_get_signal_handler obs_service_prochandler obs_service_get_proc_handler
2014-08-04 16:09:02 +00:00
signal_handler_connect(obs_output_get_signal_handler(streamOutput),
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
"reconnect", OBSOutputReconnect, this);
(API Change) Use 'get' convention in libobs (base) Instead of having functions like obs_signal_handler() that can fail to properly specify their actual intent in the name (does it signal a handler, or does it return a signal handler?), always prefix functions that are meant to get information with 'get' to make its functionality more explicit. Previous names: New names: ----------------------------------------------------------- obs_audio obs_get_audio obs_video obs_get_video obs_signalhandler obs_get_signal_handler obs_prochandler obs_get_proc_handler obs_source_signalhandler obs_source_get_signal_handler obs_source_prochandler obs_source_get_proc_handler obs_output_signalhandler obs_output_get_signal_handler obs_output_prochandler obs_output_get_proc_handler obs_service_signalhandler obs_service_get_signal_handler obs_service_prochandler obs_service_get_proc_handler
2014-08-04 16:09:02 +00:00
signal_handler_connect(obs_output_get_signal_handler(streamOutput),
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
"reconnect_success", OBSOutputReconnectSuccess, this);
retries = 0;
lastBytesSent = 0;
lastBytesSentTime = os_gettime_ns();
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
Activate();
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
}
void OBSBasicStatusBar::StreamStopped()
{
if (streamOutput) {
signal_handler_disconnect(
(API Change) Use 'get' convention in libobs (base) Instead of having functions like obs_signal_handler() that can fail to properly specify their actual intent in the name (does it signal a handler, or does it return a signal handler?), always prefix functions that are meant to get information with 'get' to make its functionality more explicit. Previous names: New names: ----------------------------------------------------------- obs_audio obs_get_audio obs_video obs_get_video obs_signalhandler obs_get_signal_handler obs_prochandler obs_get_proc_handler obs_source_signalhandler obs_source_get_signal_handler obs_source_prochandler obs_source_get_proc_handler obs_output_signalhandler obs_output_get_signal_handler obs_output_prochandler obs_output_get_proc_handler obs_service_signalhandler obs_service_get_signal_handler obs_service_prochandler obs_service_get_proc_handler
2014-08-04 16:09:02 +00:00
obs_output_get_signal_handler(streamOutput),
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
"reconnect", OBSOutputReconnect, this);
signal_handler_disconnect(
(API Change) Use 'get' convention in libobs (base) Instead of having functions like obs_signal_handler() that can fail to properly specify their actual intent in the name (does it signal a handler, or does it return a signal handler?), always prefix functions that are meant to get information with 'get' to make its functionality more explicit. Previous names: New names: ----------------------------------------------------------- obs_audio obs_get_audio obs_video obs_get_video obs_signalhandler obs_get_signal_handler obs_prochandler obs_get_proc_handler obs_source_signalhandler obs_source_get_signal_handler obs_source_prochandler obs_source_get_proc_handler obs_output_signalhandler obs_output_get_signal_handler obs_output_prochandler obs_output_get_proc_handler obs_service_signalhandler obs_service_get_signal_handler obs_service_prochandler obs_service_get_proc_handler
2014-08-04 16:09:02 +00:00
obs_output_get_signal_handler(streamOutput),
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
"reconnect_success", OBSOutputReconnectSuccess,
this);
streamOutput = nullptr;
clearMessage();
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
Deactivate();
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
}
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
void OBSBasicStatusBar::RecordingStarted(obs_output_t *output)
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
{
recordOutput = output;
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
Activate();
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
}
void OBSBasicStatusBar::RecordingStopped()
{
recordOutput = nullptr;
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
Deactivate();
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
}
Reference in a new issue Copy permalink