Merge pull request #13722 from wayne-chen/fixAudioStats-RC71-13955

MS13955: Audio Stats are blank
This commit is contained in:
John Conklin II 2018-09-10 17:03:31 -07:00 committed by GitHub
commit b184ad1334
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions

View file

@ -12,12 +12,12 @@ import QtQuick 2.5
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../../../../resources/qml/controls-uit" as HifiControls import "qrc:////qml//controls-uit" as HifiControls
Column { Column {
id: stats id: stats
width: parent.width width: parent.width
property bool showGraphs: toggleGraphs.checked property alias showGraphs: toggleGraphs.toggle
Item { Item {
width: parent.width width: parent.width
@ -25,10 +25,10 @@ Column {
HifiControls.Button { HifiControls.Button {
id: toggleGraphs id: toggleGraphs
property bool checked: false property bool toggle: false
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
text: checked ? "Hide graphs" : "Show graphs" text: toggle ? "Hide graphs" : "Show graphs"
onClicked: function() { checked = !checked; } onClicked: { toggle = !toggle;}
} }
} }
@ -40,7 +40,8 @@ Column {
Section { Section {
label: "Latency" label: "Latency"
description: "Audio pipeline latency, broken out and summed" // description: "Audio pipeline latency, broken out and summed"
description: label
control: ColumnLayout { control: ColumnLayout {
MovingValue { label: "Input Read"; source: AudioStats.inputReadMsMax; showGraphs: stats.showGraphs } MovingValue { label: "Input Read"; source: AudioStats.inputReadMsMax; showGraphs: stats.showGraphs }
MovingValue { label: "Input Ring"; source: AudioStats.inputUnplayedMsMax; showGraphs: stats.showGraphs } MovingValue { label: "Input Ring"; source: AudioStats.inputUnplayedMsMax; showGraphs: stats.showGraphs }
@ -62,7 +63,8 @@ Column {
Section { Section {
label: "Upstream Jitter" label: "Upstream Jitter"
description: "Timegaps in packets sent to the mixer" // description: "Timegaps in packets sent to the mixer"
description: label
control: Jitter { control: Jitter {
max: AudioStats.sentTimegapMsMaxWindow max: AudioStats.sentTimegapMsMaxWindow
avg: AudioStats.sentTimegapMsAvgWindow avg: AudioStats.sentTimegapMsAvgWindow
@ -76,13 +78,15 @@ Column {
Section { Section {
label: "Mixer (upstream)" label: "Mixer (upstream)"
description: "This client's remote audio stream, as seen by the server's mixer" // description: "This client's remote audio stream, as seen by the server's mixer"
description: label
control: Stream { stream: AudioStats.mixerStream; showGraphs: stats.showGraphs } control: Stream { stream: AudioStats.mixerStream; showGraphs: stats.showGraphs }
} }
Section { Section {
label: "Client (downstream)" label: "Client (downstream)"
description: "This client's received audio stream, between the network and the OS" // description: "This client's received audio stream, between the network and the OS"
description: label
control: Stream { stream: AudioStats.clientStream; showGraphs: stats.showGraphs } control: Stream { stream: AudioStats.clientStream; showGraphs: stats.showGraphs }
} }
} }

View file

@ -12,7 +12,7 @@ import QtQuick 2.5
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../../../../resources/qml/styles-uit" import "qrc:////qml//styles-uit"
Item { Item {
id: dialog id: dialog