aboutsummaryrefslogtreecommitdiffstats
path: root/Managers/MultimediaManager.cpp
diff options
context:
space:
mode:
authorjsamain <jsamain@cisco.com>2019-05-27 18:59:35 +0200
committerjsamain <jsamain@cisco.com>2019-05-27 18:59:35 +0200
commit2a876fc0d7986dc1ecb169bdc41972fe0f33d0dd (patch)
tree4a907472bfbe31e3fa75e3291282af27d6ba6956 /Managers/MultimediaManager.cpp
parent6dd3a9e9f88d7ef36707dad09f16685944aa182c (diff)
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 <jsamain@cisco.com>
Diffstat (limited to 'Managers/MultimediaManager.cpp')
-rw-r--r--Managers/MultimediaManager.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/Managers/MultimediaManager.cpp b/Managers/MultimediaManager.cpp
index 30f8427a..81c5514e 100644
--- a/Managers/MultimediaManager.cpp
+++ b/Managers/MultimediaManager.cpp
@@ -99,7 +99,7 @@ bool MultimediaManager::initICN(const std::string& url)
{
this->url = url;
EnterCriticalSection(&this->monitorMutex);
- this->icnConn = new libdash::framework::input::ICNConnectionConsumerApi(20.0, this->beta, this->drop);
+ this->icnConn = new libdash::framework::input::ICNConnectionConsumerApi(20.0, this->beta, this->drop, this->v6FirstWord);
icnConn->InitForMPD(url);
int ret = 0;
char * data = (char *)malloc(4096);
@@ -394,14 +394,14 @@ void MultimediaManager::notifyAudioBufferObservers(uint32_t fillstateInPercent)
void MultimediaManager::initVideoRendering(uint32_t offset)
{
- this->videoStream = new MultimediaStream(viper::managers::VIDEO, this->mpdWrapper, this->segmentBufferSize, this->isICN(), this->icnAlpha, this->noDecoding, this->beta, this->drop);
+ this->videoStream = new MultimediaStream(viper::managers::VIDEO, this->mpdWrapper, this->segmentBufferSize, this->isICN(), this->icnAlpha, this->noDecoding, this->beta, this->drop, this->v6FirstWord);
this->videoStream->attachStreamObserver(this);
this->videoStream->setPosition(offset);
}
void MultimediaManager::initAudioPlayback(uint32_t offset)
{
- this->audioStream = new MultimediaStream(viper::managers::AUDIO, this->mpdWrapper, this->segmentBufferSize, this->isICN(), this->icnAlpha, this->noDecoding, this->beta, this->drop);
+ this->audioStream = new MultimediaStream(viper::managers::AUDIO, this->mpdWrapper, this->segmentBufferSize, this->isICN(), this->icnAlpha, this->noDecoding, this->beta, this->drop, this->v6FirstWord);
this->audioStream->attachStreamObserver(this);
this->audioStream->setPosition(offset);
}
@@ -673,6 +673,11 @@ void MultimediaManager::setDrop(float drop)
this->drop = drop;
}
+void MultimediaManager::setV6FirstWord(std::string v6FirstWord)
+{
+ this->v6FirstWord = v6FirstWord;
+}
+
void MultimediaManager::fetchMPD()
{
if(this->icn)