From 2a876fc0d7986dc1ecb169bdc41972fe0f33d0dd Mon Sep 17 00:00:00 2001 From: jsamain Date: Mon, 27 May 2019 18:59:35 +0200 Subject: Update to be compliant with [HICN-206] Customize first part of the name for HTTP. Added the -P option to set the IPv6 first word of the name. Change-Id: I321b22450d0efee713ddefef7405cf46ee381369 Signed-off-by: jsamain --- qml/Viper/Options.qml | 33 +++++++++++++++++++++++++++++++++ qml/Viper/main.qml | 7 +++++++ 2 files changed, 40 insertions(+) (limited to 'qml') diff --git a/qml/Viper/Options.qml b/qml/Viper/Options.qml index f8ed0909..3f8d7ab6 100755 --- a/qml/Viper/Options.qml +++ b/qml/Viper/Options.qml @@ -25,6 +25,7 @@ Rectangle { signal saveAdaptationLogic(string selectedAdaptationLogic, int adaptationLogicKey) signal saveIcn(bool selectedIcn) signal saveVideoURI(string selectedVideoURI) + signal saveV6FirstWord(string selectedV6FirstWord) signal saveSegmentBufferSize(real selectedSegmentBufferSize) signal saveRateAlpha(real selectedRateAlpha) signal saveBufferReservoirThreshold(real selectedBufferReservoirThreshold) @@ -434,6 +435,37 @@ Rectangle { text: videoURI } } + Item { + id: itemv6Prefix + anchors.top: parent.top + anchors.left: parent.left + anchors.right: parent.right + anchors.rightMargin: parent.width/2 + anchors.topMargin: Utils.scaled(18) + 2*heightRow + Label { + text: "IPv6 First Word:" + id: labelv6Prefix + color: "white" + anchors.top: parent.top + anchors.right: textInputv6FirstWord.left + anchors.rightMargin: Utils.scaled(5) + anchors.topMargin: (textInputv6Prefix.height - height)/2 + font.bold: true + font.pixelSize: Utils.scaled(10); + } + + TextInput { + id: textInputv6FirstWord + z: parent.z + 1 + width: parent.width/4*3 + anchors.top: parent.bottom + anchors.left: parent.left + anchors.leftMargin: Utils.scaled(200) + font.pixelSize: Utils.scaled(20) + color: "white" + text: v6FirstWord + } + } Item { id: itemSegmentBufferSize @@ -1582,6 +1614,7 @@ Rectangle { saveAdaptationLogic(adaptationLogicModel.get(comboAdaptationSetList.currentIndex).text, comboAdaptationSetList.currentIndex); saveIcn(switchIcn.checked) saveVideoURI(textInputVideoURI.text) + saveV6FirstWord(textInputv6FirstWord.text) saveSegmentBufferSize(spinboxSegmentBufferSize.value/100) saveRateAlpha(spinboxRateAlpha.value/100) saveBufferReservoirThreshold(spinboxBufferReservoirThreshold.value/100) diff --git a/qml/Viper/main.qml b/qml/Viper/main.qml index e170931b..1b645e35 100755 --- a/qml/Viper/main.qml +++ b/qml/Viper/main.qml @@ -37,6 +37,7 @@ Rectangle { property bool buffering: false property string adaptationLogic: "" property string videoURI: "" + property string v6FirstWord: "" property real alpha: 0 property real segmentBufferSize: 0 property bool icn: false @@ -412,6 +413,7 @@ Rectangle { icn = dashPlayer.getIcn() adaptationLogic = dashPlayer.getAdaptationLogic() videoURI = dashPlayer.getVideoURI() + v6FirstWord = dashPlayer.getV6FirstWord() segmentBufferSize = dashPlayer.getSegmentBufferSize() rateAlpha = dashPlayer.getRateAlpha() bufferReservoirThreshold = dashPlayer.getBufferReservoirThreshold() @@ -574,6 +576,11 @@ Rectangle { videoURI = selectedVideoURI } + onSaveV6FirstWord: { + dashPlayer.setV6FirstWord(selectedV6FirstWord) + v6FirstWord = selectedV6FirstWord + } + onSaveSegmentBufferSize: { dashPlayer.setSegmentBufferSize(selectedSegmentBufferSize) segmentBufferSize = selectedSegmentBufferSize -- cgit 1.2.3-korg