scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-20 05:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUI: Add send bandwidth widget

Browse Source
This commit is contained in:
Martin Piatka
2022-11-22 14:58:12 +01:00
parent c4a26b49b1
commit 44cbec0087
5 changed files with 161 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
gui/QT/ui/ultragrid_window.ui
View File

@@ -53,20 +53,37 @@
<layout class="QHBoxLayout" name="localPreviewBar"/>
</item>
<item>
<widget class="QLabel" name="previewLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Local</string>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
</property>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLabel" name="previewLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Local</string>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
</property>
</widget>
</item>
<item>
<widget class="BandwidthWidget" name="send_bandwidth">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
@@ -687,6 +704,11 @@
<header>vuMeterWidget.hpp</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BandwidthWidget</class>
<extends>QLabel</extends>
<header>bandwidth_widget.hpp</header>
</customwidget>
</customwidgets>
<resources/>
<connections>

2
gui/QT/uv-qt.pro
View File

@@ -56,6 +56,7 @@ HEADERS += window/ultragrid_window.hpp \
widget/vuMeterWidget.hpp \
widget/recv_report.hpp \
widget/recv_loss.hpp \
widget/bandwidth_widget.hpp \
window/settings_window.hpp \
option/widget_ui.hpp \
option/checkable_ui.hpp \
@@ -90,6 +91,7 @@ SOURCES += window/ultragrid_window.cpp \
widget/vuMeterWidget.cpp \
widget/recv_report.cpp \
widget/recv_loss.cpp \
widget/bandwidth_widget.cpp \
window/settings_window.cpp \
option/widget_ui.cpp \
option/checkable_ui.cpp \

82
gui/QT/widget/bandwidth_widget.cpp Normal file
View File

@@ -0,0 +1,82 @@
#include <stdio.h>
#include "bandwidth_widget.hpp"
#include "utils/string_view_utils.hpp"
BandwidthWidget::BandwidthWidget(QWidget *parent) : QLabel(parent){
elapsedTimer.start();
reset();
QObject::connect(&timer, &QTimer::timeout, this, &BandwidthWidget::timeout);
timer.setInterval(timeout_msec);
}
void BandwidthWidget::updateVal(){
reports.remove_timed_out(timeout_msec, elapsedTimer.elapsed());
long long total = 0;
for(const auto& i : reports.get()){
total += i.item;
}
report(total);
timer.start();
}
void BandwidthWidget::parseLine(std::string_view line){
static constexpr std::string_view prefix = "stats tx_send";
if(!sv_is_prefix(line, prefix))
return;
line.remove_prefix(prefix.size());
auto ssrc_sv = tokenize(line, ' ');
if(ssrc_sv.substr(0, 2) == "0x")
ssrc_sv.remove_prefix(2);
auto type = tokenize(line, ' ');
auto bytes_sv = tokenize(line, ' ');
long long bytes = 0;
uint32_t ssrc = 0;
if(!parse_num(bytes_sv, bytes)
|| !parse_num(ssrc_sv, ssrc, 16))
{
return;
}
long long num = 0;
for(const auto& r : reports.get()){
if(r.ssrc != ssrc)
continue;
num = bytes * 1000 / (elapsedTimer.elapsed() - r.timestamp);
}
reports.insert(ssrc, num, elapsedTimer.elapsed());
updateVal();
}
void BandwidthWidget::reset(){
reports.clear();
report(0);
timer.stop();
}
void BandwidthWidget::timeout(){
reset();
}
void BandwidthWidget::report(long long bytes_per_second){
static constexpr std::string_view units = "kMG";
float num = bytes_per_second;
char unit = ' ';
for(unsigned i = 0; num > 1000 && i < units.size(); i++){
unit = units[i];
num /= 1000;
}
setText(QString::number(num, 'f', 2) + " " + unit + "Bps");
}

37
gui/QT/widget/bandwidth_widget.hpp Normal file
View File

@@ -0,0 +1,37 @@
#ifndef BANDWIDTH_WIDGET_c035f927c51f
#define BANDWIDTH_WIDGET_c035f927c51f
#include <QWidget>
#include <QLabel>
#include <QTimer>
#include <QElapsedTimer>
#include <string_view>
#include "ssrc_container.hpp"
class BandwidthWidget : public QLabel{
Q_OBJECT
public:
BandwidthWidget(QWidget *parent = nullptr);
~BandwidthWidget() = default;
void updateVal();
void parseLine(std::string_view line);
void reset();
private slots:
void timeout();
private:
void report(long long bytes_per_second);
QTimer timer;
QElapsedTimer elapsedTimer;
SSRC_container<long long, decltype(elapsedTimer.elapsed())> reports;
const int timeout_msec = 2500;
};
#endif //BANDWIDTH_WIDGET_c035f927c51f

4
gui/QT/window/ultragrid_window.cpp
View File

@@ -124,6 +124,9 @@ UltragridWindow::UltragridWindow(QWidget *parent): QMainWindow(parent){
ui.statusbar->addPermanentWidget(&versionLabel);
ui.vuMeter->setControlPort(&controlPort);
using namespace std::placeholders;
controlPort.addLineCallback(std::bind(&BandwidthWidget::parseLine, ui.send_bandwidth, _1));
}
void UltragridWindow::refresh(){
@@ -458,6 +461,7 @@ void UltragridWindow::processStateChanged(UgProcessManager::State state){
receiverLoss.reset();
rtcpRr.reset();
ui.send_bandwidth->reset();
}
void UltragridWindow::unexpectedExit(UgProcessManager::State state,